aient 1.1.50__py3-none-any.whl → 1.1.52__py3-none-any.whl

aient/core/request.py

@@ -3,6 +3,8 @@ import json
 import httpx
 import base64
 import urllib.parse
+from io import IOBase
+from typing import Tuple
 
 from .models import RequestModel, Message
 from .utils import (
@@ -239,30 +241,48 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             ]
 
     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 > 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 <= 0:
-                    val = 0
-                elif val > 24576:
-                    val = 24576
-                payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+                budget = None
+                # gemini-2.5-pro: [128, 32768]
+                if "gemini-2.5-pro" in original_model:
+                    if val < 128:
+                        budget = 128
+                    elif val > 32768:
+                        budget = 32768
+                    else: # 128 <= val <= 32768
+                        budget = val
+
+                # gemini-2.5-flash-lite: [0] or [512, 24576]
+                elif "gemini-2.5-flash-lite" in original_model:
+                    if val > 0 and val < 512:
+                        budget = 512
+                    elif val > 24576:
+                        budget = 24576
+                    else: # Includes 0 and valid range, and clamps invalid negatives
+                        budget = val if val >= 0 else 0
+
+                # gemini-2.5-flash (and other gemini-2.5 models as a fallback): [0, 24576]
+                else:
+                    if val > 24576:
+                        budget = 24576
+                    else: # Includes 0 and valid range, and clamps invalid negatives
+                        budget = val if val >= 0 else 0
+
+                payload["generationConfig"]["thinkingConfig"] = {
+                    "includeThoughts": True if budget else False,
+                    "thinkingBudget": budget
+                }
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass
-
-    # # 检测search标签
-    # if request.model.endswith("-search"):
-    #     payload["tools"] = [{"googleSearch": {}}]
+        else:
+            payload["generationConfig"]["thinkingConfig"] = {
+                "includeThoughts": True,
+            }
 
     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():
@@ -348,16 +368,12 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=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"]
+    pro_models = ["gemini-2.5"]
     if any(pro_model in original_model for pro_model in pro_models):
-        location = gemini2
+        location = gemini2_5_pro_exp
     else:
         location = gemini1
 
-    if "gemini-2.5-flash-lite-preview-06-17" == original_model or \
-    "gemini-2.5-pro-preview-06-05" == original_model:
-        location = gemini2_5_pro_exp
-
     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(
             LOCATION=await location.next(),
@@ -366,24 +382,8 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
             stream=gemini_stream
         )
     elif api_key is not None and api_key[2] == ".":
-        if provider.get("project_id") and "gemini-2.5-pro-preview-06-05" == original_model:
-            if isinstance(provider.get("project_id"), list):
-                api_key_index = provider.get("api").index(api_key)
-                project_id = provider.get("project_id")[api_key_index]
-            else:
-                project_id = provider.get("project_id")
-            url = f"https://aiplatform.googleapis.com/v1/projects/{project_id}/locations/global/publishers/google/models/{original_model}:{gemini_stream}?key={api_key}"
-        else:
-            url = f"https://aiplatform.googleapis.com/v1/publishers/google/models/{original_model}:{gemini_stream}?key={api_key}"
+        url = f"https://aiplatform.googleapis.com/v1/publishers/google/models/{original_model}:{gemini_stream}?key={api_key}"
         headers.pop("Authorization", None)
-    elif "gemini-2.5-flash-lite-preview-06-17" == original_model or \
-    "gemini-2.5-pro-preview-06-05" == original_model:
-        url = "https://aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
-            LOCATION=await location.next(),
-            PROJECT_ID=project_id,
-            MODEL_ID=original_model,
-            stream=gemini_stream
-        )
     else:
         url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
             LOCATION=await location.next(),
@@ -535,29 +535,48 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
             payload["generationConfig"]["max_output_tokens"] = 8192
 
     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 > 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 <= 0:
-                    val = 0
-                elif val > 24576:
-                    val = 24576
-                payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+                budget = None
+                # gemini-2.5-pro: [128, 32768]
+                if "gemini-2.5-pro" in original_model:
+                    if val < 128:
+                        budget = 128
+                    elif val > 32768:
+                        budget = 32768
+                    else: # 128 <= val <= 32768
+                        budget = val
+
+                # gemini-2.5-flash-lite: [0] or [512, 24576]
+                elif "gemini-2.5-flash-lite" in original_model:
+                    if val > 0 and val < 512:
+                        budget = 512
+                    elif val > 24576:
+                        budget = 24576
+                    else: # Includes 0 and valid range, and clamps invalid negatives
+                        budget = val if val >= 0 else 0
+
+                # gemini-2.5-flash (and other gemini-2.5 models as a fallback): [0, 24576]
+                else:
+                    if val > 24576:
+                        budget = 24576
+                    else: # Includes 0 and valid range, and clamps invalid negatives
+                        budget = val if val >= 0 else 0
+
+                payload["generationConfig"]["thinkingConfig"] = {
+                    "includeThoughts": True if budget else False,
+                    "thinkingBudget": budget
+                }
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass
-
-    # if request.model.endswith("-search"):
-    #     payload["tools"] = [search_tool]
+        else:
+            payload["generationConfig"]["thinkingConfig"] = {
+                "includeThoughts": True,
+            }
 
     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():
