beswarm 0.2.83__py3-none-any.whl → 0.2.85__py3-none-any.whl

beswarm/agents/planact.py

@@ -34,12 +34,13 @@ class BaseAgent:
         self.goal = goal
         self.tools_json = tools_json
         self.work_dir = work_dir
-        self.cache_file = Path(work_dir) / ".beswarm" / "history.pkl"
+        self.pkl_file = Path(work_dir) / ".beswarm" / "history.pkl"
+        self.cache_file = Path(work_dir) / ".beswarm" / "work_agent_conversation_history.json"
         self.config = agent_config
         self.logger = agent_config.get("logger", None)
         self.cache_messages = cache_messages
         if cache_messages and isinstance(cache_messages, bool) and cache_messages == True:
-            self.cache_messages = Messages.load(self.cache_file)
+            self.cache_messages = Messages.load(self.pkl_file)
         self.broker = broker
         self.listen_topic = listen_topic
         self.error_topic = listen_topic + ".error"
@@ -80,13 +81,14 @@ class InstructionAgent(BaseAgent):
                         changed_lines.append(line)
                 self.goal_diff = '\n'.join(changed_lines).strip()
 
-    def get_conversation_history(self, raw_conversation_history: List[Dict]):
+    async def get_conversation_history(self, raw_conversation_history: List[Dict]):
         conversation_history = copy.deepcopy(raw_conversation_history)
-        conversation_history.save(self.cache_file)
-        if len(conversation_history) > 1:
-            latest_file_content = conversation_history.pop("files")
-            conversation_history[1] = latest_file_content + conversation_history[1]
-            conversation_history.pop(0)
+        conversation_history.save(self.pkl_file)
+        self.cache_file.write_text(json.dumps(await conversation_history.render_latest(), ensure_ascii=False, indent=4), encoding="utf-8")
+        latest_file_content = conversation_history.pop("files")
+        conversation_history.pop(0)
+        if conversation_history and latest_file_content:
+            conversation_history[0] = latest_file_content + conversation_history[0]
 
         return conversation_history
 
@@ -107,7 +109,7 @@ class InstructionAgent(BaseAgent):
                 f"这是你上次给assistant的错误格式的指令：\n{self.last_instruction}"
             )
 
-        self.agent.conversation["default"][1:] = self.get_conversation_history(message["conversation"])
+        self.agent.conversation["default"][1:] = await self.get_conversation_history(message["conversation"])
 
         if "find_and_click_element" in json.dumps(self.tools_json):
             instruction_prompt = await get_current_screen_image_message(instruction_prompt)

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

@@ -58,11 +58,11 @@ class ContentBlock:
 
 # 2. 上下文提供者 (带缓存)
 class ContextProvider(ABC):
-    def __init__(self, name: str):
+    def __init__(self, name: str, visible: bool = True):
         self.name = name
         self._cached_content: Optional[str] = None
         self._is_stale: bool = True
-        self._visible: bool = True
+        self._visible: bool = visible
 
     def __str__(self):
         # This allows the object to be captured when used inside an f-string.
@@ -96,8 +96,15 @@ class ContextProvider(ABC):
             return ContentBlock(self.name, self._cached_content)
         return None
 
+    def __add__(self, other):
+        if isinstance(other, Message):
+            # Create a new message of the same type as `other`, with `self` prepended.
+            new_items = [self] + other.provider()
+            return type(other)(*new_items)
+        return NotImplemented
+
 class Texts(ContextProvider):
-    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None):
+    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None, visible: bool = True):
         if text is None and name is None:
             raise ValueError("Either 'text' or 'name' must be provided.")
 
@@ -119,7 +126,7 @@ class Texts(ContextProvider):
                 _name = f"text_{h[:8]}"
         else:
             _name = name
-        super().__init__(_name)
+        super().__init__(_name, visible=visible)
 
     async def refresh(self):
         if self._is_dynamic:
@@ -180,8 +187,8 @@ class Texts(ContextProvider):
         return self.content == other.content
 
 class Tools(ContextProvider):
