Avoid off-by-one when streaming ongoing tool call arguments

Author: astralord

vllm/entrypoints/openai/serving_chat.py

@@ -810,6 +810,7 @@ async def chat_completion_stream_generator(
                         tool_messages = []
 
                         # Calculate base_index once before the loop
+                        # This represents the number of completed tool calls
                         base_index = 0
                         for msg in harmony_parser.messages:
                             if (msg.channel == "commentary"
@@ -818,6 +819,9 @@ async def chat_completion_stream_generator(
                                         "functions.")):
                                 base_index += 1
 
+                        # next_tool_index tracks the index for the next NEW tool call
+                        next_tool_index = base_index
+
                         for group in groups:
                             group_channel = group['channel']
                             group_recipient = group['recipient']
@@ -832,6 +836,7 @@ async def chat_completion_stream_generator(
                                   and group_recipient.startswith("functions.")):
 
                                 if prev_recipient != group_recipient:
+                                    # New tool call - emit the opening message
                                     tool_name = group_recipient.split(
                                         "functions.", 1)[1]
                                     tool_messages.append(DeltaToolCall(
@@ -841,15 +846,19 @@ async def chat_completion_stream_generator(
                                             name=tool_name,
                                             arguments="",
                                         ),
-                                        index=base_index,
+                                        index=next_tool_index,
                                     ))
                                     prev_recipient = group_recipient
-                                    # Increment index for next tool call
-                                    base_index += 1
+                                    # Increment for any subsequent new tool calls in this chunk
+                                    next_tool_index += 1
 
                                 if group_text:
+                                    # Stream arguments for the ongoing tool call
+                                    # The current call index is next_tool_index - 1 if we just
+                                    # opened it, OR base_index if continuing from prev chunk
+                                    tool_call_index = next_tool_index - 1 if next_tool_index > base_index else base_index
                                     tool_messages.append(DeltaToolCall(
-                                        index=base_index - 1,  # Use the index of the current tool call
+                                        index=tool_call_index,
                                         function=DeltaFunctionCall(
                                             arguments=group_text),
                                     ))