aient 1.1.65__py3-none-any.whl → 1.1.66__py3-none-any.whl

aient/core/request.py

@@ -27,8 +27,6 @@ from .utils import (
 gemini_max_token_65k_models = ["gemini-2.5-pro", "gemini-2.0-pro", "gemini-2.0-flash-thinking", "gemini-2.5-flash"]
 
 async def get_gemini_payload(request, engine, provider, api_key=None):
-    import re
-
     headers = {
         'Content-Type': 'application/json'
     }
@@ -176,6 +174,24 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
     ]
     generation_config = {}
 
+    def process_tool_parameters(data):
+        if isinstance(data, dict):
+            # 移除 Gemini 不支持的 'additionalProperties'
+            data.pop("additionalProperties", None)
+
+            # 将 'default' 值移入 'description'
+            if "default" in data:
+                default_value = data.pop("default")
+                description = data.get("description", "")
+                data["description"] = f"{description}\nDefault: {default_value}"
+
+            # 递归处理
+            for value in data.values():
+                process_tool_parameters(value)
+        elif isinstance(data, list):
+            for item in data:
+                process_tool_parameters(item)
+
     for field, value in request.model_dump(exclude_unset=True).items():
         if field not in miss_fields and value is not None:
             if field == "tools" and "gemini-2.0-flash-thinking" in original_model:
@@ -185,22 +201,9 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 processed_tools = []
                 for tool in value:
                     function_def = tool["function"]
-                    # gemini不支持parameters里面的additionalProperties字段，需要删除
-                    if safe_get(function_def, "parameters", "additionalProperties", default=None) is not None:
-                        del function_def["parameters"]["additionalProperties"]
-
-                    # 处理 parameters.properties 中的 default 字段
-                    if safe_get(function_def, "parameters", "properties", default=None):
-                        for prop_value in function_def["parameters"]["properties"].values():
-                            if "additionalProperties" in prop_value:
-                                del prop_value["additionalProperties"]
-                            if "default" in prop_value:
-                                # 将 default 值添加到 description 中
-                                default_value = prop_value["default"]
-                                description = prop_value.get("description", "")
-                                prop_value["description"] = f"{description}\nDefault: {default_value}"
-                                # 删除 default 字段
-                                del prop_value["default"]
+                    if "parameters" in function_def:
+                        process_tool_parameters(function_def["parameters"])
+
                     if function_def["name"] != "googleSearch" and function_def["name"] != "googleSearch":
                         processed_tools.append({"function": function_def})
 

{aient-1.1.65.dist-info → aient-1.1.66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.65
+Version: 1.1.66
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.1.65.dist-info → aient-1.1.66.dist-info}/RECORD

@@ -2,7 +2,7 @@ aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
-aient/core/request.py,sha256=M1AfroPgFDG7oTLE2gisvR4BdkUeWqoTwfpxl_nxYB8,76923
+aient/core/request.py,sha256=4FFCwQ7h7b6bqtrA8qw-DPJVXZTj2i1CkYccFeEwUPw,76552
 aient/core/response.py,sha256=sPcNV9qLosj3lIXElezUZEjIyglspdkBg-EsIUhr9bQ,33203
 aient/core/utils.py,sha256=D98d5Cy1h4ejKtuxS0EEDtL4YqpaZLB5tuXoVP0IBWQ,28462
 aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
@@ -30,8 +30,8 @@ aient/plugins/write_file.py,sha256=Jt8fOEwqhYiSWpCbwfAr1xoi_BmFnx3076GMhuL06uI,3
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=VqtK4RFEx7KxkmcqG3lFDS1DxoNlFFGErEjopVcc8IE,40974
-aient-1.1.65.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.65.dist-info/METADATA,sha256=ybVwQ1ZUlaD9L4EDMBDp9ORdC8wrcmVBNxfCcRGvrRo,4842
-aient-1.1.65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.65.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.65.dist-info/RECORD,,
+aient-1.1.66.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.66.dist-info/METADATA,sha256=sAVJU71_BYtagFIvhB9RefiumnVUFPTA9vrhOba01R8,4842
+aient-1.1.66.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.66.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.66.dist-info/RECORD,,