Merge branch 'feature/compapi'

* feature/compapi:
  请求参数里的model转存在另外一个请求参数Variables里
  1.fastgptWorkIdMap映射字典增加新的workId 2.增加对fastgpt特有写法的请求参数chatId的支持

desc/openapi/chat.api

@@ -41,6 +41,8 @@ type (
 	FastGptSpecReq {
         //ChatId
         ChatId string `json:"chat_id,optional"`
+		//FastgptChatId
+		FastgptChatId string `json:"chatId,optional"`
         //ResponseChatItemId
         ResponseChatItemId string `json:"response_chat_item_id,optional"`
         //Detail 详情开关
@@ -84,8 +86,8 @@ type (
     }
 
 	FastgptSpecResp {
-		ResponseData []map[string]string `json:"responseData,omitempty"`
-		NewVariables map[string]string `json:"newVariables,omitempty"`
+		ResponseData []map[string]any `json:"responseData,omitempty"`
+		NewVariables map[string]any `json:"newVariables,omitempty"`
 	}
 	
 	ChatCompletionAudio {

internal/logic/chat/chat_completions_logic.go

@@ -64,7 +64,7 @@ func (l *ChatCompletionsLogic) ChatCompletions(req *types.CompApiReq) (resp *typ
 	}
 
 	apiResp, err := l.workForFastgpt(req, workToken, apiKeyObj.OpenaiBase)
-	if err == nil {
+	if err == nil && apiResp != nil {
 		l.doRequestLog(req, apiResp) //请求记录
 	}
 
@@ -187,6 +187,12 @@ func (l *ChatCompletionsLogic) appendUsageDetailLog(authToken string, req *types
 func (l *ChatCompletionsLogic) workForFastgpt(req *types.CompApiReq, apiKey string, apiBase string) (resp *types.CompOpenApiResp, err error) {
 
 	//apiKey := "fastgpt-d2uehCb2T40h9chNGjf4bpFrVKmMkCFPbrjfVLZ6DAL2zzqzOFJWP"
+	if len(req.ChatId) > 0 && len(req.FastgptChatId) == 0 {
+		req.FastgptChatId = req.ChatId
+	}
+	if len(req.Model) > 0 {
+		req.Variables["model"] = req.Model
+	}
 	return compapi.NewFastgptChatCompletions(l.ctx, apiKey, apiBase, req)
 
 }

internal/types/types.go

@@ -1938,6 +1938,8 @@ type CompCtlReq struct {
 type FastGptSpecReq struct {
 	//ChatId
 	ChatId string `json:"chat_id,optional"`
+	//FastgptChatId
+	FastgptChatId string `json:"chatId,optional"`
 	//ResponseChatItemId
 	ResponseChatItemId string `json:"response_chat_item_id,optional"`
 	//Detail 详情开关
@@ -1984,8 +1986,8 @@ type StdCompApiResp struct {
 
 // swagger:model FastgptSpecResp
 type FastgptSpecResp struct {
-	ResponseData []map[string]string `json:"responseData,omitempty"`
-	NewVariables map[string]string   `json:"newVariables,omitempty"`
+	ResponseData []map[string]any `json:"responseData,omitempty"`
+	NewVariables map[string]any   `json:"newVariables,omitempty"`
 }
 
 type ChatCompletionAudio struct {

internal/utils/compapi/config.go

@@ -19,4 +19,5 @@ type workIdInfo struct {
 var fastgptWorkIdMap = map[string]workIdInfo{
 	"default":              {"fastgpt-jcDATa9aH4vtUsjDpCU773BxmLU50IxKUX9nUT0mCTLQkEoo1hPxPEdNQeOEWGTn", 0},
 	"OPTIMIZE_CALL_SCRIPT": {"fastgpt-bcQ9cWKd6y9a2LfizweeWEnukkQi1Oq46yoiRg9yDNLm8NPTWXsyFwcB", 1},
+	"test_douyin":          {"fastgpt-bAbJkLtWyRmJFAPFpwv0LkN5IBdpcheHP8Eu8Rn1qlDjo7QmqwUHMq4D82p", 2},
 }

internal/utils/compapi/func.go

@@ -42,6 +42,7 @@ func DoChatCompletions(ctx context.Context, client *openai.Client, chatInfo *typ
 	if jsonBytes, err = json.Marshal(chatInfo); err != nil {
 		return nil, err
 	}
+	//fmt.Printf("In DoChatCompletions, req: '%s'\n", string(jsonBytes))
 	customResp := types.CompOpenApiResp{}
 	reqBodyOps := option.WithRequestBody("application/json", jsonBytes)
 	respBodyOps := option.WithResponseBodyInto(&customResp)