feat: support Tencent's model (close #519)

4d65a13a · JustSong · dfd5b615 · 4d65a13a · 4d65a13a · 4d65a13a
Commit 4d65a13a authored Oct 03, 2023 by JustSong
10 changed files
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用 
   + [x] [讯飞星火认知大模型](https://www.xfyun.cn/doc/spark/Web.html)
   + [x] [智谱 ChatGLM 系列模型](https://bigmodel.cn)
   + [x] [360 智脑](https://ai.360.cn)
+   + [x] [腾讯混元大模型](https://cloud.tencent.com/document/product/1729)
 2. 支持配置镜像以及众多第三方代理服务：
   + [x] [OpenAI-SB](https://openai-sb.com)
   + [x] [CloseAI](https://console.closeai-asia.com/r/2412)

--- a/common/constants.go
+++ b/common/constants.go
@@ -186,30 +186,32 @@ const (
 	ChannelTypeOpenRouter     = 20
 	ChannelTypeAIProxyLibrary = 21
 	ChannelTypeFastGPT        = 22
+	ChannelTypeTencent        = 23
 )
 var ChannelBaseURLs = []string{
-	"",                                // 0
+	"",                                  // 0
-	"https://api.openai.com",          // 1
+	"https://api.openai.com",            // 1
-	"https://oa.api2d.net",            // 2
+	"https://oa.api2d.net",              // 2
-	"",                                // 3
+	"",                                  // 3
-	"https://api.closeai-proxy.xyz",   // 4
+	"https://api.closeai-proxy.xyz",     // 4
-	"https://api.openai-sb.com",       // 5
+	"https://api.openai-sb.com",         // 5
-	"https://api.openaimax.com",       // 6
+	"https://api.openaimax.com",         // 6
-	"https://api.ohmygpt.com",         // 7
+	"https://api.ohmygpt.com",           // 7
-	"",                                // 8
+	"",                                  // 8
-	"https://api.caipacity.com",       // 9
+	"https://api.caipacity.com",         // 9
-	"https://api.aiproxy.io",          // 10
+	"https://api.aiproxy.io",            // 10
-	"",                                // 11
+	"",                                  // 11
-	"https://api.api2gpt.com",         // 12
+	"https://api.api2gpt.com",           // 12
-	"https://api.aigc2d.com",          // 13
+	"https://api.aigc2d.com",            // 13
-	"https://api.anthropic.com",       // 14
+	"https://api.anthropic.com",         // 14
-	"https://aip.baidubce.com",        // 15
+	"https://aip.baidubce.com",          // 15
-	"https://open.bigmodel.cn",        // 16
+	"https://open.bigmodel.cn",          // 16
-	"https://dashscope.aliyuncs.com",  // 17
+	"https://dashscope.aliyuncs.com",    // 17
-	"",                                // 18
+	"",                                  // 18
-	"https://ai.360.cn",               // 19
+	"https://ai.360.cn",                 // 19
-	"https://openrouter.ai/api",       // 20
+	"https://openrouter.ai/api",         // 20
-	"https://api.aiproxy.io",          // 21
+	"https://api.aiproxy.io",            // 21
-	"https://fastgpt.run/api/openapi", // 22
+	"https://fastgpt.run/api/openapi",   // 22
+	"https://hunyuan.cloud.tencent.com", //23
 }
--- a/common/model-ratio.go
+++ b/common/model-ratio.go
@@ -59,6 +59,7 @@ var ModelRatio = map[string]float64{
 	"embedding-bert-512-v1":     0.0715, // ¥0.001 / 1k tokens
 	"embedding_s1_v1":           0.0715, // ¥0.001 / 1k tokens
 	"semantic_similarity_s1_v1": 0.0715, // ¥0.001 / 1k tokens
+	"hunyuan":                   7.143,  // ¥0.1 / 1k tokens  // https://cloud.tencent.com/document/product/1729/97731#e0e6be58-60c8-469f-bdeb-6c264ce3b4d0
 }
 func ModelRatio2JSONString() string {

--- a/controller/model.go
+++ b/controller/model.go
@@ -423,6 +423,15 @@ func init() {
 			Root:       "semantic_similarity_s1_v1",
 			Parent:     nil,
 		},
+		{
+			Id:         "hunyuan",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "tencent",
+			Permission: permission,
+			Root:       "hunyuan",
+			Parent:     nil,
+		},
 	}
 	openAIModelsMap = make(map[string]OpenAIModels)
 	for _, model := range openAIModels {

--- a/controller/option.go
+++ b/controller/option.go
@@ -46,7 +46,7 @@ func UpdateOption(c *gin.Context) {
 		if option.Value == "true" && common.GitHubClientId == "" {
 			c.JSON(http.StatusOK, gin.H{
 				"success": false,
-				"message": "无法启用 GitHub OAuth，请先填入 GitHub Client ID 以及 GitHub Client Secret！",
+				"message": "无法启用 GitHub OAuth，请先填入 GitHub Client Id 以及 GitHub Client Secret！",
 			})
 			return
 		}

--- a/controller/relay-tencent.go
+++ b/controller/relay-tencent.go
--- a/controller/relay-text.go
+++ b/controller/relay-text.go
@@ -24,6 +24,7 @@ const (
 	APITypeAli
 	APITypeXunfei
 	APITypeAIProxyLibrary
+	APITypeTencent
 )
 var httpClient *http.Client
@@ -109,6 +110,8 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 		apiType = APITypeXunfei
 	case common.ChannelTypeAIProxyLibrary:
 		apiType = APITypeAIProxyLibrary
+	case common.ChannelTypeTencent:
+		apiType = APITypeTencent
 	}
 	baseURL := common.ChannelBaseURLs[channelType]
 	requestURL := c.Request.URL.String()
@@ -179,6 +182,8 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 		if relayMode == RelayModeEmbeddings {
 			fullRequestURL = "https://dashscope.aliyuncs.com/api/v1/services/embeddings/text-embedding/text-embedding"
 		}
+	case APITypeTencent:
+		fullRequestURL = "https://hunyuan.cloud.tencent.com/hyllm/v1/chat/completions"
 	case APITypeAIProxyLibrary:
 		fullRequestURL = fmt.Sprintf("%s/api/library/ask", baseURL)
 	}
@@ -285,6 +290,23 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 			return errorWrapper(err, "marshal_text_request_failed", http.StatusInternalServerError)
 		}
 		requestBody = bytes.NewBuffer(jsonStr)
+	case APITypeTencent:
+		apiKey := c.Request.Header.Get("Authorization")
+		apiKey = strings.TrimPrefix(apiKey, "Bearer ")
+		appId, secretId, secretKey, err := parseTencentConfig(apiKey)
+		if err != nil {
+			return errorWrapper(err, "invalid_tencent_config", http.StatusInternalServerError)
+		}
+		tencentRequest := requestOpenAI2Tencent(textRequest)
+		tencentRequest.AppId = appId
+		tencentRequest.SecretId = secretId
+		jsonStr, err := json.Marshal(tencentRequest)
+		if err != nil {
+			return errorWrapper(err, "marshal_text_request_failed", http.StatusInternalServerError)
+		}
+		sign := getTencentSign(*tencentRequest, secretKey)
+		c.Request.Header.Set("Authorization", sign)
+		requestBody = bytes.NewBuffer(jsonStr)
 	case APITypeAIProxyLibrary:
 		aiProxyLibraryRequest := requestOpenAI2AIProxyLibrary(textRequest)
 		aiProxyLibraryRequest.LibraryId = c.GetString("library_id")
@@ -332,6 +354,8 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 			if textRequest.Stream {
 				req.Header.Set("X-DashScope-SSE", "enable")
 			}
+		case APITypeTencent:
+			req.Header.Set("Authorization", apiKey)
 		default:
 			req.Header.Set("Authorization", "Bearer "+apiKey)
 		}
@@ -584,6 +608,25 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 			}
 			return nil
 		}
+	case APITypeTencent:
+		if isStream {
+			err, responseText := tencentStreamHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			textResponse.Usage.PromptTokens = promptTokens
+			textResponse.Usage.CompletionTokens = countTokenText(responseText, textRequest.Model)
+			return nil
+		} else {
+			err, usage := tencentHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
+		}
 	default:
 		return errorWrapper(errors.New("unknown api type"), "unknown_api_type", http.StatusInternalServerError)
 	}

--- a/middleware/distributor.go
+++ b/middleware/distributor.go
@@ -25,12 +25,12 @@ func Distribute() func(c *gin.Context) {
 		if ok {
 			id, err := strconv.Atoi(channelId.(string))
 			if err != nil {
-				abortWithMessage(c, http.StatusBadRequest, "无效的渠道 ID")
+				abortWithMessage(c, http.StatusBadRequest, "无效的渠道 Id")
 				return
 			}
 			channel, err = model.GetChannelById(id, true)
 			if err != nil {
-				abortWithMessage(c, http.StatusBadRequest, "无效的渠道 ID")
+				abortWithMessage(c, http.StatusBadRequest, "无效的渠道 Id")
 				return
 			}
 			if channel.Status != common.ChannelStatusEnabled {

--- a/web/src/constants/channel.constants.js
+++ b/web/src/constants/channel.constants.js
@@ -8,6 +8,7 @@ export const CHANNEL_OPTIONS = [
  { key: 18, text: '讯飞星火认知', value: 18, color: 'blue' },
  { key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet' },
  { key: 19, text: '360 智脑', value: 19, color: 'blue' },
+  { key: 23, text: '腾讯混元', value: 23, color: 'teal' },
  { key: 8, text: '自定义渠道', value: 8, color: 'pink' },
  { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
  { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },

--- a/web/src/pages/Channel/EditChannel.js
+++ b/web/src/pages/Channel/EditChannel.js
@@ -19,6 +19,8 @@ function type2secretPrompt(type) {
      return '按照如下格式输入：APPID|APISecret|APIKey';
    case 22:
      return '按照如下格式输入：APIKey-AppId，例如：fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041';
+    case 23:
+      return '按照如下格式输入：AppId|SecretId|SecretKey';
    default:
      return '请输入渠道对应的鉴权密钥';
  }
@@ -78,6 +80,9 @@ const EditChannel = () => {
        case 19:
          localModels = ['360GPT_S2_V9', 'embedding-bert-512-v1', 'embedding_s1_v1', 'semantic_similarity_s1_v1'];
          break;
+        case 23:
+          localModels = ['hunyuan'];
+          break;
      }
      setInputs((inputs) => ({ ...inputs, models: localModels }));
    }