aient 1.1.68__py3-none-any.whl → 1.1.70__py3-none-any.whl

aient/models/chatgpt.py

@@ -6,9 +6,8 @@ import httpx
 import asyncio
 import logging
 import inspect
-import requests
 from typing import Set
-from typing import Union, Optional, Callable, List, Dict, Any
+from typing import Union, Optional, Callable
 from pathlib import Path
 
 
@@ -360,6 +359,7 @@ class chatgpt(BaseLLM):
         system_prompt=None,
         pass_history=9999,
         is_async=False,
+        stream: bool = True,
         **kwargs
     ):
         """
@@ -388,6 +388,7 @@ class chatgpt(BaseLLM):
             elif isinstance(line, (dict, list)):
                 if isinstance(line, dict) and safe_get(line, "choices", 0, "message", "content"):
                     full_response = line["choices"][0]["message"]["content"]
+                    total_tokens = safe_get(line, "usage", "total_tokens", default=0)
                     return full_response
                 else:
                     return str(line)
@@ -637,6 +638,9 @@ class chatgpt(BaseLLM):
                 else:
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
 
+                if self.check_done:
+                    all_responses.append("Your message **must** end with [done] to signify the end of your output.")
+
             # 合并所有工具响应
             function_response = "\n\n".join(all_responses).strip()
             if missing_required_params:
@@ -657,7 +661,7 @@ class chatgpt(BaseLLM):
                     model=model or self.engine, function_arguments=function_full_response,
                     function_call_id=function_call_id, api_key=kwargs.get('api_key', self.api_key),
                     api_url=kwargs.get('api_url', self.api_url.chat_url),
-                    plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt
+                    plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt, stream=stream
                 ):
                     yield chunk
             else:
@@ -667,7 +671,7 @@ class chatgpt(BaseLLM):
                     model=model or self.engine, function_arguments=function_full_response,
                     function_call_id=function_call_id, api_key=kwargs.get('api_key', self.api_key),
                     api_url=kwargs.get('api_url', self.api_url.chat_url),
-                    plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt
+                    plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt, stream=stream
                 ):
                     yield chunk
         else:
@@ -761,7 +765,7 @@ class chatgpt(BaseLLM):
                     generator, convo_id=convo_id, function_name=function_name,
                     total_tokens=total_tokens, function_arguments=function_arguments,
                     function_call_id=function_call_id, model=model, language=language,
-                    system_prompt=system_prompt, pass_history=pass_history, is_async=True, **kwargs
+                    system_prompt=system_prompt, pass_history=pass_history, is_async=True, stream=stream, **kwargs
                 ):
                     yield processed_chunk
 

{aient-1.1.68.dist-info → aient-1.1.70.dist-info}/METADATA

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

{aient-1.1.68.dist-info → aient-1.1.70.dist-info}/RECORD

@@ -12,7 +12,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-aient/models/chatgpt.py,sha256=sIAr_0jnux4VBnMu13wzWH1EBRdYuD7MmKHmI_QOixo,49396
+aient/models/chatgpt.py,sha256=cDqIPsdKFHBvE1aQc_ocAx7wyXOFvpYgKnQpTmIGmVc,49677
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=2DXH-LP9KGl_P4467chJu3q4AAbX5nSn4DIkdI0aYH8,7105
@@ -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.68.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.68.dist-info/METADATA,sha256=duF98k4OVbuSq6w-AU4ENUEzwloNGeq-5q08o3n8EDs,4842
-aient-1.1.68.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.68.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.68.dist-info/RECORD,,
+aient-1.1.70.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.70.dist-info/METADATA,sha256=EYligsIiofnMQzId4IzzBTAD52tVTXR04mmC_1oRyLc,4842
+aient-1.1.70.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.70.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.70.dist-info/RECORD,,