jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openai: finish_reason as tool_calls for streaming with tools (#7963)

Browse Source
This commit is contained in:
Anuraag (Rag) Agrawal 2025-02-14 03:20:12 +09:00 committed by GitHub
parent a4f69a0191
commit 10d59d5f90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openai/openai.go
View File

@ -20,6 +20,8 @@ import (
"github.com/ollama/ollama/types/model" "github.com/ollama/ollama/types/model"
) )
var finishReasonToolCalls = "tool_calls"
type Error struct { type Error struct {
Message string `json:"message"` Message string `json:"message"`
Type string `json:"type"` Type string `json:"type"`
@ -266,7 +268,7 @@ func toChatCompletion(id string, r api.ChatResponse) ChatCompletion {
} }
} }
func toChunk(id string, r api.ChatResponse) ChatCompletionChunk { func toChunk(id string, r api.ChatResponse, toolCallSent bool) ChatCompletionChunk {
toolCalls := toToolCalls(r.Message.ToolCalls) toolCalls := toToolCalls(r.Message.ToolCalls)
return ChatCompletionChunk{ return ChatCompletionChunk{
Id: id, Id: id,
@ -279,6 +281,9 @@ func toChunk(id string, r api.ChatResponse) ChatCompletionChunk {
Delta: Message{Role: "assistant", Content: r.Message.Content, ToolCalls: toolCalls}, Delta: Message{Role: "assistant", Content: r.Message.Content, ToolCalls: toolCalls},
FinishReason: func(reason string) *string { FinishReason: func(reason string) *string {
if len(reason) > 0 { if len(reason) > 0 {
if toolCallSent {
return &finishReasonToolCalls
}
return &reason return &reason
} }
return nil return nil
@ -585,6 +590,7 @@ type ChatWriter struct {
stream bool stream bool
streamOptions *StreamOptions streamOptions *StreamOptions
id string id string
toolCallSent bool
BaseWriter BaseWriter
} }
@ -634,11 +640,14 @@ func (w *ChatWriter) writeResponse(data []byte) (int, error) {
// chat chunk // chat chunk
if w.stream { if w.stream {
c := toChunk(w.id, chatResponse) c := toChunk(w.id, chatResponse, w.toolCallSent)
d, err := json.Marshal(c) d, err := json.Marshal(c)
if err != nil { if err != nil {
return 0, err return 0, err
} }
if !w.toolCallSent && len(c.Choices) > 0 && len(c.Choices[0].Delta.ToolCalls) > 0 {
w.toolCallSent = true
}
w.ResponseWriter.Header().Set("Content-Type", "text/event-stream") w.ResponseWriter.Header().Set("Content-Type", "text/event-stream")
_, err = w.ResponseWriter.Write([]byte(fmt.Sprintf("data: %s\n\n", d))) _, err = w.ResponseWriter.Write([]byte(fmt.Sprintf("data: %s\n\n", d)))