beswarm 0.2.96__tar.gz → 0.2.98__tar.gz

{beswarm-0.2.96 → beswarm-0.2.98}/PKG-INFO

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

{beswarm-0.2.96 → beswarm-0.2.98}/beswarm/agents/planact.py

@@ -201,6 +201,8 @@ class WorkerAgent(BaseAgent):
             self.broker.publish(message, self.error_topic)
         else:
             self.broker.publish({"status": "new_message", "result": "\n✅ 工作智能体:\n" + response}, self.status_topic)
+            if len(self.agent.conversation["default"]) > 1 and self.agent.conversation["default"][-1].role == "user":
+                self.agent.conversation["default"].pop(-1)
             self.broker.publish({
                 "conversation": self.agent.conversation["default"]
             }, self.publish_topic)

{beswarm-0.2.96 → beswarm-0.2.98}/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-0.2.96 → beswarm-0.2.98}/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-0.2.96 → beswarm-0.2.98}/beswarm/aient/aient/models/chatgpt.py

@@ -476,7 +476,9 @@ class chatgpt(BaseLLM):
                 # 删除 task_complete 跟其他工具一起调用的情况，因为 task_complete 必须单独调用
                 if len(function_parameter) > 1:
                     function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") != "task_complete"]
-                    function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") != "get_task_result"]
+                    # 仅当存在其他工具时，才删除 get_task_result
+                    if any(tool.get("function_name") != "get_task_result" for tool in function_parameter):
+                        function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") != "get_task_result"]
                 if len(function_parameter) == 1 and function_parameter[0].get("function_name", "") == "task_complete":
                     raise TaskComplete(safe_get(function_parameter, 0, "parameter", "message", default="The task has been completed."))
 

{beswarm-0.2.96 → beswarm-0.2.98}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.96 → beswarm-0.2.98}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.2.96"
+version = "0.2.98"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"