mirrors2/opencatd-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug

Browse Source
This commit is contained in:
Sakurasan
2024-11-17 21:39:13 +08:00
parent 7519846e20
commit 017bcfcb32
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/openai/chat.go
View File

@@ -53,6 +53,7 @@ type ChatCompletionMessage struct {
Role string `json:"role"` Role string `json:"role"`
Content json.RawMessage `json:"content"` Content json.RawMessage `json:"content"`
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
// MultiContent []VisionContent
} }
type FunctionDefinition struct { type FunctionDefinition struct {
@@ -115,17 +116,27 @@ type ChatCompletionResponse struct {
Message struct { Message struct {
Role string `json:"role"` Role string `json:"role"`
Content string `json:"content"` Content string `json:"content"`
ToolCalls []ToolCall `json:"tool_calls"` ToolCalls []ToolCall `json:"tool_calls,omitempty"`
} `json:"message"` } `json:"message"`
Logprobs string `json:"logprobs"` Logprobs string `json:"logprobs"`
FinishReason string `json:"finish_reason"` FinishReason string `json:"finish_reason"`
} `json:"choices"` } `json:"choices"`
Usage struct { Usage struct {
PromptTokens int `json:"prompt_tokens"` PromptTokens int `json:"prompt_tokens,omitempty"`
CompletionTokens int `json:"completion_tokens"` CompletionTokens int `json:"completion_tokens,omitempty"`
TotalTokens int `json:"total_tokens"` TotalTokens int `json:"total_tokens,omitempty"`
} `json:"usage"` PromptTokensDetails struct {
SystemFingerprint string `json:"system_fingerprint"` CachedTokens int `json:"cached_tokens,omitempty"`
AudioTokens int `json:"audio_tokens,omitempty"`
} `json:"prompt_tokens_details,omitempty"`
CompletionTokensDetails struct {
ReasoningTokens int `json:"reasoning_tokens,omitempty"`
AudioTokens int `json:"audio_tokens,omitempty"`
AcceptedPredictionTokens int `json:"accepted_prediction_tokens,omitempty"`
RejectedPredictionTokens int `json:"rejected_prediction_tokens,omitempty"`
} `json:"completion_tokens_details,omitempty"`
} `json:"usage,omitempty"`
SystemFingerprint string `json:"system_fingerprint,omitempty"`
} }
type Choice struct { type Choice struct {
@@ -304,13 +315,12 @@ func ChatProxy(c *gin.Context, chatReq *ChatCompletionRequest) {
// 处理非流式响应 // 处理非流式响应
body, err := io.ReadAll(teeReader) body, err := io.ReadAll(teeReader)
if err != nil { if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) fmt.Println("Error reading response body:", err)
return return
} }
var opiResp ChatCompletionResponse var opiResp ChatCompletionResponse
if err := json.Unmarshal(body, &opiResp); err != nil { if err := json.Unmarshal(body, &opiResp); err != nil {
log.Println("Error parsing JSON:", err) log.Println("Error parsing JSON:", err)
c.JSON(http.StatusInternalServerError, gin.H{"error": "Error parsing JSON," + err.Error()})
return return
} }
if opiResp.Choices != nil && len(opiResp.Choices) > 0 { if opiResp.Choices != nil && len(opiResp.Choices) > 0 {