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

aient/architext/architext/core.py

@@ -4,10 +4,28 @@ import asyncio
 import logging
 import hashlib
 import mimetypes
+import uuid
+import threading
 from dataclasses import dataclass
 from abc import ABC, abstractmethod
 from typing import List, Dict, Any, Optional, Union, Callable
 
+# Global, thread-safe registry for providers created within f-strings
+_fstring_provider_registry = {}
+_registry_lock = threading.Lock()
+
+def _register_provider(provider: 'ContextProvider') -> str:
+    """Registers a provider and returns a unique placeholder."""
+    with _registry_lock:
+        provider_id = f"__provider_placeholder_{uuid.uuid4().hex}__"
+        _fstring_provider_registry[provider_id] = provider
+        return provider_id
+
+def _retrieve_provider(placeholder: str) -> Optional['ContextProvider']:
+    """Retrieves a provider from the registry."""
+    with _registry_lock:
+        return _fstring_provider_registry.pop(placeholder, None)
+
 # 1. 核心数据结构: ContentBlock
 @dataclass
 class ContentBlock:
@@ -18,6 +36,11 @@ class ContentBlock:
 class ContextProvider(ABC):
     def __init__(self, name: str):
         self.name = name; self._cached_content: Optional[str] = None; self._is_stale: bool = True
+
+    def __str__(self):
+        # This allows the object to be captured when used inside an f-string.
+        return _register_provider(self)
+
     def mark_stale(self): self._is_stale = True
     async def refresh(self):
         if self._is_stale:
@@ -70,15 +93,20 @@ class Texts(ContextProvider):
         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
+    def __init__(self, tools_json: Optional[List[Dict]] = None, name: str = "tools"):
+        super().__init__(name)
+        self._tools_json = tools_json or []
     def update(self, tools_json: List[Dict]):
         self._tools_json = tools_json
         self.mark_stale()
-    async def render(self) -> str: return f"<tools>{str(self._tools_json)}</tools>"
+    async def render(self) -> Optional[str]:
+        if not self._tools_json:
+            return None
+        return f"<tools>{str(self._tools_json)}</tools>"
 
 class Files(ContextProvider):
-    def __init__(self, *paths: Union[str, List[str]]):
-        super().__init__("files")
+    def __init__(self, *paths: Union[str, List[str]], name: str = "files"):
+        super().__init__(name)
         self._files: Dict[str, str] = {}
 
         file_paths: List[str] = []
@@ -179,7 +207,23 @@ class Message(ABC):
         processed_items = []
         for item in initial_items:
             if isinstance(item, str):
-                processed_items.append(Texts(text=item))
+                # Check if the string contains placeholders from f-string rendering
+                import re
+                placeholder_pattern = re.compile(r'(__provider_placeholder_[a-f0-9]{32}__)')
+                parts = placeholder_pattern.split(item)
+
+                if len(parts) > 1: # Placeholders were found
+                    for part in parts:
+                        if not part: continue
+                        if placeholder_pattern.match(part):
+                            provider = _retrieve_provider(part)
+                            if provider:
+                                processed_items.append(provider)
+                        else:
+                            processed_items.append(Texts(text=part))
+                else: # No placeholders, just a regular string
+                    processed_items.append(Texts(text=item))
+
             elif isinstance(item, Message):
                 processed_items.extend(item.providers())
             elif isinstance(item, ContextProvider):
@@ -204,37 +248,13 @@ class Message(ABC):
         self._parent_messages: Optional['Messages'] = None
 
     def _render_content(self) -> str:
-        # Get all blocks and their provider types first
-        blocks_with_types = []
+        final_parts = []
         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)
+            if block and block.content is not None:
+                final_parts.append(block.content)
 
-        return "".join(final_content_parts)
+        return "".join(final_parts)
 
     def pop(self, name: str) -> Optional[ContextProvider]:
         popped_item = None

aient/architext/test/test.py

@@ -904,62 +904,99 @@ class TestContextManagement(unittest.IsolatedAsyncioTestCase):
         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 应该为空字符串
+    async def test_z4_direct_fstring_usage(self):
+        """直接使用 f-string 语法，并预期其能够被处理"""
+
+        # 这个测试将直接使用用户期望的 f-string 语法。
+        # 由于 Python 的限制，这行代码会立即对 f-string 求值，
+        # 导致 providers 的字符串表示形式（而不是 provider 对象本身）被插入。
+        # 因此，这个测试最初会失败。
+        f_string_message = f"""<user_info>
+The user's OS version is {Texts(name="os_version")}.
+Tools: {Tools()}
+Files: {Files()}
+Current time: {Texts(name="current_time")}
+</user_info>"""
+
+        # 借助新的 f-string 处理机制，UserMessage 现在可以直接消费 f-string 的结果。
+        messages = Messages(UserMessage(f_string_message))
+
+        # 初始渲染时，provider 的内容应该为空
         rendered_initial = await messages.render_latest()
