aient 1.0.89__tar.gz → 1.0.91__tar.gz

{aient-1.0.89/src/aient.egg-info → aient-1.0.91}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.0.89
+Version: 1.0.91
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE

{aient-1.0.89 → aient-1.0.91}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.89",
+    version="1.0.91",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

{aient-1.0.89 → aient-1.0.91}/src/aient/core/request.py

@@ -995,6 +995,10 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
                     }
                 })
 
+    if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
+        for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
+            payload[key] = value
+
     return url, headers, payload
 
 def build_azure_endpoint(base_url, deployment_id, api_version="2025-01-01-preview"):
@@ -1085,6 +1089,10 @@ async def get_azure_payload(request, engine, provider, api_key=None):
         payload.pop("tools", None)
         payload.pop("tool_choice", None)
 
+    if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
+        for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
+            payload[key] = value
+
     return url, headers, payload
 
 async def get_openrouter_payload(request, engine, provider, api_key=None):

{aient-1.0.89 → aient-1.0.91}/src/aient/core/response.py

@@ -327,7 +327,10 @@ async def fetch_azure_response_stream(client, url, headers, payload):
                         continue
 
                     if no_stream_content or content or sse_string:
-                        sse_string = await generate_sse_response(timestamp, safe_get(line, "model", default=None), content=no_stream_content or content)
+                        input_tokens = safe_get(line, "usage", "prompt_tokens", default=0)
+                        output_tokens = safe_get(line, "usage", "completion_tokens", default=0)
+                        total_tokens = safe_get(line, "usage", "total_tokens", default=0)
+                        sse_string = await generate_sse_response(timestamp, safe_get(line, "model", default=None), content=no_stream_content or content, total_tokens=total_tokens, prompt_tokens=input_tokens, completion_tokens=output_tokens)
                         yield sse_string
                     else:
                         if no_stream_content:

{aient-1.0.89 → aient-1.0.91}/src/aient/models/chatgpt.py

@@ -125,9 +125,9 @@ class chatgpt(BaseLLM):
         # print("role", role, "function_name", function_name, "message", message)
         if convo_id not in self.conversation:
             self.reset(convo_id=convo_id)
-        if function_name == "" and message and message != None:
+        if function_name == "" and message:
             self.conversation[convo_id].append({"role": role, "content": message})
-        elif function_name != "" and message and message != None:
+        elif function_name != "" and message:
             # 删除从 cut_history_by_function_name 以后的所有历史记录
             if function_name == self.cut_history_by_function_name:
                 matching_message = next(filter(lambda x: safe_get(x, "tool_calls", 0, "function", "name", default="") == 'get_next_pdf', self.conversation[convo_id]), None)
@@ -429,40 +429,31 @@ class chatgpt(BaseLLM):
         if response_role is None:
             response_role = "assistant"
 
-        function_parameter = parse_function_xml(full_response)
-        if function_parameter:
-            print("function_parameter1", function_parameter)
-            function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
-            invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not in self.plugins.keys()]
-            for tool_dict in invalid_tools:
-                full_response = full_response + f"\n\nFunction: {tool_dict.get('function_name', '')} does not exist! I must use existing functions. I need to try again."
-            print("function_parameter2", self.print_log, function_parameter)
-            if self.print_log:
-                print("invalid_tools", invalid_tools)
-                print("full_response", full_response)
+        if self.use_plugins == True:
+            function_parameter = parse_function_xml(full_response)
             if function_parameter:
-                need_function_call = True
-            else:
-                need_function_call = False
-                if self.print_log:
-                    print("Failed to parse function_parameter", function_parameter)
+                invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not in self.plugins.keys()]
+                function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
+                for tool_dict in invalid_tools:
+                    full_response = full_response + f"\n\nFunction: {tool_dict.get('function_name', '')} does not exist! I must use existing functions. I need to try again."
+                if self.print_log and invalid_tools:
+                    print("invalid_tools", invalid_tools)
+                    print("function_parameter", function_parameter)
                     print("full_response", full_response)
-                full_response = (
-                    f"{full_response}"
-                    "\n\nFailed to parse function parameter, I need to try again."
-                )
+                if function_parameter:
+                    need_function_call = True
+                else:
+                    need_function_call = False
+                    if self.print_log:
+                        print("Failed to parse function_parameter full_response", full_response)
+                    full_response = ""
 
         # 处理函数调用
-        if need_function_call and self.use_plugins != False:
+        if need_function_call and self.use_plugins == True:
             if self.print_log:
                 print("function_parameter", function_parameter)
                 print("function_full_response", function_full_response)
 
-            function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
-
-            if self.print_log:
-                print("function_parameter3", function_parameter)
-
             function_response = ""
             # 定义处理单个工具调用的辅助函数
             async def process_single_tool_call(tool_name, tool_args, tool_id):

{aient-1.0.89 → aient-1.0.91/src/aient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.0.89
+Version: 1.0.91
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE