highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-11-11 17:46:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

server: add thinking and tool calls to CompletionResponse

Browse Source
This commit is contained in:
ParthSareen
2025-08-21 14:50:34 -07:00
parent 4a5bdd5f12
commit eb7660d724
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
llm/server.go
View File

@@ -1374,13 +1374,15 @@ func (d DoneReason) String() string {
} }
type CompletionResponse struct { type CompletionResponse struct {
Content string `json:"content"` Content string `json:"content"`
DoneReason DoneReason `json:"done_reason"` Thinking string `json:"thinking"`
Done bool `json:"done"` ToolCalls []api.ToolCall `json:"tool_calls"`
PromptEvalCount int `json:"prompt_eval_count"` DoneReason DoneReason `json:"done_reason"`
PromptEvalDuration time.Duration `json:"prompt_eval_duration"` Done bool `json:"done"`
EvalCount int `json:"eval_count"` PromptEvalCount int `json:"prompt_eval_count"`
EvalDuration time.Duration `json:"eval_duration"` PromptEvalDuration time.Duration `json:"prompt_eval_duration"`
EvalCount int `json:"eval_count"`
EvalDuration time.Duration `json:"eval_duration"`
} }
func (s *llmServer) Completion(ctx context.Context, req CompletionRequest, fn func(CompletionResponse)) error { func (s *llmServer) Completion(ctx context.Context, req CompletionRequest, fn func(CompletionResponse)) error {
@@ -1511,10 +1513,8 @@ func (s *llmServer) Completion(ctx context.Context, req CompletionRequest, fn fu
return ctx.Err() return ctx.Err()
} }
if c.Content != "" { if c.Content != "" || c.Thinking != "" || len(c.ToolCalls) > 0 {
fn(CompletionResponse{ fn(c)
Content: c.Content,
})
} }
if c.Done { if c.Done {