aient 1.0.68__py3-none-any.whl → 1.0.70__py3-none-any.whl

aient/core/.gitignore

@@ -0,0 +1 @@
+/__pycache__

aient/core/request.py

@@ -21,21 +21,24 @@ from .utils import (
 )
 
 async def get_gemini_payload(request, engine, provider, api_key=None):
+    import re
+
     headers = {
         'Content-Type': 'application/json'
     }
+
+    # 获取映射后的实际模型ID
     model_dict = get_model_dict(provider)
     original_model = model_dict[request.model]
+
     gemini_stream = "streamGenerateContent"
     url = provider['base_url']
     parsed_url = urllib.parse.urlparse(url)
-    # print("parsed_url", parsed_url)
     if "/v1beta" in parsed_url.path:
         api_version = "v1beta"
     else:
         api_version = "v1"
 
-    # https://generativelanguage.googleapis.com/v1beta/models/
     url = f"{parsed_url.scheme}://{parsed_url.netloc}{parsed_url.path.split('/models')[0].rstrip('/')}/models/{original_model}:{gemini_stream}?key={api_key}"
 
     messages = []
@@ -96,7 +99,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             content[0]["text"] = re.sub(r"_+", "_", content[0]["text"])
             systemInstruction = {"parts": content}
 
-    off_models = ["gemini-2.0-flash", "gemini-1.5", "gemini-2.5-pro"]
+    off_models = ["gemini-2.0-flash", "gemini-2.5-flash", "gemini-1.5", "gemini-2.5-pro"]
     if any(off_model in original_model for off_model in off_models):
         safety_settings = "OFF"
     else:
@@ -196,7 +199,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             else:
                 payload[field] = value
 
-    max_token_65k_models = ["gemini-2.5-pro", "gemini-2.0-pro", "gemini-2.0-flash-thinking"]
+    max_token_65k_models = ["gemini-2.5-pro", "gemini-2.0-pro", "gemini-2.0-flash-thinking", "gemini-2.5-flash"]
     payload["generationConfig"] = generation_config
     if "maxOutputTokens" not in generation_config:
         if any(pro_model in original_model for pro_model in max_token_65k_models):
@@ -204,15 +207,26 @@ 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"):
         if "tools" not in payload:
-            payload["tools"] = [{
-                "googleSearch": {}
-            }]
+            payload["tools"] = [{"googleSearch": {}}]
         else:
-            payload["tools"].append({
-                "googleSearch": {}
-            })
+            payload["tools"].append({"googleSearch": {}})
 
     return url, headers, payload
 
@@ -917,7 +931,7 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
 
     for field, value in request.model_dump(exclude_unset=True).items():
         if field not in miss_fields and value is not None:
-            if field == "max_tokens" and ("o1" in original_model or "o3" in original_model):
+            if field == "max_tokens" and ("o1" in original_model or "o3" in original_model or "o4" in original_model):
                 payload["max_completion_tokens"] = value
             else:
                 payload[field] = value
@@ -925,29 +939,28 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
     if provider.get("tools") == False or "o1-mini" in original_model or "chatgpt-4o-latest" in original_model or "grok" in original_model:
         payload.pop("tools", None)
         payload.pop("tool_choice", None)
+
     if "models.inference.ai.azure.com" in url:
         payload["stream"] = False
-        # request.stream = False
         payload.pop("stream_options", None)
 
     if "api.x.ai" in url:
         payload.pop("stream_options", None)
 
-    if "o3-mini" in original_model:
+    if "grok-3-mini" in original_model:
         if request.model.endswith("high"):
             payload["reasoning_effort"] = "high"
         elif request.model.endswith("low"):
             payload["reasoning_effort"] = "low"
-        else:
-            payload["reasoning_effort"] = "medium"
 
-    if "grok-3-mini" in original_model:
+    if "o1" in original_model or "o3" in original_model or "o4" in original_model:
         if request.model.endswith("high"):
             payload["reasoning_effort"] = "high"
         elif request.model.endswith("low"):
             payload["reasoning_effort"] = "low"
