beswarm 0.2.95__py3-none-any.whl → 0.2.97__py3-none-any.whl

beswarm/aient/aient/architext/architext/core.py

@@ -457,6 +457,15 @@ class Message(ABC):
         return len(self._items)
 
     def __repr__(self): return f"Message(role='{self.role}', items={[i.name for i in self._items]})"
+
+    def __contains__(self, item: Any) -> bool:
+        """Checks if a ContextProvider is in the message."""
+        if not isinstance(item, ContextProvider):
+            return False
+        # The `in` operator on a list checks for equality,
+        # and our custom __eq__ on ContextProvider handles the comparison logic.
+        return item in self._items
+
     def __bool__(self) -> bool:
         return bool(self._items)
     def get(self, key: str, default: Any = None) -> Any:
@@ -717,3 +726,13 @@ class Messages:
 
     def __len__(self) -> int: return len(self._messages)
     def __iter__(self): return iter(self._messages)
+
+    def __contains__(self, item: Any) -> bool:
+        """Checks if a Message or ContextProvider is in the collection."""
+        if isinstance(item, Message):
+            # Check for object identity
+            return any(item is msg for msg in self._messages)
+        if isinstance(item, ContextProvider):
+            # Check if any message contains the provider
+            return any(item in msg for msg in self._messages)
+        return False

beswarm/aient/aient/architext/test/test.py

@@ -1409,6 +1409,31 @@ Files: {Files(visible=True, name="files")}
         # 5. 验证 provider 索引
         self.assertIsNotNone(messages.provider(text_provider.name))
 
+    async def test_zi_provider_in_message_and_messages(self):
+        """测试 `in` 操作符是否能检查 provider 是否存在于 Message 或 Messages 中"""
+        # 1. 准备 providers 和 messages
+        text_hi = Texts("hi")
+        text_hello = Texts("hello")
+        text_world = Texts("world")
+
+        message = UserMessage(text_hello, text_hi)
+        messages_collection = Messages(SystemMessage("System"), message)
+
+        # 2. 测试 `in` Message
+        self.assertTrue(Texts("hi") in UserMessage(Texts("hello"), Texts("hi")))
+        self.assertTrue(text_hi in message)
+        self.assertTrue(text_hello in message)
+        self.assertFalse(text_world in message)
+
+        # 3. 测试 `in` Messages
+        self.assertTrue(text_hi in messages_collection)
+        self.assertTrue(text_hello in messages_collection)
+        self.assertFalse(text_world in messages_collection)
+
+        # 4. 测试一个 Message 对象是否在 Messages 中
+        self.assertTrue(message in messages_collection)
+        self.assertFalse(UserMessage("not in collection") in messages_collection)
+
 
 # ==============================================================================
 # 6. 演示

beswarm/aient/aient/plugins/read_file.py

@@ -7,7 +7,7 @@ from .registry import register_tool
 
 # 读取文件内容
 @register_tool()
-def read_file(file_path):
+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.
 
@@ -16,6 +16,7 @@ Description: Request to read the contents of a file at the specified path. Use t
 
 参数:
     file_path: 要读取的文件路径，(required) The path of the file to read (relative to the current working directory)
+    head: (可选) 读取文件的前N行，默认为None，读取整个文件
 
 返回:
     文件内容的字符串
@@ -161,13 +162,23 @@ Examples:
                 # 捕获在此块中可能发生的其他错误，例如未被早期检查捕获的文件读取问题
                 return f"<tool_error>处理通用文件 '{file_path}' 时发生错误: {e}</tool_error>"
 
-        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)
+        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
@@ -182,6 +193,6 @@ Examples:
 
 if __name__ == "__main__":
     # python -m beswarm.aient.aient.plugins.read_file
-    result = read_file("./work/cax/Lenia Notebook.ipynb")
+    result = read_file("./work/cax/Lenia Notebook.ipynb", head=10)
     print(result)
     print(len(result))

{beswarm-0.2.95.dist-info → beswarm-0.2.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.2.95
+Version: 0.2.97
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{beswarm-0.2.95.dist-info → beswarm-0.2.97.dist-info}/RECORD

@@ -9,9 +9,9 @@ beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,1
 beswarm/agents/planact.py,sha256=m78GIbgv8VGMcSPAU_Jk3YAT-1mHykEo5xuF6kNoxx8,18279
 beswarm/aient/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
-beswarm/aient/aient/architext/architext/core.py,sha256=IHN1d8Pe1oqaFSS1EQ3OpxCJydiLB3goL5n2uohr5Q8,29737
+beswarm/aient/aient/architext/architext/core.py,sha256=_o5gI5XF6e4kQo4L4x8Q1Tb7C1U0GANm24gJmvAgoXE,30546
 beswarm/aient/aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-beswarm/aient/aient/architext/test/test.py,sha256=o_lxUYqGnt3gAlIKBqxNe9OrqT5v7sjlPXKMVO6e5uw,65629
+beswarm/aient/aient/architext/test/test.py,sha256=G64knZR1rSo0hr8lZPaWWJizEq1A8RGCzcN0e9uhZEM,66729
 beswarm/aient/aient/architext/test/test_save_load.py,sha256=o8DqH6gDYZkFkQy-a7blqLtJTRj5e4a-Lil48pJ0V3g,3260
 beswarm/aient/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -34,7 +34,7 @@ beswarm/aient/aient/plugins/excute_command.py,sha256=b-rxsyFN6_HnZJAhUi9Qsp8iJ6X
 beswarm/aient/aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 beswarm/aient/aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 beswarm/aient/aient/plugins/list_directory.py,sha256=V_uKkLx_fQDL5z__bSDC-PqAP-o32KmQW6Pdhx0Fx0s,1433
-beswarm/aient/aient/plugins/read_file.py,sha256=AOGGzSzkALG1R_ncpDmegX_zKFZBZr8ZhTBQCiwhZfU,8691
+beswarm/aient/aient/plugins/read_file.py,sha256=qHAhdesOr1VMOCDkeHNvI8UV2ZI98HmJl6GhN4Aq9dU,9183
 beswarm/aient/aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9ujcXGyuqlGTJMd7ac,4017
 beswarm/aient/aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
 beswarm/aient/aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
@@ -122,7 +122,7 @@ beswarm/tools/search_web.py,sha256=0fTeczXiOX_LJQGaLEGbuJtIPzofeuquGWEt3yDMtVw,1
 beswarm/tools/subtasks.py,sha256=NHDnmUhUPgDQKBACnpgErpFJRcsH0w_Q9VsyQjNvNHA,12658
 beswarm/tools/worker.py,sha256=mQ1qdrQ8MgL99byAbTvxfEByFFGN9mty3UHqHjARMQ8,2331
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.95.dist-info/METADATA,sha256=DICmBt1fSQnjROkMa17nt951VwUOoUHfxvBVoWSqTuQ,3878
-beswarm-0.2.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.95.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.95.dist-info/RECORD,,
+beswarm-0.2.97.dist-info/METADATA,sha256=DkJNgq-l2GKOpgFRJP2UZ0oFvdJjxyFSyAiQrIE2gew,3878
+beswarm-0.2.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.97.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.97.dist-info/RECORD,,