Skip to content

fix: replace blunt pop with assistant message rewriting in _separate_tool_calls #5303

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

Open
jaideepr97 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: replace blunt pop with assistant message rewriting in _separate_tool_calls #5303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b11173
fix: prevent next_turn_messages.pop() from corrupting history with mu…
jaideepr97 Mar 25, 2026
7b63ab9
fix: replace blunt pop with assistant message rewriting in _separate_…
jaideepr97 Mar 25, 2026
7ac4102
refactor: move _separate_tool_calls tests into test_streaming.py
jaideepr97 Mar 27, 2026
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
18 changes: 16 additions & 2 deletions src/llama_stack/providers/inline/responses/builtin/responses/streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,12 @@ def _separate_tool_calls(self, current_response, messages) -> tuple[list, list,
logger.debug(f"Choice message tool_calls: {choice.message.tool_calls}")

if choice.message.tool_calls and self.ctx.response_tools:
executed_tool_calls: list = []
has_deferred_or_denied = False
for tool_call in choice.message.tool_calls:
if is_function_tool_call(tool_call, self.ctx.response_tools):
function_tool_calls.append(tool_call)
executed_tool_calls.append(tool_call)
elif (
tool_call.function
and tool_call.function.name not in _SERVER_SIDE_BUILTIN_TOOL_NAMES
Expand All @@ -709,6 +712,7 @@ def _separate_tool_calls(self, current_response, messages) -> tuple[list, list,
"treating as a client-side function call."
)
function_tool_calls.append(tool_call)
executed_tool_calls.append(tool_call)
else:
if self._approval_required(tool_call.function.name):
approval_response = self.ctx.approval_response(
Expand All @@ -718,15 +722,25 @@ def _separate_tool_calls(self, current_response, messages) -> tuple[list, list,
if approval_response.approve:
logger.info(f"Approval granted for {tool_call.id} on {tool_call.function.name}")
non_function_tool_calls.append(tool_call)
executed_tool_calls.append(tool_call)
else:
logger.info(f"Approval denied for {tool_call.id} on {tool_call.function.name}")
next_turn_messages.pop()
has_deferred_or_denied = True
else:
logger.info(f"Requesting approval for {tool_call.id} on {tool_call.function.name}")
approvals.append(tool_call)
next_turn_messages.pop()
has_deferred_or_denied = True
else:
non_function_tool_calls.append(tool_call)
executed_tool_calls.append(tool_call)
if has_deferred_or_denied:
if executed_tool_calls:
next_turn_messages[-1] = OpenAIAssistantMessageParam(
content=choice.message.content,
tool_calls=executed_tool_calls,
)
else:
next_turn_messages.pop()

return function_tool_calls, non_function_tool_calls, approvals, next_turn_messages

Expand Down
Loading
Loading