+        else:
+            payload["reasoning_effort"] = "medium"
 
-    if "o3-mini" in original_model or "o1" in original_model:
         if "temperature" in payload:
             payload.pop("temperature")
 

aient/core/response.py

@@ -456,42 +456,46 @@ async def fetch_aws_response_stream(client, url, headers, payload, model):
             yield error_message
             return
 
+        buffer = ""
         async for line in response.aiter_text():
-            if not line or \
-            line.strip() == "" or\
-            line.strip().startswith(':content-type') or \
-            line.strip().startswith(':event-type'): # 过滤掉完全空的行或只有空白的行
-                continue
-
-            json_match = re.search(r'event{.*?}', line)
-            if not json_match:
-                continue
-            try:
-                chunk_data = json.loads(json_match.group(0).lstrip('event'))
-            except json.JSONDecodeError:
-                logger.error(f"DEBUG json.JSONDecodeError: {json_match.group(0).lstrip('event')!r}")
-                continue
-
-            # --- 后续处理逻辑不变 ---
-            if "bytes" in chunk_data:
-                # 解码 Base64 编码的字节
-                decoded_bytes = base64.b64decode(chunk_data["bytes"])
-                # 将解码后的字节再次解析为 JSON
-                payload_chunk = json.loads(decoded_bytes.decode('utf-8'))
-                # print(f"DEBUG payload_chunk: {payload_chunk!r}")
-
-                text = safe_get(payload_chunk, "delta", "text", default="")
-                if text:
-                    sse_string = await generate_sse_response(timestamp, model, text, None, None)
-                    yield sse_string
+            buffer += line
+            while "\r" in buffer:
+                line, buffer = buffer.split("\r", 1)
+                if not line or \
+                line.strip() == "" or \
+                line.strip().startswith(':content-type') or \
+                line.strip().startswith(':event-type'): # 过滤掉完全空的行或只有空白的行
+                    continue
+
+                json_match = re.search(r'event{.*?}', line)
+                if not json_match:
+                    continue
+                try:
+                    chunk_data = json.loads(json_match.group(0).lstrip('event'))
+                except json.JSONDecodeError:
+                    logger.error(f"DEBUG json.JSONDecodeError: {json_match.group(0).lstrip('event')!r}")
+                    continue
+
+                # --- 后续处理逻辑不变 ---
+                if "bytes" in chunk_data:
+                    # 解码 Base64 编码的字节
+                    decoded_bytes = base64.b64decode(chunk_data["bytes"])
+                    # 将解码后的字节再次解析为 JSON
+                    payload_chunk = json.loads(decoded_bytes.decode('utf-8'))
+                    # print(f"DEBUG payload_chunk: {payload_chunk!r}")
+
+                    text = safe_get(payload_chunk, "delta", "text", default="")
+                    if text:
+                        sse_string = await generate_sse_response(timestamp, model, text, None, None)
+                        yield sse_string
 
-                usage = safe_get(payload_chunk, "amazon-bedrock-invocationMetrics", default="")
-                if usage:
-                    input_tokens = usage.get("inputTokenCount", 0)
-                    output_tokens = usage.get("outputTokenCount", 0)
-                    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
+                    usage = safe_get(payload_chunk, "amazon-bedrock-invocationMetrics", default="")
+                    if usage:
+                        input_tokens = usage.get("inputTokenCount", 0)
+                        output_tokens = usage.get("outputTokenCount", 0)
+                        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
 
     yield "data: [DONE]" + end_of_line
 
@@ -538,7 +542,7 @@ async def fetch_response(client, url, headers, payload, engine, model):
         if role == "model":
             role = "assistant"
         else:
-            logger.error(f"Unknown role: {role}")
+            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)

aient/core/utils.py

@@ -91,6 +91,7 @@ def get_engine(provider, endpoint=None, original_model=""):
     and "deepseek" not in original_model \
     and "o1" not in original_model \
     and "o3" not in original_model \
+    and "o4" not in original_model \
     and "gemini" not in original_model \
     and "learnlm" not in original_model \
     and "grok" not in original_model \

