beswarm 0.3.2__tar.gz → 0.3.3__tar.gz

{beswarm-0.3.2 → beswarm-0.3.3}/PKG-INFO

@@ -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 → beswarm-0.3.3}/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-0.3.2 → beswarm-0.3.3}/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-0.3.2 → beswarm-0.3.3}/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 → beswarm-0.3.3}/beswarm.egg-info/PKG-INFO

@@ -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 → beswarm-0.3.3}/pyproject.toml

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