aient 1.1.22__py3-none-any.whl → 1.1.24__py3-none-any.whl

aient/plugins/config.py

@@ -8,10 +8,25 @@ from ..utils.prompt import search_key_word_prompt
 async def get_tools_result_async(function_call_name, function_full_response, function_call_max_tokens, engine, robot, api_key, api_url, use_plugins, model, add_message, convo_id, language):
     function_response = ""
     function_to_call = None
+    call_args = json.loads(function_full_response)
     if function_call_name in registry.tools:
         function_to_call = registry.tools[function_call_name]
+        call_args_name_list = call_args.keys()
+        required_args = registry.tools_info[function_call_name].args
+        invalid_args = [arg_name for arg_name in call_args_name_list if arg_name not in required_args]
+        if invalid_args:
+            function_response = (
+                "function_response:"
+                "<tool_error>"
+                f"无效的参数: {invalid_args}"
+                f"{function_call_name} 只允许使用以下参数: {required_args}"
+                "</tool_error>"
+            )
+            yield function_response
+            return
+
     if function_call_name == "get_search_results":
-        prompt = json.loads(function_full_response)["query"]
+        prompt = call_args["query"]
         yield "message_search_stage_1"
         llm = robot(api_key=api_key, api_url=api_url, engine=engine, use_plugins=use_plugins)
         keywords = (await llm.ask_async(search_key_word_prompt.format(source=prompt), model=model)).split("\n")
