aient 1.1.39__py3-none-any.whl → 1.1.41__py3-none-any.whl

aient/core/request.py

@@ -10,6 +10,7 @@ from .utils import (
     c3o,
     c3h,
     c35s,
+    c4,
     gemini1,
     gemini2,
     gemini2_5_pro_exp,
@@ -240,6 +241,10 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 val = int(m.group(1))
                 if val < 0:
                     val = 0
+                elif val > 32768 and "gemini-2.5-pro" in original_model:
+                    val = 32768
+                elif val < 128 and "gemini-2.5-pro" in original_model:
+                    val = 128
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
@@ -532,6 +537,10 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                 val = int(m.group(1))
                 if val < 0:
                     val = 0
+                elif val > 32768 and "gemini-2.5-pro" in original_model:
+                    val = 32768
+                elif val < 128 and "gemini-2.5-pro" in original_model:
+                    val = 128
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
@@ -568,6 +577,8 @@ async def get_vertex_claude_payload(request, engine, provider, api_key=None):
         location = c35s
     elif "claude-3-opus" in original_model:
         location = c3o
+    elif "claude-sonnet-4" in original_model or "claude-opus-4" in original_model:
+        location = c4
     elif "claude-3-sonnet" in original_model:
         location = c3s
     elif "claude-3-haiku" in original_model:
@@ -790,23 +801,6 @@ async def get_aws_payload(request, engine, provider, api_key=None):
     # url = f"{base_url}/model/{original_model}/invoke"
     url = f"{base_url}/model/{original_model}/invoke-with-response-stream"
 
-    # if "claude-3-5-sonnet" in original_model or "claude-3-7-sonnet" in original_model:
-    #     location = c35s
-    # elif "claude-3-opus" in original_model:
-    #     location = c3o
-    # elif "claude-3-sonnet" in original_model:
-    #     location = c3s
-    # elif "claude-3-haiku" in original_model:
-    #     location = c3h
-
-    # claude_stream = "streamRawPredict"
-    # url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/anthropic/models/{MODEL}:{stream}".format(
-    #     LOCATION=await location.next(),
-    #     PROJECT_ID=project_id,
-    #     MODEL=original_model,
-    #     stream=claude_stream
-    # )
-
     messages = []
     system_prompt = None
     tool_id = None

aient/core/response.py

@@ -568,6 +568,7 @@ async def fetch_response(client, url, headers, payload, engine, model):
 
     elif engine == "gemini" or engine == "vertex-gemini" or engine == "aws":
         response_json = response.json()
+        # print("response_json", json.dumps(response_json, indent=4, ensure_ascii=False))
 
         if isinstance(response_json, str):
             import ast
@@ -579,7 +580,7 @@ async def fetch_response(client, url, headers, payload, engine, model):
         else:
             logger.error(f"error fetch_response: Unknown response_json type: {type(response_json)}")
             parsed_data = response_json
-        # print("parsed_data", json.dumps(parsed_data, indent=4, ensure_ascii=False))
+
         content = ""
         reasoning_content = ""
         image_base64 = ""
@@ -596,15 +597,6 @@ async def fetch_response(client, url, headers, payload, engine, model):
                     reasoning_content += chunk
                 else:
                     content += chunk
-        # for item in parsed_data:
-        #     chunk = safe_get(item, "candidates", 0, "content", "parts", 0, "text")
-        #     is_think = safe_get(item, "candidates", 0, "content", "parts", 0, "thought", default=False)
-        #     # logger.info(f"chunk: {repr(chunk)}")
-        #     if chunk:
-        #         if is_think:
-        #             reasoning_content += chunk
-        #         else:
-        #             content += chunk
 
         usage_metadata = safe_get(parsed_data, -1, "usageMetadata")
         prompt_tokens = safe_get(usage_metadata, "promptTokenCount", default=0)
@@ -618,8 +610,13 @@ async def fetch_response(client, url, headers, payload, engine, model):
             logger.error(f"Unknown role: {role}, parsed_data: {parsed_data}")
             role = "assistant"
 
-        function_call_name = safe_get(parsed_data, -1, "candidates", 0, "content", "parts", 0, "functionCall", "name", default=None)
-        function_call_content = safe_get(parsed_data, -1, "candidates", 0, "content", "parts", 0, "functionCall", "args", default=None)
+        has_think = safe_get(parsed_data, 0, "candidates", 0, "content", "parts", 0, "thought", default=False)
+        if has_think:
+            function_message_parts_index = -1
+        else:
+            function_message_parts_index = 0
+        function_call_name = safe_get(parsed_data, -1, "candidates", 0, "content", "parts", function_message_parts_index, "functionCall", "name", default=None)
+        function_call_content = safe_get(parsed_data, -1, "candidates", 0, "content", "parts", function_message_parts_index, "functionCall", "args", default=None)
 
         timestamp = int(datetime.timestamp(datetime.now()))
         yield await generate_no_stream_response(timestamp, model, content=content, tools_id=None, function_call_name=function_call_name, function_call_content=function_call_content, role=role, total_tokens=total_tokens, prompt_tokens=prompt_tokens, completion_tokens=candidates_tokens, reasoning_content=reasoning_content, image_base64=image_base64)

aient/core/utils.py

@@ -436,6 +436,7 @@ provider_api_circular_list = defaultdict(ThreadSafeCircularList)
 c35s = ThreadSafeCircularList(["us-east5", "europe-west1"])
 c3s = ThreadSafeCircularList(["us-east5", "us-central1", "asia-southeast1"])
 c3o = ThreadSafeCircularList(["us-east5"])
+c4 = ThreadSafeCircularList(["us-east5", "us-central1", "europe-west4", "asia-southeast1"])
 c3h = ThreadSafeCircularList(["us-east5", "us-central1", "europe-west1", "europe-west4"])
 gemini1 = ThreadSafeCircularList(["us-central1", "us-east4", "us-west1", "us-west4", "europe-west1", "europe-west2"])
 gemini2 = ThreadSafeCircularList(["us-central1"])

{aient-1.1.39.dist-info → aient-1.1.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.39
+Version: 1.1.41
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE

{aient-1.1.39.dist-info → aient-1.1.41.dist-info}/RECORD

@@ -4,9 +4,9 @@ aient/core/.gitignore,sha256=5JRRlYYsqt_yt6iFvvzhbqh2FTUQMqwo6WwIuFzlGR8,13
 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=6Nwduj7kFuubFaZ0ZLkT_zd03XpT-bFhgrKVOZiGBOQ,71918
-aient/core/response.py,sha256=RYy70Ld_txixHHd61Dqtlo0tKHMU_OIXqxGWd6EfATI,35315
-aient/core/utils.py,sha256=fhI5wBxr01lVEp8nMfjG9dQ859AE-VdrWyb9suLzzqM,27400
+aient/core/request.py,sha256=1iY-GUgbGCt0gXpO91QDEERIfkptI_anCHg9ElDvVVc,71765
+aient/core/response.py,sha256=mAVsCnNhWY09DXNe0lyPUJq-1ljtGjC67Az-Uh7ozIw,35166
+aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
 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
@@ -37,8 +37,8 @@ aient/plugins/write_file.py,sha256=hExFLuoNPtjYxJI3pVbofZRpokvUabpXdEkd3mZJPPc,3
 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.39.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.39.dist-info/METADATA,sha256=61ptj-W1QQYypJuZ6j6J4Vl2OBz03Ex91wFqDHOvNS0,4968
-aient-1.1.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.39.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.39.dist-info/RECORD,,
+aient-1.1.41.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.41.dist-info/METADATA,sha256=hMAJ7yUTFHx9-QqfRUy1Vu9BBRZGHKUco1m3nGdQC28,4968
+aient-1.1.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.41.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.41.dist-info/RECORD,,