-        expected_initial_content = (
+
+        # With the new simplest rendering logic, the output should match the f-string exactly,
+        # with empty strings for the providers and no leading whitespace.
+        expected_initial = (
             "<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"
+            "The user's OS version is .\n"
+            "Tools: \n"
+            "Files: \n"
+            "Current time: \n"
             "</user_info>"
         )
-        self.assertEqual(rendered_initial[0]['content'], expected_initial_content)
+        self.assertEqual(rendered_initial[0]['content'].strip(), expected_initial.strip())
 
-        # 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")
+        # 现在，尝试通过 provider 更新内容。这应该会成功。
+        messages.provider("os_version").update("TestOS")
+        messages.provider("tools").update([{"name": "test_tool"}])
+        messages.provider("current_time").update("2025-12-25")
 
-        # 4. 再次渲染，验证 placeholders 是否已填充
-        rendered_final = await messages.render_latest()
-        final_content = rendered_final[0]['content']
+        test_file = "fstring_test.txt"
+        with open(test_file, "w") as f: f.write("content from f-string test")
+
+        try:
+            messages.provider("files").update(test_file)
+
+            rendered_final = await messages.render_latest()
+            final_content = rendered_final[0]['content']
+
+            # 断言内容已经被成功更新
+            tools_str = "<tools>[{'name': 'test_tool'}]</tools>"
+            files_str = f"<latest_file_content><file><file_path>fstring_test.txt</file_path><file_content>content from f-string test</file_content></file>\n</latest_file_content>"
+
+            expected_final = f"""<user_info>
+The user's OS version is TestOS.
+Tools: {tools_str}
+Files: {files_str}
+Current time: 2025-12-25
+</user_info>"""
+            self.assertEqual(final_content.strip(), expected_final.strip())
+        finally:
+            if os.path.exists(test_file):
+                os.remove(test_file)
+
+    async def test_z5_fstring_with_dynamic_lambda(self):
+        """测试 f-string 消息是否支持动态 lambda 函数"""
+        from datetime import datetime
+        import time
+
+        # 这个测试将验证 f-string 是否能正确处理包含 lambda 的动态 provider
+        f_string_message = f"""<user_info>
+The user's OS version is {Texts(name="os_version")}.
+Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
+</user_info>"""
+
+        messages = Messages(UserMessage(f_string_message))
+        messages.provider("os_version").update("TestOS")
+
+        # 第一次渲染
+        rendered1 = await messages.render_latest()
+        content1 = rendered1[0]['content']
+        self.assertIn("TestOS", content1)
+
+        time1_str_part = content1.split("Current time:")[1].strip().split("\n")[0]
+
+
+        # 等待一秒
+        time.sleep(1)
+
+        # 第二次渲染
+        rendered2 = await messages.render_latest()
+        content2 = rendered2[0]['content']
+        time2_str_part = content2.split("Current time:")[1].strip().split("\n")[0]
 
-        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)
+        # 验证两次渲染的时间戳不同
+        self.assertNotEqual(time1_str_part, time2_str_part, "f-string 中的动态 lambda 内容在两次渲染之间应该更新")
 
 
 # ==============================================================================

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

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

{aient-1.1.95.dist-info → aient-1.1.97.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=arBodL7N3o-YDDgX0I_ZtGlFoQDTXal0L6t9TCP_924,20028
+aient/architext/architext/core.py,sha256=-uu6CelQyKJQ7e6xTZWRxnC-yvxeLiIl8siQdXcL8RI,20727
 aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-aient/architext/test/test.py,sha256=oF7FyRpfZIMNYbDE9vuQv9uTeV6Q_Hsv9-QoyI0YIRI,47326
+aient/architext/test/test.py,sha256=URVDaUfxxPU4yobojJC7SO1cBsM0Hzz96ZW3lYYMWGo,48176
 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.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,,
+aient-1.1.97.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.97.dist-info/METADATA,sha256=iNrH1fwUGshVwM3UmFmun1CV7qPH61FPl1XpUmMemyo,4842
+aient-1.1.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.97.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.97.dist-info/RECORD,,