aient 1.1.64__py3-none-any.whl → 1.1.66__py3-none-any.whl

aient/core/request.py

@@ -27,8 +27,6 @@ from .utils import (
 gemini_max_token_65k_models = ["gemini-2.5-pro", "gemini-2.0-pro", "gemini-2.0-flash-thinking", "gemini-2.5-flash"]
 
 async def get_gemini_payload(request, engine, provider, api_key=None):
-    import re
-
     headers = {
         'Content-Type': 'application/json'
     }
@@ -176,6 +174,24 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
     ]
     generation_config = {}
 
+    def process_tool_parameters(data):
+        if isinstance(data, dict):
+            # 移除 Gemini 不支持的 'additionalProperties'
+            data.pop("additionalProperties", None)
+
+            # 将 'default' 值移入 'description'
+            if "default" in data:
+                default_value = data.pop("default")
+                description = data.get("description", "")
+                data["description"] = f"{description}\nDefault: {default_value}"
+
+            # 递归处理
+            for value in data.values():
+                process_tool_parameters(value)
+        elif isinstance(data, list):
+            for item in data:
+                process_tool_parameters(item)
+
     for field, value in request.model_dump(exclude_unset=True).items():
         if field not in miss_fields and value is not None:
             if field == "tools" and "gemini-2.0-flash-thinking" in original_model:
@@ -185,22 +201,9 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 processed_tools = []
                 for tool in value:
                     function_def = tool["function"]
-                    # gemini不支持parameters里面的additionalProperties字段，需要删除
-                    if safe_get(function_def, "parameters", "additionalProperties", default=None) is not None:
-                        del function_def["parameters"]["additionalProperties"]
-
-                    # 处理 parameters.properties 中的 default 字段
-                    if safe_get(function_def, "parameters", "properties", default=None):
-                        for prop_value in function_def["parameters"]["properties"].values():
-                            if "additionalProperties" in prop_value:
-                                del prop_value["additionalProperties"]
-                            if "default" in prop_value:
-                                # 将 default 值添加到 description 中
-                                default_value = prop_value["default"]
-                                description = prop_value.get("description", "")
-                                prop_value["description"] = f"{description}\nDefault: {default_value}"
-                                # 删除 default 字段
-                                del prop_value["default"]
+                    if "parameters" in function_def:
+                        process_tool_parameters(function_def["parameters"])
+
                     if function_def["name"] != "googleSearch" and function_def["name"] != "googleSearch":
                         processed_tools.append({"function": function_def})
 

aient/core/response.py

@@ -426,53 +426,41 @@ async def fetch_claude_response_stream(client, url, headers, payload, model):
                 line, buffer = buffer.split("\n", 1)
                 # logger.info(line)
 
-                if line.startswith("data:"):
-                    line = line.lstrip("data: ")
+                if line.startswith("data:") and (line := line.lstrip("data: ")):
                     resp: dict = json.loads(line)
-                    message = resp.get("message")
-                    if message:
-                        role = message.get("role")
-                        if role:
-                            sse_string = await generate_sse_response(timestamp, model, None, None, None, None, role)
-                            yield sse_string
-                        tokens_use = message.get("usage")
-                        if tokens_use:
-                            input_tokens = tokens_use.get("input_tokens", 0)
-                    usage = resp.get("usage")
-                    if usage:
-                        output_tokens = usage.get("output_tokens", 0)
+
+                    input_tokens = input_tokens or safe_get(resp, "message", "usage", "input_tokens", default=0)
+                    # cache_creation_input_tokens = safe_get(resp, "message", "usage", "cache_creation_input_tokens", default=0)
+                    # cache_read_input_tokens = safe_get(resp, "message", "usage", "cache_read_input_tokens", default=0)
+                    output_tokens = safe_get(resp, "usage", "output_tokens", default=0)
+                    if output_tokens:
                         total_tokens = input_tokens + output_tokens
                         sse_string = await generate_sse_response(timestamp, model, None, None, None, None, None, total_tokens, input_tokens, output_tokens)
                         yield sse_string
