aient 1.1.32__py3-none-any.whl → 1.1.33__py3-none-any.whl

aient/models/chatgpt.py

@@ -12,7 +12,7 @@ from pathlib import Path
 
 from .base import BaseLLM
 from ..plugins import PLUGINS, get_tools_result_async, function_call_list, update_tools_config
-from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json, convert_functions_to_xml
+from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json, convert_functions_to_xml, remove_xml_tags_and_content
 from ..core.request import prepare_request_payload
 from ..core.response import fetch_response_stream
 
@@ -465,7 +465,7 @@ class chatgpt(BaseLLM):
                     if isinstance(self.conversation[convo_id][-1]["content"], str) and \
                     "<tool_error>" in self.conversation[convo_id][-1]["content"]:
                         need_function_call = False
-                        full_response = "接下来我需要做什么？"
+                        full_response = remove_xml_tags_and_content(full_response) + "上面是我的分析，还没有实际行动。\n\n接下来我需要做什么？"
                 else:
                     need_function_call = False
                     if self.print_log:

aient/utils/scripts.py

@@ -1,4 +1,5 @@
 import os
+import re
 import json
 import requests
 import urllib.parse
@@ -148,6 +149,35 @@ def safe_get(data, *keys, default=None):
             return default
     return data
 
+def remove_xml_tags_and_content(text: str) -> str:
+    """
+    删除字符串中所有的XML标签及其包裹的内容。
+    这个函数通过迭代地移除最内层的标签来处理嵌套标签和自闭合标签。
+
+    Args:
+        text: 包含XML标签的输入字符串。
+
+    Returns:
+        清理掉XML标签和内容后的字符串。
+    """
+    # 正则表达式匹配成对的标签及其内容（非贪婪模式）以及自闭合标签
+    # 捕获组 \1 用于确保开始和结束标签名匹配
+    pair_pattern = r'<([a-zA-Z0-9_:]+)\b[^>]*>.*?</\1>'
+    self_closing_pattern = r'<[^>/]+/>'
+
+    cleaned_text = text
+    while True:
+        # 使用 re.sub 替换所有非重叠的匹配项
+        new_text = re.sub(pair_pattern, '', cleaned_text, flags=re.DOTALL)
+        new_text = re.sub(self_closing_pattern, '', new_text)
+
+        # 如果没有更多内容被移除，则退出循环
+        if new_text == cleaned_text:
+            break
+        cleaned_text = new_text
+
+    return cleaned_text.strip()
+
 import asyncio
 def async_generator_to_sync(async_gen):
     """
@@ -919,14 +949,15 @@ 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))
+#     test_xml = """
+# 好的，我现在执行第一步。
+# <tools>
+# <list_directory>
+# <path>/Downloads/GitHub/beswarm/work/test</path>
+# </list_directory>
+# </tools>
+# """
+    # print(parse_function_xml(test_xml))
+    print(remove_xml_tags_and_content(test_xml))
 
 # 运行本文件：python -m beswarm.aient.src.aient.utils.scripts

{aient-1.1.32.dist-info → aient-1.1.33.dist-info}/METADATA

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

{aient-1.1.32.dist-info → aient-1.1.33.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=9l6_7QCF4VuOWPGZiroTT-0dg1h_qze5RUQwauDw_A4,46539
+aient/models/chatgpt.py,sha256=MKCdstV_gTkcf_bT2mmQVDLgK5f4PUUfEO3_WHzahpE,46665
 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
@@ -36,9 +36,9 @@ aient/plugins/websearch.py,sha256=FsUxM9GL4AAjmYJ8TS2jSqv4qfCAoOkCQZH59whtAXk,15
 aient/plugins/write_file.py,sha256=7spYxloI_aUbeANEQK-oXrGPoBqSfsD7sdfMAWlNxhU,3656
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-aient/utils/scripts.py,sha256=sXS0MrfRDQGAXOHW4BEwz4lUj_ORchdbVRh62XxidZQ,35939
-aient-1.1.32.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.32.dist-info/METADATA,sha256=CPreNIU9nbALNCGCW7r3HN-ccGYVdO69R1kMMdsJY2Y,4968
-aient-1.1.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.32.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.32.dist-info/RECORD,,
+aient/utils/scripts.py,sha256=8NJCASleffBsA20E3K7HvChCH6rb-7-Qa_ygXXpEsCE,37051
+aient-1.1.33.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.33.dist-info/METADATA,sha256=2cPqc-MuWBbf9Mg6lujoA-Fb4fHQKuvGtc3WbaKJwKE,4968
+aient-1.1.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.33.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.33.dist-info/RECORD,,