@@ -1776,21 +1795,98 @@ async def get_dalle_payload(request, engine, provider, api_key=None):
 
     return url, headers, payload
 
+async def get_upload_certificate(client: httpx.AsyncClient, api_key: str, model: str) -> dict:
+    """第一步：获取文件上传凭证"""
+    # print("步骤 1: 正在获取上传凭证...")
+    headers = {"Authorization": f"Bearer {api_key}"}
+    params = {"action": "getPolicy", "model": model}
+    try:
+        response = await client.get("https://dashscope.aliyuncs.com/api/v1/uploads", headers=headers, params=params)
+        response.raise_for_status()  # 如果请求失败则抛出异常
+        cert_data = response.json()
+        # print("凭证获取成功。")
+        return cert_data.get("data")
+    except httpx.HTTPStatusError as e:
+        print(f"获取凭证失败: HTTP {e.response.status_code}")
+        print(f"响应内容: {e.response.text}")
+        return None
+    except Exception as e:
+        print(f"获取凭证时发生未知错误: {e}")
+        return None
+
+from mimetypes import guess_type
+
+async def upload_file_to_oss(client: httpx.AsyncClient, certificate: dict, file: Tuple[str, IOBase, str]) -> str:
+    """第二步：使用凭证将文件内容上传到OSS"""
+    upload_host = certificate.get("upload_host")
+    upload_dir = certificate.get("upload_dir")
+    object_key = f"{upload_dir}/{file[0]}"
+
+    form_data = {
+        "key": object_key,
+        "policy": certificate.get("policy"),
+        "OSSAccessKeyId": certificate.get("oss_access_key_id"),
+        "signature": certificate.get("signature"),
+        "success_action_status": "200",
+        "x-oss-object-acl": certificate.get("x_oss_object_acl"),
+        "x-oss-forbid-overwrite": certificate.get("x_oss_forbid_overwrite"),
+    }
+
+    files = {"file": file}
+
+    try:
+        response = await client.post(upload_host, data=form_data, files=files, timeout=3600)
+        response.raise_for_status()
+        # print("文件上传成功！")
+        oss_url = f"oss://{object_key}"
+        # print(f"文件OSS URL: {oss_url}")
+        return oss_url
+    except httpx.HTTPStatusError as e:
+        print(f"上传文件失败: HTTP {e.response.status_code}")
+        print(f"响应内容: {e.response.text}")
+        return None
+    except Exception as e:
+        print(f"上传文件时发生未知错误: {e}")
+        return None
+
 async def get_whisper_payload(request, engine, provider, api_key=None):
     model_dict = get_model_dict(provider)
     original_model = model_dict[request.model]
-    headers = {
-        # "Content-Type": "multipart/form-data",
-    }
+    headers = {}
     if api_key:
         headers['Authorization'] = f"Bearer {api_key}"
     url = provider['base_url']
     url = BaseAPI(url).audio_transcriptions
 
-    payload = {
-        "model": original_model,
-        "file": request.file,
-    }
+    if "dashscope.aliyuncs.com" in url:
+        client = httpx.AsyncClient()
+        certificate = await get_upload_certificate(client, api_key, original_model)
+        if not certificate:
+            return
+
+        # 步骤 2: 上传文件
+        oss_url = await upload_file_to_oss(client, certificate, request.file)
+        headers = {
+            "Authorization": f"Bearer {api_key}",
+            "Content-Type": "application/json",
+            "X-DashScope-OssResourceResolve": "enable"
+        }
+        payload = {
+            "model": original_model,
+            "input": {
+                "messages": [
+                    {
+                        "role": "user",
+                        "content": [{"audio": oss_url}]
+                    }
+                ]
+            }
+        }
+    else:
+        payload = {
+            "model": original_model,
+            "file": request.file,
+        }
 
     if request.prompt:
         payload["prompt"] = request.prompt
@@ -1860,11 +1956,20 @@ async def get_tts_payload(request, engine, provider, api_key=None):
     url = provider['base_url']
     url = BaseAPI(url).audio_speech
 
-    payload = {
-        "model": original_model,
-        "input": request.input,
-        "voice": request.voice,
-    }
+    if "api.minimaxi.com" in url:
+        payload = {
+            "model": original_model,
+            "text": request.input,
+            "voice_setting": {
+                "voice_id": request.voice
+            }
+        }
+    else:
+        payload = {
+            "model": original_model,
+            "input": request.input,
+            "voice": request.voice,
+        }
 
     if request.response_format:
         payload["response_format"] = request.response_format

aient/core/response.py

@@ -666,6 +666,10 @@ async def fetch_response(client, url, headers, payload, engine, model):
 
         yield response_json
 
