mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-08-12 04:50:39 +00:00
clean up
This commit is contained in:
parent
2fc64d611f
commit
c5c970a6be
1 changed files with 4 additions and 5 deletions
|
@ -536,7 +536,6 @@ class ChatAgent(ShieldRunnerMixin):
|
||||||
output_attachments = []
|
output_attachments = []
|
||||||
|
|
||||||
n_iter = await self.storage.get_num_infer_iters_in_turn(session_id, turn_id) or 0
|
n_iter = await self.storage.get_num_infer_iters_in_turn(session_id, turn_id) or 0
|
||||||
print("initial n_iter", n_iter)
|
|
||||||
|
|
||||||
# Build a map of custom tools to their definitions for faster lookup
|
# Build a map of custom tools to their definitions for faster lookup
|
||||||
client_tools = {}
|
client_tools = {}
|
||||||
|
@ -616,9 +615,7 @@ class ChatAgent(ShieldRunnerMixin):
|
||||||
span.set_attribute("output", f"content: {content} tool_calls: {tool_calls}")
|
span.set_attribute("output", f"content: {content} tool_calls: {tool_calls}")
|
||||||
|
|
||||||
n_iter += 1
|
n_iter += 1
|
||||||
print(f"n_iter after update: {n_iter}")
|
|
||||||
await self.storage.set_num_infer_iters_in_turn(session_id, turn_id, n_iter)
|
await self.storage.set_num_infer_iters_in_turn(session_id, turn_id, n_iter)
|
||||||
print(self.agent_config.max_infer_iters)
|
|
||||||
|
|
||||||
stop_reason = stop_reason or StopReason.out_of_tokens
|
stop_reason = stop_reason or StopReason.out_of_tokens
|
||||||
|
|
||||||
|
@ -655,8 +652,8 @@ class ChatAgent(ShieldRunnerMixin):
|
||||||
|
|
||||||
if n_iter >= self.agent_config.max_infer_iters:
|
if n_iter >= self.agent_config.max_infer_iters:
|
||||||
log.info("Done with MAX iterations, exiting.")
|
log.info("Done with MAX iterations, exiting.")
|
||||||
# we always resume tool call, so we need a way to indicate to client that we are done
|
# NOTE: mark end_of_turn to indicate to client that we are done with the turn
|
||||||
# currently let's do it with having the tool call be
|
# Do not continue the tool call loop after this point
|
||||||
message.stop_reason = StopReason.end_of_turn
|
message.stop_reason = StopReason.end_of_turn
|
||||||
yield message
|
yield message
|
||||||
break
|
break
|
||||||
|
@ -707,6 +704,8 @@ class ChatAgent(ShieldRunnerMixin):
|
||||||
|
|
||||||
# If tool is a client tool, yield CompletionMessage and return
|
# If tool is a client tool, yield CompletionMessage and return
|
||||||
if tool_call.tool_name in client_tools:
|
if tool_call.tool_name in client_tools:
|
||||||
|
# NOTE: mark end_of_message to indicate to client that it may
|
||||||
|
# call the tool and continue the conversation with the tool's response.
|
||||||
message.stop_reason = StopReason.end_of_message
|
message.stop_reason = StopReason.end_of_message
|
||||||
await self.storage.set_in_progress_tool_call_step(
|
await self.storage.set_in_progress_tool_call_step(
|
||||||
session_id,
|
session_id,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue