-
Notifications
You must be signed in to change notification settings - Fork 518
add tool result call #2118
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.
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
dheerajiiitv
wants to merge
1
commit into
SciPhi-AI:main
Choose a base branch
from
SpotDraft:adding-tool-result
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
add tool result call #2118
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -557,17 +557,68 @@ async def sse_generator() -> AsyncGenerator[str, None]: | |||||
calls_list, partial_text_buffer | ||||||
) | ||||||
|
||||||
# (c) Execute each tool call in parallel | ||||||
await asyncio.gather( | ||||||
*[ | ||||||
self.handle_function_or_tool_call( | ||||||
# (c) Execute each tool call and emit tool result events | ||||||
for c in calls_list: | ||||||
try: | ||||||
tool_result = await self.handle_function_or_tool_call( | ||||||
c["name"], | ||||||
c["arguments"], | ||||||
tool_id=c["tool_call_id"], | ||||||
save_messages=True, # Set to True to add tool results to conversation | ||||||
) | ||||||
for c in calls_list | ||||||
] | ||||||
) | ||||||
result_content = tool_result.llm_formatted_result | ||||||
|
||||||
# Extract the ids from the tool tool_result.content | ||||||
ids = self.BRACKET_PATTERN.findall(tool_result.llm_formatted_result) | ||||||
# Get the raw result from source_collector | ||||||
raw_results = [] | ||||||
for id in ids: | ||||||
raw_result = self.search_results_collector.find_by_short_id( | ||||||
id | ||||||
) | ||||||
if raw_result: | ||||||
raw_results.append(raw_result) | ||||||
|
||||||
# Create the result data with raw results | ||||||
result_data = { | ||||||
"tool_call_id": c["tool_call_id"], | ||||||
"role": "tool", | ||||||
"content": json.dumps(raw_results), | ||||||
} | ||||||
|
||||||
# Emit SSE tool result event | ||||||
async for line in SSEFormatter.yield_tool_result_event( | ||||||
result_data | ||||||
): | ||||||
yield line | ||||||
except Exception as e: | ||||||
error_content = f"Error in tool '{c['name']}': {str(e)}" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the exception block, the error is both logged and added to conversation. Ensure that sensitive error details are not exposed to clients if that is a concern.
Suggested change
|
||||||
logger.error(error_content) | ||||||
|
||||||
# Add error message to conversation | ||||||
await self.conversation.add_message( | ||||||
Message( | ||||||
role="tool", | ||||||
content=error_content, | ||||||
name=c["name"], | ||||||
tool_call_id=c["tool_call_id"], | ||||||
) | ||||||
) | ||||||
|
||||||
# Emit error as tool result | ||||||
result_data = { | ||||||
"tool_call_id": c["tool_call_id"], | ||||||
"role": "tool", | ||||||
"content": json.dumps( | ||||||
convert_nonserializable_objects( | ||||||
error_content | ||||||
) | ||||||
), | ||||||
} | ||||||
async for line in SSEFormatter.yield_tool_result_event( | ||||||
result_data | ||||||
): | ||||||
yield line | ||||||
|
||||||
# Reset buffer & calls | ||||||
pending_tool_calls.clear() | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The variable
result_content
is assigned but not used later. If unnecessary, consider removing it to clean up the code.