-    def __init__(self, tools_json: Optional[List[Dict]] = None, name: str = "tools"):
-        super().__init__(name)
+    def __init__(self, tools_json: Optional[List[Dict]] = None, name: str = "tools", visible: bool = True):
+        super().__init__(name, visible=visible)
         self._tools_json = tools_json or []
     def update(self, tools_json: List[Dict]):
         self._tools_json = tools_json
@@ -197,8 +204,8 @@ class Tools(ContextProvider):
         return self._tools_json == other._tools_json
 
 class Files(ContextProvider):
-    def __init__(self, *paths: Union[str, List[str]], name: str = "files"):
-        super().__init__(name)
+    def __init__(self, *paths: Union[str, List[str]], name: str = "files", visible: bool = True):
+        super().__init__(name, visible=visible)
         self._files: Dict[str, str] = {}
 
         file_paths: List[str] = []
@@ -278,8 +285,8 @@ class Files(ContextProvider):
         return self._files == other._files
 
 class Images(ContextProvider):
-    def __init__(self, url: str, name: Optional[str] = None):
-        super().__init__(name or url)
+    def __init__(self, url: str, name: Optional[str] = None, visible: bool = True):
+        super().__init__(name or url, visible=visible)
         self.url = url
     def update(self, url: str):
         self.url = url
@@ -665,30 +672,48 @@ class Messages:
             return Messages(*self._messages[index])
         return self._messages[index]
 
-    def __setitem__(self, index: slice, value: 'Messages'):
-        if not isinstance(index, slice) or not isinstance(value, Messages):
-            raise TypeError("Unsupported operand type(s) for slice assignment")
-
-        # Basic slice assignment logic.
-        # A more robust implementation would handle step and negative indices.
-        start, stop, step = index.indices(len(self._messages))
+    def __setitem__(self, index: Union[int, slice], value: Union[Message, 'Messages']):
+        if isinstance(index, int):
+            if not isinstance(value, Message):
+                raise TypeError("When assigning to an index, the value must be a Message.")
 
-        if step != 1:
-            raise ValueError("Slice assignment with step is not supported.")
+            if not (-len(self._messages) <= index < len(self._messages)):
+                raise IndexError("Messages assignment index out of range")
 
-        # Remove old providers from the index
-        for i in range(start, stop):
-            for provider in self._messages[i].provider():
+            # Get old message to remove its providers
+            old_message = self._messages[index]
+            for provider in old_message.provider():
                 self._notify_provider_removed(provider)
 
-        # Replace the slice in the list
-        self._messages[start:stop] = value._messages
+            # Assign new message
+            self._messages[index] = value
+            value._parent_messages = self
+            for provider in value.provider():
+                self._notify_provider_added(provider, value)
+
+        elif isinstance(index, slice):
+            if not isinstance(value, Messages):
+                raise TypeError("When assigning to a slice, the value must be a Messages object.")
 
-        # Add new providers to the index and set parent
-        for msg in value:
-            msg._parent_messages = self
-            for provider in msg.provider():
-                self._notify_provider_added(provider, msg)
+            start, stop, step = index.indices(len(self._messages))
+            if step != 1:
+                raise ValueError("Slice assignment with step is not supported.")
+
+            # Remove old providers from the index
+            for i in range(start, stop):
+                for provider in self._messages[i].provider():
+                    self._notify_provider_removed(provider)
+
+            # Replace the slice in the list
+            self._messages[start:stop] = value._messages
+
+            # Add new providers to the index and set parent
+            for msg in value:
+                msg._parent_messages = self
+                for provider in msg.provider():
+                    self._notify_provider_added(provider, msg)
+        else:
+            raise TypeError("Unsupported operand type(s) for assignment")
 
     def __len__(self) -> int: return len(self._messages)
     def __iter__(self): return iter(self._messages)

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

@@ -1158,7 +1158,46 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         with self.assertRaises(IndexError):
             _ = mess[2]
 
