chore: opt video channel and platform

relay/constant/relay_mode.go

@@ -40,11 +40,8 @@ const (
 	RelayModeSunoFetchByID
 	RelayModeSunoSubmit
 
-	RelayModeKlingFetchByID
-	RelayModeKlingSubmit
-
-	RelayModeJimengFetchByID
-	RelayModeJimengSubmit
+	RelayModeVideoFetchByID
+	RelayModeVideoSubmit
 
 	RelayModeRerank
 
@@ -145,23 +142,3 @@ func Path2RelaySuno(method, path string) int {
 	}
 	return relayMode
 }
-
-func Path2RelayKling(method, path string) int {
-	relayMode := RelayModeUnknown
-	if method == http.MethodPost && strings.HasSuffix(path, "/video/generations") {
-		relayMode = RelayModeKlingSubmit
-	} else if method == http.MethodGet && (strings.Contains(path, "/video/generations")) {
-		relayMode = RelayModeKlingFetchByID
-	}
-	return relayMode
-}
-
-func Path2RelayJimeng(method, path string) int {
-	relayMode := RelayModeUnknown
-	if method == http.MethodPost && strings.HasSuffix(path, "/video/generations") {
-		relayMode = RelayModeJimengSubmit
-	} else if method == http.MethodGet && strings.Contains(path, "/video/generations/") {
-		relayMode = RelayModeJimengFetchByID
-	}
-	return relayMode
-}

relay/relay_adaptor.go

@@ -1,8 +1,8 @@
 package relay
 
 import (
+	"github.com/gin-gonic/gin"
 	"one-api/constant"
-	commonconstant "one-api/constant"
 	"one-api/relay/channel"
 	"one-api/relay/channel/ali"
 	"one-api/relay/channel/aws"
@@ -34,6 +34,7 @@ import (
 	"one-api/relay/channel/xunfei"
 	"one-api/relay/channel/zhipu"
 	"one-api/relay/channel/zhipu_4v"
+	"strconv"
 )
 
 func GetAdaptor(apiType int) channel.Adaptor {
@@ -100,16 +101,28 @@ func GetAdaptor(apiType int) channel.Adaptor {
 	return nil
 }
 
-func GetTaskAdaptor(platform commonconstant.TaskPlatform) channel.TaskAdaptor {
+func GetTaskPlatform(c *gin.Context) constant.TaskPlatform {
+	channelType := c.GetInt("channel_type")
+	if channelType > 0 {
+		return constant.TaskPlatform(strconv.Itoa(channelType))
+	}
+	return constant.TaskPlatform(c.GetString("platform"))
+}
+
+func GetTaskAdaptor(platform constant.TaskPlatform) channel.TaskAdaptor {
 	switch platform {
 	//case constant.APITypeAIProxyLibrary:
 	//	return &aiproxy.Adaptor{}
-	case commonconstant.TaskPlatformSuno:
+	case constant.TaskPlatformSuno:
 		return &suno.TaskAdaptor{}
-	case commonconstant.TaskPlatformKling:
-		return &kling.TaskAdaptor{}
-	case commonconstant.TaskPlatformJimeng:
-		return &taskjimeng.TaskAdaptor{}
+	}
+	if channelType, err := strconv.ParseInt(string(platform), 10, 64); err == nil {
+		switch channelType {
+		case constant.ChannelTypeKling:
+			return &kling.TaskAdaptor{}
+		case constant.ChannelTypeJimeng:
+			return &taskjimeng.TaskAdaptor{}
+		}
 	}
 	return nil
 }

relay/relay_task.go

@@ -24,6 +24,9 @@ Task 任务通过平台、Action 区分任务
 */
 func RelayTaskSubmit(c *gin.Context, relayMode int) (taskErr *dto.TaskError) {
 	platform := constant.TaskPlatform(c.GetString("platform"))
+	if platform == "" {
+		platform = GetTaskPlatform(c)
+	}
 	relayInfo := relaycommon.GenTaskRelayInfo(c)
 
 	adaptor := GetTaskAdaptor(platform)
@@ -178,7 +181,7 @@ func RelayTaskSubmit(c *gin.Context, relayMode int) (taskErr *dto.TaskError) {
 var fetchRespBuilders = map[int]func(c *gin.Context) (respBody []byte, taskResp *dto.TaskError){
 	relayconstant.RelayModeSunoFetchByID:  sunoFetchByIDRespBodyBuilder,
 	relayconstant.RelayModeSunoFetch:      sunoFetchRespBodyBuilder,
-	relayconstant.RelayModeKlingFetchByID: videoFetchByIDRespBodyBuilder,
+	relayconstant.RelayModeVideoFetchByID: videoFetchByIDRespBodyBuilder,
 }
 
 func RelayTaskFetch(c *gin.Context, relayMode int) (taskResp *dto.TaskError) {