fix: preserve provider-specific tool call metadata for Gemini
This commit is contained in:
@@ -208,14 +208,7 @@ class AgentLoop:
|
||||
await on_progress(self._tool_hint(response.tool_calls), tool_hint=True)
|
||||
|
||||
tool_call_dicts = [
|
||||
{
|
||||
"id": tc.id,
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": tc.name,
|
||||
"arguments": json.dumps(tc.arguments, ensure_ascii=False)
|
||||
}
|
||||
}
|
||||
self._build_tool_call_message(tc)
|
||||
for tc in response.tool_calls
|
||||
]
|
||||
messages = self.context.add_assistant_message(
|
||||
@@ -256,6 +249,22 @@ class AgentLoop:
|
||||
|
||||
return final_content, tools_used, messages
|
||||
|
||||
@staticmethod
|
||||
def _build_tool_call_message(tc: Any) -> dict[str, Any]:
|
||||
tool_call = {
|
||||
"id": tc.id,
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": tc.name,
|
||||
"arguments": json.dumps(tc.arguments, ensure_ascii=False)
|
||||
}
|
||||
}
|
||||
if getattr(tc, "provider_specific_fields", None):
|
||||
tool_call["provider_specific_fields"] = tc.provider_specific_fields
|
||||
if getattr(tc, "function_provider_specific_fields", None):
|
||||
tool_call["function"]["provider_specific_fields"] = tc.function_provider_specific_fields
|
||||
return tool_call
|
||||
|
||||
async def run(self) -> None:
|
||||
"""Run the agent loop, dispatching messages as tasks to stay responsive to /stop."""
|
||||
self._running = True
|
||||
|
||||
@@ -135,14 +135,7 @@ class SubagentManager:
|
||||
if response.has_tool_calls:
|
||||
# Add assistant message with tool calls
|
||||
tool_call_dicts = [
|
||||
{
|
||||
"id": tc.id,
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": tc.name,
|
||||
"arguments": json.dumps(tc.arguments, ensure_ascii=False),
|
||||
},
|
||||
}
|
||||
self._build_tool_call_message(tc)
|
||||
for tc in response.tool_calls
|
||||
]
|
||||
messages.append({
|
||||
@@ -230,6 +223,22 @@ Stay focused on the assigned task. Your final response will be reported back to
|
||||
parts.append(f"## Skills\n\nRead SKILL.md with read_file to use a skill.\n\n{skills_summary}")
|
||||
|
||||
return "\n\n".join(parts)
|
||||
|
||||
@staticmethod
|
||||
def _build_tool_call_message(tc: Any) -> dict[str, Any]:
|
||||
tool_call = {
|
||||
"id": tc.id,
|
||||
"type": "function",
|
||||
"function": {
|
||||
"name": tc.name,
|
||||
"arguments": json.dumps(tc.arguments, ensure_ascii=False),
|
||||
},
|
||||
}
|
||||
if getattr(tc, "provider_specific_fields", None):
|
||||
tool_call["provider_specific_fields"] = tc.provider_specific_fields
|
||||
if getattr(tc, "function_provider_specific_fields", None):
|
||||
tool_call["function"]["provider_specific_fields"] = tc.function_provider_specific_fields
|
||||
return tool_call
|
||||
|
||||
async def cancel_by_session(self, session_key: str) -> int:
|
||||
"""Cancel all subagents for the given session. Returns count cancelled."""
|
||||
|
||||
@@ -14,6 +14,8 @@ class ToolCallRequest:
|
||||
id: str
|
||||
name: str
|
||||
arguments: dict[str, Any]
|
||||
provider_specific_fields: dict[str, Any] | None = None
|
||||
function_provider_specific_fields: dict[str, Any] | None = None
|
||||
|
||||
|
||||
@dataclass
|
||||
|
||||
@@ -309,10 +309,17 @@ class LiteLLMProvider(LLMProvider):
|
||||
if isinstance(args, str):
|
||||
args = json_repair.loads(args)
|
||||
|
||||
provider_specific_fields = getattr(tc, "provider_specific_fields", None) or None
|
||||
function_provider_specific_fields = (
|
||||
getattr(tc.function, "provider_specific_fields", None) or None
|
||||
)
|
||||
|
||||
tool_calls.append(ToolCallRequest(
|
||||
id=_short_tool_id(),
|
||||
name=tc.function.name,
|
||||
arguments=args,
|
||||
provider_specific_fields=provider_specific_fields,
|
||||
function_provider_specific_fields=function_provider_specific_fields,
|
||||
))
|
||||
|
||||
usage = {}
|
||||
|
||||
Reference in New Issue
Block a user