Fix the bug of incorrect request body format for tool use.

request.py

@@ -406,15 +406,16 @@ async def get_vertex_claude_payload(request, engine, provider):
 
         if tool_calls:
             tool_calls_list = []
-            for tool_call in tool_calls:
-                tool_calls_list.append({
-                    "type": "tool_use",
-                    "id": tool_call.id,
-                    "name": tool_call.function.name,
-                    "input": json.loads(tool_call.function.arguments),
-                })
-                messages.append({"role": msg.role, "content": tool_calls_list})
-        elif tool_call_id:
+            tool_call = tool_calls[0]
+            tool_calls_list.append({
+                "type": "tool_use",
+                "id": tool_call.id,
+                "name": tool_call.function.name,
+                "input": json.loads(tool_call.function.arguments),
+            })
+            messages.append({"role": msg.role, "content": tool_calls_list})
+        elif tool_call_id and tool_calls:
+            tool_call = tool_calls[0]
             messages.append({"role": "user", "content": [{
                 "type": "tool_result",
                 "tool_use_id": tool_call.id,
@@ -668,15 +669,16 @@ async def get_claude_payload(request, engine, provider):
 
         if tool_calls:
             tool_calls_list = []
-            for tool_call in tool_calls:
-                tool_calls_list.append({
-                    "type": "tool_use",
-                    "id": tool_call.id,
-                    "name": tool_call.function.name,
-                    "input": json.loads(tool_call.function.arguments),
-                })
-                messages.append({"role": msg.role, "content": tool_calls_list})
-        elif tool_call_id:
+            tool_call = tool_calls[0]
+            tool_calls_list.append({
+                "type": "tool_use",
+                "id": tool_call.id,
+                "name": tool_call.function.name,
+                "input": json.loads(tool_call.function.arguments),
+            })
+            messages.append({"role": msg.role, "content": tool_calls_list})
+        elif tool_call_id and tool_calls:
+            tool_call = tool_calls[0]
             messages.append({"role": "user", "content": [{
                 "type": "tool_result",
                 "tool_use_id": tool_call.id,

test/curl.py

@@ -6,8 +6,12 @@ from main import load_config
 
 provider_name = "linuxdoi"
 model = "claude-3-5-sonnet"
+import asyncio
+config, api_keys_db, api_list = asyncio.run(load_config())
+import json
 
-config, api_keys_db, api_list = load_config()
+print(json.dumps(api_keys_db, indent=2))
+exit(0)
 providers = config["providers"]
 provider_config = None
 for provider in providers:

utils.py

@@ -22,7 +22,7 @@ def update_config(config_data):
     return config_data, api_keys_db, api_list
 
 # 读取YAML配置文件
-async def load_config(app):
+async def load_config(app=None):
     import yaml
     try:
         with open('./api.yaml', 'r') as f: