aient 1.1.86__py3-none-any.whl → 1.1.88__py3-none-any.whl

aient/core/response.py

@@ -183,7 +183,7 @@ async def fetch_vertex_claude_response_stream(client, url, headers, payload, mod
             function_call_id = function_call["id"]
             sse_string = await generate_sse_response(timestamp, model, content=None, tools_id=function_call_id, function_call_name=function_call_name)
             yield sse_string
-            function_full_response = json.dumps(function_call["input"])
+            function_full_response = await asyncio.to_thread(json.dumps, function_call["input"])
             sse_string = await generate_sse_response(timestamp, model, content=None, tools_id=function_call_id, function_call_name=None, function_call_content=function_full_response)
             yield sse_string
 
@@ -213,6 +213,9 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
             while "\n" in buffer:
                 line, buffer = buffer.split("\n", 1)
                 # logger.info("line: %s", repr(line))
+                if line.startswith(": keepalive"):
+                    yield line + end_of_line
+                    continue
                 if line and not line.startswith(":") and (result:=line.lstrip("data: ").strip()):
                     if result.strip() == "[DONE]":
                         break
@@ -272,6 +275,11 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
 
                     no_stream_content = safe_get(line, "choices", 0, "message", "content", default=None)
                     openrouter_reasoning = safe_get(line, "choices", 0, "delta", "reasoning", default="")
+                    openrouter_base64_image = safe_get(line, "choices", 0, "delta", "images", 0, "image_url", "url", default="")
+                    if openrouter_base64_image:
+                        sse_string = await generate_sse_response(timestamp, payload["model"], content=f"\n\n![image]({openrouter_base64_image})")
+                        yield sse_string
+                        continue
                     azure_databricks_claude_summary_content = safe_get(line, "choices", 0, "delta", "content", 0, "summary", 0, "text", default="")
                     azure_databricks_claude_signature_content = safe_get(line, "choices", 0, "delta", "content", 0, "summary", 0, "signature", default="")
                     # print("openrouter_reasoning", repr(openrouter_reasoning), openrouter_reasoning.endswith("\\\\"), openrouter_reasoning.endswith("\\"))
@@ -306,7 +314,8 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
                     else:
                         if no_stream_content:
                             del line["choices"][0]["message"]
-                        yield "data: " + json.dumps(line).strip() + end_of_line
+                        json_line = await asyncio.to_thread(json.dumps, line)
+                        yield "data: " + json_line.strip() + end_of_line
     yield "data: [DONE]" + end_of_line
 
 async def fetch_azure_response_stream(client, url, headers, payload, timeout):
@@ -363,7 +372,8 @@ async def fetch_azure_response_stream(client, url, headers, payload, timeout):
                     else:
                         if no_stream_content:
                             del line["choices"][0]["message"]
-                        yield "data: " + json.dumps(line).strip() + end_of_line
+                        json_line = await asyncio.to_thread(json.dumps, line)
+                        yield "data: " + json_line.strip() + end_of_line
     yield "data: [DONE]" + end_of_line
 
 async def fetch_cloudflare_response_stream(client, url, headers, payload, model, timeout):

aient/core/utils.py

@@ -243,7 +243,8 @@ def parse_rate_limit(limit_string):
         'h': 3600, 'hr': 3600, 'hour': 3600,
         'd': 86400, 'day': 86400,
         'mo': 2592000, 'month': 2592000,
-        'y': 31536000, 'year': 31536000
+        'y': 31536000, 'year': 31536000,
+        'tpr': -1,
     }
 
     # 处理多个限制条件
@@ -377,6 +378,32 @@ class ThreadSafeCircularList:
                     logger.warning(f"All API keys are rate limited!")
                     raise HTTPException(status_code=429, detail="Too many requests")
 
+    async def is_tpr_exceeded(self, model: str = None, tokens: int = 0) -> bool:
+        """Checks if the request exceeds the TPR (Tokens Per Request) limit."""
+        if not tokens:
+            return False
+
+        async with self.lock:
+            rate_limit = None
+            model_key = model or "default"
+            if model and model_key in self.rate_limits:
+                rate_limit = self.rate_limits[model_key]
+            else:
+                # fuzzy match
+                for limit_model in self.rate_limits:
+                    if limit_model != "default" and model and limit_model in model:
+                        rate_limit = self.rate_limits[limit_model]
+                        break
+            if rate_limit is None:
+                rate_limit = self.rate_limits.get("default", [])
+
+            for limit_count, limit_period in rate_limit:
+                if limit_period == -1:  # TPR limit
+                    if tokens > limit_count:
+                        # logger.warning(f"API provider for model {model_key} exceeds TPR limit ({tokens}/{limit_count}).")
+                        return True
+        return False
+
     async def is_all_rate_limited(self, model: str = None) -> bool:
         """检查是否所有的items都被速率限制
 

aient/models/chatgpt.py

@@ -844,6 +844,9 @@ class chatgpt(BaseLLM):
             except BadRequestError as e:
                 self.logger.error(f"Bad request error: {e}")
                 raise
+            except GeneratorExit:
+                self.logger.warning("GeneratorExit caught, closing stream.")
+                break
             except ValidationError as e:
                 self.logger.warning(f"Validation failed: {e}. Retrying with corrective prompt.")
                 need_done_prompt = [

{aient-1.1.86.dist-info → aient-1.1.88.dist-info}/METADATA

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

{aient-1.1.86.dist-info → aient-1.1.88.dist-info}/RECORD

@@ -3,8 +3,8 @@ aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=KMlCRLjtq1wQHZTJGqnbWhPS2cHq6eLdnk7peKDrzR8,7490
 aient/core/request.py,sha256=QnDhyrjzcJOEQU2oauMQi_HHMRR5NxdkrX7nn5JMwTc,76675
-aient/core/response.py,sha256=waC-i5i04bwooqNAgjmX30nx0IJ1nLITPeF0RCYwRs0,35620
-aient/core/utils.py,sha256=okDFj8S4r71vnkEBYxiOqoKee63UzNyk2y_p4uhWBvY,28848
+aient/core/response.py,sha256=HcyOEfZXZEXeJaUBMCYE4LiLyB79XuUR5o0Gtwdyi-E,36309
+aient/core/utils.py,sha256=sLmPHONYhIPq1zUYcbKOtIOpAVsLFk_5lNwH5-G2c4E,30013
 aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -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=-3bOA_jLsePy3B77Q5C1C3UglY0NDc9dRMDi7bAdcNw,47056
+aient/models/chatgpt.py,sha256=R6qXgTbcshwYKx3nfSgh4uK2baQ6OZ37j8zV_wV8lLk,47189
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -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.86.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.86.dist-info/METADATA,sha256=WTsDczZLe_c5md4EyuWASjIGxISX3QUrMl9LFygjXJ0,4842
-aient-1.1.86.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.86.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.86.dist-info/RECORD,,
+aient-1.1.88.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.88.dist-info/METADATA,sha256=SUcULwPGR1But7X7FnMup7UueDC-WRKym1iCFtX1Ve0,4842
+aient-1.1.88.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.88.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.88.dist-info/RECORD,,