aient 1.0.96__py3-none-any.whl → 1.0.98__py3-none-any.whl

aient/models/chatgpt.py

@@ -150,8 +150,12 @@ class chatgpt(BaseLLM):
                     })
                 self.conversation[convo_id].append({"role": role, "tool_call_id": function_call_id, "content": message})
             else:
-                self.conversation[convo_id].append({"role": "assistant", "content": convert_functions_to_xml(function_arguments)})
-                self.conversation[convo_id].append({"role": "user", "content": message})
+                last_user_message = self.conversation[convo_id][-1]["content"]
+                if last_user_message != message:
+                    self.conversation[convo_id].append({"role": "assistant", "content": convert_functions_to_xml(function_arguments)})
+                    self.conversation[convo_id].append({"role": "user", "content": message})
+                else:
+                    self.conversation[convo_id].append({"role": "assistant", "content": "我已经执行过这个工具了，接下来我需要做什么？"})
 
         else:
             print('\033[31m')
@@ -430,6 +434,7 @@ class chatgpt(BaseLLM):
             response_role = "assistant"
 
         if self.use_plugins == True:
+            full_response = full_response.replace("<tool_code>", "").replace("</tool_code>", "")
             function_parameter = parse_function_xml(full_response)
             if function_parameter:
                 invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not in self.plugins.keys()]

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.96.dist-info → aient-1.0.98.dist-info}/METADATA

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

{aient-1.0.96.dist-info → aient-1.0.98.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=-NWkkKxTCyraPYT0YN37NA2rUfOaDNXtvFSQmIE5tS8,45066
+aient/models/chatgpt.py,sha256=q8dx4PD57m4a3gJHrzJr7v_Pl8X0RKDBCZHZEtIMxkk,45480
 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
@@ -33,12 +33,12 @@ aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4
 aient/plugins/websearch.py,sha256=I4tYU7CGLdyG6Hd3yK19V-PoG5IbFI9FEEVggyrshRg,15227
 aient/plugins/write_file.py,sha256=qmT6iQ3mDyVAa9Sld1jfJq0KPZj0w2kRIHq0JyjpGeA,1853
 aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
-aient/prompt/agent.py,sha256=3VycHGnUq9OdR5pd_RM0AeLESlpAgBcmzrsesfq82X0,23856
+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=JbYHsU3LLtxBcuO_2MWbSgpHpCgtVQe9FGEFJpUyejc,25926
-aient-1.0.96.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.96.dist-info/METADATA,sha256=tUjeMs8W1DrH8grCIG-jn7zTnWoX9QDTGLuMo2TdLAo,4945
-aient-1.0.96.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-aient-1.0.96.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.96.dist-info/RECORD,,
+aient-1.0.98.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.0.98.dist-info/METADATA,sha256=GdOJCIW3xQrHk1tnVMoPunfvOB6pWHGPC-KLUlUOnF8,4945
+aient-1.0.98.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+aient-1.0.98.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.0.98.dist-info/RECORD,,

{aient-1.0.96.dist-info → aient-1.0.98.dist-info}/WHEEL

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