chore: 更新版本号至2.2.1

VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

app/service/chat/gemini_chat_service.py

@@ -80,6 +80,21 @@ def _clean_json_schema_properties(obj: Any) -> Any:
 def _build_tools(model: str, payload: Dict[str, Any]) -> List[Dict[str, Any]]:
     """构建工具"""
     
+    def _has_function_call(contents: List[Dict[str, Any]]) -> bool:
+        """检查内容中是否包含 functionCall"""
+        if not contents or not isinstance(contents, list):
+            return False
+        for content in contents:
+            if not content or not isinstance(content, dict) or "parts" not in content:
+                continue
+            parts = content.get("parts", [])
+            if not parts or not isinstance(parts, list):
+                continue
+            for part in parts:
+                if isinstance(part, dict) and "functionCall" in part:
+                    return True
+        return False
+    
     def _merge_tools(tools: List[Dict[str, Any]]) -> Dict[str, Any]:
         record = dict()
         for item in tools:
@@ -125,7 +140,7 @@ def _build_tools(model: str, payload: Dict[str, Any]) -> List[Dict[str, Any]]:
         tool["urlContext"] = {}
         
     # 解决 "Tool use with function calling is unsupported" 问题
-    if tool.get("functionDeclarations"):
+    if tool.get("functionDeclarations") or _has_function_call(payload.get("contents", [])):
         tool.pop("googleSearch", None)
         tool.pop("codeExecution", None)
         tool.pop("urlContext", None)
@@ -227,7 +242,7 @@ def _build_payload(model: str, request: GeminiRequest) -> Dict[str, Any]:
                 payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": 128}
             else:
                 payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": 0} 
-        elif model in settings.THINKING_BUDGET_MAP:
+        elif _get_real_model(model) in settings.THINKING_BUDGET_MAP:
             if settings.SHOW_THINKING_PROCESS:
                 payload["generationConfig"]["thinkingConfig"] = {
                     "thinkingBudget": settings.THINKING_BUDGET_MAP.get(model,1000),

app/service/chat/openai_chat_service.py

@@ -206,7 +206,7 @@ def _build_payload(
         else:
             payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": 0} 
     
-    if request.model in settings.THINKING_BUDGET_MAP:
+    if _get_real_model(request.model) in settings.THINKING_BUDGET_MAP:
         if settings.SHOW_THINKING_PROCESS:
             payload["generationConfig"]["thinkingConfig"] = {
                 "thinkingBudget": settings.THINKING_BUDGET_MAP.get(request.model, 1000),

app/service/chat/vertex_express_chat_service.py

@@ -58,6 +58,21 @@ def _clean_json_schema_properties(obj: Any) -> Any:
 def _build_tools(model: str, payload: Dict[str, Any]) -> List[Dict[str, Any]]:
     """构建工具"""
     
+    def _has_function_call(contents: List[Dict[str, Any]]) -> bool:
+        """检查内容中是否包含 functionCall"""
+        if not contents or not isinstance(contents, list):
+            return False
+        for content in contents:
+            if not content or not isinstance(content, dict) or "parts" not in content:
+                continue
+            parts = content.get("parts", [])
+            if not parts or not isinstance(parts, list):
+                continue
+            for part in parts:
+                if isinstance(part, dict) and "functionCall" in part:
+                    return True
+        return False
+    
     def _merge_tools(tools: List[Dict[str, Any]]) -> Dict[str, Any]:
         record = dict()
         for item in tools:
@@ -103,7 +118,7 @@ def _build_tools(model: str, payload: Dict[str, Any]) -> List[Dict[str, Any]]:
         tool["urlContext"] = {}
 
     # 解决 "Tool use with function calling is unsupported" 问题
-    if tool.get("functionDeclarations"):
+    if tool.get("functionDeclarations") or _has_function_call(payload.get("contents", [])):
         tool.pop("googleSearch", None)
         tool.pop("codeExecution", None)
         tool.pop("urlContext", None)
@@ -165,7 +180,7 @@ def _build_payload(model: str, request: GeminiRequest) -> Dict[str, Any]:
                 payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": 128}
             else:
                 payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": 0} 
-        elif model in settings.THINKING_BUDGET_MAP:
+        elif _get_real_model(model) in settings.THINKING_BUDGET_MAP:
             if settings.SHOW_THINKING_PROCESS:
                 payload["generationConfig"]["thinkingConfig"] = {
                     "thinkingBudget": settings.THINKING_BUDGET_MAP.get(model,1000),