Skip to content
Merged
Changes from all commits
Commits
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
24 changes: 6 additions & 18 deletions backend/app/agent/listen_chat_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ def _send_agent_deactivate(self, message: str, tokens: int) -> None:
message: The accumulated message content
tokens: The total token count used
"""
if self._camel_has_request_usage:
tokens = 0
task_lock = get_task_lock(self.api_task_id)
_schedule_async_task(
task_lock.put_queue(
Expand Down Expand Up @@ -332,24 +334,10 @@ def step(
f"Agent {self.agent_name} completed step, "
f"tokens used: {total_tokens}"
)
if self._camel_has_request_usage:
total_tokens = 0

assert message is not None

_schedule_async_task(
task_lock.put_queue(
ActionDeactivateAgentData(
data={
"agent_name": self.agent_name,
"process_task_id": self.process_task_id,
"agent_id": self.agent_id,
"message": message,
"tokens": total_tokens,
},
)
)
)
self._send_agent_deactivate(message, total_tokens)

if error_info is not None:
raise error_info
Expand Down Expand Up @@ -437,8 +425,6 @@ async def astep(
f"Agent {self.agent_name} completed step, "
f"tokens used: {total_tokens}"
)
if self._camel_has_request_usage:
total_tokens = 0

# Send deactivation for all non-streaming cases (success or error)
# Streaming responses handle deactivation in _astream_chunks
Expand All @@ -452,7 +438,9 @@ async def astep(
"process_task_id": self.process_task_id,
"agent_id": self.agent_id,
"message": message,
"tokens": total_tokens,
"tokens": 0
if self._camel_has_request_usage
else total_tokens,
},
)
)
Expand Down