aient 1.2.40__tar.gz → 1.2.41__tar.gz

{aient-1.2.40 → aient-1.2.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.2.40
+Version: 1.2.41
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.2.40 → aient-1.2.41}/aient/architext/architext/core.py

@@ -192,6 +192,22 @@ class Texts(ContextProvider):
         # For static content, compare the actual content.
         return self.content == other.content
 
+    def __iadd__(self, other):
+        if isinstance(other, str):
+            new_text = self.content + other
+            self.update(new_text)
+            return self
+        return NotImplemented
+
+    def __add__(self, other):
+        if isinstance(other, str):
+            # Create a new instance of the same class with the combined content
+            return type(self)(text=self.content + other, name=self.name, visible=self.visible, newline=self.newline)
+        elif isinstance(other, Message):
+            new_items = [self] + other.provider()
+            return type(other)(*new_items)
+        return NotImplemented
+
 class Tools(ContextProvider):
     def __init__(self, tools_json: Optional[List[Dict]] = None, name: str = "tools", visible: bool = True):
         super().__init__(name, visible=visible)
@@ -711,7 +727,27 @@ class Messages:
 
     def render(self) -> List[Dict[str, Any]]:
         results = [msg.to_dict() for msg in self._messages]
-        return [res for res in results if res]
+        non_empty_results = [res for res in results if res]
+
+        if not non_empty_results:
+            return []
+
+        merged_results = [non_empty_results[0]]
+        for i in range(1, len(non_empty_results)):
+            current_msg = non_empty_results[i]
+            last_merged_msg = merged_results[-1]
+
+            # Merge if roles match, no tool_calls, and content is string
+            if (current_msg.get('role') == last_merged_msg.get('role') and
+                'tool_calls' not in current_msg and
+                'tool_calls' not in last_merged_msg and
+                isinstance(current_msg.get('content'), str) and
+                isinstance(last_merged_msg.get('content'), str)):
+                last_merged_msg['content'] += current_msg.get('content', '')
+            else:
+                merged_results.append(current_msg)
+
+        return merged_results
 
     async def render_latest(self) -> List[Dict[str, Any]]:
         await self.refresh()

{aient-1.2.40 → aient-1.2.41}/aient/architext/test/test.py

@@ -9,7 +9,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')
 
 
 from architext import *
-
+from typing import Optional, Union, Callable
 # ==============================================================================
 # 单元测试部分
 # ==============================================================================
@@ -1709,6 +1709,79 @@ Files: {Files(visible=True, name="files")}
         rendered_tool_2 = await tool_results_msg.render()
         self.assertEqual(rendered_tool_1, rendered_tool_2)
 
+    async def test_zag_iadd_on_provider(self):
+        """测试对 provider 使用 += 操作符来追加文本"""
+        class Goal(Texts):
+            def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: str = "goal"):
+                super().__init__(text=text, name=name)
+
+            async def render(self) -> Optional[str]:
+                content = await super().render()
+                if content is None:
+                    return None
+                return f"<goal>{content}</goal>"
+
+        messages = Messages(UserMessage(Goal("hi")))
+
+        # This is the new syntax we want to test
+        goal_provider = messages.provider("goal")
+        goal_provider += "test"
+
+        rendered = await messages.render_latest()
+
+        self.assertEqual(len(rendered), 1)
+        self.assertEqual(rendered[0]['content'], "<goal>hitest</goal>")
+
+    async def test_zz_user_message_auto_merging(self):
+        """测试连续的UserMessage是否能自动合并"""
+        # 场景1: 初始化时合并
+        messages_init = Messages(UserMessage("hi"), UserMessage("hi2"))
+        self.assertEqual(len(messages_init), 1, "初始化时，两个连续的UserMessage应该合并为一个")
+        self.assertEqual(len(messages_init[0]), 2, "合并后的UserMessage应该包含两个Texts provider")
+
+        rendered_init = await messages_init.render_latest()
+        self.assertEqual(rendered_init[0]['content'], "hihi2", "合并后渲染的内容不正确")
+
+        # 场景2: 追加时合并
+        messages_append = Messages(UserMessage("hi"))
+        messages_append.append(UserMessage("hi2"))
+        self.assertEqual(len(messages_append), 1, "追加时，两个连续的UserMessage应该合并为一个")
+        self.assertEqual(len(messages_append[0]), 2, "追加合并后的UserMessage应该包含两个Texts provider")
+
+        rendered_append = await messages_append.render_latest()
+        self.assertEqual(rendered_append[0]['content'], "hihi2", "追加合并后渲染的内容不正确")
+
+        # 场景3: 追加RoleMessage时合并
+        messages_append.append(RoleMessage("user", "hi3"))
+        self.assertEqual(len(messages_append), 1, "追加RoleMessage时，连续的UserMessage应该合并为一个")
+        self.assertEqual(len(messages_append[0]), 3, "追加RoleMessage合并后的UserMessage应该包含三个Texts provider")
+
+        rendered_append_role = await messages_append.render_latest()
+        self.assertEqual(rendered_append_role[0]['content'], "hihi2hi3", "追加RoleMessage合并后渲染的内容不正确")
+
+        # 场景4: 追加包含ContextProvider和字符串组合的RoleMessage时合并
+        class Goal(Texts):
+            def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: str = "goal", visible: bool = True, newline: bool = False):
+                super().__init__(text=text, name=name, visible=visible, newline=newline)
+
+            async def render(self) -> Optional[str]:
+                content = await super().render()
+                if content is None:
+                    return None
+                return f"<goal>{content}</goal>"
+
+        messages_append.append(RoleMessage("user", Goal("goal") + "hi4"))
+        self.assertEqual(len(messages_append), 1, "追加(ContextProvider + str)的RoleMessage时，未能正确合并")
+        self.assertEqual(len(messages_append[0]), 4, "追加(ContextProvider + str)的RoleMessage合并后的provider数量不正确")
+
+        rendered_append_combo = await messages_append.render_latest()
+        self.assertEqual(rendered_append_combo[0]['content'], "hihi2hi3<goal>goalhi4</goal>", "追加(ContextProvider + str)合并后渲染的内容不正确")
+
+        # 场景5: 被空消息隔开的同角色消息在渲染时合并
+        messages_separated = Messages(UserMessage("hi"), AssistantMessage(""), UserMessage("hi2"))
+        rendered_separated = await messages_separated.render_latest()
+        self.assertEqual(len(rendered_separated), 1, "被空消息隔开的同角色消息在渲染时应该合并")
+        self.assertEqual(rendered_separated[0]['content'], "hihi2", "被空消息隔开的同角色消息合并后内容不正确")
 
 # ==============================================================================
 # 6. 演示

{aient-1.2.40 → aient-1.2.41}/aient/models/chatgpt.py

@@ -180,7 +180,7 @@ class chatgpt(BaseLLM):
         """
         Add a message to the conversation
         """
-        # self.logger.info(f"role: {role}, function_name: {function_name}, message: {message}")
+        # self.logger.info(f"role: {role}, function_name: {function_name}, message: {message}, function_arguments: {function_arguments}")
         if convo_id not in self.conversation:
             self.reset(convo_id=convo_id)
         if function_name == "" and message:
@@ -284,9 +284,9 @@ class chatgpt(BaseLLM):
         }
 
         done_message = self.conversation[convo_id].provider("done")
-        if self.check_done and done_message:
+        if done_message:
             done_message.visible = False
-            if self.conversation[convo_id][-1][-1].name == "done":
+            if self.check_done and self.conversation[convo_id][-1][-1].name == "done":
                 self.conversation[convo_id][-1][-1].visible = True
 
         # 构造请求数据
@@ -627,6 +627,11 @@ class chatgpt(BaseLLM):
                     elif tool_name == "get_knowledge_graph_tree":
                         self.conversation[convo_id].provider("knowledge_graph").visible = True
                         final_tool_response = "Get knowledge graph tree successfully! The knowledge graph tree has been updated in the tag <knowledge_graph_tree>."
+                    elif tool_name.endswith("goal"):
+                        goal_provider = self.conversation[convo_id].provider("goal")
+                        if goal_provider:
+                            goal_provider += tool_response
+                        final_tool_response = "Get goal successfully! The goal has been updated in the tag <goal>."
                     elif tool_name == "write_to_file":
                         tool_args = None
                     elif tool_name == "read_image":

{aient-1.2.40 → aient-1.2.41}/aient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.2.40
+Version: 1.2.41
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.2.40 → aient-1.2.41}/aient.egg-info/SOURCES.txt

@@ -33,13 +33,11 @@ aient/plugins/excute_command.py
 aient/plugins/get_time.py
 aient/plugins/image.py
 aient/plugins/list_directory.py
-aient/plugins/read_file.py
 aient/plugins/read_image.py
 aient/plugins/readonly.py
 aient/plugins/registry.py
 aient/plugins/run_python.py
 aient/plugins/websearch.py
-aient/plugins/write_file.py
 aient/utils/__init__.py
 aient/utils/prompt.py
 aient/utils/scripts.py

{aient-1.2.40 → aient-1.2.41}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aient"
-version = "1.2.40"
+version = "1.2.41"
 description = "Aient: The Awakening of Agent."
 readme = "README.md"
 requires-python = ">=3.11"

aient-1.2.40/aient/plugins/read_file.py

@@ -1,198 +0,0 @@
-import os
-import json
-import chardet
-from pdfminer.high_level import extract_text
-
-from .registry import register_tool
-
-# 读取文件内容
-@register_tool()
-def read_file(file_path, head: int = None):
-    """
-Description: Request to read the contents of a file at the specified path. Use this when you need to examine the contents of an existing file you do not know the contents of, for example to analyze code, review text files, or extract information from configuration files. Automatically extracts raw text from PDF and DOCX files. May not be suitable for other types of binary files, as it returns the raw content as a string.
-
-注意：
-1. pdf 文件 必须使用 read_file 读取，可以使用 read_file 直接读取 PDF。
-
-参数:
-    file_path: 要读取的文件路径，(required) The path of the file to read (relative to the current working directory)
-    head: (可选) 读取文件的前N行，默认为None，读取整个文件
-
-返回:
-    文件内容的字符串
-
-Usage:
-<read_file>
-<file_path>File path here</file_path>
-</read_file>
-
-Examples:
-
-1. Reading an entire file:
-<read_file>
-<file_path>frontend.pdf</file_path>
-</read_file>
-
-2. Reading multiple files:
-
-<read_file>
-<file_path>frontend-config.json</file_path>
-</read_file>
-
-<read_file>
-<file_path>backend-config.txt</file_path>
-</read_file>
-
-...
-
-<read_file>
-<file_path>README.md</file_path>
-</read_file>
-    """
-    try:
-        # 检查文件是否存在
-        if not os.path.exists(file_path):
-            return f"<tool_error>文件 '{file_path}' 不存在</tool_error>"
-
-        # 检查是否为文件
-        if not os.path.isfile(file_path):
-            return f"<tool_error>'{file_path}' 不是一个文件</tool_error>"
-
-        # 检查文件扩展名
-        if file_path.lower().endswith('.pdf'):
-            # 提取PDF文本
-            text_content = extract_text(file_path)
-
-            # 如果提取结果为空
-            if not text_content:
-                return f"<tool_error>无法从 '{file_path}' 提取文本内容</tool_error>"
-        elif file_path.lower().endswith('.ipynb'):
-            try:
-                with open(file_path, 'r', encoding='utf-8') as file:
-                    notebook_content = json.load(file)
-
-                for cell in notebook_content.get('cells', []):
-                    if cell.get('cell_type') == 'code' and 'outputs' in cell:
-                        filtered_outputs = []
-                        for output in cell.get('outputs', []):
-                            new_output = output.copy()
-                            if 'data' in new_output:
-                                original_data = new_output['data']
-                                filtered_data = {}
-                                for key, value in original_data.items():
-                                    if key.startswith('image/'):
-                                        continue
-                                    if key == 'text/html':
-                                        html_content = "".join(value) if isinstance(value, list) else value
-                                        if isinstance(html_content, str) and '<table class="show_videos"' in html_content:
-                                            continue
-                                    filtered_data[key] = value
-                                if filtered_data:
-                                    new_output['data'] = filtered_data
-                                    filtered_outputs.append(new_output)
-                            elif 'output_type' in new_output and new_output['output_type'] in ['stream', 'error']:
-                                filtered_outputs.append(new_output)
-
-                        cell['outputs'] = filtered_outputs
-
-                text_content = json.dumps(notebook_content, indent=2, ensure_ascii=False)
-            except json.JSONDecodeError:
-                return f"<tool_error>文件 '{file_path}' 不是有效的JSON格式 (IPython Notebook)。</tool_error>"
-            except Exception as e:
-                return f"<tool_error>处理IPython Notebook文件 '{file_path}' 时发生错误: {e}</tool_error>"
-        else:
-            # 更新：修改通用文件读取逻辑以支持多种编码
-            # 这部分替换了原有的 else 块内容
-            try:
-                with open(file_path, 'rb') as file: # 以二进制模式读取
-                    raw_data = file.read()
-
-                if not raw_data: # 处理空文件
-                    text_content = ""
-                else:
-                    detected_info = chardet.detect(raw_data)
-                    primary_encoding_to_try = detected_info['encoding']
-                    confidence = detected_info['confidence']
-
-                    decoded_successfully = False
-
-                    # 尝试1: 使用检测到的编码 (如果置信度高且编码有效)
-                    if primary_encoding_to_try and confidence > 0.7: # 您可以根据需要调整置信度阈值
-                        try:
-                            text_content = raw_data.decode(primary_encoding_to_try)
-                            decoded_successfully = True
-                        except (UnicodeDecodeError, LookupError): # LookupError 用于处理无效的编码名称
-                            # 解码失败，将尝试后备编码
-                            pass
-
-                    # 尝试2: UTF-8 (如果第一次尝试失败或未进行)
-                    if not decoded_successfully:
-                        try:
-                            text_content = raw_data.decode('utf-8')
-                            decoded_successfully = True
-                        except UnicodeDecodeError:
-                            # 解码失败，将尝试下一个后备编码
-                            pass
-
-                    # 尝试3: UTF-16 (如果之前的尝试都失败)
-                    # 'utf-16' 会处理带BOM的LE/BE编码。若无BOM，则假定为本机字节序。
-                    # chardet 通常能更准确地检测具体的 utf-16le 或 utf-16be。
-                    if not decoded_successfully:
-                        try:
-                            text_content = raw_data.decode('utf-16')
-                            decoded_successfully = True
-                        except UnicodeDecodeError:
-                            # 所有主要尝试都失败
-                            pass
-
-                    if not decoded_successfully:
-                        # 所有尝试均失败后的错误信息
-                        detected_str_part = ""
-                        if primary_encoding_to_try and confidence > 0.7: # 如果有高置信度的检测结果
-                            detected_str_part = f"检测到的编码 '{primary_encoding_to_try}' (置信度 {confidence:.2f}), "
-                        elif primary_encoding_to_try: # 如果有检测结果但置信度低
-                            detected_str_part = f"低置信度检测编码 '{primary_encoding_to_try}' (置信度 {confidence:.2f}), "
-
-                        return f"<tool_error>文件 '{file_path}' 无法解码。已尝试: {detected_str_part}UTF-8, UTF-16。</tool_error>"
-
-            except FileNotFoundError:
-                # 此处不太可能触发 FileNotFoundError，因为函数开头已有 os.path.exists 检查
-                return f"<tool_error>文件 '{file_path}' 在读取过程中未找到。</tool_error>"
-            except Exception as e:
-                # 捕获在此块中可能发生的其他错误，例如未被早期检查捕获的文件读取问题
-                return f"<tool_error>处理通用文件 '{file_path}' 时发生错误: {e}</tool_error>"
-
-        if head is not None:
-            try:
-                num_lines = int(head)
-                if num_lines > 0:
-                    lines = text_content.splitlines(True)
-                    return "".join(lines[:num_lines])
-            except (ValueError, TypeError):
-                # Invalid head value, ignore and proceed with normal logic.
-                pass
-
-        # if file_path.lower().endswith('.csv'):
-        #     lines = text_content.splitlines(True)
-        #     if len(lines) > 500:
-        #         top_lines = lines[:250]
-        #         bottom_lines = lines[-250:]
-        #         omitted_count = len(lines) - 500
-        #         text_content = "".join(top_lines) + f"\n... (中间省略了 {omitted_count} 行) ...\n" + "".join(bottom_lines)
-
-        # 返回文件内容
-        return text_content
-
-    except PermissionError:
-        return f"<tool_error>没有权限访问文件 '{file_path}'</tool_error>"
-    except UnicodeDecodeError:
-        # 更新：修改全局 UnicodeDecodeError 错误信息使其更通用
-        return f"<tool_error>文件 '{file_path}' 包含无法解码的字符 (UnicodeDecodeError)。</tool_error>"
-    except Exception as e:
-        return f"<tool_error>读取文件时发生错误: {e}</tool_error>"
-
-if __name__ == "__main__":
-    # python -m beswarm.aient.aient.plugins.read_file
-    result = read_file("./work/cax/Lenia Notebook.ipynb", head=10)
-    print(result)
-    print(len(result))

