wx44wx/pipecat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated tools parsing logic

Browse Source
This commit is contained in:
Adithya Suresh
2025-04-03 11:27:17 +00:00
committed by Aleix Conchillo Flaqué
parent 3d1424d3cf
commit 81f7cbfd09
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/pipecat/services/aws/llm.py
View File

@@ -210,7 +210,6 @@ class BedrockLLMService(LLMService):
# Add tools if present # Add tools if present
if context.tools: if context.tools:
print(context.tools)
tool_config = { tool_config = {
"tools": context.tools "tools": context.tools
} }
@@ -257,23 +256,22 @@ class BedrockLLMService(LLMService):
completion_tokens_estimate += self._estimate_tokens(delta["text"]) completion_tokens_estimate += self._estimate_tokens(delta["text"])
elif "toolUse" in delta and "input" in delta["toolUse"]: elif "toolUse" in delta and "input" in delta["toolUse"]:
# Handle partial JSON for tool use # Handle partial JSON for tool use
json_str = json.dumps(delta["toolUse"]["input"]) json_accumulator += delta["toolUse"]["input"]
json_accumulator += json_str completion_tokens_estimate += self._estimate_tokens(delta["toolUse"]["input"])
completion_tokens_estimate += self._estimate_tokens(json_str)
# Handle tool use start # Handle tool use start
elif "contentBlockStart" in event: elif "contentBlockStart" in event:
content_block = event["contentBlockStart"] content_block_start = event["contentBlockStart"]['start']
if content_block.get("type") == "toolUse": if "toolUse" in content_block_start:
tool_use_block = { tool_use_block = {
"id": content_block["toolUse"].get("toolUseId", ""), "id": content_block_start["toolUse"].get("toolUseId", ""),
"name": content_block["toolUse"].get("name", "") "name": content_block_start["toolUse"].get("name", "")
} }
json_accumulator = "" json_accumulator = ""
# Handle message completion with tool use # Handle message completion with tool use
elif "messageDelta" in event and "stopReason" in event["messageDelta"]: elif "messageStop" in event and "stopReason" in event["messageStop"]:
if event["messageDelta"]["stopReason"] == "toolUse" and tool_use_block: if event["messageStop"]["stopReason"] == "tool_use" and tool_use_block:
try: try:
arguments = json.loads(json_accumulator) if json_accumulator else {} arguments = json.loads(json_accumulator) if json_accumulator else {}
await self.call_function( await self.call_function(
@@ -286,8 +284,8 @@ class BedrockLLMService(LLMService):
logger.error(f"Failed to parse tool arguments: {json_accumulator}") logger.error(f"Failed to parse tool arguments: {json_accumulator}")
# Handle usage metrics if available # Handle usage metrics if available
if "usage" in event: if "metadata" in event and "usage" in event["metadata"]:
usage = event["usage"] usage = event["metadata"]["usage"]
prompt_tokens += usage.get("inputTokens", 0) prompt_tokens += usage.get("inputTokens", 0)
completion_tokens += usage.get("outputTokens", 0) completion_tokens += usage.get("outputTokens", 0)
@@ -516,7 +514,6 @@ class BedrockLLMContext(OpenAILLMContext):
] ]
} }
""" """
print(message)
if message["role"] == "tool": if message["role"] == "tool":
# Try to parse the content as JSON if it looks like JSON # Try to parse the content as JSON if it looks like JSON
try: try:
@@ -623,9 +620,6 @@ class BedrockLLMContext(OpenAILLMContext):
"""Restructure messages in Bedrock format by handling system messages, """Restructure messages in Bedrock format by handling system messages,
merging consecutive messages with the same role, and ensuring proper content formatting. merging consecutive messages with the same role, and ensuring proper content formatting.
""" """
print(self.messages)
# Handle system message if present at the beginning # Handle system message if present at the beginning
if self.messages and self.messages[0]["role"] == "system": if self.messages and self.messages[0]["role"] == "system":
if len(self.messages) == 1: if len(self.messages) == 1:
@@ -739,7 +733,7 @@ class BedrockAssistantContextAggregator(LLMAssistantContextAggregator):
"toolUse": { "toolUse": {
"toolUseId": frame.tool_call_id, "toolUseId": frame.tool_call_id,
"name": frame.function_name, "name": frame.function_name,
"input": frame.arguments "input": frame.arguments if frame.arguments else {}
} }
} }
], ],