aient 1.1.9__py3-none-any.whl → 1.1.10__py3-none-any.whl

aient/models/chatgpt.py

@@ -152,8 +152,25 @@ class chatgpt(BaseLLM):
             else:
                 last_user_message = self.conversation[convo_id][-1]["content"]
                 if last_user_message != message:
+                    image_message_list = []
+                    if isinstance(function_arguments, str):
+                        functions_list = json.loads(function_arguments)
+                    else:
+                        functions_list = function_arguments
+                    for tool_info in functions_list:
+                        if tool_info.get("base64_image"):
+                            image_message_list.append({"type": "text", "text": safe_get(tool_info, "parameter", "image_path", default="") + " image:"})
+                            image_message_list.append({
+                                "type": "image_url",
+                                "image_url": {
+                                    "url": tool_info["base64_image"],
+                                }
+                            })
                     self.conversation[convo_id].append({"role": "assistant", "content": convert_functions_to_xml(function_arguments)})
-                    self.conversation[convo_id].append({"role": "user", "content": message})
+                    if image_message_list:
+                        self.conversation[convo_id].append({"role": "user", "content": [{"type": "text", "text": message}] + image_message_list})
+                    else:
+                        self.conversation[convo_id].append({"role": "user", "content": message})
                 else:
                     self.conversation[convo_id].append({"role": "assistant", "content": "我已经执行过这个工具了，接下来我需要做什么？"})
 
@@ -545,10 +562,10 @@ class chatgpt(BaseLLM):
                     self.latest_file_content[tool_info['parameter']["file_path"]] = tool_response
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead file successfully! The file content has been updated in the tag <latest_file_content>.")
                 elif tool_name == "write_to_file":
-                    # change_tools_args = copy.deepcopy(tool_info['parameter'])
-                    # change_tools_args["content"] = "...文件已写入，内容已省略以节省上下文..."
-                    # tool_args = json.dumps(change_tools_args, ensure_ascii=False) if not isinstance(change_tools_args, str) else change_tools_args
                     all_responses.append(f"[{tool_name} Result]:\n\n{tool_response}")
+                elif tool_name == "read_image":
+                    tool_info["base64_image"] = tool_response
+                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead image successfully!")
                 else:
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
 

aient/plugins/list_directory.py

@@ -5,13 +5,13 @@ from .registry import register_tool
 @register_tool()
 def list_directory(path="."):
     """
-    列出指定目录中的所有文件和子目录
+列出指定目录中的所有文件和子目录
 
-    参数:
-        path: 要列出内容的目录路径，默认为当前目录
+参数:
+    path: 要列出内容的目录路径，默认为当前目录
 
-    返回:
-        目录内容的列表字符串
+返回:
+    目录内容的列表字符串
     """
     try:
         # 获取目录内容

aient/plugins/read_image.py

@@ -0,0 +1,54 @@
+import os
+import base64
+import mimetypes
+from .registry import register_tool
+
+@register_tool()
+def read_image(image_path: str):
+    """
+读取本地图片文件，将其转换为 Base64 编码，并返回包含 MIME 类型和完整数据的字符串。
+此工具用于将图片内容加载到上下文中。
+
+参数:
+    image_path (str): 本地图片文件的路径。
+
+返回:
+    str: 成功时返回包含图片MIME类型和Base64编码数据的格式化字符串。
+            失败时返回错误信息字符串。
+    """
+    try:
+        # 检查路径是否存在
+        if not os.path.exists(image_path):
+            return f"错误: 图片路径 '{image_path}' 不存在。"
+        # 检查是否为文件
+        if not os.path.isfile(image_path):
+            return f"错误: 路径 '{image_path}' 不是一个有效的文件 (可能是一个目录)。"
+
+        # 尝试猜测MIME类型
+        mime_type, _ = mimetypes.guess_type(image_path) # encoding 变量通常不需要
+
+        if not mime_type or not mime_type.startswith('image/'):
+            # 如果mimetypes无法识别，或者不是图片类型
+            return f"错误: 文件 '{image_path}' 的MIME类型无法识别为图片 (检测到: {mime_type})。请确保文件是常见的图片格式 (e.g., PNG, JPG, GIF, WEBP)。"
+
+        with open(image_path, "rb") as image_file:
+            image_data = image_file.read()
+
+        base64_encoded_data = base64.b64encode(image_data).decode('utf-8')
+
+        # 返回一个描述性字符串，模仿 list_directory.py 的风格
+        # 包含完整的 Base64 数据
+        # 注意：对于非常大的图片，这可能会产生非常长的输出字符串。
+        # return f"成功读取图片 '{image_path}':\n  MIME 类型: {mime_type}\n  Base64 数据: {base64_encoded_data}"
+        return f"data:{mime_type};base64," + base64_encoded_data
+
+    except FileNotFoundError:
+        # 这个异常通常由 open() 抛出，如果 os.path.exists 通过但文件在读取前被删除
+        # 或者路径检查逻辑未能完全覆盖所有情况 (理论上不应发生)
+        return f"错误: 图片路径 '{image_path}' 未找到 (可能在检查后被删除或移动)。"
+    except PermissionError:
+        return f"错误: 没有权限访问图片路径 '{image_path}'。"
+    except IOError as e: # 例如文件损坏无法读取，或磁盘问题
+        return f"错误: 读取图片 '{image_path}' 时发生 I/O 错误: {e}"
+    except Exception as e:
+        return f"读取图片 '{image_path}' 时发生未知错误: {e}"