aient-1.2.40/aient/plugins/write_file.py

@@ -1,90 +0,0 @@
-from .registry import register_tool
-from ..utils.scripts import unescape_html
-
-import os
-
-@register_tool()
-def write_to_file(path, content, mode='w', newline=False):
-    """
-## write_to_file
-Description: Request to write full content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
-Parameters:
-- path: (required) The path of the file to write to (relative to the current working directory ${args.cwd})
-- content: (required) The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified. Do NOT include the line numbers in the content though, just the actual content of the file.
-- mode: (optional) The mode to write to the file. Default is 'w'. 'w' for write, 'a' for append.
-- newline: (optional) Whether to add a newline before the content. Default is False.
-Usage:
-<write_to_file>
-<path>File path here</path>
-<content>
-Your file content here
-</content>
-<mode>w</mode>
-<newline>False</newline>
-</write_to_file>
-
-Example: Requesting to write to frontend-config.json
-<write_to_file>
-<path>frontend-config.json</path>
-<content>
-{
-  "apiEndpoint": "https://api.example.com",
-  "theme": {
-    "primaryColor": "#007bff",
-    "secondaryColor": "#6c757d",
-    "fontFamily": "Arial, sans-serif"
-  },
-  "features": {
-    "darkMode": true,
-    "notifications": true,
-    "analytics": false
-  },
-  "version": "1.0.0"
-}
-</content>
-</write_to_file>
-    """
-    # 确保目录存在
-    os.makedirs(os.path.dirname(path) or '.', exist_ok=True)
-
-    if content.startswith("##") and (path.endswith(".md") or path.endswith(".txt")):
-        content = "\n\n" + content
-
-    if content.startswith("---\n") and (path.endswith(".md") or path.endswith(".txt")):
-        content = "\n" + content
-
-    if newline:
-        content = '\n' + content
-
-    # 写入文件
-    try:
-        with open(path, mode, encoding='utf-8') as file:
-            file.write(unescape_html(content))
-    except PermissionError as e:
-        return f"<tool_error>写入文件失败: {e}</tool_error>"
-
-    return f"已成功写入文件：{path}"
-
-
-if __name__ == "__main__":
-    text = """
-&lt;!DOCTYPE html&gt;
-&lt;html lang=&quot;zh-CN&quot;&gt;
-&lt;head&gt;
-    &lt;meta charset=&quot;UTF-8&quot;&gt;
-    &lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1.0&quot;&gt;
-    &lt;title&gt;Continuous Thought Machines (CTM) 原理解读&lt;/title&gt;
-    &lt;script&gt;MathJax={chtml:{fontURL:'https://cdn.jsdelivr.net/npm/mathjax@3/es5/output/chtml/fonts/woff-v2'}}&lt;/script&gt;
-    &lt;script src=&quot;https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js&quot; id=&quot;MathJax-script&quot; async&gt;&lt;/script&gt;
-    &lt;script src=&quot;https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/viz.js&quot; defer&gt;&lt;/script&gt;
-    &lt;script src=&quot;https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/full.render.js&quot; defer&gt;&lt;/script&gt;
-    &lt;script src=&quot;https://unpkg.com/@panzoom/panzoom@4.5.1/dist/panzoom.min.js&quot; defer&gt;&lt;/script&gt;
-    &lt;link href=&quot;https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism-okaidia.min.css&quot; rel=&quot;stylesheet&quot;/&gt;
-    &lt;link href=&quot;https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&amp;family=Fira+Code:wght@400;500&amp;display=swap&quot; rel=&quot;stylesheet&quot;&gt;
-    &lt;link href=&quot;https://fonts.googleapis.com/icon?family=Material+Icons+Outlined&quot; rel=&quot;stylesheet&quot;&gt;
-&lt;style&gt;
-    """
-    with open("test.txt", "r", encoding="utf-8") as file:
-        content = file.read()
-    print(write_to_file("test.txt", content))
-    # python -m beswarm.aient.aient.plugins.write_file