aient 1.1.65__tar.gz → 1.1.67__tar.gz

{aient-1.1.65 → aient-1.1.67}/PKG-INFO

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

{aient-1.1.65 → aient-1.1.67}/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 → aient-1.1.67}/aient/models/chatgpt.py

@@ -67,6 +67,7 @@ class chatgpt(BaseLLM):
         cut_history_by_function_name: str = "",
         cache_messages: list = None,
         logger: logging.Logger = None,
+        check_done: bool = False,
     ) -> None:
         """
         Initialize Chatbot with API key (from https://platform.openai.com/account/api-keys)
@@ -86,6 +87,7 @@ class chatgpt(BaseLLM):
         self.function_call_max_loop = function_call_max_loop
         self.cut_history_by_function_name = cut_history_by_function_name
         self.latest_file_content = {}
+        self.check_done = check_done
 
         if logger:
             self.logger = logger
@@ -465,6 +467,12 @@ class chatgpt(BaseLLM):
         missing_required_params = []
 
         if self.use_plugins == True:
+            if self.check_done:
+                # self.logger.info(f"worker Response: {full_response}")
+                if not full_response.strip().endswith('[done]'):
+                    raise Exception(f"Response is not ended with [done]: {full_response}")
+                else:
+                    full_response = full_response.strip().rstrip('[done]')
             full_response = full_response.replace("<tool_code>", "").replace("</tool_code>", "")
             function_parameter = parse_function_xml(full_response)
             if function_parameter:
@@ -711,7 +719,7 @@ class chatgpt(BaseLLM):
             self.logger.info(f"api_key: {kwargs.get('api_key', self.api_key)}")
 
         # 发送请求并处理响应
-        for i in range(3):
+        for i in range(10):
             if self.print_log:
                 replaced_text = json.loads(re.sub(r';base64,([A-Za-z0-9+/=]+)', ';base64,***', json.dumps(json_post)))
                 replaced_text_str = json.dumps(replaced_text, indent=4, ensure_ascii=False)
@@ -763,6 +771,9 @@ class chatgpt(BaseLLM):
             except httpx.RemoteProtocolError:
                 continue
             except Exception as e:
+                if "Response is not ended with [done]:" in str(e):
+                    self.logger.error(f"Response is not ended with [done]: {e}")
+                    continue
                 self.logger.error(f"发生了未预料的错误：{e}")
                 import traceback
                 self.logger.error(traceback.format_exc())
@@ -770,7 +781,7 @@ class chatgpt(BaseLLM):
                     e = "您输入了无效的API URL，请使用正确的URL并使用`/start`命令重新设置API URL。具体错误如下：\n\n" + str(e)
                     raise Exception(f"{e}")
                 # 最后一次重试失败，向上抛出异常
-                if i == 2:
+                if i == 11:
                     raise Exception(f"{e}")
 
     def ask_stream(

{aient-1.1.65 → aient-1.1.67}/aient.egg-info/PKG-INFO

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

{aient-1.1.65 → aient-1.1.67}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aient"
-version = "1.1.65"
+version = "1.1.67"
 description = "Aient: The Awakening of Agent."
 readme = "README.md"
 requires-python = ">=3.11"