aient 1.1.89__tar.gz → 1.1.91__tar.gz

{aient-1.1.89 → aient-1.1.91}/PKG-INFO

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

aient-1.1.91/aient/architext/architext/__init__.py

@@ -0,0 +1 @@
+from .core import *

aient-1.1.91/aient/architext/architext/core.py

@@ -0,0 +1,237 @@
+import base64
+import asyncio
+import logging
+import mimetypes
+from dataclasses import dataclass
+from abc import ABC, abstractmethod
+from typing import List, Dict, Any, Optional
+
+# 1. 核心数据结构: ContentBlock
+@dataclass
+class ContentBlock:
+    name: str
+    content: str
+
+# 2. 上下文提供者 (带缓存)
+class ContextProvider(ABC):
+    def __init__(self, name: str):
+        self.name = name; self._cached_content: Optional[str] = None; self._is_stale: bool = True
+    def mark_stale(self): self._is_stale = True
+    async def refresh(self):
+        if self._is_stale:
+            self._cached_content = await self._fetch_content()
+            self._is_stale = False
+    @abstractmethod
+    async def _fetch_content(self) -> Optional[str]: raise NotImplementedError
+    def get_content_block(self) -> Optional[ContentBlock]:
+        if self._cached_content is not None: return ContentBlock(self.name, self._cached_content)
+        return None
+
+class Texts(ContextProvider):
+    def __init__(self, name: str, text: str): super().__init__(name); self._text = text
+    async def _fetch_content(self) -> str: return self._text
+
+class Tools(ContextProvider):
+    def __init__(self, tools_json: List[Dict]): super().__init__("tools"); self._tools_json = tools_json
+    async def _fetch_content(self) -> str: return f"<tools>{str(self._tools_json)}</tools>"
+
+class Files(ContextProvider):
+    def __init__(self): super().__init__("files"); self._files: Dict[str, str] = {}
+    def update(self, path: str, content: str): self._files[path] = content; self.mark_stale()
+    async def _fetch_content(self) -> str:
+        if not self._files: return None
+        return "<files>\n" + "\n".join([f"<file path='{p}'>{c}...</file>" for p, c in self._files.items()]) + "\n</files>"
+
+class Images(ContextProvider):
+    def __init__(self, image_path: str, name: Optional[str] = None):
+        super().__init__(name or image_path)
+        self.image_path = image_path
+    async def _fetch_content(self) -> Optional[str]:
+        try:
+            with open(self.image_path, "rb") as image_file:
+                encoded_string = base64.b64encode(image_file.read()).decode('utf-8')
+                mime_type, _ = mimetypes.guess_type(self.image_path)
+                if not mime_type: mime_type = "application/octet-stream" # Fallback
+                return f"data:{mime_type};base64,{encoded_string}"
+        except FileNotFoundError:
+            logging.warning(f"Image file not found: {self.image_path}. Skipping.")
+            return None # Or handle error appropriately
+
+# 3. 消息类 (已合并 MessageContent)
+class Message(ABC):
+    def __init__(self, role: str, *initial_items: ContextProvider):
+        self.role = role
+        self._items: List[ContextProvider] = list(initial_items)
+        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)
+
+    def pop(self, name: str) -> Optional[ContextProvider]:
+        popped_item = None
+        for i, item in enumerate(self._items):
+            if hasattr(item, 'name') and item.name == name:
+                popped_item = self._items.pop(i)
+                break
+        if popped_item and self._parent_messages:
+            self._parent_messages._notify_provider_removed(popped_item)
+        return popped_item
+
+    def insert(self, index: int, item: ContextProvider):
+        self._items.insert(index, item)
+        if self._parent_messages:
+            self._parent_messages._notify_provider_added(item, self)
+
+    def append(self, item: ContextProvider):
+        self._items.append(item)
+        if self._parent_messages:
+            self._parent_messages._notify_provider_added(item, self)
+
+    def providers(self) -> List[ContextProvider]: return self._items
+    def __repr__(self): return f"Message(role='{self.role}', items={[i.name for i in self._items]})"
+    def to_dict(self) -> Optional[Dict[str, Any]]:
+        is_multimodal = any(isinstance(p, Images) for p in self._items)
+
+        if not is_multimodal:
+            rendered_content = self._render_content()
+            if not rendered_content: return None
+            return {"role": self.role, "content": rendered_content}
+        else:
+            content_list = []
+            for item in self._items:
+                block = item.get_content_block()
+                if not block or not block.content: continue
+                if isinstance(item, Images):
+                    content_list.append({"type": "image_url", "image_url": {"url": block.content}})
+                else:
+                    content_list.append({"type": "text", "text": block.content})
+            if not content_list: return None
+            return {"role": self.role, "content": content_list}
+
+class SystemMessage(Message):
+    def __init__(self, *items): super().__init__("system", *items)
+class UserMessage(Message):
+    def __init__(self, *items): super().__init__("user", *items)
+
+# 4. 顶层容器: Messages
+class Messages:
+    def __init__(self, *initial_messages: Message):
+        from typing import Tuple
+        self._messages: List[Message] = []
+        self._providers_index: Dict[str, Tuple[ContextProvider, Message]] = {}
+        if initial_messages:
+            for msg in initial_messages:
+                self.append(msg)
+
+    def _notify_provider_added(self, provider: ContextProvider, message: Message):
+        if provider.name not in self._providers_index:
+            self._providers_index[provider.name] = (provider, message)
+
+    def _notify_provider_removed(self, provider: ContextProvider):
+        if provider.name in self._providers_index:
+            del self._providers_index[provider.name]
+
+    def provider(self, name: str) -> Optional[ContextProvider]:
+        indexed = self._providers_index.get(name)
+        return indexed[0] if indexed else None
+
+    def pop(self, name: str) -> Optional[ContextProvider]:
+        indexed = self._providers_index.get(name)
+        if not indexed:
+            return None
+        _provider, parent_message = indexed
+        return parent_message.pop(name)
+
+    async def refresh(self):
+        tasks = [provider.refresh() for provider, _ in self._providers_index.values()]
+        await asyncio.gather(*tasks)
+
+    def render(self) -> List[Dict[str, Any]]:
+        results = [msg.to_dict() for msg in self._messages]
+        return [res for res in results if res]
+
+    async def render_latest(self) -> List[Dict[str, Any]]:
+        await self.refresh()
+        return self.render()
+
+    def append(self, message: Message):
+        if self._messages and self._messages[-1].role == message.role:
+            last_message = self._messages[-1]
+            for provider in message.providers():
+                last_message.append(provider)
+        else:
+            message._parent_messages = self
+            self._messages.append(message)
+            for p in message.providers():
+                self._notify_provider_added(p, message)
+
+    def __getitem__(self, index: int) -> Message: return self._messages[index]
+    def __len__(self) -> int: return len(self._messages)
+    def __iter__(self): return iter(self._messages)
+
+# ==============================================================================
+# 6. 演示
+# ==============================================================================
+async def run_demo():
+    # --- 1. 初始化提供者 ---
+    system_prompt_provider = Texts("system_prompt", "你是一个AI助手。")
+    tools_provider = Tools(tools_json=[{"name": "read_file"}])
+    files_provider = Files()
+
+    # --- 2. 演示新功能：优雅地构建 Messages ---
+    print("\n>>> 场景 A: 使用新的、优雅的构造函数直接初始化 Messages")
+    messages = Messages(
+        SystemMessage(system_prompt_provider, tools_provider),
+        UserMessage(files_provider, Texts("user_input", "这是我的初始问题。")),
+        UserMessage(Texts("user_input2", "这是我的初始问题2。"))
+    )
+
+    print("\n--- 渲染后的初始 Messages (首次渲染，全部刷新) ---")
+    for msg_dict in await messages.render_latest(): print(msg_dict)
+    print("-" * 40)
+
+    # --- 3. 演示穿透更新 ---
+    print("\n>>> 场景 B: 穿透更新 File Provider，渲染时自动刷新")
+    files_provider_instance = messages.provider("files")
+    if isinstance(files_provider_instance, Files):
+        files_provider_instance.update("file1.py", "这是新的文件内容！")
+
+    print("\n--- 再次渲染 Messages (只有文件提供者会刷新) ---")
+    for msg_dict in await messages.render_latest(): print(msg_dict)
+    print("-" * 40)
+
+    # --- 4. 演示全局 Pop 和通过索引 Insert ---
+    print("\n>>> 场景 C: 全局 Pop 工具提供者，并 Insert 到 UserMessage 中")
+    popped_tools_provider = messages.pop("tools")
+    if popped_tools_provider:
+        messages[1].insert(0, popped_tools_provider)
+        print(f"\n已成功将 '{popped_tools_provider.name}' 提供者移动到用户消息。")
+
+    print("\n--- Pop 和 Insert 后渲染的 Messages (验证移动效果) ---")
+    for msg_dict in messages.render(): print(msg_dict)
+    print("-" * 40)
+
+    # --- 5. 演示多模态渲染 ---
+    print("\n>>> 场景 D: 演示多模态 (文本+图片) 渲染")
+    with open("dummy_image.png", "w") as f:
+        f.write("This is a dummy image file.")
+
+    multimodal_message = Messages(
+        UserMessage(
+            Texts("prompt", "What do you see in this image?"),
+            Images("dummy_image.png")
+        )
+    )
+    print("\n--- 渲染后的多模态 Message ---")
+    for msg_dict in await multimodal_message.render_latest():
+        if isinstance(msg_dict['content'], list):
+            for item in msg_dict['content']:
+                if item['type'] == 'image_url':
+                    item['image_url']['url'] = item['image_url']['url'][:80] + "..."
+        print(msg_dict)
+    print("-" * 40)
+
+
+if __name__ == "__main__":
+    asyncio.run(run_demo())

