Skip to content

Handle ollama's deviation from the OpenAI tool streaming spec #1512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2025
Merged

Handle ollama's deviation from the OpenAI tool streaming spec #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bac76d
name the cli "cli" in package.json for consistency
julien-c Jun 3, 2025
b80f4c8
Handle ollama's deviation from the OpenAI tool streaming spec
julien-c Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/mcp-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"prepare": "pnpm run build",
"test": "vitest run",
"check": "tsc",
"agent": "tsx cli.ts"
"cli": "tsx cli.ts"
},
"files": [
"src",
Expand Down
17 changes: 11 additions & 6 deletions packages/mcp-client/src/McpClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,18 @@ export class McpClient {
for (const toolCall of delta.tool_calls ?? []) {
// aggregating chunks into an encoded arguments JSON object
if (!finalToolCalls[toolCall.index]) {
/// first chunk of the tool call
finalToolCalls[toolCall.index] = toolCall;
}
if (finalToolCalls[toolCall.index].function.arguments === undefined) {
finalToolCalls[toolCall.index].function.arguments = "";
}
if (toolCall.function.arguments) {
finalToolCalls[toolCall.index].function.arguments += toolCall.function.arguments;

/// ensure .function.arguments is always a string
if (finalToolCalls[toolCall.index].function.arguments === undefined) {
finalToolCalls[toolCall.index].function.arguments = "";
}
} else {
/// any subsequent chunk to the same tool call
if (toolCall.function.arguments) {
finalToolCalls[toolCall.index].function.arguments += toolCall.function.arguments;
}
}
}
if (opts.exitIfFirstChunkNoTool && numOfChunks <= 2 && Object.keys(finalToolCalls).length === 0) {
Expand Down