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

aient/models/base.py

@@ -53,20 +53,10 @@ class BaseLLM:
                 "https": proxy,
             },
         )
-        if proxy := (
-            proxy or os.environ.get("all_proxy") or os.environ.get("ALL_PROXY") or None
-        ):
-            if "socks5h" not in proxy:
-                self.aclient = httpx.AsyncClient(
-                    follow_redirects=True,
-                    proxies=proxy,
-                    timeout=timeout,
-                )
-        else:
-            self.aclient = httpx.AsyncClient(
-                follow_redirects=True,
-                timeout=timeout,
-            )
+        self._aclient = None
+        self._proxy = proxy
+        self._timeout = timeout
+        self._loop = None
 
         self.conversation: dict[str, list[dict]] = {
             "default": [
@@ -83,6 +73,33 @@ class BaseLLM:
         self.use_plugins = use_plugins
         self.print_log: bool = print_log
 
+    def _get_aclient(self):
+        """
+        Lazily initialize and return the httpx.AsyncClient.
+        This method ensures the client is always bound to a running event loop.
+        """
+        import asyncio
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+
+        if self._aclient is None or self._aclient.is_closed or self._loop is not loop:
+            self._loop = loop
+            proxy = self._proxy or os.environ.get("all_proxy") or os.environ.get("ALL_PROXY") or None
+            proxies = proxy if proxy and "socks5h" not in proxy else None
+            self._aclient = httpx.AsyncClient(
+                follow_redirects=True,
+                proxy=proxies,
+                timeout=self._timeout,
+            )
+        return self._aclient
+
+    @property
+    def aclient(self):
+        return self._get_aclient()
+
     def add_to_conversation(
         self,
         message: list,
@@ -196,7 +213,6 @@ class BaseLLM:
             **kwargs,
         ):
             response += chunk
-        # full_response: str = "".join([r async for r in response])
         full_response: str = "".join(response)
         return full_response
 

aient/models/chatgpt.py

@@ -711,11 +711,14 @@ class chatgpt(BaseLLM):
         # 替换原来的获取请求体的代码
         # json_post = next(async_generator_to_sync(get_post_body_async()))
         try:
-            url, headers, json_post, engine_type = asyncio.run(get_post_body_async())
-        except RuntimeError:
-            # 如果已经在事件循环中，则使用不同的方法
             loop = asyncio.get_event_loop()
-            url, headers, json_post, engine_type = loop.run_until_complete(get_post_body_async())
+            if loop.is_closed():
+                loop = asyncio.new_event_loop()
+                asyncio.set_event_loop(loop)
+        except RuntimeError:
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+        url, headers, json_post, engine_type = loop.run_until_complete(get_post_body_async())
 
         self.truncate_conversation(convo_id=convo_id)
 

aient/utils/scripts.py

@@ -212,6 +212,8 @@ def async_generator_to_sync(async_gen):
             # 清理所有待处理的任务
             tasks = [t for t in asyncio.all_tasks(loop) if not t.done()]
             if tasks:
+                for task in tasks:
+                    task.cancel()
                 loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
             loop.run_until_complete(loop.shutdown_asyncgens())
             loop.close()

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

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

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

@@ -11,8 +11,8 @@ aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE
 aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhFkw,2755
 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=pk34Oggn2z3Rnj65PRKufYknBgTK8yngAaMOxk3Nur8,54423
+aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
+aient/models/chatgpt.py,sha256=vpzjALLjxZTjUac_VZulxU1oKzI44LL1H-n3i3YMt5M,54472
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=2DXH-LP9KGl_P4467chJu3q4AAbX5nSn4DIkdI0aYH8,7105
@@ -29,9 +29,9 @@ aient/plugins/websearch.py,sha256=aPsBjUQ3zQ4gzNrbVq7BMh28ENj9h_fSAeJFF2h9TNk,15
 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=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,,
+aient/utils/scripts.py,sha256=VqtK4RFEx7KxkmcqG3lFDS1DxoNlFFGErEjopVcc8IE,40974
+aient-1.1.62.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.62.dist-info/METADATA,sha256=wROTpkVN1qjMAro9hZU50FrJec6X6pIAOEIpA_oXR1s,4994
+aient-1.1.62.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.62.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.62.dist-info/RECORD,,