refactor: comment out image file validation for qwen edit in Ali image processing

relay/channel/ali/image.go

@@ -98,9 +98,9 @@ func oaiFormEdit2AliImageEdit(c *gin.Context, info *relaycommon.RelayInfo, reque
 		return nil, errors.New("image is required")
 	}
 
-	if len(imageFiles) > 1 {
-		return nil, errors.New("only one image is supported for qwen edit")
-	}
+	//if len(imageFiles) > 1 {
+	//	return nil, errors.New("only one image is supported for qwen edit")
+	//}
 
 	// 获取base64编码的图片
 	var imageBase64s []string

relay/channel/task/ali/adaptor.go

@@ -5,10 +5,12 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strconv"
 	"strings"
 
 	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/dto"
+	"github.com/QuantumNous/new-api/logger"
 	"github.com/QuantumNous/new-api/model"
 	"github.com/QuantumNous/new-api/relay/channel"
 	relaycommon "github.com/QuantumNous/new-api/relay/common"
@@ -108,6 +110,7 @@ type TaskAdaptor struct {
 	ChannelType int
 	apiKey      string
 	baseURL     string
+	aliReq      *AliVideoRequest
 }
 
 func (a *TaskAdaptor) Init(info *relaycommon.RelayInfo) {
@@ -118,6 +121,16 @@ func (a *TaskAdaptor) Init(info *relaycommon.RelayInfo) {
 
 func (a *TaskAdaptor) ValidateRequestAndSetAction(c *gin.Context, info *relaycommon.RelayInfo) (taskErr *dto.TaskError) {
 	// 阿里通义万相支持 JSON 格式，不使用 multipart
+	var taskReq relaycommon.TaskSubmitReq
+	if err := common.UnmarshalBodyReusable(c, &taskReq); err != nil {
+		return service.TaskErrorWrapper(err, "unmarshal_task_request_failed", http.StatusBadRequest)
+	}
+	aliReq, err := a.convertToAliRequest(info, taskReq)
+	if err != nil {
+		return service.TaskErrorWrapper(err, "convert_to_ali_request_failed", http.StatusInternalServerError)
+	}
+	a.aliReq = aliReq
+	logger.LogJson(c, "ali video request body", aliReq)
 	return relaycommon.ValidateMultipartDirect(c, info)
 }
 
@@ -134,13 +147,7 @@ func (a *TaskAdaptor) BuildRequestHeader(c *gin.Context, req *http.Request, info
 }
 
 func (a *TaskAdaptor) BuildRequestBody(c *gin.Context, info *relaycommon.RelayInfo) (io.Reader, error) {
-	var taskReq relaycommon.TaskSubmitReq
-	if err := common.UnmarshalBodyReusable(c, &taskReq); err != nil {
-		return nil, errors.Wrap(err, "unmarshal_task_request_failed")
-	}
-	aliReq := a.convertToAliRequest(taskReq)
-
-	bodyBytes, err := common.Marshal(aliReq)
+	bodyBytes, err := common.Marshal(a.aliReq)
 	if err != nil {
 		return nil, errors.Wrap(err, "marshal_ali_request_failed")
 	}
@@ -148,7 +155,31 @@ func (a *TaskAdaptor) BuildRequestBody(c *gin.Context, info *relaycommon.RelayIn
 	return bytes.NewReader(bodyBytes), nil
 }
 
-func (a *TaskAdaptor) convertToAliRequest(req relaycommon.TaskSubmitReq) *AliVideoRequest {
+func (a *TaskAdaptor) convertToAliRequest(info *relaycommon.RelayInfo, req relaycommon.TaskSubmitReq) (*AliVideoRequest, error) {
+	otherRatios := map[string]map[string]float64{
+		"wan2.5-i2v-preview": {
+			"480P":  1,
+			"720P":  2,
+			"1080P": 1 / 0.3,
+		},
+		"wan2.2-i2v-plus": {
+			"480P":  1,
+			"1080P": 0.7 / 0.14,
+		},
+		"wan2.2-kf2v-flash": {
+			"480P":  1,
+			"720P":  2,
+			"1080P": 4.8,
+		},
+		"wan2.2-i2v-flash": {
+			"480P": 1,
+			"720P": 2,
+		},
+		"wan2.2-s2v": {
+			"480P": 1,
+			"720P": 0.9 / 0.5,
+		},
+	}
 	aliReq := &AliVideoRequest{
 		Model: req.Model,
 		Input: AliVideoInput{
@@ -185,6 +216,13 @@ func (a *TaskAdaptor) convertToAliRequest(req relaycommon.TaskSubmitReq) *AliVid
 	// 处理时长
 	if req.Duration > 0 {
 		aliReq.Parameters.Duration = req.Duration
+	} else if req.Seconds != "" {
+		seconds, err := strconv.Atoi(req.Seconds)
+		if err != nil {
+			return nil, errors.Wrap(err, "convert seconds to int failed")
+		} else {
+			aliReq.Parameters.Duration = seconds
+		}
 	} else {
 		aliReq.Parameters.Duration = 5 // 默认5秒
 	}
@@ -192,11 +230,32 @@ func (a *TaskAdaptor) convertToAliRequest(req relaycommon.TaskSubmitReq) *AliVid
 	// 从 metadata 中提取额外参数
 	if req.Metadata != nil {
 		if metadataBytes, err := common.Marshal(req.Metadata); err == nil {
-			_ = common.Unmarshal(metadataBytes, aliReq)
+			err = common.Unmarshal(metadataBytes, aliReq)
+			if err != nil {
+				return nil, errors.Wrap(err, "unmarshal metadata failed")
+			}
+		} else {
+			return nil, errors.Wrap(err, "marshal metadata failed")
 		}
 	}
 
-	return aliReq
+	if aliReq.Model != req.Model {
+		return nil, errors.New("can't change model with metadata")
+	}
+
+	info.PriceData.OtherRatios = map[string]float64{
+		"seconds": float64(aliReq.Parameters.Duration),
+	}
+
+	if otherRatio, ok := otherRatios[req.Model]; ok {
+		if ratio, ok := otherRatio[aliReq.Parameters.Resolution]; ok {
+			info.PriceData.OtherRatios[fmt.Sprintf("resolution-%s", aliReq.Parameters.Resolution)] = ratio
+		}
+	}
+
+	// println(fmt.Sprintf("other ratios: %v", info.PriceData.OtherRatios))
+
+	return aliReq, nil
 }
 
 // DoRequest delegates to common helper

relay/channel/task/sora/adaptor.go

@@ -2,13 +2,9 @@ package sora
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"io"
-	"mime"
-	"mime/multipart"
 	"net/http"
-	"strings"
 
 	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/dto"
@@ -91,107 +87,9 @@ func (a *TaskAdaptor) BuildRequestBody(c *gin.Context, info *relaycommon.RelayIn
 	if err != nil {
 		return nil, errors.Wrap(err, "get_request_body_failed")
 	}
-
-	// 检查是否需要模型重定向
-	if !info.IsModelMapped {
-		// 如果不需要重定向，直接返回原始请求体
-		return bytes.NewReader(cachedBody), nil
-	}
-
-	contentType := c.Request.Header.Get("Content-Type")
-
-	// 处理multipart/form-data请求
-	if strings.Contains(contentType, "multipart/form-data") {
-		return buildRequestBodyWithMappedModel(cachedBody, contentType, info.UpstreamModelName)
-	}
-	// 处理JSON请求
-	if strings.Contains(contentType, "application/json") {
-		var jsonData map[string]interface{}
-		if err := json.Unmarshal(cachedBody, &jsonData); err != nil {
-			return nil, errors.Wrap(err, "unmarshal_json_failed")
-		}
-
-		// 替换model字段为映射后的模型名
-		jsonData["model"] = info.UpstreamModelName
-
-		// 重新编码为JSON
-		newBody, err := json.Marshal(jsonData)
-		if err != nil {
-			return nil, errors.Wrap(err, "marshal_json_failed")
-		}
-
-		return bytes.NewReader(newBody), nil
-	}
-
 	return bytes.NewReader(cachedBody), nil
 }
 
-func buildRequestBodyWithMappedModel(originalBody []byte, contentType, redirectedModel string) (io.Reader, error) {
-	newBuffer := &bytes.Buffer{}
-	writer := multipart.NewWriter(newBuffer)
-
-	_, params, err := mime.ParseMediaType(contentType)
-	if err != nil {
-		return nil, errors.Wrap(err, "parse_content_type_failed")
-	}
-	boundary, ok := params["boundary"]
-	if !ok {
-		return nil, errors.New("boundary_not_found_in_content_type")
-	}
-	if err := writer.SetBoundary(boundary); err != nil {
-		return nil, errors.Wrap(err, "set_boundary_failed")
-	}
-	r := multipart.NewReader(bytes.NewReader(originalBody), boundary)
-
-	for {
-		part, err := r.NextPart()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return nil, errors.Wrap(err, "read_multipart_part_failed")
-		}
-
-		fieldName := part.FormName()
-
-		if fieldName == "model" {
-			// 修改 model 字段为映射后的模型名
-			if err := writer.WriteField("model", redirectedModel); err != nil {
-				return nil, errors.Wrap(err, "write_model_field_failed")
-			}
-		} else {
-			// 对于其他字段，保留原始内容
-			if part.FileName() != "" {
-				newPart, err := writer.CreatePart(part.Header)
-				if err != nil {
-					return nil, errors.Wrap(err, "create_form_file_failed")
-				}
-				if _, err := io.Copy(newPart, part); err != nil {
-					return nil, errors.Wrap(err, "copy_file_content_failed")
-				}
-			} else {
-				newPart, err := writer.CreatePart(part.Header)
-				if err != nil {
-					return nil, errors.Wrap(err, "create_form_field_failed")
-				}
-				if _, err := io.Copy(newPart, part); err != nil {
-					return nil, errors.Wrap(err, "copy_field_content_failed")
-				}
-			}
-		}
-
-		if err := part.Close(); err != nil {
-			return nil, errors.Wrap(err, "close_part_failed")
-		}
-	}
-
-	if err := writer.Close(); err != nil {
-		return nil, errors.Wrap(err, "close_multipart_writer_failed")
-	}
-
-	return newBuffer, nil
-}
-
 // DoRequest delegates to common helper.
 func (a *TaskAdaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (*http.Response, error) {
 	return channel.DoTaskApiRequest(a, c, info, requestBody)

relay/common/relay_utils.go

@@ -121,6 +121,7 @@ func ValidateMultipartDirect(c *gin.Context, info *RelayInfo) *dto.TaskError {
 
 	prompt = req.Prompt
 	model = req.Model
+	size = req.Size
 	seconds, _ = strconv.Atoi(req.Seconds)
 	if seconds == 0 {
 		seconds = req.Duration
@@ -223,11 +224,6 @@ func ValidateBasicTaskRequest(c *gin.Context, info *RelayInfo, action string) *d
 		}
 	}
 
-	// 模型映射
-	if info.IsModelMapped {
-		req.Model = info.UpstreamModelName
-	}
-
 	storeTaskRequest(c, info, action, req)
 	return nil
 }

relay/relay_task.go

@@ -17,7 +17,6 @@ import (
 	"github.com/QuantumNous/new-api/relay/channel"
 	relaycommon "github.com/QuantumNous/new-api/relay/common"
 	relayconstant "github.com/QuantumNous/new-api/relay/constant"
-	"github.com/QuantumNous/new-api/relay/helper"
 	"github.com/QuantumNous/new-api/service"
 	"github.com/QuantumNous/new-api/setting/ratio_setting"
 
@@ -39,11 +38,6 @@ func RelayTaskSubmit(c *gin.Context, info *relaycommon.RelayInfo) (taskErr *dto.
 	}
 
 	info.InitChannelMeta(c)
-
-	// 模型映射
-	if err := helper.ModelMappedHelper(c, info, nil); err != nil {
-		return service.TaskErrorWrapper(err, "model_mapped_failed", http.StatusBadRequest)
-	}
 	adaptor := GetTaskAdaptor(platform)
 	if adaptor == nil {
 		return service.TaskErrorWrapperLocal(fmt.Errorf("invalid api platform: %s", platform), "invalid_api_platform", http.StatusBadRequest)
@@ -214,10 +208,6 @@ func RelayTaskSubmit(c *gin.Context, info *relaycommon.RelayInfo) (taskErr *dto.
 	task.Quota = quota
 	task.Data = taskData
 	task.Action = info.Action
-	task.Properties = model.Properties{
-		UpstreamModelName: info.UpstreamModelName,
-		OriginModelName:   info.OriginModelName,
-	}
 	err = task.Insert()
 	if err != nil {
 		taskErr = service.TaskErrorWrapper(err, "insert_task_failed", http.StatusInternalServerError)