aient 1.0.89__py3-none-any.whl → 1.0.91__py3-none-any.whl

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/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/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.dist-info → aient-1.0.91.dist-info}/METADATA

@@ -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.dist-info → aient-1.0.91.dist-info}/RECORD

@@ -4,8 +4,8 @@ aient/core/.gitignore,sha256=5JRRlYYsqt_yt6iFvvzhbqh2FTUQMqwo6WwIuFzlGR8,13
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=_1wYZg_n9kb2A3C8xCboyqleH2iHc9scwOvtx9DPeok,7582
-aient/core/request.py,sha256=DzjOtWb7rm1frsyKRIsnhONCuttURfwtqERc_qJqHgg,60931
-aient/core/response.py,sha256=CSAOQmybBu3i2Yq2YUyi91dZWTN1tmtJEBTI8RFwj_s,30594
+aient/core/request.py,sha256=U0SDf_dOE5EEhzyJA14XMQCiCFUtcivYcISveLBsK64,61405
+aient/core/response.py,sha256=6fo3GKvTKio8nf4cZdizDIYYq7SnBnFeQ6ROvdAIW9k,30959
 aient/core/utils.py,sha256=W-PDhwoJIbmlt4xfyrV9GXHu9TwRk4pivBOcDVXjgsc,26163
 aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -13,7 +13,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-aient/models/chatgpt.py,sha256=pimBAmMcTb1wggftyrJ8n3mrwMp0Id7Lddoc3Hg1NUg,45486
+aient/models/chatgpt.py,sha256=-NWkkKxTCyraPYT0YN37NA2rUfOaDNXtvFSQmIE5tS8,45066
 aient/models/claude.py,sha256=thK9P8qkaaoUN3OOJ9Shw4KDs-pAGKPoX4FOPGFXva8,28597
 aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -36,8 +36,8 @@ aient/prompt/agent.py,sha256=WLs0KiNZs29FJ5w7N3kQZYLVEeS7K8vxIOUw06LcXVE,23825
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=PPwaJEigPkpciJHUXOag483iq1GjvaLReHDHjkinv6c,26780
-aient-1.0.89.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.89.dist-info/METADATA,sha256=I6ig9V0cfvfa5Evt96OMj8UWne4ABXdu61Yvpc5Ap68,5000
-aient-1.0.89.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-aient-1.0.89.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.89.dist-info/RECORD,,
+aient-1.0.91.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.0.91.dist-info/METADATA,sha256=6QuaVz9_62x2b2ynwHT1dQULl-FJCTBMdBYOOh-3MZw,5000
+aient-1.0.91.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+aient-1.0.91.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.0.91.dist-info/RECORD,,

{aient-1.0.89.dist-info → aient-1.0.91.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any