-    async def test_zb_message_provider_by_name(self):
+    async def test_zb_fstring_provider_invisible_on_init(self):
+        """测试在f-string中初始化的provider可以被设置为不可见"""
+
+        # 1. 在 f-string 中初始化一个 provider 并设置 visible=False
+        # 在修改前，这会因为 __init__ 不接受 'visible' 参数而失败
+        message_with_invisible_provider = f"""
+Tools: {Tools(tools_json=[{"name": "should_not_appear"}], visible=False)}
+Files: {Files(visible=True, name="files")}
+"""
+
+        messages = Messages(UserMessage(message_with_invisible_provider))
+
+        # 2. 准备 Files provider 的内容
+        test_file = "test_invisible_fstring.txt"
+        with open(test_file, "w") as f:
+            f.write("visible content")
+
+        try:
+            files_provider = messages.provider("files")
+            self.assertIsNotNone(files_provider)
+            files_provider.update(test_file)
+
+            # 3. 渲染并验证
+            rendered = await messages.render_latest()
+            self.assertEqual(len(rendered), 1)
+            content = rendered[0]['content']
+
+            # 4. 验证不可见的 provider 的内容没有出现
+            self.assertNotIn("<tools>", content)
+            self.assertNotIn("should_not_appear", content)
+
+            # 5. 验证可见的 provider 的内容正常出现
+            self.assertIn("<latest_file_content>", content)
+            self.assertIn("visible content", content)
+
+        finally:
+            if os.path.exists(test_file):
+                os.remove(test_file)
+
+    async def test_zc_message_provider_by_name(self):
         """测试是否可以通过名称从 Message 对象中获取 provider"""
         # 1. 创建一个包含命名 provider 的 Message
         message = UserMessage(
@@ -1182,7 +1221,7 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         non_existent_provider = message.provider("non_existent")
         self.assertIsNone(non_existent_provider)
 
-    async def test_zc_slicing_support(self):
+    async def test_zd_slicing_support(self):
         """测试 Messages 对象是否支持切片操作"""
         m1 = SystemMessage("1")
         m2 = UserMessage("2")
@@ -1217,7 +1256,7 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         self.assertEqual(len(sliced_single), 1)
         self.assertIs(sliced_single[0], m3)
 
-    async def test_zd_slice_assignment(self):
+    async def test_ze_slice_assignment(self):
         """测试 Messages 对象的切片赋值功能"""
         # 1. Setup initial Messages objects
         m1 = SystemMessage("1")
@@ -1258,7 +1297,7 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         self.assertEqual(messages3[2].content, "C")
         self.assertIsInstance(messages3[1], AssistantMessage)
 
-    async def test_ze_fstring_lambda_serialization(self):
+    async def test_zf_fstring_lambda_serialization(self):
         """测试包含 lambda 的 f-string 消息是否可以被序列化和反序列化"""
         import platform
         import os
@@ -1302,6 +1341,74 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
             if os.path.exists(test_file_path):
                 os.remove(test_file_path)
 
+    async def test_zg_provider_plus_message_addition(self):
+        """测试所有 ContextProvider 子类与 Message 子类相加的功能"""
+        # 1. 准备 providers
+        text_provider = Texts("Some text.")
+        tools_provider = Tools([{"name": "a_tool"}])
+
+        test_file = "test_provider_addition.txt"
+        with open(test_file, "w") as f: f.write("File content.")
+        files_provider = Files(test_file)
+
+        providers_to_test = [text_provider, tools_provider, files_provider]
+
+        # 2. 准备 message aclsdd
+        messages_to_test = [
+            UserMessage(Texts("Initial user message.")),
+            SystemMessage(Texts("Initial system message.")),
+            AssistantMessage(Texts("Initial assistant message."))
+        ]
+
+        try:
+            for provider in providers_to_test:
+                for message in messages_to_test:
+                    with self.subTest(provider=type(provider).__name__, message=type(message).__name__):
+                        # 执行加法操作
+                        result_message = provider + message
+
+                        # 验证结果类型是否与原始 message 相同
+                        self.assertIsInstance(result_message, type(message), f"结果应为 {type(message).__name__} 类型")
+
+                        # 验证 provider 数量
+                        self.assertEqual(len(result_message), 2, "结果消息应包含两个 provider")
+
+                        # 验证 provider 的类型和顺序
+                        result_providers = result_message.provider()
+                        self.assertIsInstance(result_providers[0], type(provider), f"第一个 provider 应为 {type(provider).__name__} 类型")
+                        self.assertIsInstance(result_providers[1], Texts, "第二个 provider 应为 Texts 类型")
+
+                        # 验证原始消息没有被修改
+                        self.assertEqual(len(message), 1)
+
+        finally:
+            # 3. 清理文件
+            if os.path.exists(test_file):
+                os.remove(test_file)
+
+    async def test_zh_provider_plus_message_assignment(self):
+        """测试 ContextProvider + Message 的结果可以赋值回 Messages 列表"""
+        # 1. 准备 provider 和 messages
+        text_provider = Texts("Prefix text.")
+        messages = Messages(
+            UserMessage("Initial user message.")
+        )
+
+        # 2. 执行操作
+        # 这行代码在修改 __setitem__ 之前应该会失败
+        messages[0] = text_provider + messages[0]
+
+        # 3. 验证结果
+        self.assertEqual(len(messages), 1)
+        self.assertEqual(len(messages[0]), 2) # Now UserMessage has two providers
+
+        # 4. 验证内容
+        rendered = await messages.render_latest()
+        self.assertEqual(rendered[0]['content'], "Prefix text.Initial user message.")
+
+        # 5. 验证 provider 索引
+        self.assertIsNotNone(messages.provider(text_provider.name))
+
 
 # ==============================================================================
 # 6. 演示

beswarm/aient/aient/models/chatgpt.py

@@ -586,6 +586,9 @@ class chatgpt(BaseLLM):
                 if tool_name == "read_file" and "<tool_error>" not in tool_response:
                     self.conversation[convo_id].provider("files").update(tool_info['parameter']["file_path"], tool_response)
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead file successfully! The file content has been updated in the tag <latest_file_content>.")
+                if tool_name == "get_knowledge_graph_tree" and "<tool_error>" not in tool_response:
+                    self.conversation[convo_id].provider("knowledge_graph").visible = True
+                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nGet knowledge graph tree successfully! The knowledge graph tree has been updated in the tag <knowledge_graph_tree>.")
                 elif tool_name == "write_to_file" and "<tool_error>" not in tool_response:
                     all_responses.append(f"[{tool_name} Result]:\n\n{tool_response}")
                 elif tool_name == "read_image" and "<tool_error>" not in tool_response:

beswarm/prompt.py

@@ -19,14 +19,14 @@ class Goal(Texts):
         return f"<goal>{content}</goal>"
 
 class KnowledgeGraph(Texts):
-    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: str = "knowledge_graph"):
-        super().__init__(text=text, name=name)
+    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: str = "knowledge_graph", visible: bool = False):
+        super().__init__(text=text, name=name, visible=visible)
 
     async def render(self) -> Optional[str]:
         content = await super().render()
         if content is None:
             return None
