aient 1.1.23__tar.gz → 1.1.24__tar.gz

{aient-1.1.23/src/aient.egg-info → aient-1.1.24}/PKG-INFO

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

{aient-1.1.23 → aient-1.1.24}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.23",
+    version="1.1.24",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

{aient-1.1.23 → aient-1.1.24}/src/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-1.1.23 → aient-1.1.24}/src/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.23 → aient-1.1.24/src/aient.egg-info}/PKG-INFO

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