aient 1.0.97__tar.gz → 1.0.99__tar.gz

{aient-1.0.97/src/aient.egg-info → aient-1.0.99}/PKG-INFO

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

{aient-1.0.97 → aient-1.0.99}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.97",
+    version="1.0.99",
     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.0.97 → aient-1.0.99}/src/aient/models/chatgpt.py

@@ -439,8 +439,6 @@ class chatgpt(BaseLLM):
             if function_parameter:
                 invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not in self.plugins.keys()]
                 function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
-                for tool_dict in invalid_tools:
-                    full_response = full_response + f"\n\nFunction: {tool_dict.get('function_name', '')} does not exist! I must use existing functions. I need to try again."
                 if self.print_log and invalid_tools:
                     print("invalid_tools", invalid_tools)
                     print("function_parameter", function_parameter)

{aient-1.0.97 → aient-1.0.99}/src/aient/prompt/agent.py

@@ -71,15 +71,19 @@ Answer the user's request using the relevant tool(s), if they are available. Che
 
 You have tools at your disposal to solve the coding task. Follow these rules regarding tool calls:
 
-Tool uses are formatted using XML-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. Here's the structure:
+Tool uses are formatted using XML-style tags.
+The **actual name of the tool** (e.g., `read_file`, `edit_file`) must be used as the main XML tag.
+Do **NOT** use literal placeholder strings like `<tool_name>`, `<parameter1_name>`, or `<tool_name1>` as actual XML tags. These are for illustration only. Always use the specific tool name and its defined parameter names.
 
-<tool_name>
-<parameter1_name>value1</parameter1_name>
-<parameter2_name>value2</parameter2_name>
+Here's how to structure a single tool call. Replace `actual_tool_name_here` with the specific tool's name, and `parameter_name` with actual parameter names for that tool:
+
+<actual_tool_name_here>
+<parameter_name>value</parameter_name>
+<another_parameter_name>another_value</another_parameter_name>
 ...
-</tool_name>
+</actual_tool_name_here>
 
-For example:
+For example, to use the `read_file` tool:
 
 <read_file>
 <file_path>
@@ -87,18 +91,18 @@ For example:
 </file_path>
 </read_file>
 
-you can call multiple tools in one turn, for example:
+If you need to call multiple tools in one turn, list each tool call's XML structure sequentially. For example:
 
-<tool_name1>
+<actual_tool_name1_here>
 <parameter1_name>value1</parameter1_name>
 ...
-</tool_name1>
+</actual_tool_name1_here>
 
 ...
-<tool_name2>
+<actual_tool_name2_here>
 <parameter1_name>value1</parameter1_name>
 ...
-</tool_name2>
+</actual_tool_name2_here>
 
 When calling tools in parallel, multiple different or the same tools can be invoked simultaneously. 你可以同时执行这两个或者多个操作。
 
@@ -161,34 +165,36 @@ instruction_system_prompt = """
 
 工具使用规范如下：
 
-Tool uses are formatted using XML-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. Here's the structure:
+Tool uses are formatted using XML-style tags.
+The **actual name of the tool** (e.g., `read_file`, `edit_file`) must be used as the main XML tag.
+Do **NOT** use literal placeholder strings like `<tool_name>`, `<parameter1_name>`, or `<tool_name1>` as actual XML tags. These are for illustration only. Always use the specific tool name and its defined parameter names.
 
-<tool_name>
-<parameter1_name>value1</parameter1_name>
-<parameter2_name>value2</parameter2_name>
+Here's how to structure a single tool call. Replace `actual_tool_name_here` with the specific tool's name, and `parameter_name` with actual parameter names for that tool:
+
+<actual_tool_name_here>
+<parameter_name>value</parameter_name>
+<another_parameter_name>another_value</another_parameter_name>
 ...
-</tool_name>
+</actual_tool_name_here>
 
-For example:
+For example, to use the `read_file` tool:
 
 <read_file>
-<file_path>
-/path/to/file.txt
-</file_path>
+<file_path>/path/to/file.txt</file_path>
 </read_file>
 
-you can call multiple tools in one turn, for example:
+If you need to call multiple tools in one turn, list each tool call's XML structure sequentially. For example:
 
-<tool_name1>
+<actual_tool_name1_here>
 <parameter1_name>value1</parameter1_name>
 ...
-</tool_name1>
+</actual_tool_name1_here>
 
 ...
-<tool_name2>
+<actual_tool_name2_here>
 <parameter1_name>value1</parameter1_name>
 ...
-</tool_name2>
+</actual_tool_name2_here>
 
 When calling tools in parallel, multiple different or the same tools can be invoked simultaneously.
 
@@ -211,7 +217,9 @@ git clone https://github.com/username/project-name.git
 </excute_command>
 
 工作智能体仅可以使用如下工具：
+<tools>
 {tools_list}
+</tools>
 """
 
 cursor_prompt = """

{aient-1.0.97 → aient-1.0.99}/src/aient/utils/scripts.py

@@ -413,13 +413,15 @@ class XmlMatcher(Generic[R]):
         self._update(chunk)
         return self._pop()
 
-def parse_function_xml(xml_content: str) -> List[Dict[str, Any]]:
+def parse_function_xml(xml_content: str, check_line_start: bool = True) -> List[Dict[str, Any]]:
     """
     解析XML格式的函数调用信息，转换为字典数组格式
     只解析倒数两层XML标签，忽略更高层级的XML标签
+    当 check_line_start 为 True 时，只解析行首的XML标签。
 
     参数:
         xml_content: 包含一个或多个函数调用的XML字符串
+        check_line_start: 布尔值，指示是否只解析行首的XML标签
 
     返回:
         包含所有函数调用信息的字典数组，每个字典包含函数名和参数
@@ -434,6 +436,14 @@ def parse_function_xml(xml_content: str) -> List[Dict[str, Any]]:
         if tag_start == -1:
             break  # 没有找到更多的标签
 
+        # 新增：如果 check_line_start 为 True，检查标签是否在行首
+        # 如果 '<' 不在行首 (即 tag_start > 0 且其前一个字符不是换行符)，
+        # 则将其视为普通文本的一部分，移动 position 并继续搜索
+        if check_line_start:
+            if tag_start > 0 and xml_content[tag_start - 1] != '\n':
+                position = tag_start + 1  # 从 '<' 之后继续搜索
+                continue
+
         # 检查是否是XML标签的开始（不是闭合标签）
         if tag_start + 1 < len(xml_content) and xml_content[tag_start + 1] == '/':
             # 这是一个结束标签，跳过
@@ -476,8 +486,8 @@ def parse_function_xml(xml_content: str) -> List[Dict[str, Any]]:
 
         # 如果是普通辅助标签（如tool_call），则在其内部寻找函数调用
         if tag_name in ["tool_call", "function_call", "tool", "function"]:
-            # 递归处理内部内容
-            nested_functions = parse_function_xml(tag_inner_content)
+            # 递归处理内部内容，此时不再检查行首条件
+            nested_functions = parse_function_xml(tag_inner_content, check_line_start=False)
             result_functions.extend(nested_functions)
         else:
             # 将当前标签作为函数名，解析其内部标签作为参数
@@ -646,7 +656,7 @@ def convert_functions_to_xml(functions_list):
 
 if __name__ == "__main__":
 
-    # 运行本文件：python -m aient.utils.scripts
+    # 运行本文件：python -m beswarm.aient.src.aient.utils.scripts
     os.system("clear")
     test_xml = """
 ✅ 好的，我现在读取 `README.md` 文件。
@@ -656,6 +666,7 @@ if __name__ == "__main__":
 </read_file>
 </tool_call>好的，我现在读取 `README.md` 文件。
 """
+    test_xml = """首先使用read_file工具读取论文内容，然后使用excute_command工具克隆代码仓库到本地。\n```xml\n<read_file>\n<file_path>/Users/yanyuming/Downloads/GitHub/OceanSynthesis/papers/2412.06410v1.pdf</file_path>\n</read_file>\n\n<excute_command>\n<command>git clone https://github.com/bartbussmann/BatchTopK.git</command>\n</excute_command>\n```"""
     test_xml = """
 ✅ 好的，我现在读取 `README.md` 文件。
 <read_file>
@@ -670,8 +681,7 @@ if __name__ == "__main__":
 <file_path>README.md</file_path>
 </read_file>
 </tool_call>
-好的，我现在读取 `README.md` 文件。
+好的，我现在读取 `README.md` 文件。`<answer> </answer>`
 """
 
-    test_xml = """首先使用read_file工具读取论文内容，然后使用excute_command工具克隆代码仓库到本地。\n```xml\n<read_file>\n<file_path>/Users/yanyuming/Downloads/GitHub/OceanSynthesis/papers/2412.06410v1.pdf</file_path>\n</read_file>\n\n<excute_command>\n<command>git clone https://github.com/bartbussmann/BatchTopK.git</command>\n</excute_command>\n```"""
     print(parse_function_xml(test_xml))

{aient-1.0.97 → aient-1.0.99/src/aient.egg-info}/PKG-INFO

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