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

reverting some formatting

Browse source
This commit is contained in:
Omar Abdelwahab 2025-11-04 13:18:28 -08:00
parent a23ee35b24
commit 6bd0d644d1
1 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,9 +83,7 @@ class ToolExecutor:
yield event_result yield event_result
# Execute the actual tool call # Execute the actual tool call
error_exc, result = await self._execute_tool( error_exc, result = await self._execute_tool(function.name, tool_kwargs, ctx, mcp_tool_to_server)
function.name, tool_kwargs, ctx, mcp_tool_to_server
)
# Emit completion events for tool execution # Emit completion events for tool execution
has_error = bool( has_error = bool(
@ -169,9 +167,7 @@ class ToolExecutor:
if result_item.attributes: if result_item.attributes:
metadata_text += f", attributes: {result_item.attributes}" metadata_text += f", attributes: {result_item.attributes}"
text_content = ( text_content = (f"[{i + 1}] {metadata_text} (cite as <|{file_id}|>)\n{chunk_text}\n")
f"[{i + 1}] {metadata_text} (cite as <|{file_id}|>)\n{chunk_text}\n"
)
content_items.append(TextContentItem(text=text_content)) content_items.append(TextContentItem(text=text_content))
unique_files.add(file_id) unique_files.add(file_id)
@ -370,33 +366,25 @@ class ToolExecutor:
yield ToolExecutionResult(stream_event=mcp_failed_event, sequence_number=sequence_number) yield ToolExecutionResult(stream_event=mcp_failed_event, sequence_number=sequence_number)
else: else:
mcp_completed_event = OpenAIResponseObjectStreamResponseMcpCallCompleted( mcp_completed_event = OpenAIResponseObjectStreamResponseMcpCallCompleted(
sequence_number=sequence_number, sequence_number=sequence_number,
)
yield ToolExecutionResult(
stream_event=mcp_completed_event, sequence_number=sequence_number
) )
yield ToolExecutionResult(stream_event=mcp_completed_event, sequence_number=sequence_number)
elif function_name == "web_search": elif function_name == "web_search":
sequence_number += 1 sequence_number += 1
web_completion_event = OpenAIResponseObjectStreamResponseWebSearchCallCompleted( web_completion_event = OpenAIResponseObjectStreamResponseWebSearchCallCompleted(
item_id=item_id, item_id=item_id,
output_index=output_index, output_index=output_index,
sequence_number=sequence_number, sequence_number=sequence_number,
)
yield ToolExecutionResult(
stream_event=web_completion_event, sequence_number=sequence_number
) )
yield ToolExecutionResult(stream_event=web_completion_event, sequence_number=sequence_number)
elif function_name == "knowledge_search": elif function_name == "knowledge_search":
sequence_number += 1 sequence_number += 1
file_completion_event = OpenAIResponseObjectStreamResponseFileSearchCallCompleted( file_completion_event = OpenAIResponseObjectStreamResponseFileSearchCallCompleted(
item_id=item_id, item_id=item_id,
output_index=output_index, output_index=output_index,
sequence_number=sequence_number, sequence_number=sequence_number,
)
yield ToolExecutionResult(
stream_event=file_completion_event, sequence_number=sequence_number
) )
yield ToolExecutionResult(stream_event=file_completion_event, sequence_number=sequence_number)
async def _build_result_messages( async def _build_result_messages(
self, self,
@ -427,8 +415,8 @@ class ToolExecutor:
if error_exc: if error_exc:
message.error = str(error_exc) message.error = str(error_exc)
elif (result and (error_code := getattr(result, "error_code", None)) and error_code > 0) or ( elif (result and (error_code := getattr(result, "error_code", None)) and error_code > 0) or (
result and getattr(result, "error_message", None) result and getattr(result, "error_message", None)
): ):
ec = getattr(result, "error_code", "unknown") ec = getattr(result, "error_code", "unknown")
em = getattr(result, "error_message", "") em = getattr(result, "error_message", "")
message.error = f"Error (code {ec}): {em}" message.error = f"Error (code {ec}): {em}"