aient 1.1.12__py3-none-any.whl → 1.1.13__py3-none-any.whl

aient/core/request.py

@@ -48,6 +48,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
 
     messages = []
     systemInstruction = None
+    system_prompt = ""
     function_arguments = None
     for msg in request.messages:
         if msg.role == "assistant":
@@ -102,7 +103,8 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             messages.append({"role": msg.role, "parts": content})
         elif msg.role == "system":
             content[0]["text"] = re.sub(r"_+", "_", content[0]["text"])
-            systemInstruction = {"parts": content}
+            system_prompt = system_prompt + "\n\n" + content[0]["text"]
+    systemInstruction = {"parts": [{"text": system_prompt}]}
 
     if any(off_model in original_model for off_model in gemini_max_token_65k_models):
         safety_settings = "OFF"
@@ -212,23 +214,35 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
         else:
             payload["generationConfig"]["maxOutputTokens"] = 8192
 
-    # 从请求模型名中检测思考预算设置
-    m = re.match(r".*-think-(-?\d+)", request.model)
-    if m:
-        try:
-            val = int(m.group(1))
-            if val < 0:
-                val = 0
-            elif val > 24576:
-                val = 24576
-            payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": val}
-        except ValueError:
-            # 如果转换为整数失败，忽略思考预算设置
-            pass
-
-    # 检测search标签
-    if request.model.endswith("-search"):
-        payload["tools"] = [{"googleSearch": {}}]
+    if "gemini-2.5" in original_model:
+        payload["generationConfig"]["thinkingConfig"] = {
+            "includeThoughts": True,
+        }
+        # 从请求模型名中检测思考预算设置
+        m = re.match(r".*-think-(-?\d+)", request.model)
+        if m:
+            try:
+                val = int(m.group(1))
+                if val < 0:
+                    val = 0
+                elif val > 24576:
+                    val = 24576
+                payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+            except ValueError:
+                # 如果转换为整数失败，忽略思考预算设置
+                pass
+
+    # # 检测search标签
+    # if request.model.endswith("-search"):
+    #     payload["tools"] = [{"googleSearch": {}}]
+
+    if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
+        for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
 
     return url, headers, payload
 
@@ -303,16 +317,16 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         gemini_stream = "generateContent"
     model_dict = get_model_dict(provider)
     original_model = model_dict[request.model]
-    search_tool = None
+    # search_tool = None
 
     # https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-0-flash?hl=zh-cn
     pro_models = ["gemini-2.5", "gemini-2.0"]
     if any(pro_model in original_model for pro_model in pro_models):
         location = gemini2
-        search_tool = {"googleSearch": {}}
+        # search_tool = {"googleSearch": {}}
     else:
         location = gemini1
-        search_tool = {"googleSearchRetrieval": {}}
+        # search_tool = {"googleSearchRetrieval": {}}
 
     if "google-vertex-ai" in provider.get("base_url", ""):
         url = provider.get("base_url").rstrip('/') + "/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
@@ -334,6 +348,7 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
 
     messages = []
     systemInstruction = None
+    system_prompt = ""
     function_arguments = None
     for msg in request.messages:
         if msg.role == "assistant":
@@ -387,7 +402,8 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         elif msg.role != "system":
             messages.append({"role": msg.role, "parts": content})
         elif msg.role == "system":
-            systemInstruction = {"parts": content}
+            system_prompt = system_prompt + "\n\n" + content[0]["text"]
+    systemInstruction = {"parts": [{"text": system_prompt}]}
 
     if any(off_model in original_model for off_model in gemini_max_token_65k_models):
         safety_settings = "OFF"
@@ -469,8 +485,34 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         else:
             payload["generationConfig"]["max_output_tokens"] = 8192
 
-    if request.model.endswith("-search"):
-        payload["tools"] = [search_tool]
+    if "gemini-2.5" in original_model:
+        payload["generationConfig"]["thinkingConfig"] = {
+            "includeThoughts": True,
+        }
+        # 从请求模型名中检测思考预算设置
+        m = re.match(r".*-think-(-?\d+)", request.model)
+        if m:
+            try:
+                val = int(m.group(1))
+                if val < 0:
+                    val = 0
+                elif val > 24576:
+                    val = 24576
+                payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+            except ValueError:
+                # 如果转换为整数失败，忽略思考预算设置
+                pass
+
+    # if request.model.endswith("-search"):
+    #     payload["tools"] = [search_tool]
+
+    if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
+        for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
 
     return url, headers, payload
 
