Repository navigation
Commit b11d98b
authored
Python: fix(ollama): preserve streamed parallel tool calls by assigning call index (#14623)
### Summary
Fixes #14614
When Ollama streams tool calls across response chunks, each chunk
contains a tool call without an `id` or `index`. When the stream is
reduced across chunks via `StreamingChatMessageContent.__add__`,
`FunctionCallContent.__add__` collapsed all parallel tool calls with
`index=None` into a single tool call (keeping the first function name
and merging subsequent argument dictionaries into it).
### Changes
1. In `OllamaChatCompletion._inner_get_streaming_chat_message_contents`,
maintain a running `tool_call_index` across streamed chunks and pass it
to message parsers.
2. In `_create_streaming_chat_message_content_from_chat_response`,
`_parse_tool_calls`, `_create_chat_message_content`, and
`_create_streaming_chat_message_content`, assign the sequential `index`
(falling back to `start_index + idx` if `index` is not present on the
tool call).
3. Added unit tests for both mapping/dict chunks and `ChatResponse`
chunks verifying that when parallel tool call chunks are combined via
`reduce(lambda x, y: x + y, chunks)`, both function calls remain
distinct with their respective names, arguments, and sequential indices.
### Verification
- Ran `uv run --with "ollama" pytest tests/unit/connectors/ai/ollama/`
(62 passed).
- Ran `uv run ruff check semantic_kernel/connectors/ai/ollama/
tests/unit/connectors/ai/ollama/` (all checks passed).1 parent cb59096 commit b11d98b
2 files changed
Lines changed: 163 additions & 8 deletions
File tree
- python
- semantic_kernel/connectors/ai/ollama/services
- tests/unit/connectors/ai/ollama/services
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
201 | 201 | | |
202 | 202 | | |
203 | 203 | | |
| 204 | + | |
204 | 205 | | |
205 | 206 | | |
206 | | - | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
207 | 212 | | |
208 | 213 | | |
209 | | - | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
210 | 219 | | |
211 | 220 | | |
212 | 221 | | |
| |||
219 | 228 | | |
220 | 229 | | |
221 | 230 | | |
| 231 | + | |
222 | 232 | | |
223 | 233 | | |
224 | 234 | | |
| |||
230 | 240 | | |
231 | 241 | | |
232 | 242 | | |
233 | | - | |
| 243 | + | |
234 | 244 | | |
235 | 245 | | |
236 | 246 | | |
| |||
241 | 251 | | |
242 | 252 | | |
243 | 253 | | |
244 | | - | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
245 | 257 | | |
246 | | - | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
247 | 262 | | |
248 | 263 | | |
249 | 264 | | |
250 | 265 | | |
| 266 | + | |
251 | 267 | | |
252 | 268 | | |
253 | 269 | | |
| |||
286 | 302 | | |
287 | 303 | | |
288 | 304 | | |
289 | | - | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
290 | 309 | | |
291 | 310 | | |
292 | 311 | | |
293 | 312 | | |
| 313 | + | |
294 | 314 | | |
295 | 315 | | |
296 | 316 | | |
| |||
304 | 324 | | |
305 | 325 | | |
306 | 326 | | |
307 | | - | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
308 | 331 | | |
309 | 332 | | |
310 | 333 | | |
| |||
320 | 343 | | |
321 | 344 | | |
322 | 345 | | |
323 | | - | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
324 | 350 | | |
325 | 351 | | |
326 | 352 | | |
327 | 353 | | |
| 354 | + | |
328 | 355 | | |
329 | 356 | | |
330 | 357 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
451 | 451 | | |
452 | 452 | | |
453 | 453 | | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
0 commit comments