Merge branch 'feature/compapi'

* feature/compapi:
  适配 go 官方 sdk
  去除一处无用分支
  修改请求日志处理Content类型推断一个BUG

desc/openapi/chat.api

@@ -125,6 +125,8 @@ type (
 	    Message ChatCompletionMessage  `json:"message,omitempty"`
         // A chat completion message generated by the model stream mode.
 	    Delta ChatCompletionMessage  `json:"delta,omitempty"`
+		//
+		Logprobs string `json:"logprobs"`
     }
 
     CompletionUsageCompletionTokensDetails {

internal/logic/chat/chat_completions_logic.go

@@ -3,7 +3,6 @@ package chat
 import (
 	"context"
 	"errors"
-	"fmt"
 	"strconv"
 
 	"wechat-api/ent"
@@ -164,7 +163,19 @@ func (l *ChatCompletionsLogic) appendUsageDetailLog(authToken string, req *types
 	completionToken := uint64(resp.Usage.CompletionTokens)
 	totalTokens := promptTokens + completionToken
 
-	fmt.Printf("====>n appendUsageDetailLog:%v|||%T\n", req.Messages[0].Content, req.Messages[0].Content)
+	msgContent := ""
+	switch val := req.Messages[0].Content.(type) {
+	case string:
+		msgContent = val
+	case []interface{}:
+		if len(val) > 0 {
+			if valc, ok := val[0].(map[string]interface{}); ok {
+				if valcc, ok := valc["text"]; ok {
+					msgContent, _ = valcc.(string)
+				}
+			}
+		}
+	}
 
 	res, err := l.svcCtx.DB.UsageDetail.Create().
 		SetNotNilType(&logType).
@@ -173,6 +184,7 @@ func (l *ChatCompletionsLogic) appendUsageDetailLog(authToken string, req *types
 		SetNotNilSessionID(&sessionId).
 		SetNillableApp(&workIdx).
 		//SetNillableRequest(&req.Messages[0].Content).
+		SetNillableRequest(&msgContent).
 		SetNillableResponse(&resp.Choices[0].Message.Content).
 		SetNillableOrganizationID(&orgId).
 		SetOriginalData(rawReqResp).

internal/types/types.go

@@ -2024,6 +2024,8 @@ type ChatCompletionChoice struct {
 	Message ChatCompletionMessage `json:"message,omitempty"`
 	// A chat completion message generated by the model stream mode.
 	Delta ChatCompletionMessage `json:"delta,omitempty"`
+	//
+	Logprobs string `json:"logprobs"`
 }
 
 type CompletionUsageCompletionTokensDetails struct {

internal/utils/compapi/func.go

@@ -95,7 +95,7 @@ func DoChatCompletionsStream(ctx context.Context, client *openai.Client, chatInf
 		flusher.Flush()
 		//time.Sleep(1 * time.Millisecond)
 	}
-	fmt.Fprintf(hw, "event:%s\ndata:%s\n\n", "answer", "[DONE]")
+	fmt.Fprintf(hw, "data:%s\n\n", "[DONE]")
 	flusher.Flush()
 	httpx.Ok(hw)