aient 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

aient/core/models.py

@@ -42,13 +42,6 @@ class ContentItem(BaseModel):
     text: Optional[str] = None
     image_url: Optional[ImageUrl] = None
 
-class Message(BaseModel):
-    role: str
-    name: Optional[str] = None
-    arguments: Optional[str] = None
-    content: Optional[Union[str, List[ContentItem]]] = None
-    tool_calls: Optional[List[ToolCall]] = None
-
 class Message(BaseModel):
     role: str
     name: Optional[str] = None

aient/core/request.py

@@ -20,6 +20,8 @@ from .utils import (
     get_image_message,
 )
 
+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
 
@@ -102,8 +104,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-2.5-flash", "gemini-1.5", "gemini-2.5-pro"]
-    if any(off_model in original_model for off_model in off_models):
+    if any(off_model in original_model for off_model in gemini_max_token_65k_models):
         safety_settings = "OFF"
     else:
         safety_settings = "BLOCK_NONE"
@@ -196,16 +197,17 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             elif field == "temperature":
                 generation_config["temperature"] = value
             elif field == "max_tokens":
+                if value > 65536:
+                    value = 65536
                 generation_config["maxOutputTokens"] = value
             elif field == "top_p":
                 generation_config["topP"] = value
             else:
                 payload[field] = value
 
-    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):
+        if any(pro_model in original_model for pro_model in gemini_max_token_65k_models):
             payload["generationConfig"]["maxOutputTokens"] = 65536
         else:
             payload["generationConfig"]["maxOutputTokens"] = 8192
@@ -226,10 +228,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
 
     # 检测search标签
     if request.model.endswith("-search"):
-        if "tools" not in payload:
-            payload["tools"] = [{"googleSearch": {}}]
-        else:
-            payload["tools"].append({"googleSearch": {}})
+        payload["tools"] = [{"googleSearch": {}}]
 
     return url, headers, payload
 
@@ -390,27 +389,35 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         elif msg.role == "system":
             systemInstruction = {"parts": content}
 
+    if any(off_model in original_model for off_model in gemini_max_token_65k_models):
+        safety_settings = "OFF"
+    else:
+        safety_settings = "BLOCK_NONE"
 
     payload = {
         "contents": messages,
-        # "safetySettings": [
-        #     {
-        #         "category": "HARM_CATEGORY_HARASSMENT",
-        #         "threshold": "BLOCK_NONE"
-        #     },
-        #     {
-        #         "category": "HARM_CATEGORY_HATE_SPEECH",
-        #         "threshold": "BLOCK_NONE"
-        #     },
-        #     {
-        #         "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        #         "threshold": "BLOCK_NONE"
-        #     },
-        #     {
-        #         "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        #         "threshold": "BLOCK_NONE"
-        #     }
-        # ]
+        "safetySettings": [
+            {
+                "category": "HARM_CATEGORY_HARASSMENT",
+                "threshold": safety_settings
+            },
+            {
+                "category": "HARM_CATEGORY_HATE_SPEECH",
+                "threshold": safety_settings
+            },
+            {
+                "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
+                "threshold": safety_settings
+            },
+            {
+                "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
+                "threshold": safety_settings
+            },
+            {
+                "category": "HARM_CATEGORY_CIVIC_INTEGRITY",
+                "threshold": "BLOCK_NONE"
+            },
+        ]
     }
     if systemInstruction:
         payload["system_instruction"] = systemInstruction
@@ -447,15 +454,19 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
             elif field == "temperature":
                 generation_config["temperature"] = value
             elif field == "max_tokens":
+                if value > 65535:
+                    value = 65535
                 generation_config["max_output_tokens"] = value
             elif field == "top_p":
                 generation_config["top_p"] = value
             else:
                 payload[field] = value
 
-    if generation_config:
-        payload["generationConfig"] = generation_config
-        if "max_output_tokens" not in generation_config:
+    payload["generationConfig"] = generation_config
+    if "max_output_tokens" not in generation_config:
+        if any(pro_model in original_model for pro_model in gemini_max_token_65k_models):
+            payload["generationConfig"]["max_output_tokens"] = 65535
+        else:
             payload["generationConfig"]["max_output_tokens"] = 8192
 
     if request.model.endswith("-search"):

aient/core/response.py

@@ -67,9 +67,9 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
                 if (line and '"parts": [' in line or parts_json != "") and is_finish == False:
                     parts_json += line
                 if parts_json != "" and line and '],' == line.strip():
