aient 1.1.59__py3-none-any.whl → 1.1.61__py3-none-any.whl

aient/models/chatgpt.py

@@ -17,7 +17,7 @@ from ..plugins.registry import registry
 from ..plugins import PLUGINS, get_tools_result_async, function_call_list, update_tools_config
 from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json, convert_functions_to_xml, remove_xml_tags_and_content
 from ..core.request import prepare_request_payload
-from ..core.response import fetch_response_stream
+from ..core.response import fetch_response_stream, fetch_response
 
 def get_filtered_keys_from_object(obj: object, *keys: str) -> Set[str]:
     """
@@ -288,6 +288,7 @@ class chatgpt(BaseLLM):
         convo_id: str = "default",
         model: str = "",
         pass_history: int = 9999,
+        stream: bool = True,
         **kwargs,
     ):
         self.conversation[convo_id][0] = {"role": "system","content": self.system_prompt + "\n\n" + self.get_latest_file_content()}
@@ -309,12 +310,13 @@ class chatgpt(BaseLLM):
                 {"role": "system","content": self.system_prompt + "\n\n" + self.get_latest_file_content()},
                 {"role": role, "content": prompt}
             ],
-            "stream": True,
-            "stream_options": {
-                "include_usage": True
-            },
+            "stream": stream,
             "temperature": kwargs.get("temperature", self.temperature)
         }
+        if stream:
+            request_data["stream_options"] = {
+                "include_usage": True
+            }
 
         if kwargs.get("max_tokens", self.max_tokens):
             request_data["max_tokens"] = kwargs.get("max_tokens", self.max_tokens)
@@ -687,6 +689,7 @@ class chatgpt(BaseLLM):
         function_call_id: str = "",
         language: str = "English",
         system_prompt: str = None,
+        stream: bool = True,
         **kwargs,
     ):
         """
@@ -702,7 +705,7 @@ class chatgpt(BaseLLM):
         json_post = None
         async def get_post_body_async():
             nonlocal json_post
-            url, headers, json_post, engine_type = await self.get_post_body(prompt, role, convo_id, model, pass_history, **kwargs)
+            url, headers, json_post, engine_type = await self.get_post_body(prompt, role, convo_id, model, pass_history, stream=stream, **kwargs)
             return url, headers, json_post, engine_type
 
         # 替换原来的获取请求体的代码
@@ -760,14 +763,24 @@ class chatgpt(BaseLLM):
                             yield f"data: {json.dumps(tmp_response)}\n\n"
                         async_generator = _mock_response_generator()
                     else:
-                        async_generator = fetch_response_stream(
-                            self.aclient,
-                            url,
-                            headers,
-                            json_post,
-                            engine_type,
-                            model or self.engine,
-                        )
+                        if stream:
+                            async_generator = fetch_response_stream(
+                                self.aclient,
+                                url,
+                                headers,
+                                json_post,
+                                engine_type,
+                                model or self.engine,
+                            )
+                        else:
+                            async_generator = fetch_response(
+                                self.aclient,
+                                url,
+                                headers,
+                                json_post,
+                                engine_type,
+                                model or self.engine,
+                            )
                     # 异步处理响应流
                     async for chunk in self._process_stream_response(
                         async_generator,
@@ -817,6 +830,7 @@ class chatgpt(BaseLLM):
         function_call_id: str = "",
         language: str = "English",
         system_prompt: str = None,
+        stream: bool = True,
         **kwargs,
     ):
         """
@@ -829,7 +843,7 @@ class chatgpt(BaseLLM):
         self.add_to_conversation(prompt, role, convo_id=convo_id, function_name=function_name, total_tokens=total_tokens, function_arguments=function_arguments, pass_history=pass_history, function_call_id=function_call_id)
 
         # 获取请求体
-        url, headers, json_post, engine_type = await self.get_post_body(prompt, role, convo_id, model, pass_history, **kwargs)
+        url, headers, json_post, engine_type = await self.get_post_body(prompt, role, convo_id, model, pass_history, stream=stream, **kwargs)
         self.truncate_conversation(convo_id=convo_id)
 
         # 打印日志
@@ -874,24 +888,24 @@ class chatgpt(BaseLLM):
                         yield f"data: {json.dumps(tmp_response)}\n\n"
                     generator = _mock_response_generator()
                 else:
-                    generator = fetch_response_stream(
-                        self.aclient,
-                        url,
-                        headers,
-                        json_post,
-                        engine_type,
-                        model or self.engine,
-                    )
-                # if isinstance(chunk, dict) and "error" in chunk:
-                #     # 处理错误响应
-                #     if chunk["status_code"] in (400, 422, 503):
-                #         json_post, should_retry = await self._handle_response_error(
-                #             type('Response', (), {'status_code': chunk["status_code"], 'text': json.dumps(chunk["details"]), 'aread': lambda: asyncio.sleep(0)}),
-                #             json_post
-                #         )
-                #         if should_retry:
-                #             break  # 跳出内部循环，继续外部循环重试
-                #     raise Exception(f"{chunk['status_code']} {chunk['error']} {chunk['details']}")
+                    if stream:
+                        generator = fetch_response_stream(
+                            self.aclient,
+                            url,
+                            headers,
+                            json_post,
+                            engine_type,
+                            model or self.engine,
+                        )
+                    else:
+                        generator = fetch_response(
+                            self.aclient,
+                            url,
+                            headers,
+                            json_post,
+                            engine_type,
+                            model or self.engine,
+                        )
 
                 # 处理正常响应
                 async for processed_chunk in self._process_stream_response(
@@ -943,11 +957,36 @@ class chatgpt(BaseLLM):
             convo_id=convo_id,
             pass_history=pass_history,
             model=model or self.engine,
+            stream=False,
             **kwargs,
         )
         full_response: str = "".join([r async for r in response])
         return full_response
 
+    def ask(
+        self,
+        prompt: str,
+        role: str = "user",
+        convo_id: str = "default",
+        model: str = "",
+        pass_history: int = 9999,
+        **kwargs,
+    ) -> str:
+        """
+        Non-streaming ask
+        """
+        response = self.ask_stream(
+            prompt=prompt,
+            role=role,
+            convo_id=convo_id,
+            pass_history=pass_history,
+            model=model or self.engine,
+            stream=False,
+            **kwargs,
+        )
+        full_response: str = "".join([r for r in response])
+        return full_response
+
     def rollback(self, n: int = 1, convo_id: str = "default") -> None:
         """
         Rollback the conversation