aient/prompt/agent.py

@@ -220,6 +220,8 @@ git clone https://github.com/username/project-name.git
 <tools>
 {tools_list}
 </tools>
+
+<work_agent_conversation_start>
 """
 
 cursor_prompt = """

{aient-1.1.9.dist-info → aient-1.1.10.dist-info}/METADATA

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

{aient-1.1.9.dist-info → aient-1.1.10.dist-info}/RECORD

@@ -14,7 +14,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-aient/models/chatgpt.py,sha256=vjmMELVO96NWsptrwoqcvyDS_YQfvE_piA-4G_hQR0I,45258
+aient/models/chatgpt.py,sha256=6SuMfV8n0pBOaKN3WGqhPc53_LHBdyOECQgVsHscso8,46169
 aient/models/claude.py,sha256=JezghW7y0brl4Y5qiSHvnYR5prQCFywX4RViHt39pGI,26037
 aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -26,19 +26,20 @@ aient/plugins/config.py,sha256=Vp6CG9ocdC_FAlCMEGtKj45xamir76DFxdJVvURNtog,6539
 aient/plugins/excute_command.py,sha256=A3WmfZboEikU1EHvtMWhBv-xHxCyMxbDddQ982I_8wE,10482
 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
+aient/plugins/list_directory.py,sha256=JZVuImecMSfEv6jLqii-0uQJ1UCsrpMNmYlwW3PEDg4,1374
 aient/plugins/read_file.py,sha256=-RRmaj-rSl8y--5VKnxCsZ1YQHe75OhnqvsDRLJyujM,8412
+aient/plugins/read_image.py,sha256=goBnpmnmu753pQBkEROTo1ZaGE23fx5WJVr8T8z4598,2577
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
 aient/plugins/websearch.py,sha256=llxy1U0vJiNMiKvamMr4p7IruLb3nnDR4YErz8TYimc,15215
 aient/plugins/write_file.py,sha256=YRvQKMvV-5lwohxlvwt9hjfxz2dRJP85AJWAMUIqbBY,3804
 aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
-aient/prompt/agent.py,sha256=6f5ZB66Rb8y0iQScHMRhvXZ1qMM3YsKpCBPCTAAw2rg,24917
+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=NXmTxcZqHoRv3S13isLsv7kvqktXnA5ej7uMsxCJUe0,26656
-aient-1.1.9.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.9.dist-info/METADATA,sha256=_7E_2mM7_toOqkWUvi28i2-otAtSpnJpA-u9DkW1vf8,4967
-aient-1.1.9.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-aient-1.1.9.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.9.dist-info/RECORD,,
+aient-1.1.10.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.10.dist-info/METADATA,sha256=59vJo7hMpLQ6Y9ZHXoLkZwiHuVpk1B5qLSepbTxXrXc,4968
+aient-1.1.10.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+aient-1.1.10.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.10.dist-info/RECORD,,