-                    parts_json =  "{" + parts_json.strip().replace(',      "groundingMetadata": {}', "").rstrip(",} ]}").lstrip("{") + "}]}"
+                    tmp_parts_json =  "{" + parts_json.split("}        ]      },")[0].strip().rstrip("}], ").replace("\n", "\\n").lstrip("{") + "}]}"
                     try:
-                        json_data = json.loads(parts_json)
+                        json_data = json.loads(tmp_parts_json)
 
                         content = safe_get(json_data, "parts", 0, "text", default="")
 

aient/core/utils.py

@@ -1,12 +1,10 @@
 import re
 import io
-import os
 import ast
 import json
 import httpx
 import base64
 import asyncio
-import urllib.parse
 from time import time
 from PIL import Image
 from fastapi import HTTPException
@@ -17,8 +15,11 @@ from .log_config import logger
 
 def get_model_dict(provider):
     model_dict = {}
+    if "model" not in provider:
+        logger.error(f"Error: model is not set in provider: {provider}")
+        return model_dict
     for model in provider['model']:
-        if type(model) == str:
+        if isinstance(model, str):
             model_dict[model] = model
         if isinstance(model, dict):
             model_dict.update({str(new): old for old, new in model.items()})
@@ -68,7 +69,9 @@ def get_engine(provider, endpoint=None, original_model=""):
     parsed_url.path.endswith("/v1") or \
     (parsed_url.netloc == 'generativelanguage.googleapis.com' and "openai/chat/completions" not in parsed_url.path):
         engine = "gemini"
-    elif parsed_url.netloc.rstrip('/').endswith('aiplatform.googleapis.com') or (parsed_url.netloc.rstrip('/').endswith('gateway.ai.cloudflare.com') and "google-vertex-ai" in parsed_url.path):
+    elif parsed_url.netloc.rstrip('/').endswith('aiplatform.googleapis.com') or \
+        (parsed_url.netloc.rstrip('/').endswith('gateway.ai.cloudflare.com') and "google-vertex-ai" in parsed_url.path) or \
+        "aiplatform.googleapis.com" in parsed_url.path:
         engine = "vertex"
     elif parsed_url.netloc.rstrip('/').endswith('azure.com'):
         engine = "azure"

aient/plugins/excute_command.py

@@ -3,6 +3,14 @@ from .registry import register_tool
 
 import re
 import html
+import os
+import select
+
+# 检查是否在 Unix-like 系统上 (pty 模块主要用于 Unix)
+IS_UNIX = hasattr(os, 'fork')
+
+if IS_UNIX:
+    import pty
 
 def unescape_html(input_string: str) -> str:
   """
@@ -28,18 +36,18 @@ def get_python_executable(command: str) -> str:
         executable = cmd_parts[0]
         args_str = cmd_parts[1] if len(cmd_parts) > 1 else ""
 
-        # 检查是否是 python 可执行文件 (如 python, python3, pythonX.Y)
         is_python_exe = False
         if executable == "python" or re.match(r"^python[23]?(\.\d+)?$", executable):
             is_python_exe = True
 
         if is_python_exe:
-            # 检查参数中是否已经有 -u 选项
             args_list = args_str.split()
             has_u_option = "-u" in args_list
             if not has_u_option:
                 if args_str:
                     command = f"{executable} -u {args_str}"
+                else:
+                    command = f"{executable} -u" # 如果没有其他参数，也添加 -u
     return command
 
 # 执行命令
@@ -56,60 +64,95 @@ def excute_command(command):
     命令执行的最终状态和收集到的输出/错误信息
     """
     try:
-        command = unescape_html(command) # 保留 HTML 解码
-
+        command = unescape_html(command)
         command = get_python_executable(command)
 
