aient 1.1.73__py3-none-any.whl → 1.1.75__py3-none-any.whl

aient/core/models.py

@@ -1,4 +1,3 @@
-import json
 from io import IOBase
 from pydantic import BaseModel, Field, model_validator, ConfigDict
 from typing import List, Dict, Optional, Union, Tuple, Literal, Any

aient/core/request.py

@@ -2,6 +2,7 @@ import re
 import json
 import httpx
 import base64
+import asyncio
 import urllib.parse
 from io import IOBase
 from typing import Tuple
@@ -336,11 +337,11 @@ def create_jwt(client_email, private_key):
     segments.append(base64.urlsafe_b64encode(signature).rstrip(b'='))
     return b'.'.join(segments).decode()
 
-def get_access_token(client_email, private_key):
-    jwt = create_jwt(client_email, private_key)
+async def get_access_token(client_email, private_key):
+    jwt = await asyncio.to_thread(create_jwt, client_email, private_key)
 
-    with httpx.Client() as client:
-        response = client.post(
+    async with httpx.AsyncClient() as client:
+        response = await client.post(
             "https://oauth2.googleapis.com/token",
             data={
                 "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
@@ -356,7 +357,7 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         'Content-Type': 'application/json'
     }
     if provider.get("client_email") and provider.get("private_key"):
-        access_token = get_access_token(provider['client_email'], provider['private_key'])
+        access_token = await get_access_token(provider['client_email'], provider['private_key'])
         headers['Authorization'] = f"Bearer {access_token}"
     if provider.get("project_id"):
         project_id = provider.get("project_id")
@@ -596,7 +597,7 @@ async def get_vertex_claude_payload(request, engine, provider, api_key=None):
         'Content-Type': 'application/json',
     }
     if provider.get("client_email") and provider.get("private_key"):
-        access_token = get_access_token(provider['client_email'], provider['private_key'])
+        access_token = await get_access_token(provider['client_email'], provider['private_key'])
         headers['Authorization'] = f"Bearer {access_token}"
     if provider.get("project_id"):
         project_id = provider.get("project_id")
@@ -972,7 +973,9 @@ async def get_aws_payload(request, engine, provider, api_key=None):
 
     if provider.get("aws_access_key") and provider.get("aws_secret_key"):
         ACCEPT_HEADER = "application/vnd.amazon.bedrock.payload+json" # 指定接受 Bedrock 流格式
-        amz_date, payload_hash, authorization_header = get_signature(payload, original_model, provider.get("aws_access_key"), provider.get("aws_secret_key"), AWS_REGION, HOST, CONTENT_TYPE, ACCEPT_HEADER)
+        amz_date, payload_hash, authorization_header = await asyncio.to_thread(
+            get_signature, payload, original_model, provider.get("aws_access_key"), provider.get("aws_secret_key"), AWS_REGION, HOST, CONTENT_TYPE, ACCEPT_HEADER
+        )
         headers = {
             'Accept': ACCEPT_HEADER,
             'Content-Type': CONTENT_TYPE,

aient/core/response.py

@@ -53,9 +53,9 @@ def gemini_json_poccess(response_str):
 
     return is_thinking, reasoning_content, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount
 
-async def fetch_gemini_response_stream(client, url, headers, payload, model):
+async def fetch_gemini_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload) as response:
+    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_gemini_response_stream")
         if error_message:
             yield error_message
@@ -122,9 +122,9 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
 
     yield "data: [DONE]" + end_of_line
 
-async def fetch_vertex_claude_response_stream(client, url, headers, payload, model):
+async def fetch_vertex_claude_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload) as response:
+    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_vertex_claude_response_stream")
         if error_message:
             yield error_message
@@ -190,14 +190,14 @@ async def fetch_vertex_claude_response_stream(client, url, headers, payload, mod
 
     yield "data: [DONE]" + end_of_line
 
-async def fetch_gpt_response_stream(client, url, headers, payload):
+async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
     random.seed(timestamp)
     random_str = ''.join(random.choices(string.ascii_letters + string.digits, k=29))
     is_thinking = False
     has_send_thinking = False
     ark_tag = False
-    async with client.stream('POST', url, headers=headers, json=payload) as response:
+    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_gpt_response_stream")
         if error_message:
             yield error_message
@@ -306,12 +306,12 @@ async def fetch_gpt_response_stream(client, url, headers, payload):
                         yield "data: " + json.dumps(line).strip() + end_of_line
     yield "data: [DONE]" + end_of_line
 
-async def fetch_azure_response_stream(client, url, headers, payload):
+async def fetch_azure_response_stream(client, url, headers, payload, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
     is_thinking = False
     has_send_thinking = False
     ark_tag = False
-    async with client.stream('POST', url, headers=headers, json=payload) as response:
+    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_azure_response_stream")
         if error_message:
             yield error_message
@@ -362,9 +362,9 @@ async def fetch_azure_response_stream(client, url, headers, payload):
                         yield "data: " + json.dumps(line).strip() + end_of_line
     yield "data: [DONE]" + end_of_line
 
-async def fetch_cloudflare_response_stream(client, url, headers, payload, model):
+async def fetch_cloudflare_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload) as response:
+    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_cloudflare_response_stream")
         if error_message:
             yield error_message
@@ -387,9 +387,9 @@ async def fetch_cloudflare_response_stream(client, url, headers, payload, model)
                         yield sse_string
     yield "data: [DONE]" + end_of_line
 
-async def fetch_cohere_response_stream(client, url, headers, payload, model):
+async def fetch_cohere_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload) as response:
+    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_cohere_response_stream")
         if error_message:
             yield error_message