@@ -38,11 +53,10 @@ async def get_tools_result_async(function_call_name, function_full_response, fun
             function_response = "无法找到相关信息，停止使用 tools"
 
     elif function_to_call:
-        prompt = json.loads(function_full_response)
         if inspect.iscoroutinefunction(function_to_call):
-            function_response = await function_to_call(**prompt)
+            function_response = await function_to_call(**call_args)
         else:
-            function_response = function_to_call(**prompt)
+            function_response = function_to_call(**call_args)
 
     function_response = (
         f"function_response:{function_response}"

aient/plugins/read_image.py

@@ -2,6 +2,8 @@ import os
 import base64
 import mimetypes
 from .registry import register_tool
+import io
+from PIL import Image, UnidentifiedImageError
 
 @register_tool()
 def read_image(image_path: str):
@@ -16,7 +18,12 @@ def read_image(image_path: str):
     str: 成功时返回包含图片MIME类型和Base64编码数据的格式化字符串。
             失败时返回错误信息字符串。
     """
+    original_max_pixels = Image.MAX_IMAGE_PIXELS
     try:
+        # 暂时禁用解压炸弹检查，以允许打开非常大的图像进行缩放。
+        # 这是安全的，因为我们控制代码，并且会立即对图像进行缩减。
+        Image.MAX_IMAGE_PIXELS = None
+
         # 检查路径是否存在
         if not os.path.exists(image_path):
             return f"<tool_error>图片路径 '{image_path}' 不存在。</tool_error>"
@@ -31,17 +38,40 @@ def read_image(image_path: str):
             # 如果mimetypes无法识别，或者不是图片类型
             return f"<tool_error>文件 '{image_path}' 的MIME类型无法识别为图片 (检测到: {mime_type})。请确保文件是常见的图片格式 (e.g., PNG, JPG, GIF, WEBP)。</tool_error>"
 
-        with open(image_path, "rb") as image_file:
-            image_data = image_file.read()
+        max_dim = 3072
+        with Image.open(image_path) as img:
+            width, height = img.size
+
+            target_img = img
+            if width > max_dim or height > max_dim:
+                if width > height:
+                    new_width = max_dim
+                    new_height = int(height * (max_dim / width))
+                else:
+                    new_height = max_dim
+                    new_width = int(width * (max_dim / height))
+
+                try:
+                    resampling_filter = Image.Resampling.LANCZOS
+                except AttributeError:
+                    # 兼容旧版 Pillow
+                    resampling_filter = Image.LANCZOS
+
+                target_img = img.resize((new_width, new_height), resampling_filter)
+
+            # 将处理后的图片保存到内存中的字节流
+            img_byte_arr = io.BytesIO()
+            # 保留原始图片格式以获得最佳兼容性，如果无法确定格式，默认为PNG
+            img_format = img.format or 'PNG'
+            target_img.save(img_byte_arr, format=img_format)
+            image_data = img_byte_arr.getvalue()
 
         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 UnidentifiedImageError:
+        return f"<tool_error>无法识别的图片格式 '{image_path}'，文件可能已损坏或格式不受支持。</tool_error>"
     except FileNotFoundError:
         # 这个异常通常由 open() 抛出，如果 os.path.exists 通过但文件在读取前被删除
         # 或者路径检查逻辑未能完全覆盖所有情况 (理论上不应发生)
@@ -51,4 +81,7 @@ def read_image(image_path: str):
     except IOError as e: # 例如文件损坏无法读取，或磁盘问题
         return f"<tool_error>读取图片 '{image_path}' 时发生 I/O 错误: {e}</tool_error>"
     except Exception as e:
-        return f"<tool_error>读取图片 '{image_path}' 时发生未知错误: {e}</tool_error>"
+        return f"<tool_error>读取图片 '{image_path}' 时发生未知错误: {e}</tool_error>"
+    finally:
+        # 恢复原始限制以避免副作用。
+        Image.MAX_IMAGE_PIXELS = original_max_pixels

aient/utils/scripts.py

@@ -496,7 +496,7 @@ def parse_function_xml(xml_content: str, check_line_start: bool = True) -> List[
         tag_inner_content = xml_content[tag_end+1:end_pos]
 
         # 如果是普通辅助标签（如tool_call），则在其内部寻找函数调用
-        if tag_name in ["tool_call", "function_call", "tool", "function"]:
+        if tag_name in ["tool_call", "function_call", "tool", "function", "tools"]:
             # 递归处理内部内容，此时不再检查行首条件
             nested_functions = parse_function_xml(tag_inner_content, check_line_start=False)
             result_functions.extend(nested_functions)
@@ -740,7 +740,14 @@ if __name__ == "__main__":
 
 请提供前两个 `excute_command` 的执行结果。
 """
-
+    test_xml = """
+好的，我现在执行第一步。
+<tools>
+<list_directory>
+<path>/Downloads/GitHub/beswarm/work/test</path>
+</list_directory>
+</tools>
+"""
     print(parse_function_xml(test_xml))
 
 # 运行本文件：python -m beswarm.aient.src.aient.utils.scripts

{aient-1.1.22.dist-info → aient-1.1.24.dist-info}/METADATA

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

{aient-1.1.22.dist-info → aient-1.1.24.dist-info}/RECORD

@@ -22,13 +22,13 @@ aient/models/groq.py,sha256=eXfSOaPxgQEtk4U8qseArN8rFYOFBfMsPwRcDW1nERo,8790
 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/config.py,sha256=QGyI9LlNaU36GUpY531o7UbTFBB39u7LfS6rrx_RTWw,7103
 aient/plugins/excute_command.py,sha256=i5AUSfnYe05cS4YZuNIhuCy-Cfxil7RJG372YwzteXs,10691
 aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 aient/plugins/list_directory.py,sha256=JZVuImecMSfEv6jLqii-0uQJ1UCsrpMNmYlwW3PEDg4,1374
 aient/plugins/read_file.py,sha256=Lv03AW-gWGzM2esos2vLTXHcceczdTqEO7_vqFT4yoY,8302
-aient/plugins/read_image.py,sha256=jFu8MGCPWg19YOG-STWH3pqacf94F17i_4JaJu1XWLs,2704
+aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9ujcXGyuqlGTJMd7ac,4017
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
 aient/plugins/websearch.py,sha256=llxy1U0vJiNMiKvamMr4p7IruLb3nnDR4YErz8TYimc,15215
@@ -37,9 +37,9 @@ aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
 aient/prompt/agent.py,sha256=ZNsbgXRyvYzAFTRRziAnNVqcTyAnxrGcsGfGrt72j6k,25427
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-aient/utils/scripts.py,sha256=LD8adnfuRrJoY2tWKseXOPJXaxbrUmz4czsnUvHswNY,29096
-aient-1.1.22.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.22.dist-info/METADATA,sha256=sFiobRMyPCjvaMyWZk4GCwe2_KFCzHSLNKEeJ75HSUI,4968
-aient-1.1.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.22.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.22.dist-info/RECORD,,
+aient/utils/scripts.py,sha256=RFkuu3j1tC_x1SwQQsS__wQOZe5olmy7FPHEOk5Obds,29265
+aient-1.1.24.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.24.dist-info/METADATA,sha256=FyHXoKl3zIZncMu4FevGSBk52ZEEa-cn_o1KS4Ru18g,4968
+aient-1.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.24.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.24.dist-info/RECORD,,