aient/plugins/excute_command.py

@@ -276,4 +276,4 @@ for i in content.split("\\n"):
 #     print(excute_command(python_long_task_command))
 
     # print(get_python_executable("python -c 'print(123)'"))
-# python -m beswarm.aient.src.aient.plugins.excute_command
+# python -m beswarm.aient.aient.plugins.excute_command

aient/plugins/read_file.py

@@ -181,7 +181,7 @@ Examples:
         return f"<tool_error>读取文件时发生错误: {e}</tool_error>"
 
 if __name__ == "__main__":
-    # python -m beswarm.aient.src.aient.plugins.read_file
+    # python -m beswarm.aient.aient.plugins.read_file
     result = read_file("./work/cax/Lenia Notebook.ipynb")
     print(result)
     print(len(result))

aient/plugins/websearch.py

@@ -344,7 +344,7 @@ async def get_search_results(query):
 
 if __name__ == "__main__":
     os.system("clear")
-    # python -m beswarm.aient.src.aient.plugins.websearch
+    # python -m beswarm.aient.aient.plugins.websearch
     print(get_url_content(""))
     # from aient.models import chatgpt
     # print(get_search_results("今天的微博热搜有哪些？", chatgpt.chatgpt_api_url.v1_url))

aient/plugins/write_file.py

@@ -87,4 +87,4 @@ if __name__ == "__main__":
     with open("test.txt", "r", encoding="utf-8") as file:
         content = file.read()
     print(write_to_file("test.txt", content))
-    # python -m beswarm.aient.src.aient.plugins.write_file
+    # python -m beswarm.aient.aient.plugins.write_file

aient/utils/scripts.py

@@ -1050,4 +1050,4 @@ if __name__ == "__main__":
     # print(parse_function_xml(test_xml))
     print(remove_xml_tags_and_content(test_xml))
 
-# 运行本文件：python -m beswarm.aient.src.aient.utils.scripts
+# 运行本文件：python -m beswarm.aient.aient.utils.scripts

{aient-1.1.59.dist-info → aient-1.1.61.dist-info}/METADATA

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

{aient-1.1.59.dist-info → aient-1.1.61.dist-info}/RECORD

@@ -12,26 +12,26 @@ 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=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-aient/models/chatgpt.py,sha256=LXSMwKRIbWIaPa1Ejk8oCEXVmjZ0rpgFLss35Attn-Q,53493
+aient/models/chatgpt.py,sha256=pk34Oggn2z3Rnj65PRKufYknBgTK8yngAaMOxk3Nur8,54423
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=2DXH-LP9KGl_P4467chJu3q4AAbX5nSn4DIkdI0aYH8,7105
-aient/plugins/excute_command.py,sha256=EQe-vSlTrdd5I0reLqkSXqnPn1VoaCF1HeYZ4z0Txew,10646
+aient/plugins/excute_command.py,sha256=urbOFUI-Wd-XaNyH3EfNBn7vnimzF84b2uq4jMXPxYM,10642
 aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 aient/plugins/list_directory.py,sha256=V_uKkLx_fQDL5z__bSDC-PqAP-o32KmQW6Pdhx0Fx0s,1433
-aient/plugins/read_file.py,sha256=ifG9J499oHqm7wXqGb2ye7YTYHFtwB1Mf4JYyWae7ig,8695
+aient/plugins/read_file.py,sha256=AOGGzSzkALG1R_ncpDmegX_zKFZBZr8ZhTBQCiwhZfU,8691
 aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9ujcXGyuqlGTJMd7ac,4017
 aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4614
-aient/plugins/websearch.py,sha256=9yImBa1s5V7Djqzx6L4naDyIsGIcf_js1LOyLX0aNHw,15338
-aient/plugins/write_file.py,sha256=9msWSxWfJNhawLA-CyLLxtLipm53AX8o0VyCSV6VieM,3953
+aient/plugins/websearch.py,sha256=aPsBjUQ3zQ4gzNrbVq7BMh28ENj9h_fSAeJFF2h9TNk,15334
+aient/plugins/write_file.py,sha256=Jt8fOEwqhYiSWpCbwfAr1xoi_BmFnx3076GMhuL06uI,3949
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-aient/utils/scripts.py,sha256=h7EA2xBydUF_wdZLsPgjCq4Egdycx1gf2qrdrm0I7y0,40909
-aient-1.1.59.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.59.dist-info/METADATA,sha256=aWYs-nodkkOBESAPnPGHI8Q6AXYNrd0YnzmTdaji8AQ,4994
-aient-1.1.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.59.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.59.dist-info/RECORD,,
+aient/utils/scripts.py,sha256=CjB4qq6MoltfT0AnoekFqhw3p5sH7iWz65RuImTipVo,40905
+aient-1.1.61.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.61.dist-info/METADATA,sha256=pp6yzSaglBHddABnIYJI5V7pnye9vkaOdXwa8LTiMM8,4994
+aient-1.1.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.61.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.61.dist-info/RECORD,,