beswarm 0.2.96__py3-none-any.whl → 0.2.98__py3-none-any.whl

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/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/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.dist-info → beswarm-0.2.98.dist-info}/METADATA

@@ -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.dist-info → beswarm-0.2.98.dist-info}/RECORD

@@ -6,12 +6,12 @@ beswarm/prompt.py,sha256=yuIDzFnU4nFmaZ4st_tS14W7RI_bvDDpaoTJYEuZTo4,34285
 beswarm/taskmanager.py,sha256=2Uz_cthW9rWkQMJdzgsXAMlfN8Ni2Qj_DOq_L-p6XZc,12662
 beswarm/utils.py,sha256=0J-b38P5QGT-A_38co7FjzaUNJykaskI7mbbcQ4w_68,8215
 beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,12012
-beswarm/agents/planact.py,sha256=m78GIbgv8VGMcSPAU_Jk3YAT-1mHykEo5xuF6kNoxx8,18279
+beswarm/agents/planact.py,sha256=OjxnYNu-LkxF2zIf7o75QB25d-yVtD4-FgDllTV_nZM,18456
 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
@@ -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=DtcbRJObXyCXlJdel9OItd1wgpOCVvenS2fXs4_xO34,42710
+beswarm/aient/aient/models/chatgpt.py,sha256=TWU-uPGL2WfGP7CdT2IkfNh3JYYJhV00fhr2mplISp4,42899
 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
@@ -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.96.dist-info/METADATA,sha256=0zhgegx3K6PKTRtbI64ZE96bNOgZqIf5yA_-zDbusVE,3878
-beswarm-0.2.96.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.96.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.96.dist-info/RECORD,,
+beswarm-0.2.98.dist-info/METADATA,sha256=w-1DXvjxubJhjMMScXlDXIeSfwJZj_WL2HJaGIcfCi0,3878
+beswarm-0.2.98.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.98.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.98.dist-info/RECORD,,