-        return f"<knowledge_graph>{content}</knowledge_graph>"
+        return f"<knowledge_graph_tree>{content}</knowledge_graph_tree>"
 
 worker_system_prompt = SystemMessage(f"""
 <communication>
@@ -123,6 +123,10 @@ Always adhere to this format for all tool uses to ensure proper parsing and exec
 You can use tools as follows:
 
 {Tools()}
+
+{Files()}
+
+{KnowledgeGraph(name="knowledge_graph", text=lambda: kgm.render_tree(), visible=False)}
 """)
 
 instruction_system_prompt = SystemMessage(f"""
@@ -242,9 +246,7 @@ git clone https://github.com/username/project-name.git
 工作智能体仅可以使用如下工具：
 {Tools()}
 
-{Files()}
-
-{KnowledgeGraph(name="knowledge_graph", text=lambda: kgm.render_tree())}
+{KnowledgeGraph(name="knowledge_graph", text=lambda: kgm.render_tree(), visible=False)}
 <work_agent_conversation_start>""")
 
 definition = """

{beswarm-0.2.83.dist-info → beswarm-0.2.85.dist-info}/METADATA

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

{beswarm-0.2.83.dist-info → beswarm-0.2.85.dist-info}/RECORD

@@ -2,16 +2,16 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/broker.py,sha256=64Y-djrKYaZfBQ8obwHOmr921QgZeu9BtScZWaYLfDo,9887
 beswarm/core.py,sha256=jKStpTTOu6Ojond_i-okTZLrvSAJ4yUoTZwtDfFTiRs,553
 beswarm/knowledge_graph.py,sha256=oiOMknAJzGrOHc2AyQgvrCcZAkGLhFnsnvSBdfFBWMw,14831
-beswarm/prompt.py,sha256=MCv9H20-2l7acG4lNuPRFJ8MO2-WTKwXL5GqyLT_Ns8,34131
+beswarm/prompt.py,sha256=yuIDzFnU4nFmaZ4st_tS14W7RI_bvDDpaoTJYEuZTo4,34285
 beswarm/taskmanager.py,sha256=vMmcoZ4FlNvjEliRkv3AniPji50NcY4Q1_2HETzR0DU,12226
 beswarm/utils.py,sha256=0J-b38P5QGT-A_38co7FjzaUNJykaskI7mbbcQ4w_68,8215
 beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,12012
-beswarm/agents/planact.py,sha256=8ISGuCFh17ROh5SAF_byJkknp88pr1O_URHzyX9ShRI,17958
+beswarm/agents/planact.py,sha256=3Fu1fd7byZ1_wsK1KntMSfU-BnMgn5mjHLGnX59yGIs,18205
 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=lMXqjpSr7J80xuuWv5IHy04kcHbTwHWtRoIcsr6MR3o,28433
+beswarm/aient/aient/architext/architext/core.py,sha256=IHN1d8Pe1oqaFSS1EQ3OpxCJydiLB3goL5n2uohr5Q8,29737
 beswarm/aient/aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-beswarm/aient/aient/architext/test/test.py,sha256=XOSbDD-hlBnZiu5-500T-sy0m61zsq2SqQgFIoK6TJ0,61137
+beswarm/aient/aient/architext/test/test.py,sha256=o_lxUYqGnt3gAlIKBqxNe9OrqT5v7sjlPXKMVO6e5uw,65629
 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
@@ -26,7 +26,7 @@ beswarm/aient/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9
 beswarm/aient/aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 beswarm/aient/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-beswarm/aient/aient/models/chatgpt.py,sha256=Krs9Fk07XmYiiRFrCuhh_tiQWcUUdJT2dh0Ei6zRhmo,42214
+beswarm/aient/aient/models/chatgpt.py,sha256=gEOwukH-t9bHbW9ctyYiQ671NeHyIz8yP1QG4fLTKY8,42604
 beswarm/aient/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -121,7 +121,7 @@ beswarm/tools/search_web.py,sha256=0fTeczXiOX_LJQGaLEGbuJtIPzofeuquGWEt3yDMtVw,1
 beswarm/tools/subtasks.py,sha256=4wJWNAqRFgvwmDOP12SddYo_OteWBU5cLhLBh6xILk8,10492
 beswarm/tools/worker.py,sha256=mQ1qdrQ8MgL99byAbTvxfEByFFGN9mty3UHqHjARMQ8,2331
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.83.dist-info/METADATA,sha256=BjUJDbLYpEG0BfI0ZIsT3UK_Dev2WuvtQpWRn3CJTBw,3878
-beswarm-0.2.83.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.83.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.83.dist-info/RECORD,,
+beswarm-0.2.85.dist-info/METADATA,sha256=Kgu_r1BYQXoJwR0QQZ1c_-sTpDvSovAQDRvlx2aISDw,3878
+beswarm-0.2.85.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.85.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.85.dist-info/RECORD,,