phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-11 19:56:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

small stylistic fixes

Browse source
This commit is contained in:
Ashwin Bharambe 2025-10-28 12:27:05 -07:00
parent ce1392b3a8
commit 2882ae39b9
1 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/llama_stack/providers/inline/agents/meta_reference/responses/tool_executor.py
View file

@ -225,48 +225,58 @@ class ToolExecutor:
# Emit in_progress event based on tool type (only for tools with specific streaming events) # Emit in_progress event based on tool type (only for tools with specific streaming events)
if mcp_tool_to_server and function_name in mcp_tool_to_server: if mcp_tool_to_server and function_name in mcp_tool_to_server:
sequence_number += 1 sequence_number += 1
mcp_progress_event = OpenAIResponseObjectStreamResponseMcpCallInProgress( yield ToolExecutionResult(
stream_event=OpenAIResponseObjectStreamResponseMcpCallInProgress(
item_id=item_id, item_id=item_id,
output_index=output_index, output_index=output_index,
sequence_number=sequence_number, sequence_number=sequence_number,
),
sequence_number=sequence_number,
) )
yield ToolExecutionResult(stream_event=mcp_progress_event, sequence_number=sequence_number)
elif function_name == "web_search": elif function_name == "web_search":
sequence_number += 1 sequence_number += 1
web_progress_event = OpenAIResponseObjectStreamResponseWebSearchCallInProgress( yield ToolExecutionResult(
stream_event=OpenAIResponseObjectStreamResponseWebSearchCallInProgress(
item_id=item_id, item_id=item_id,
output_index=output_index, output_index=output_index,
sequence_number=sequence_number, sequence_number=sequence_number,
),
sequence_number=sequence_number,
) )
yield ToolExecutionResult(stream_event=web_progress_event, sequence_number=sequence_number)
elif function_name == "knowledge_search": elif function_name == "knowledge_search":
sequence_number += 1 sequence_number += 1
file_progress_event = OpenAIResponseObjectStreamResponseFileSearchCallInProgress( yield ToolExecutionResult(
stream_event=OpenAIResponseObjectStreamResponseFileSearchCallInProgress(
item_id=item_id, item_id=item_id,
output_index=output_index, output_index=output_index,
sequence_number=sequence_number, sequence_number=sequence_number,
),
sequence_number=sequence_number,
) )
yield ToolExecutionResult(stream_event=file_progress_event, sequence_number=sequence_number)
# For web search, emit searching event # For web search, emit searching event
if function_name == "web_search": if function_name == "web_search":
sequence_number += 1 sequence_number += 1
web_searching_event = OpenAIResponseObjectStreamResponseWebSearchCallSearching( yield ToolExecutionResult(
stream_event=OpenAIResponseObjectStreamResponseWebSearchCallSearching(
item_id=item_id, item_id=item_id,
output_index=output_index, output_index=output_index,
sequence_number=sequence_number, sequence_number=sequence_number,
),
sequence_number=sequence_number,
) )
yield ToolExecutionResult(stream_event=web_searching_event, sequence_number=sequence_number)
# For file search, emit searching event # For file search, emit searching event
if function_name == "knowledge_search": if function_name == "knowledge_search":
sequence_number += 1 sequence_number += 1
file_searching_event = OpenAIResponseObjectStreamResponseFileSearchCallSearching( yield ToolExecutionResult(
stream_event=OpenAIResponseObjectStreamResponseFileSearchCallSearching(
item_id=item_id, item_id=item_id,
output_index=output_index, output_index=output_index,
sequence_number=sequence_number, sequence_number=sequence_number,
),
sequence_number=sequence_number,
) )
yield ToolExecutionResult(stream_event=file_searching_event, sequence_number=sequence_number)
async def _execute_tool( async def _execute_tool(
self, self,
@ -440,6 +450,7 @@ class ToolExecutor:
# Build input message # Build input message
input_message: OpenAIToolMessageParam | None = None input_message: OpenAIToolMessageParam | None = None
if result and (result_content := getattr(result, "content", None)): if result and (result_content := getattr(result, "content", None)):
# all the mypy contortions here are still unsatisfactory with random Any typing
if isinstance(result_content, str): if isinstance(result_content, str):
msg_content: str | list[Any] = result_content msg_content: str | list[Any] = result_content
elif isinstance(result_content, list): elif isinstance(result_content, list):