beswarm 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

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

@@ -128,6 +128,11 @@ class Texts(ContextProvider):
         else:
             _name = name
         super().__init__(_name, visible=visible)
+        if not self._is_dynamic:
+            self._cached_content = self.content
+            # The content is cached, but it's still "stale" from the perspective
+            # of the async refresh cycle. Let the first refresh formalize it.
+            self._is_stale = True
 
     async def refresh(self):
         if self._is_dynamic:
@@ -191,6 +196,10 @@ class Tools(ContextProvider):
     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 []
+        # Pre-render and cache the content, but leave it stale for the first refresh
+        if self._tools_json:
+            self._cached_content = f"<tools>{str(self._tools_json)}</tools>"
+        self._is_stale = True
     def update(self, tools_json: List[Dict]):
         self._tools_json = tools_json
         self.mark_stale()
@@ -289,6 +298,9 @@ class Images(ContextProvider):
     def __init__(self, url: str, name: Optional[str] = None, visible: bool = True):
         super().__init__(name or url, visible=visible)
         self.url = url
+        if self.url.startswith("data:"):
+            self._cached_content = self.url
+        self._is_stale = True
     def update(self, url: str):
         self.url = url
         self.mark_stale()

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

@@ -1578,6 +1578,26 @@ Files: {Files(visible=True, name="files")}
         rendered_single = await message_single.render_latest()
         self.assertEqual(rendered_single['content'], "Only one.")
 
+    async def test_zad_simple_render_without_refresh(self):
+        """测试 Messages(UserMessage('hi')).render() 是否能直接同步渲染"""
+        # This test checks if a simple message can be rendered synchronously
+        # without an explicit `await refresh()` or `await render_latest()`.
+        # Calling the synchronous render method directly on a new instance
+        rendered = Messages(UserMessage("hi", Images(url="data:image/png;base64,FAKE"))).render()
+
+        # The current implementation will likely fail here, returning []
+        self.assertEqual(len(rendered), 1)
+        self.assertEqual(rendered[0]['role'], 'user')
+
+        # Now we expect a list for multimodal content
+        content = rendered[0]['content']
+        self.assertIsInstance(content, list)
+        self.assertEqual(len(content), 2)
+        self.assertEqual(content[0]['type'], 'text')
+        self.assertEqual(content[0]['text'], 'hi')
+        self.assertEqual(content[1]['type'], 'image_url')
+        self.assertEqual(content[1]['image_url']['url'], "data:image/png;base64,FAKE")
+
 
 # ==============================================================================
 # 6. 演示

beswarm/aient/aient/models/chatgpt.py

@@ -125,8 +125,12 @@ class chatgpt(BaseLLM):
         else:
             # 如果没有提供 logger，创建一个默认的，它只会打印到控制台
             self.logger = logging.getLogger("chatgpt_default")
+            self.logger.propagate = False
             if not self.logger.handlers: # 防止重复添加 handler
-                self.logger.addHandler(logging.StreamHandler())
+                handler = logging.StreamHandler()
+                formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+                handler.setFormatter(formatter)
+                self.logger.addHandler(handler)
                 self.logger.setLevel(logging.INFO if print_log else logging.WARNING)
 
         # 注册和处理传入的工具
@@ -282,7 +286,7 @@ class chatgpt(BaseLLM):
             "messages": await self.conversation[convo_id].render_latest() if pass_history else Messages(
                 SystemMessage(self.system_prompt, self.conversation[convo_id].provider("files")),
                 UserMessage(prompt)
-            ),
+            ).render(),
             "stream": stream,
             "temperature": kwargs.get("temperature", self.temperature)
         }
@@ -688,7 +692,7 @@ class chatgpt(BaseLLM):
         # 准备会话
         self.system_prompt = system_prompt or self.system_prompt
         if convo_id not in self.conversation or pass_history <= 2:
-            self.reset(convo_id=convo_id, system_prompt=system_prompt)
+            self.reset(convo_id=convo_id, system_prompt=self.system_prompt)
         self.add_to_conversation(prompt, role, convo_id=convo_id, function_name=function_name, total_tokens=total_tokens, function_arguments=function_arguments, pass_history=pass_history, function_call_id=function_call_id)
 
         # 获取请求体
@@ -945,7 +949,7 @@ class chatgpt(BaseLLM):
         """
         self.system_prompt = system_prompt or self.system_prompt
         self.conversation[convo_id] = Messages(
-            SystemMessage(Texts("system_prompt", self.system_prompt), self.conversation[convo_id].provider("files")),
+            SystemMessage(self.system_prompt, self.conversation[convo_id].provider("files")),
         )
         self.tokens_usage[convo_id] = 0
         self.current_tokens[convo_id] = 0

{beswarm-0.3.2.dist-info → beswarm-0.3.3.dist-info}/METADATA

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

{beswarm-0.3.2.dist-info → beswarm-0.3.3.dist-info}/RECORD

@@ -10,9 +10,9 @@ beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,1
 beswarm/agents/planact.py,sha256=wYIyrAsBY6Z_Hc8rx76vbfUTsagqYFIBOfPi43ze708,18361
 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=KHzc6ly4vNYie2kRfPokDGhfTz3CvntuiSd-XyE3cAM,32502
+beswarm/aient/aient/architext/architext/core.py,sha256=XKMYDLdaTP6OWmNZLEF-b24KVDkMeM-xyVptmpXoBsU,33112
 beswarm/aient/aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-beswarm/aient/aient/architext/test/test.py,sha256=9OQ12qAs81Ce6KCKXQx4Re0P9VjNuTF4rZRcTRstJVw,72868
+beswarm/aient/aient/architext/test/test.py,sha256=jxmEfZaeJWh3dq0f67TBTPMgT0FMK7eiTs9XcyAtFFg,73944
 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
@@ -27,7 +27,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=FNW4lxG1IhxOU7L8mvcbaeC1nXk_lpUZQlg9ijQ0h_Q,1937
 beswarm/aient/aient/models/base.py,sha256=HWIGfa2A7OTccvHK0wG1-UlHB-yaWRC7hbi4oR1Mu1Y,7228
-beswarm/aient/aient/models/chatgpt.py,sha256=n99RspEqdMrd8u3LLGWYgAdhDEZyibiaRASqrRVeIZw,43358
+beswarm/aient/aient/models/chatgpt.py,sha256=cRz_6ocQbEoXREAlr9HteddfIRicE0c8lV_fnWhTXcA,43574
 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,8 +121,8 @@ 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.3.2.dist-info/METADATA,sha256=cZs62VmbA4HP3fml4T7u-R6jg3QKndIxvuICMZ_mlC8,3877
-beswarm-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.3.2.dist-info/entry_points.txt,sha256=URK7Y4PDzBgxIecQnxsWTu4O-eaFa1CoAcNTWh5R7LM,45
-beswarm-0.3.2.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.3.2.dist-info/RECORD,,
+beswarm-0.3.3.dist-info/METADATA,sha256=hOAbWEDzDcl3ihVRJam3X0Tkbt91fsK-Nitu3JPceKA,3877
+beswarm-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.3.3.dist-info/entry_points.txt,sha256=URK7Y4PDzBgxIecQnxsWTu4O-eaFa1CoAcNTWh5R7LM,45
+beswarm-0.3.3.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.3.3.dist-info/RECORD,,