aient-1.1.91/aient/architext/test.py

@@ -0,0 +1,226 @@
+import unittest
+from unittest.mock import AsyncMock
+from architext import *
+
+# ==============================================================================
+# 单元测试部分
+# ==============================================================================
+class TestContextManagement(unittest.IsolatedAsyncioTestCase):
+
+    def setUp(self):
+        """在每个测试前设置环境"""
+        self.system_prompt_provider = Texts("system_prompt", "你是一个AI助手。")
+        self.tools_provider = Tools(tools_json=[{"name": "read_file"}])
+        self.files_provider = Files()
+
+    async def test_a_initial_construction_and_render(self):
+        """测试优雅的初始化和首次渲染"""
+        messages = Messages(
+            SystemMessage(self.system_prompt_provider, self.tools_provider),
+            UserMessage(self.files_provider, Texts("user_input", "这是我的初始问题。"))
+        )
+
+        self.assertEqual(len(messages), 2)
+        rendered = await messages.render_latest()
+
+        self.assertEqual(len(rendered), 2)
+        self.assertIn("<tools>", rendered[0]['content'])
+        self.assertNotIn("<files>", rendered[1]['content'])
+
+    async def test_b_provider_passthrough_and_refresh(self):
+        """测试通过 mock 验证缓存和刷新逻辑"""
+        # 我们真正关心的是 _fetch_content 是否被不必要地调用
+        # 所以我们 mock 底层的它，而不是 refresh 方法
+        original_fetch_content = self.files_provider._fetch_content
+        self.files_provider._fetch_content = AsyncMock(side_effect=original_fetch_content)
+
+        messages = Messages(UserMessage(self.files_provider))
+
+        # 1. 首次刷新
+        self.files_provider.update("path1", "content1")
+        await messages.refresh()
+        # _fetch_content 应该被调用了 1 次
+        self.assertEqual(self.files_provider._fetch_content.call_count, 1)
+
+        # 2. 再次刷新，内容未变，不应再次调用 _fetch_content
+        await messages.refresh()
+        # 调用次数应该仍然是 1，证明缓存生效
+        self.assertEqual(self.files_provider._fetch_content.call_count, 1)
+
+        # 3. 更新文件内容，这会标记 provider 为 stale
+        self.files_provider.update("path2", "content2")
+
+        # 4. 再次刷新，现在应该会重新调用 _fetch_content
+        await messages.refresh()
+        rendered = messages.render()
+        # 调用次数应该变为 2
+        self.assertEqual(self.files_provider._fetch_content.call_count, 2)
+        # 并且渲染结果包含了新内容
+        self.assertIn("content2", rendered[0]['content'])
+
+    async def test_c_global_pop_and_indexed_insert(self):
+        """测试全局pop和通过索引insert的功能"""
+        messages = Messages(
+            SystemMessage(self.system_prompt_provider, self.tools_provider),
+            UserMessage(self.files_provider)
+        )
+
+        # 验证初始状态
+        initial_rendered = await messages.render_latest()
+        self.assertTrue(any("<tools>" in msg['content'] for msg in initial_rendered if msg['role'] == 'system'))
+
+        # 全局弹出 'tools' Provider
+        popped_tools_provider = messages.pop("tools")
+        self.assertIs(popped_tools_provider, self.tools_provider)
+
+        # 验证 pop 后的状态
+        rendered_after_pop = messages.render()
+        self.assertFalse(any("<tools>" in msg['content'] for msg in rendered_after_pop if msg['role'] == 'system'))
+
+        # 通过索引将弹出的provider插入到UserMessage的开头
+        messages[1].insert(0, popped_tools_provider)
+
+        # 验证 insert 后的状态
+        rendered_after_insert = messages.render()
+        user_message_content = next(msg['content'] for msg in rendered_after_insert if msg['role'] == 'user')
+        self.assertTrue(user_message_content.startswith("<tools>"))
+
+    async def test_d_multimodal_rendering(self):
+        """测试多模态（文本+图片）渲染"""
+        # Create a dummy image file for the test
+        dummy_image_path = "test_dummy_image.png"
+        with open(dummy_image_path, "w") as f:
+            f.write("dummy content")
+
+        messages = Messages(
+            UserMessage(
+                Texts("prompt", "Describe the image."),
+                Images(dummy_image_path) # Test with optional name
+            )
+        )
+
+        rendered = await messages.render_latest()
+        self.assertEqual(len(rendered), 1)
+
+        content = rendered[0]['content']
+        self.assertIsInstance(content, list)
+        self.assertEqual(len(content), 2)
+
+        # Check text part
+        self.assertEqual(content[0]['type'], 'text')
+        self.assertEqual(content[0]['text'], 'Describe the image.')
+
+        # Check image part
+        self.assertEqual(content[1]['type'], 'image_url')
+        self.assertIn('data:image/png;base64,', content[1]['image_url']['url'])
+
+        # Clean up the dummy file
+        import os
+        os.remove(dummy_image_path)
+
+    async def test_e_multimodal_type_switching(self):
+        """测试多模态消息在pop图片后是否能正确回退到字符串渲染"""
+        dummy_image_path = "test_dummy_image_2.png"
+        with open(dummy_image_path, "w") as f:
+            f.write("dummy content")
+
+        messages = Messages(
+            UserMessage(
+                Texts("prefix", "Look at this:"),
+                Images(dummy_image_path, name="image"), # Explicit name for popping
+                Texts("suffix", "Any thoughts?")
+            )
+        )
+
+        # 1. Initial multimodal render
+        rendered_multi = await messages.render_latest()
+        content_multi = rendered_multi[0]['content']
+        self.assertIsInstance(content_multi, list)
+        self.assertEqual(len(content_multi), 3) # prefix, image, suffix
+
+        # 2. Pop the image
+        popped_image = messages.pop("image")
+        self.assertIsNotNone(popped_image)
+
+        # 3. Render again, should fall back to string content
+        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?")
+
+        # Clean up
+        import os
+        os.remove(dummy_image_path)
+
+    def test_f_message_merging(self):
+        """测试初始化和追加时自动合并消息的功能"""
+        # 1. Test merging during initialization
+        messages = Messages(
+            UserMessage(Texts("part1", "Hello,")),
+            UserMessage(Texts("part2", "world!")),
+            SystemMessage(Texts("system", "System prompt.")),
+            UserMessage(Texts("part3", "How are you?"))
+        )
+        # Should be merged into: User, System, User
+        self.assertEqual(len(messages), 3)
+        self.assertEqual(len(messages[0]._items), 2) # First UserMessage has 2 items
+        self.assertEqual(messages[0]._items[1].name, "part2")
+        self.assertEqual(messages[1].role, "system")
+        self.assertEqual(messages[2].role, "user")
+
+        # 2. Test merging during append
+        messages.append(UserMessage(Texts("part4", "I am fine.")))
+        self.assertEqual(len(messages), 3) # Still 3 messages
+        self.assertEqual(len(messages[2]._items), 2) # Last UserMessage now has 2 items
+        self.assertEqual(messages[2]._items[1].name, "part4")
+
+        # 3. Test appending a different role
+        messages.append(SystemMessage(Texts("system2", "Another prompt.")))
+        self.assertEqual(len(messages), 4) # Should not merge
+        self.assertEqual(messages[3].role, "system")
+
+    async def test_g_state_inconsistency_on_direct_message_modification(self):
+        """
+        测试当直接在 Message 对象上执行 pop 操作时，
+        顶层 Messages 对象的 _providers_index 是否会产生不一致。
+        """
+        messages = Messages(
+            SystemMessage(self.system_prompt_provider, self.tools_provider),
+            UserMessage(self.files_provider)
+        )
+
+        # 0. 先刷新一次，确保所有 provider 的 cache 都已填充
+        await messages.refresh()
+
+        # 1. 初始状态：'tools' 提供者应该在索引中
+        self.assertIsNotNone(messages.provider("tools"), "初始状态下 'tools' 提供者应该能被找到")
+        self.assertIs(messages.provider("tools"), self.tools_provider)
+
+        # 2. 直接在子消息对象上执行 pop 操作
+        system_message = messages[0]
+        popped_provider = system_message.pop("tools")
+
+        # 验证是否真的从 Message 对象中弹出了
+        self.assertIs(popped_provider, self.tools_provider, "应该从 SystemMessage 中成功弹出 provider")
+        self.assertNotIn(self.tools_provider, system_message.providers(), "provider 不应再存在于 SystemMessage 的 providers 列表中")
+
+        # 3. 核心问题：检查顶层 Messages 的索引
+        # 在理想情况下，直接修改子消息应该同步更新顶层索引。
+        # 因此，我们断言 provider 现在应该是找不到的。这个测试现在应该会失败。
+        provider_after_pop = messages.provider("tools")
+        self.assertIsNone(provider_after_pop, "BUG: 直接从子消息中 pop 后，顶层索引未同步，仍然可以找到 provider")
+
+        # 4. 进一步验证：渲染结果和索引内容不一致
+        # 渲染结果应该不再包含 tools 内容，因为 Message 对象本身是正确的
+        rendered_messages = messages.render()
+        self.assertGreater(len(rendered_messages), 0, "渲染后的消息列表不应为空")
+        rendered_content = rendered_messages[0]['content']
+        self.assertNotIn("<tools>", rendered_content, "渲染结果中不应再包含 'tools' 的内容，证明数据源已更新")
+
+
+if __name__ == '__main__':
+    # 为了在普通脚本环境中运行，添加这两行
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestContextManagement))
+    runner = unittest.TextTestRunner()
+    runner.run(suite)

{aient-1.1.89 → aient-1.1.91}/aient.egg-info/PKG-INFO

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

{aient-1.1.89 → aient-1.1.91}/aient.egg-info/SOURCES.txt

@@ -7,6 +7,9 @@ aient.egg-info/SOURCES.txt
 aient.egg-info/dependency_links.txt
 aient.egg-info/requires.txt
 aient.egg-info/top_level.txt
+aient/architext/test.py
+aient/architext/architext/__init__.py
+aient/architext/architext/core.py
 aient/core/__init__.py
 aient/core/log_config.py
 aient/core/models.py

{aient-1.1.89 → aient-1.1.91}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aient"
-version = "1.1.89"
+version = "1.1.91"
 description = "Aient: The Awakening of Agent."
 readme = "README.md"
 requires-python = ">=3.11"