-                        # print("\n\rtotal_tokens", total_tokens)
-
-                    tool_use = resp.get("content_block")
-                    tools_id = None
-                    function_call_name = None
-                    if tool_use and "tool_use" == tool_use['type']:
-                        # print("tool_use", tool_use)
-                        tools_id = tool_use["id"]
-                        if "name" in tool_use:
-                            function_call_name = tool_use["name"]
-                            sse_string = await generate_sse_response(timestamp, model, None, tools_id, function_call_name, None)
-                            yield sse_string
-                    delta = resp.get("delta")
-                    # print("delta", delta)
-                    if not delta:
+                        break
+
+                    text = safe_get(resp, "delta", "text", default="")
+                    if text:
+                        sse_string = await generate_sse_response(timestamp, model, text)
+                        yield sse_string
                         continue
-                    if "text" in delta:
-                        content = delta["text"]
-                        sse_string = await generate_sse_response(timestamp, model, content, None, None)
+
+                    function_call_name = safe_get(resp, "content_block", "name", default=None)
+                    tools_id = safe_get(resp, "content_block", "id", default=None)
+                    if tools_id and function_call_name:
+                        sse_string = await generate_sse_response(timestamp, model, None, tools_id, function_call_name, None)
                         yield sse_string
-                    if "thinking" in delta and delta["thinking"]:
-                        content = delta["thinking"]
-                        sse_string = await generate_sse_response(timestamp, model, reasoning_content=content)
+
+                    thinking_content = safe_get(resp, "delta", "thinking", default="")
+                    if thinking_content:
+                        sse_string = await generate_sse_response(timestamp, model, reasoning_content=thinking_content)
                         yield sse_string
-                    if "partial_json" in delta:
-                        # {"type":"input_json_delta","partial_json":""}
-                        function_call_content = delta["partial_json"]
+
+                    function_call_content = safe_get(resp, "delta", "partial_json", default="")
+                    if function_call_content:
                         sse_string = await generate_sse_response(timestamp, model, None, None, None, function_call_content)
                         yield sse_string
+
     yield "data: [DONE]" + end_of_line
 
 async def fetch_aws_response_stream(client, url, headers, payload, model):

aient/core/utils.py

@@ -46,7 +46,10 @@ class BaseAPI:
             before_v1 = ""
         self.base_url: str = urlunparse(parsed_url[:2] + ("",) + ("",) * 3)
         self.v1_url: str = urlunparse(parsed_url[:2]+ (before_v1,) + ("",) * 3)
-        self.v1_models: str = urlunparse(parsed_url[:2] + (before_v1 + "models",) + ("",) * 3)
+        if "v1/messages" in parsed_url.path:
+            self.v1_models: str = urlunparse(parsed_url[:2] + ("v1/models",) + ("",) * 3)
+        else:
+            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)
         if parsed_url.hostname == "dashscope.aliyuncs.com":
@@ -192,7 +195,10 @@ def update_initial_model(provider):
             endpoint_models_url = endpoint.v1_models
             if isinstance(api, list):
                 api = api[0]
-            headers = {"Authorization": f"Bearer {api}"}
+            if "v1/messages" in api_url:
+                headers = {"x-api-key": api, "anthropic-version": "2023-06-01"}
+            else:
+                headers = {"Authorization": f"Bearer {api}"}
             response = httpx.get(
                 endpoint_models_url,
                 headers=headers,

{aient-1.1.64.dist-info → aient-1.1.66.dist-info}/METADATA

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

{aient-1.1.64.dist-info → aient-1.1.66.dist-info}/RECORD

@@ -2,9 +2,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=M1AfroPgFDG7oTLE2gisvR4BdkUeWqoTwfpxl_nxYB8,76923
-aient/core/response.py,sha256=KbaNZYl1lwdt6itdJq2SSc5zmcaLSZ0wqLAbMqS6ODU,33760
-aient/core/utils.py,sha256=8TR442o3VV7Kl9l6f6LlmOUQ1UDZ-aXMzQqm-qIrqE4,28166
+aient/core/request.py,sha256=4FFCwQ7h7b6bqtrA8qw-DPJVXZTj2i1CkYccFeEwUPw,76552
+aient/core/response.py,sha256=sPcNV9qLosj3lIXElezUZEjIyglspdkBg-EsIUhr9bQ,33203
+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
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -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.64.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.64.dist-info/METADATA,sha256=CebKNT1sxlhL1cDjD4aun5jy3A0N8wJVFN3abneczGc,4842
-aient-1.1.64.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.64.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.64.dist-info/RECORD,,
+aient-1.1.66.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.66.dist-info/METADATA,sha256=sAVJU71_BYtagFIvhB9RefiumnVUFPTA9vrhOba01R8,4842
+aient-1.1.66.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.66.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.66.dist-info/RECORD,,