-
-        # 使用 Popen 以便实时处理输出
-        # bufsize=1 表示行缓冲, universal_newlines=True 与 text=True 效果类似，用于文本模式
-        process = subprocess.Popen(
-            command,
-            shell=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            bufsize=1,
-            universal_newlines=True
-        )
-
-        stdout_lines = []
-
-        # 实时打印 stdout
-        # print(f"--- 开始执行命令: {command} ---")
-        if process.stdout:
-            for line in iter(process.stdout.readline, ''):
-                # 对 pip install 命令的输出进行过滤，去除进度条相关的行
-                if "pip install" in command and '━━' in line:
-                    continue
-                print(line, end='', flush=True) # 实时打印到控制台，并刷新缓冲区
-                stdout_lines.append(line) # 收集行以供后续返回
-            process.stdout.close()
-        # print(f"\n--- 命令实时输出结束 ---")
-
-        # 等待命令完成
-        process.wait()
-
-        # 获取 stderr (命令完成后一次性读取)
+        output_lines = []
+
+        if IS_UNIX:
+            # 在 Unix-like 系统上使用 pty 以支持 tqdm 等库的 ANSI 转义序列
+            master_fd, slave_fd = pty.openpty()
+
+            process = subprocess.Popen(
+                command,
+                shell=True,
+                stdin=subprocess.PIPE, # 提供一个 stdin，即使未使用
+                stdout=slave_fd,
+                stderr=slave_fd, # 将 stdout 和 stderr 合并到 pty
+                close_fds=True, # 在子进程中关闭除 stdin/stdout/stderr 之外的文件描述符
+                # bufsize=1,      # 移除此行：pty 通常处理字节，且 bufsize=1 会导致 stdin 的二进制模式警告
+                # universal_newlines=True # pty 通常处理字节，解码在读取端进行
+            )
+            os.close(slave_fd) # 在父进程中关闭 slave 端
+
+            # print(f"--- 开始执行命令 (PTY): {command} ---")
+            while True:
+                try:
+                    # 使用 select 进行非阻塞读取
+                    r, _, _ = select.select([master_fd], [], [], 0.1) # 0.1 秒超时
+                    if r:
+                        data_bytes = os.read(master_fd, 1024)
+                        if not data_bytes: # EOF
+                            break
+                        # 尝试解码，如果失败则使用 repr 显示原始字节
+                        try:
+                            data_str = data_bytes.decode(errors='replace')
+                        except UnicodeDecodeError:
+                            data_str = repr(data_bytes) + " (decode error)\n"
+
+                        print(data_str, end='', flush=True)
+                        output_lines.append(data_str)
+                    # 检查进程是否已结束，避免在进程已退出后 select 仍然阻塞
+                    if process.poll() is not None and not r:
+                        break
+                except OSError: # 当 PTY 关闭时可能会发生
+                    break
+            # print(f"\n--- 命令实时输出结束 (PTY) ---")
+            os.close(master_fd)
+        else:
+            # 在非 Unix 系统上，回退到原始的 subprocess.PIPE 行为
+            # tqdm 进度条可能不会像在终端中那样动态更新
+            process = subprocess.Popen(
+                command,
+                shell=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                bufsize=1,
+                universal_newlines=True
+            )
+            # print(f"--- 开始执行命令 (PIPE): {command} ---")
+            if process.stdout:
+                for line in iter(process.stdout.readline, ''):
+                    print(line, end='', flush=True)
+                    if "pip install" in command and '━━' in line:
+                        continue
+                    output_lines.append(line)
+                process.stdout.close()
+            # print(f"\n--- 命令实时输出结束 (PIPE) ---")
+
+        process.wait() # 等待命令完成
+
+        # 在非 PTY 模式下，stderr 需要单独读取
         stderr_output = ""
-        if process.stderr:
+        if not IS_UNIX and process.stderr:
             stderr_output = process.stderr.read()
             process.stderr.close()
 
-        # 组合最终的 stdout 日志 (已经过 pip install 过滤)
-        final_stdout_log = "".join(stdout_lines)
+        final_output_log = "".join(output_lines)
 
         if process.returncode == 0:
-            return f"执行命令成功:\n{final_stdout_log}"
+            return f"执行命令成功:\n{final_output_log}"
         else:
-            return f"执行命令失败 (退出码 {process.returncode}):\n错误: {stderr_output}\n输出: {final_stdout_log}"
+            # 如果是 PTY 模式，stderr 已经包含在 final_output_log 中
+            if IS_UNIX:
+                return f"执行命令失败 (退出码 {process.returncode}):\n输出/错误:\n{final_output_log}"
+            else:
+                return f"执行命令失败 (退出码 {process.returncode}):\n错误: {stderr_output}\n输出: {final_output_log}"
 
     except FileNotFoundError:
-        # 当 shell=True 时，命令未找到通常由 shell 处理，并返回非零退出码。
-        # 此处捕获 FileNotFoundError 主要用于 Popen 自身无法启动命令的场景 (例如 shell 本身未找到)。
         return f"执行命令失败: 命令或程序未找到 ({command})"
     except Exception as e:
-        # 其他未知异常
         return f"执行命令时发生异常: {e}"
 
 if __name__ == "__main__":