+    elif "dashscope.aliyuncs.com" in url and "multimodal-generation" in url:
+        response_json = response.json()
+        content = safe_get(response_json, "output", "choices", 0, "message", "content", 0, default=None)
+        yield content
     else:
         response_json = response.json()
         yield response_json

aient/core/utils.py

@@ -49,10 +49,16 @@ class BaseAPI:
         self.v1_models: str = urlunparse(parsed_url[:2] + (before_v1 + "models",) + ("",) * 3)
         self.chat_url: str = urlunparse(parsed_url[:2] + (before_v1 + "chat/completions",) + ("",) * 3)
         self.image_url: str = urlunparse(parsed_url[:2] + (before_v1 + "images/generations",) + ("",) * 3)
-        self.audio_transcriptions: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/transcriptions",) + ("",) * 3)
+        if parsed_url.hostname == "dashscope.aliyuncs.com":
+            self.audio_transcriptions: str = urlunparse(parsed_url[:2] + ("/api/v1/services/aigc/multimodal-generation/generation",) + ("",) * 3)
+        else:
+            self.audio_transcriptions: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/transcriptions",) + ("",) * 3)
         self.moderations: str = urlunparse(parsed_url[:2] + (before_v1 + "moderations",) + ("",) * 3)
         self.embeddings: str = urlunparse(parsed_url[:2] + (before_v1 + "embeddings",) + ("",) * 3)
-        self.audio_speech: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/speech",) + ("",) * 3)
+        if parsed_url.hostname == "api.minimaxi.com":
+            self.audio_speech: str = urlunparse(parsed_url[:2] + ("v1/t2a_v2",) + ("",) * 3)
+        else:
+            self.audio_speech: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/speech",) + ("",) * 3)
 
         if parsed_url.hostname == "generativelanguage.googleapis.com":
             self.base_url = api_url
@@ -440,8 +446,23 @@ c4 = ThreadSafeCircularList(["us-east5", "us-central1", "europe-west4", "asia-so
 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"])
-gemini2_5_pro_exp = ThreadSafeCircularList(["global"])
-
+# gemini2_5_pro_exp = ThreadSafeCircularList(["global"])
+gemini2_5_pro_exp = ThreadSafeCircularList([
+  "us-central1",
+  "us-east1",
+  "us-east4",
+  "us-east5",
+  "us-south1",
+  "us-west1",
+  "us-west4",
+  "europe-central2",
+  "europe-north1",
+  "europe-southwest1",
+  "europe-west1",
+  "europe-west4",
+  "europe-west8",
+  "europe-west9"
+])
 
 
 # end_of_line = "\n\r\n"

aient/plugins/websearch.py

@@ -44,6 +44,8 @@ def url_to_markdown(url):
                 body = body[0]
                 body = Cleaner(javascript=True, style=True).clean_html(body)
                 return ''.join(lxml.html.tostring(c, encoding='unicode') for c in body)
+        except ImportError as e:
+            raise e
         except Exception as e:
             # print('\033[31m')
             # print("error: url_to_markdown url", url)

{aient-1.1.50.dist-info → aient-1.1.52.dist-info}/METADATA

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

{aient-1.1.50.dist-info → aient-1.1.52.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=8HlSFaBhWMs5thhL4C5qj-hvuDZWUXCYWwVShFR99QU,72263
-aient/core/response.py,sha256=-28HYKuzgfC1y7VOrYLk75_QH5yh6c1IS024yoQM0mg,35671
-aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
+aient/core/request.py,sha256=LMt80dfn-XTQ-6_yRkEIT5QMN-hAPX52sAkKQ2hAHbM,76065
+aient/core/response.py,sha256=FKcUH4f0oD0mvOB_ZWqT05ZefZfawwZS-it5djR4ETU,35915
+aient/core/utils.py,sha256=8TR442o3VV7Kl9l6f6LlmOUQ1UDZ-aXMzQqm-qIrqE4,28166
 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
@@ -32,13 +32,13 @@ aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9ujcXGyuqlGTJMd7ac,4
 aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4614
-aient/plugins/websearch.py,sha256=LPS5NmHrY-Rc0FCPlhHrUWE90XJmXF_AvShLHTV_Zqc,15285
+aient/plugins/websearch.py,sha256=9yImBa1s5V7Djqzx6L4naDyIsGIcf_js1LOyLX0aNHw,15338
 aient/plugins/write_file.py,sha256=hExFLuoNPtjYxJI3pVbofZRpokvUabpXdEkd3mZJPPc,3778
 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.50.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.50.dist-info/METADATA,sha256=4tCnfHz_FSAHEe1g8SkkXZbDK2VGHTSmJL3ea1H-VzM,4968
-aient-1.1.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.50.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.50.dist-info/RECORD,,
+aient-1.1.52.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.52.dist-info/METADATA,sha256=2NHf_SCLBcs1AfTuk_WP92BxNpUmSErYHRC1nly_9pE,4968
+aient-1.1.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.52.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.52.dist-info/RECORD,,