jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-09 04:37:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix tool_calls compatibility issues with LobeChat (#1009)

Browse Source
This commit is contained in:
Kent Dong
2024-05-30 19:20:48 +08:00
committed by GitHub
parent 38ddc49360
commit bdd050b926
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/wasm-go/extensions/ai-proxy/provider/model.go
View File

@@ -54,7 +54,7 @@ type toolChoice struct {
type chatCompletionResponse struct { type chatCompletionResponse struct {
Id string `json:"id,omitempty"` Id string `json:"id,omitempty"`
Choices []chatCompletionChoice `json:"choices,omitempty"` Choices []chatCompletionChoice `json:"choices"`
Created int64 `json:"created,omitempty"` Created int64 `json:"created,omitempty"`
Model string `json:"model,omitempty"` Model string `json:"model,omitempty"`
SystemFingerprint string `json:"system_fingerprint,omitempty"` SystemFingerprint string `json:"system_fingerprint,omitempty"`
@@ -102,14 +102,15 @@ func (m *chatMessage) IsEmpty() bool {
} }
type toolCall struct { type toolCall struct {
Index int `json:"index"`
Id string `json:"id"` Id string `json:"id"`
Type string `json:"type"` Type string `json:"type"`
Function functionCall `json:"function"` Function functionCall `json:"function"`
} }
type functionCall struct { type functionCall struct {
Id string `json:"id,omitempty"` Id string `json:"id"`
Name string `json:"name,omitempty"` Name string `json:"name"`
Arguments string `json:"arguments"` Arguments string `json:"arguments"`
} }

38
plugins/wasm-go/extensions/ai-proxy/provider/qwen.go
View File

@@ -341,6 +341,7 @@ func (m *qwenProvider) buildChatCompletionStreamingResponse(ctx wrapper.HttpCont
Id: qwenResponse.RequestId, Id: qwenResponse.RequestId,
Created: time.Now().UnixMilli() / 1000, Created: time.Now().UnixMilli() / 1000,
Model: ctx.GetContext(ctxKeyFinalRequestModel).(string), Model: ctx.GetContext(ctxKeyFinalRequestModel).(string),
Choices: make([]chatCompletionChoice, 0),
SystemFingerprint: "", SystemFingerprint: "",
Object: objectChatCompletionChunk, Object: objectChatCompletionChunk,
} }
@@ -350,12 +351,16 @@ func (m *qwenProvider) buildChatCompletionStreamingResponse(ctx wrapper.HttpCont
qwenChoice := qwenResponse.Output.Choices[0] qwenChoice := qwenResponse.Output.Choices[0]
message := qwenChoice.Message message := qwenChoice.Message
deltaMessage := &chatMessage{Role: message.Role, Content: message.Content, ToolCalls: append([]toolCall{}, message.ToolCalls...)} deltaContentMessage := &chatMessage{Role: message.Role, Content: message.Content}
deltaToolCallsMessage := &chatMessage{Role: message.Role, ToolCalls: append([]toolCall{}, message.ToolCalls...)}
if !incrementalStreaming { if !incrementalStreaming {
if pushedMessage, ok := ctx.GetContext(ctxKeyPushedMessage).(qwenMessage); ok { if pushedMessage, ok := ctx.GetContext(ctxKeyPushedMessage).(qwenMessage); ok {
deltaMessage.Content = util.StripPrefix(deltaMessage.Content, pushedMessage.Content) if message.Content == "" {
if len(deltaMessage.ToolCalls) > 0 && pushedMessage.ToolCalls != nil { message.Content = pushedMessage.Content
for i, tc := range deltaMessage.ToolCalls { }
deltaContentMessage.Content = util.StripPrefix(deltaContentMessage.Content, pushedMessage.Content)
if len(deltaToolCallsMessage.ToolCalls) > 0 && pushedMessage.ToolCalls != nil {
for i, tc := range deltaToolCallsMessage.ToolCalls {
if i >= len(pushedMessage.ToolCalls) { if i >= len(pushedMessage.ToolCalls) {
break break
} }
@@ -363,24 +368,37 @@ func (m *qwenProvider) buildChatCompletionStreamingResponse(ctx wrapper.HttpCont
tc.Function.Id = util.StripPrefix(tc.Function.Id, pushedFunction.Id) tc.Function.Id = util.StripPrefix(tc.Function.Id, pushedFunction.Id)
tc.Function.Name = util.StripPrefix(tc.Function.Name, pushedFunction.Name) tc.Function.Name = util.StripPrefix(tc.Function.Name, pushedFunction.Name)
tc.Function.Arguments = util.StripPrefix(tc.Function.Arguments, pushedFunction.Arguments) tc.Function.Arguments = util.StripPrefix(tc.Function.Arguments, pushedFunction.Arguments)
deltaMessage.ToolCalls[i] = tc deltaToolCallsMessage.ToolCalls[i] = tc
} }
} }
} }
ctx.SetContext(ctxKeyPushedMessage, message) ctx.SetContext(ctxKeyPushedMessage, message)
} }
if !deltaMessage.IsEmpty() { if !deltaContentMessage.IsEmpty() {
deltaResponse := *&baseMessage response := *&baseMessage
deltaResponse.Choices = append(deltaResponse.Choices, chatCompletionChoice{Delta: deltaMessage}) response.Choices = append(response.Choices, chatCompletionChoice{Delta: deltaContentMessage})
responses = append(responses, &deltaResponse) responses = append(responses, &response)
}
if !deltaToolCallsMessage.IsEmpty() {
response := *&baseMessage
response.Choices = append(response.Choices, chatCompletionChoice{Delta: deltaToolCallsMessage})
responses = append(responses, &response)
} }
// Yes, Qwen uses a string "null" as null. // Yes, Qwen uses a string "null" as null.
if qwenChoice.FinishReason != "" && qwenChoice.FinishReason != "null" { if qwenChoice.FinishReason != "" && qwenChoice.FinishReason != "null" {
finishResponse := *&baseMessage finishResponse := *&baseMessage
finishResponse.Choices = append(finishResponse.Choices, chatCompletionChoice{FinishReason: qwenChoice.FinishReason}) finishResponse.Choices = append(finishResponse.Choices, chatCompletionChoice{FinishReason: qwenChoice.FinishReason})
responses = append(responses, &finishResponse)
usageResponse := *&baseMessage
usageResponse.Usage = chatCompletionUsage{
PromptTokens: qwenResponse.Usage.InputTokens,
CompletionTokens: qwenResponse.Usage.OutputTokens,
TotalTokens: qwenResponse.Usage.TotalTokens,
}
responses = append(responses, &finishResponse, &usageResponse)
} }
return responses return responses