@@ -125,12 +168,25 @@ if __name__ == "__main__":
 #     time.sleep(1)
 # print('\\n-------TQDM 任务完成.')
 # """
+
+#     tqdm_script = """
+# import time
+# from tqdm import tqdm
+
+# for i in tqdm(range(10)):
+#     time.sleep(1)
+# """
 #     processed_tqdm_script = tqdm_script.replace('"', '\\"')
-#     tqdm_command = f"python -u -u -c \"{processed_tqdm_script}\""
+#     tqdm_command = f"python -c \"{processed_tqdm_script}\""
 #     # print(f"执行: {tqdm_command}")
 #     print(excute_command(tqdm_command))
 
 
+    tqdm_command = f"pip install requests"
+    # print(f"执行: {tqdm_command}")
+    print(excute_command(tqdm_command))
+
+
     # long_running_command_unix = "echo '开始长时间任务...' && for i in 1 2 3; do echo \"正在处理步骤 $i/3...\"; sleep 1; done && echo '长时间任务完成!'"
     # print(f"执行: {long_running_command_unix}")
     # print(excute_command(long_running_command_unix))
@@ -148,5 +204,5 @@ if __name__ == "__main__":
 #     print(f"执行: {python_long_task_command}")
 #     print(excute_command(python_long_task_command))
 
-    print(get_python_executable("python -c 'print(123)'"))
+    # print(get_python_executable("python -c 'print(123)'"))
 # python -m beswarm.aient.src.aient.plugins.excute_command

{aient-1.1.2.dist-info → aient-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.2
+Version: 1.1.4
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -9,6 +9,7 @@ Requires-Dist: httpx
 Requires-Dist: pillow
 Requires-Dist: msgspec
 Requires-Dist: fastapi
+Requires-Dist: chardet
 Requires-Dist: requests
 Requires-Dist: html2text
 Requires-Dist: httpx-socks

{aient-1.1.2.dist-info → aient-1.1.4.dist-info}/RECORD

@@ -3,10 +3,10 @@ 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=8ghtI3gU7QMiw1voINWZ-PMsHu4IYjV6ncO6a9Qe9sI,61551
-aient/core/response.py,sha256=rJnt4tOyJXF2pT9_4VdU7aG3Ac-k2MiCAp9nANVyFqI,31505
-aient/core/utils.py,sha256=CAFqWzICaKVysH9GLHBcp-VeOShisLjWGhEsh6-beWo,26365
+aient/core/models.py,sha256=kF-HLi1I2k_G5r153ZHuiGH8_NmpTlFMfK0_myB28YQ,7366
+aient/core/request.py,sha256=Sa2muc4buCkSNPQITOvXwQt0CGA_A39TpIoeVqdqwFQ,61929
+aient/core/response.py,sha256=BNHLazjfQT8mVg7LnPLzlX429aQM3S03pumPbOpczCI,31518
+aient/core/utils.py,sha256=n3dyaApN4rrSduI8cjZbeD0mv8_O5LPTTbwRkj1_v4w,26540
 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
@@ -23,7 +23,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=Vp6CG9ocdC_FAlCMEGtKj45xamir76DFxdJVvURNtog,6539
-aient/plugins/excute_command.py,sha256=u-JOZ21dDcDx1j3O0KVIHAsa6MNuOxHFBdV3iCnTih0,5413
+aient/plugins/excute_command.py,sha256=dwm9DEbXDYbSCbAYOagn0qoGGv8Ak2qAI3mbOVAa9KY,7664
 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
@@ -37,8 +37,8 @@ aient/prompt/agent.py,sha256=6f5ZB66Rb8y0iQScHMRhvXZ1qMM3YsKpCBPCTAAw2rg,24917
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=NXmTxcZqHoRv3S13isLsv7kvqktXnA5ej7uMsxCJUe0,26656
-aient-1.1.2.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.2.dist-info/METADATA,sha256=LjjmPbYBhPxrTuZyewleUpS6M_2IyVOKIINcJIh2kyY,4944
-aient-1.1.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-aient-1.1.2.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.2.dist-info/RECORD,,
+aient-1.1.4.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.4.dist-info/METADATA,sha256=L1TDoq_HxvzaIMWdSVDxdOzj6ex8W-R3CNc1KoSXWO8,4967
+aient-1.1.4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+aient-1.1.4.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.4.dist-info/RECORD,,

{aient-1.1.2.dist-info → aient-1.1.4.dist-info}/WHEEL

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