aient 1.0.95__py3-none-any.whl → 1.0.97__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/plugins/websearch.py

@@ -5,7 +5,6 @@ import requests
 import threading
 import time as record_time
 from itertools import islice
-from bs4 import BeautifulSoup
 from .registry import register_tool
 
 class ThreadWithReturnValue(threading.Thread):
@@ -17,11 +16,7 @@ class ThreadWithReturnValue(threading.Thread):
         super().join()
         return self._return
 
-import re
 import httpx
-import lxml.html
-from lxml_html_clean import Cleaner
-from html2text import HTML2Text
 from textwrap import dedent
 
 def url_to_markdown(url):
@@ -33,6 +28,7 @@ def url_to_markdown(url):
                 return "抱歉，目前无法访问该网页。"
             # body = lxml.html.fromstring(text).xpath('//body')
 
+            import lxml.html
             doc = lxml.html.fromstring(text)
             # 检查是否是GitHub raw文件格式（body > pre）
             if doc.xpath('//body/pre'):
@@ -44,6 +40,7 @@ def url_to_markdown(url):
                 return f'<pre>{body}</pre>'
                 # return body
             else:
+                from lxml_html_clean import Cleaner
                 body = body[0]
                 body = Cleaner(javascript=True, style=True).clean_html(body)
                 return ''.join(lxml.html.tostring(c, encoding='unicode') for c in body)
@@ -56,6 +53,7 @@ def url_to_markdown(url):
 
     # 将HTML转换为Markdown
     def get_md(cts):
+        from html2text import HTML2Text
         h2t = HTML2Text(bodywidth=5000)
         h2t.ignore_links = True
         h2t.mark_code = True
@@ -82,6 +80,7 @@ def jina_ai_Web_crawler(url: str, isSearch=False) -> str:
     }
     result = ''
     try:
+        from bs4 import BeautifulSoup
         requests.packages.urllib3.disable_warnings()
         url = "https://r.jina.ai/" + url
         response = requests.get(url, headers=headers, verify=False, timeout=5, stream=True)

{aient-1.0.95.dist-info → aient-1.0.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.0.95
+Version: 1.0.97
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -9,7 +9,6 @@ Requires-Dist: httpx
 Requires-Dist: pillow
 Requires-Dist: msgspec
 Requires-Dist: fastapi
-Requires-Dist: PyExecJS
 Requires-Dist: requests
 Requires-Dist: html2text
 Requires-Dist: httpx-socks

{aient-1.0.95.dist-info → aient-1.0.97.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
@@ -30,15 +30,15 @@ aient/plugins/list_directory.py,sha256=5ubm-mfrj-tanGSDp4M_Tmb6vQb3dx2-XVfQ2yL2G
 aient/plugins/read_file.py,sha256=cJxGnhcz1_gjkgeemVyixLUiCvf-dWm-UtDfrbFdlLE,4857
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
-aient/plugins/websearch.py,sha256=a-JJZjEZ5MEQ9WBMkD7okBHYehLSzApoLMiyqBnxDqs,15193
+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/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.95.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.95.dist-info/METADATA,sha256=HbwsFj_m6N-d67WxvnwsrYQRHjHbMN5Y4ePXcte0gRI,4969
-aient-1.0.95.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-aient-1.0.95.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.95.dist-info/RECORD,,
+aient-1.0.97.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.0.97.dist-info/METADATA,sha256=IsTDS3il2LcmMByG212pao-YUKmpHsZ-PCjFsV2n-dE,4945
+aient-1.0.97.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+aient-1.0.97.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.0.97.dist-info/RECORD,,

{aient-1.0.95.dist-info → aient-1.0.97.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