@@ -1010,7 +1052,11 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
 
     if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
         for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
-            payload[key] = value
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
 
     return url, headers, payload
 
@@ -1104,7 +1150,11 @@ async def get_azure_payload(request, engine, provider, api_key=None):
 
     if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
         for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
-            payload[key] = value
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
 
     return url, headers, payload
 
@@ -1433,9 +1483,13 @@ async def get_claude_payload(request, engine, provider, api_key=None):
             message_index = message_index + 1
 
     if "claude-3-7-sonnet" in original_model:
-        max_tokens = 20000
+        max_tokens = 128000
     elif "claude-3-5-sonnet" in original_model:
         max_tokens = 8192
+    elif "claude-sonnet-4" in original_model:
+        max_tokens = 64000
+    elif "claude-opus-4" in original_model:
+        max_tokens = 32000
     else:
         max_tokens = 4096
 

aient/core/response.py

@@ -535,15 +535,25 @@ async def fetch_response(client, url, headers, payload, engine, model):
         # print("parsed_data", json.dumps(parsed_data, indent=4, ensure_ascii=False))
         content = ""
         reasoning_content = ""
-        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)
+        parts_list = safe_get(parsed_data, 0, "candidates", 0, "content", "parts", default=[])
+        for item in parts_list:
+            chunk = safe_get(item, "text")
+            is_think = safe_get(item, "thought", default=False)
             # logger.info(f"chunk: {repr(chunk)}")
             if chunk:
                 if is_think:
                     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)

aient/core/utils.py

@@ -96,6 +96,7 @@ def get_engine(provider, endpoint=None, original_model=""):
     and "o3" not in original_model \
     and "o4" not in original_model \
     and "gemini" not in original_model \
+    and "gemma" not in original_model \
     and "learnlm" not in original_model \
     and "grok" not in original_model \
     and parsed_url.netloc != 'api.cloudflare.com' \

{aient-1.1.12.dist-info → aient-1.1.13.dist-info}/METADATA

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

{aient-1.1.12.dist-info → aient-1.1.13.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=kF-HLi1I2k_G5r153ZHuiGH8_NmpTlFMfK0_myB28YQ,7366
-aient/core/request.py,sha256=VItemXnWzqzS10W-RuLVrARki1w7MZMBZdyqyA5axw8,61943
-aient/core/response.py,sha256=BNHLazjfQT8mVg7LnPLzlX429aQM3S03pumPbOpczCI,31518
-aient/core/utils.py,sha256=n3dyaApN4rrSduI8cjZbeD0mv8_O5LPTTbwRkj1_v4w,26540
+aient/core/request.py,sha256=AmTnQ_Ri_ACRxDsWmPhhD6e79hNfwLxbsyBnpbAnmNA,64490
+aient/core/response.py,sha256=Z0Bjl_QvpUguyky1LIcsVks4BKKqT0eYEpDmKa_cwpQ,31978
+aient/core/utils.py,sha256=-naFCv8V-qhnqvDUd8BNbW1HR9CVAPxISrXoAz464Qg,26580
 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
@@ -38,8 +38,8 @@ aient/prompt/agent.py,sha256=y2GETN6ScC5yQVs75VFfzm4YUWzblbqLYz0Sy6JnPRw,24950
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=wutPtgbs-WXo5AACLpnCJaRQBOSKXWNnsf2grbYDzyQ,29098
-aient-1.1.12.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.12.dist-info/METADATA,sha256=Qw9hW21BsAFZHELCET7zEMTFUvvCaJv0r2WBgJmZM-I,4968
-aient-1.1.12.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-aient-1.1.12.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.12.dist-info/RECORD,,
+aient-1.1.13.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.13.dist-info/METADATA,sha256=uguXOGwPo-gVDnS50EHIjb9nm6KtITwdbNXH9a3IQzA,4968
+aient-1.1.13.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+aient-1.1.13.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.13.dist-info/RECORD,,