aient 1.1.93__py3-none-any.whl → 1.1.95__py3-none-any.whl

aient/architext/architext/core.py

@@ -32,7 +32,10 @@ class ContextProvider(ABC):
         return None
 
 class Texts(ContextProvider):
-    def __init__(self, text: Union[str, Callable[[], str]], name: Optional[str] = None):
+    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None):
+        if text is None and name is None:
+            raise ValueError("Either 'text' or 'name' must be provided.")
+
         self._text = text
         self._is_dynamic = callable(self._text)
 
@@ -41,7 +44,8 @@ class Texts(ContextProvider):
                 import uuid
                 _name = f"dynamic_text_{uuid.uuid4().hex[:8]}"
             else:
-                h = hashlib.sha1(self._text.encode()).hexdigest()
+                # Handle the case where text is None during initialization
+                h = hashlib.sha1(self._text.encode() if self._text else b'').hexdigest()
                 _name = f"text_{h[:8]}"
         else:
             _name = name
@@ -57,10 +61,13 @@ class Texts(ContextProvider):
         self._is_dynamic = callable(self._text)
         self.mark_stale()
 
-    async def render(self) -> str:
+    async def render(self) -> Optional[str]:
         if self._is_dynamic:
-            return self._text()
-        return self._text
+            # Ensure dynamic content returns a string, even if empty
+            result = self._text()
+            return result if result is not None else ""
+        # Ensure static content returns a string, even if empty
+        return self._text if self._text is not None else ""
 
 class Tools(ContextProvider):
     def __init__(self, tools_json: List[Dict]): super().__init__("tools"); self._tools_json = tools_json
@@ -197,8 +204,37 @@ class Message(ABC):
         self._parent_messages: Optional['Messages'] = None
 
     def _render_content(self) -> str:
-        blocks = [item.get_content_block() for item in self._items]
-        return "\n\n".join(b.content for b in blocks if b and b.content)
+        # Get all blocks and their provider types first
+        blocks_with_types = []
+        for item in self._items:
+            block = item.get_content_block()
+            if block and (block.content or block.content == ""): # Consider blocks with empty string content
+                # We only care about non-multimodal Texts providers for concatenation
+                provider_type = Texts if type(item) is Texts else type(item)
+                blocks_with_types.append((block, provider_type))
+
+        if not blocks_with_types:
+            return ""
+
+        # Build the final content string
+        # Start with the first block's content
+        final_content_parts = [blocks_with_types[0][0].content]
+
+        for i in range(1, len(blocks_with_types)):
+            current_block, current_type = blocks_with_types[i]
+            _, prev_type = blocks_with_types[i-1]
+
+            # If both the previous and current rendered blocks are simple text, concatenate them.
+            # Otherwise, join with newlines.
+            if prev_type is Texts and current_type is Texts:
+                separator = ""
+            else:
+                separator = "\n\n"
+
+            final_content_parts.append(separator)
+            final_content_parts.append(current_block.content)
+
+        return "".join(final_content_parts)
 
     def pop(self, name: str) -> Optional[ContextProvider]:
         popped_item = None

aient/architext/test/test.py

@@ -143,11 +143,12 @@ class TestContextManagement(unittest.IsolatedAsyncioTestCase):
         popped_image = messages.pop("image")
         self.assertIsNotNone(popped_image)
 
-        # 3. Render again, should fall back to string content
+        # 3. Render again, should fall back to string content and seamlessly join texts
         rendered_str = messages.render() # No refresh needed
         content_str = rendered_str[0]['content']
         self.assertIsInstance(content_str, str)
-        self.assertEqual(content_str, "Look at this:\n\nAny thoughts?")
+        # With the new render logic, adjacent texts are joined with ""
+        self.assertEqual(content_str, "Look at this:Any thoughts?")
 
         # Clean up
         import os
@@ -872,6 +873,94 @@ class TestContextManagement(unittest.IsolatedAsyncioTestCase):
         # 5. 验证两次内容不同（因为时间戳变了）
         self.assertNotEqual(content1, content2, "包含静态前缀的动态 provider 内容应该更新")
 
