aient 1.0.64__py3-none-any.whl → 1.0.66__py3-none-any.whl

aient/core/test/test_base_api.py

@@ -1,7 +1,5 @@
 from ..utils import BaseAPI
 
-import os
-
 # GOOGLE_AI_API_KEY = os.environ.get('GOOGLE_AI_API_KEY', None)
 
 # base_api = BaseAPI("https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?key=" + GOOGLE_AI_API_KEY)
@@ -9,9 +7,12 @@ import os
 # print(base_api.chat_url)
 
 base_api = BaseAPI("http://127.0.0.1:8000/v1")
-
 print(base_api.chat_url)
 
+base_api = BaseAPI("http://127.0.0.1:8000/v1/images/generations")
+print(base_api.image_url)
+
 """
 python -m core.test.test_base_api
+python -m aient.src.aient.core.test.test_base_api
 """

aient/core/utils.py

@@ -124,6 +124,7 @@ def get_engine(provider, endpoint=None, original_model=""):
 
     return engine, stream
 
+from httpx_socks import AsyncProxyTransport
 def get_proxy(proxy, client_config = {}):
     if proxy:
         # 解析代理URL
@@ -131,15 +132,10 @@ def get_proxy(proxy, client_config = {}):
         scheme = parsed.scheme.rstrip('h')
 
         if scheme == 'socks5':
-            try:
-                from httpx_socks import AsyncProxyTransport
-                proxy = proxy.replace('socks5h://', 'socks5://')
-                transport = AsyncProxyTransport.from_url(proxy)
-                client_config["transport"] = transport
-                # print("proxy", proxy)
-            except ImportError:
-                logger.error("httpx-socks package is required for SOCKS proxy support")
-                raise ImportError("Please install httpx-socks package for SOCKS proxy support: pip install httpx-socks")
+            proxy = proxy.replace('socks5h://', 'socks5://')
+            transport = AsyncProxyTransport.from_url(proxy)
+            client_config["transport"] = transport
+            # print("proxy", proxy)
         else:
             client_config["proxies"] = {
                 "http://": proxy,

aient/models/base.py

@@ -37,11 +37,6 @@ class BaseLLM:
         self.presence_penalty: float = presence_penalty
         self.frequency_penalty: float = frequency_penalty
         self.reply_count: int = reply_count
-        self.max_tokens: int = max_tokens or (
-            4096
-            if "gpt-4" or "claude" in engine
-            else 4000
-        )
         self.truncate_limit: int = truncate_limit or (
             198000
             if "claude" in engine

aient/models/chatgpt.py

@@ -83,8 +83,6 @@ class chatgpt(BaseLLM):
         # 注册和处理传入的工具
         self._register_tools(tools)
 
-        if self.tokens_usage["default"] > self.max_tokens:
-            raise Exception("System prompt is too long")
 
     def _register_tools(self, tools):
         """动态注册工具函数并更新配置"""
@@ -255,7 +253,6 @@ class chatgpt(BaseLLM):
                 {"role": "system","content": self.system_prompt},
                 {"role": role, "content": prompt}
             ],
-            "max_tokens": kwargs.get("max_tokens", self.max_tokens),
             "stream": True,
             "stream_options": {
                 "include_usage": True
@@ -263,6 +260,9 @@ class chatgpt(BaseLLM):
             "temperature": kwargs.get("temperature", self.temperature)
         }
 
+        if kwargs.get("max_tokens", self.max_tokens):
+            request_data["max_tokens"] = kwargs.get("max_tokens", self.max_tokens)
+
         # 添加工具相关信息
         if kwargs.get("plugins", None):
             self.plugins = kwargs.get("plugins")

{aient-1.0.64.dist-info → aient-1.0.66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.0.64
+Version: 1.0.66
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -12,6 +12,7 @@ Requires-Dist: fastapi
 Requires-Dist: PyExecJS
 Requires-Dist: requests
 Requires-Dist: html2text
+Requires-Dist: httpx-socks
 Requires-Dist: fake-useragent
 Requires-Dist: beautifulsoup4
 Requires-Dist: tiktoken==0.6.0

{aient-1.0.64.dist-info → aient-1.0.66.dist-info}/RECORD

@@ -5,14 +5,14 @@ aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=_1wYZg_n9kb2A3C8xCboyqleH2iHc9scwOvtx9DPeok,7582
 aient/core/request.py,sha256=sXAZwek-JtuCYheuaQiLizBSJRij_xZmTdf0-91N0AE,49986
 aient/core/response.py,sha256=6Fq-EIL7ua1zeT6GMc1fgQeRs_MCP6UST_pL0tM3f3I,27879
-aient/core/utils.py,sha256=DFpFU8Y-8lzgQlhaDUnao8HmviGoh3-oN8jZR3Dha7E,26150
-aient/core/test/test_base_api.py,sha256=CjfFzMG26r8C4xCPoVkKb3Ac6pp9gy5NUCbZJHoSSsM,393
+aient/core/utils.py,sha256=7R_4X4VhTigiuysJ-JuJuhtorAfkCEM-y-9N8dS5cME,25860
+aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
 aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhFkw,2755
 aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
-aient/models/base.py,sha256=vRCDEwabEm0u0RU4J62T2t271xg7YGCPjE3s9HzhtV8,6860
-aient/models/chatgpt.py,sha256=gOLBHWimbg2mbt9EjDXr5Za60Jt0ICqe-Hah95taupc,42217
+aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
+aient/models/chatgpt.py,sha256=aFzp25JFGHP4pW1g6jNZN__haggpUWy50KkvvzzMrrM,42170
 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
@@ -35,8 +35,8 @@ aient/prompt/agent.py,sha256=h39WOoafv0_lh2coBCiG9k-VWa3Yi9HRZV0hnvsc4gs,23598
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=n0jR5eXCBIK12W4bIx-xU1FVl1hZ4zDC7hq_BWQHYJU,27537
-aient-1.0.64.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.64.dist-info/METADATA,sha256=eQs-6r7U61NAXa8O_CLToV0HcGv4cH1vyCOCj8zMPks,4973
-aient-1.0.64.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-aient-1.0.64.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.64.dist-info/RECORD,,
+aient-1.0.66.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.0.66.dist-info/METADATA,sha256=P_IHQlqtE0huTvv0iqY48DM1ZJL8KecLY_lw31UMPok,5000
+aient-1.0.66.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+aient-1.0.66.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.0.66.dist-info/RECORD,,