aient/plugins/excute_command.py

@@ -7,7 +7,15 @@ def excute_command(command):
     """
 执行命令并返回输出结果
 禁止用于查看pdf，禁止使用 pdftotext 命令
-请确保生成的命令字符串可以直接在终端执行，特殊字符（例如 &&）必须保持原样，不要进行 HTML 编码或任何形式的转义，比如禁止使用 && 代替 &&。
+请确保生成的命令字符串可以直接在终端执行，特殊字符（例如 &&）必须保持原样，不要进行 HTML 编码或任何形式的转义，禁止使用 &&
+
+for example:
+
+correct:
+ls -l && echo 'Hello, World!'
+
+incorrect:
+ls -l && echo 'Hello, World!'
 
 参数:
     command: 要执行的命令，可以克隆仓库，安装依赖，运行代码等

{aient-1.0.68.dist-info → aient-1.0.70.dist-info}/METADATA

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

{aient-1.0.68.dist-info → aient-1.0.70.dist-info}/RECORD

@@ -1,11 +1,12 @@
 aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 aient/core/.git,sha256=lrAcW1SxzRBUcUiuKL5tS9ykDmmTXxyLP3YYU-Y-Q-I,45
+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=_1wYZg_n9kb2A3C8xCboyqleH2iHc9scwOvtx9DPeok,7582
-aient/core/request.py,sha256=025Jih6jUhlCnO_JT0si5ygbxB1h-aMUPw6ZhL8mJhk,60362
-aient/core/response.py,sha256=EYlTrpMOInM9IF0uM954xQ6QDca1u33UVcYHfoMomHE,30307
-aient/core/utils.py,sha256=8rZaTu3PA9UyEqeFd-Oxm7VGBO59CzOzcII_UIzmZJY,26035
+aient/core/request.py,sha256=qE7UFkPNqVQvM0jD9HdcrmpLKJuRYP3rZVqd6aeb8HE,60767
+aient/core/response.py,sha256=CSAOQmybBu3i2Yq2YUyi91dZWTN1tmtJEBTI8RFwj_s,30594
+aient/core/utils.py,sha256=R4oKj1oVsdfePdQReaW-ZU4VRTCetvdCKPz_OOTOU_w,26072
 aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
 aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhFkw,2755
@@ -21,7 +22,7 @@ aient/models/vertex.py,sha256=qVD5l1Q538xXUPulxG4nmDjXE1VoV4yuAkTCpIeJVw0,16795
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=tFN54y9pVgK46e9VAOux9h69XuoKJQeTGTAdFKpPPnc,7813
-aient/plugins/excute_command.py,sha256=rFvL91vm_xazNd0mU_oeNQ1N2U1Q80MyZO-A-v2xULs,1124
+aient/plugins/excute_command.py,sha256=0sQZGLCaRfh0yMM63fXU8XZV7jlo9FKeyEbM-rfgTFg,1209
 aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 aient/plugins/list_directory.py,sha256=5ubm-mfrj-tanGSDp4M_Tmb6vQb3dx2-XVfQ2yL2G8A,1394
@@ -35,8 +36,8 @@ aient/prompt/agent.py,sha256=ssZREegzmkWNW20dxzGO92J8Y5v7yjRTR9znTPDjo5Q,23681
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=n0jR5eXCBIK12W4bIx-xU1FVl1hZ4zDC7hq_BWQHYJU,27537
-aient-1.0.68.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.68.dist-info/METADATA,sha256=ybmAd9zAXxJwW78DBy9o9lk4n3ulW52EazBSkt7C7t8,5000
-aient-1.0.68.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-aient-1.0.68.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.68.dist-info/RECORD,,
+aient-1.0.70.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.0.70.dist-info/METADATA,sha256=E8QxcSZFqwXKyDLJUwD8JuTIWk3JupLbVPLaqKgxioU,5000
+aient-1.0.70.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+aient-1.0.70.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.0.70.dist-info/RECORD,,

{aient-1.0.68.dist-info → aient-1.0.70.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (78.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any