@@ -410,9 +410,9 @@ async def fetch_cohere_response_stream(client, url, headers, payload, model):
                     yield sse_string
     yield "data: [DONE]" + end_of_line
 
-async def fetch_claude_response_stream(client, url, headers, payload, model):
+async def fetch_claude_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload) as response:
+    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_claude_response_stream")
         if error_message:
             yield error_message
@@ -463,9 +463,9 @@ async def fetch_claude_response_stream(client, url, headers, payload, model):
 
     yield "data: [DONE]" + end_of_line
 
-async def fetch_aws_response_stream(client, url, headers, payload, model):
+async def fetch_aws_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload) as response:
+    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_aws_response_stream")
         if error_message:
             yield error_message
@@ -514,13 +514,13 @@ async def fetch_aws_response_stream(client, url, headers, payload, model):
 
     yield "data: [DONE]" + end_of_line
 
-async def fetch_response(client, url, headers, payload, engine, model):
+async def fetch_response(client, url, headers, payload, engine, model, timeout=200):
     response = None
     if payload.get("file"):
         file = payload.pop("file")
-        response = await client.post(url, headers=headers, data=payload, files={"file": file})
+        response = await client.post(url, headers=headers, data=payload, files={"file": file}, timeout=timeout)
     else:
-        response = await client.post(url, headers=headers, json=payload)
+        response = await client.post(url, headers=headers, json=payload, timeout=timeout)
     error_message = await check_response(response, "fetch_response")
     if error_message:
         yield error_message
@@ -625,27 +625,27 @@ async def fetch_response(client, url, headers, payload, engine, model):
         response_json = response.json()
         yield response_json
 
-async def fetch_response_stream(client, url, headers, payload, engine, model):
+async def fetch_response_stream(client, url, headers, payload, engine, model, timeout=200):
     if engine == "gemini" or engine == "vertex-gemini":
-        async for chunk in fetch_gemini_response_stream(client, url, headers, payload, model):
+        async for chunk in fetch_gemini_response_stream(client, url, headers, payload, model, timeout):
             yield chunk
     elif engine == "claude" or engine == "vertex-claude":
-        async for chunk in fetch_claude_response_stream(client, url, headers, payload, model):
+        async for chunk in fetch_claude_response_stream(client, url, headers, payload, model, timeout):
             yield chunk
     elif engine == "aws":
-        async for chunk in fetch_aws_response_stream(client, url, headers, payload, model):
+        async for chunk in fetch_aws_response_stream(client, url, headers, payload, model, timeout):
             yield chunk
     elif engine == "gpt" or engine == "openrouter" or engine == "azure-databricks":
-        async for chunk in fetch_gpt_response_stream(client, url, headers, payload):
+        async for chunk in fetch_gpt_response_stream(client, url, headers, payload, timeout):
             yield chunk
     elif engine == "azure":
-        async for chunk in fetch_azure_response_stream(client, url, headers, payload):
+        async for chunk in fetch_azure_response_stream(client, url, headers, payload, timeout):
             yield chunk
     elif engine == "cloudflare":
-        async for chunk in fetch_cloudflare_response_stream(client, url, headers, payload, model):
+        async for chunk in fetch_cloudflare_response_stream(client, url, headers, payload, model, timeout):
             yield chunk
     elif engine == "cohere":
-        async for chunk in fetch_cohere_response_stream(client, url, headers, payload, model):
+        async for chunk in fetch_cohere_response_stream(client, url, headers, payload, model, timeout):
             yield chunk
     else:
-        raise ValueError("Unknown response")
+        raise ValueError("Unknown response")

{aient-1.1.73.dist-info → aient-1.1.75.dist-info}/METADATA

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

{aient-1.1.73.dist-info → aient-1.1.75.dist-info}/RECORD

@@ -1,9 +1,9 @@
 aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
-aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
-aient/core/request.py,sha256=4FFCwQ7h7b6bqtrA8qw-DPJVXZTj2i1CkYccFeEwUPw,76552
-aient/core/response.py,sha256=tYKWOeexYEhWK4napIAfYjCn2rQ1zpxRvknsBBWrv2M,33206
+aient/core/models.py,sha256=KMlCRLjtq1wQHZTJGqnbWhPS2cHq6eLdnk7peKDrzR8,7490
+aient/core/request.py,sha256=vfwi3ZGYp2hQzSJ6mPXJVgcV_uu5AJ_NAL84mLfF8WA,76674
+aient/core/response.py,sha256=uCQEZY_68neqNbbdr-tL4yy7thqBuSNvV1z4Ezww8o8,33538
 aient/core/utils.py,sha256=D98d5Cy1h4ejKtuxS0EEDtL4YqpaZLB5tuXoVP0IBWQ,28462
 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
@@ -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.73.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.73.dist-info/METADATA,sha256=tBDP7wGDeeRRD-UEww0-UxF5IgbmHhQV4O7qXuDVXOA,4842
-aient-1.1.73.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.73.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.73.dist-info/RECORD,,
+aient-1.1.75.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.75.dist-info/METADATA,sha256=nv_h5lJXeM4gcyJ7WRSynJ_giD1ZZXWIC1CwtTn05Ig,4842
+aient-1.1.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.75.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.75.dist-info/RECORD,,