+    async def test_z3_deferred_text_update_via_provider(self):
+        """测试 Texts(name=...) 初始化, 然后通过 provider 更新内容"""
+        # This test is expected to fail with a TypeError on the next line
+        # because the current Texts.__init__ requires 'text'.
+        deferred_text_provider = Texts(name="deferred_content")
+
+        messages = Messages(UserMessage(deferred_text_provider))
+
+        # Initial render: with no text, it should probably render to an empty string.
+        # If there's no content, the message itself might not be rendered.
+        # Let's assume an empty provider results in the message not rendering.
+        await deferred_text_provider.refresh()
+        # With the new logic, it should return a block with an empty string
+        content_block = deferred_text_provider.get_content_block()
+        self.assertIsNotNone(content_block)
+        self.assertEqual(content_block.content, "")
+
+
+        rendered_initial = await messages.render_latest()
+        self.assertEqual(len(rendered_initial), 0)
+
+        # 3. Get provider and update content
+        provider = messages.provider("deferred_content")
+        self.assertIsNotNone(provider)
+        provider.update("This is the new content.")
+
+        # 4. Re-render and validate
+        rendered_updated = await messages.render_latest()
+        self.assertEqual(len(rendered_updated), 1)
+        self.assertEqual(rendered_updated[0]['content'], "This is the new content.")
+
+    async def test_z4_fstring_deferred_population(self):
+        """测试 f-string 内容是否可以延迟填充"""
+        # 1. 初始化一个带有 f-string 占位符的 UserMessage
+        # 注意：这里的 f-string 会立即求值，所以我们需要模拟一个假的 Texts 对象
+        # 让它看起来像是 f-string 的一部分。正确的用法是直接在 f-string 中创建 Texts 对象。
+        user_info_provider = Texts(name="user_info")
+
+        # This is how the user wants to use it. The f-string is evaluated immediately.
+        # The Texts object inside it is created but has no text yet.
+        raw_fstring_text = f"""
+<user_info>
+The user's OS version is {Texts(name="os_version")}. The absolute path of the user's workspace is {Texts(name="workspace_path")} which is also the project root directory. The user's shell is {Texts(name="shell")}.
+</user_info>
+"""
+        # The above f-string evaluates to a string containing reprs of Texts objects.
+        # This is not how the library is designed to work.
+        # A more correct approach is to build the message programmatically.
+
+        # Let's test the intended-like usage pattern.
+        # We create a template and providers separately.
+
+        os_provider = Texts(name="os_version")
+        path_provider = Texts(name="workspace_path")
+        shell_provider = Texts(name="shell")
+
+        messages = Messages(
+            UserMessage(
+                "<user_info>\n"
+                "The user's OS version is ", os_provider, ". The absolute path of the user's workspace is ",
+                path_provider, " which is also the project root directory. The user's shell is ", shell_provider, ".\n"
+                "</user_info>"
+            )
+        )
+
+        # 2. 初始渲染，此时 placeholders 应该为空字符串
+        rendered_initial = await messages.render_latest()
+        expected_initial_content = (
+            "<user_info>\n"
+            "The user's OS version is . The absolute path of the user's workspace is "
+            " which is also the project root directory. The user's shell is .\n"
+            "</user_info>"
+        )
+        self.assertEqual(rendered_initial[0]['content'], expected_initial_content)
+
+        # 3. 获取 providers 并更新它们的值
+        messages.provider("os_version").update("macOS 14.5")
+        messages.provider("workspace_path").update("/Users/yanyuming/Downloads/GitHub/architext")
+        messages.provider("shell").update("/bin/zsh")
+
+        # 4. 再次渲染，验证 placeholders 是否已填充
+        rendered_final = await messages.render_latest()
+        final_content = rendered_final[0]['content']
+
+        self.assertIn("The user's OS version is macOS 14.5.", final_content)
+        self.assertIn("The absolute path of the user's workspace is /Users/yanyuming/Downloads/GitHub/architext which is also the project root directory.", final_content)
+        self.assertIn("The user's shell is /bin/zsh.", final_content)
+
 
 # ==============================================================================
 # 6. 演示

{aient-1.1.93.dist-info → aient-1.1.95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.93
+Version: 1.1.95
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.1.93.dist-info → aient-1.1.95.dist-info}/RECORD

@@ -1,8 +1,8 @@
 aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
-aient/architext/architext/core.py,sha256=i-b38KG4R01pDGJxepb0deCp8zJXw7uzo_qtG7SrLN0,18378
+aient/architext/architext/core.py,sha256=arBodL7N3o-YDDgX0I_ZtGlFoQDTXal0L6t9TCP_924,20028
 aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-aient/architext/test/test.py,sha256=_e4B0G6gqaa59V9oYLJNegWKhilJ_jEjRnJ1H4ME1pA,42768
+aient/architext/test/test.py,sha256=oF7FyRpfZIMNYbDE9vuQv9uTeV6Q_Hsv9-QoyI0YIRI,47326
 aient/architext/test/test_save_load.py,sha256=o8DqH6gDYZkFkQy-a7blqLtJTRj5e4a-Lil48pJ0V3g,3260
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -35,8 +35,8 @@ aient/plugins/write_file.py,sha256=Jt8fOEwqhYiSWpCbwfAr1xoi_BmFnx3076GMhuL06uI,3
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=VqtK4RFEx7KxkmcqG3lFDS1DxoNlFFGErEjopVcc8IE,40974
-aient-1.1.93.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.93.dist-info/METADATA,sha256=l1xMyQp-D2QwFcpx9n0wbwZ5erX_fUc9oeUiBCY5pbA,4842
-aient-1.1.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.93.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.93.dist-info/RECORD,,
+aient-1.1.95.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.95.dist-info/METADATA,sha256=RqDv7-DjbGD_PUbKUqrEqcYbLQoXvOyRM7xafg-hrKQ,4842
+aient-1.1.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.95.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.95.dist-info/RECORD,,