aient 1.1.89__py3-none-any.whl → 1.1.90__py3-none-any.whl

aient/architext/architext/__init__.py

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

aient/architext/architext/core.py

@@ -0,0 +1,165 @@
+import asyncio
+from abc import ABC, abstractmethod
+from typing import List, Dict, Any, Optional, Union
+
+# 1. 核心数据结构: ContentBlock
+class ContentBlock:
+    def __init__(self, name: str, content: str, provider: Optional['ContextProvider'] = None):
+        self.name = name; self.content = content; self.provider = provider
+    def __repr__(self): return f"Block(name='{self.name}')"
+
+# 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:
+            # 注意：我们将在这个方法上使用 mock，所以实际的 print 不再重要
+            # print(f"信息: 正在为上下文提供者 '{self.name}' 刷新内容...")
+            self._cached_content = await self._fetch_content()
+            self._is_stale = False
+        # else:
+            # print(f"调试: 上下文提供者 '{self.name}' 正在使用缓存内容。")
+    @abstractmethod
+    async def _fetch_content(self) -> Optional[str]: raise NotImplementedError
+    async def render(self) -> Optional[ContentBlock]:
+        await self._refresh()
+        if self._cached_content is not None: return ContentBlock(self.name, self._cached_content, self)
+        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[:50]}...</file>" for p, c in self._files.items()]) + "\n</files>"
+
+Item = Union[ContentBlock, ContextProvider]
+
+# 3. 消息内容类与消息类
+class MessageContent:
+    def __init__(self, items: List[Item]): self._items: List[Item] = items
+    async def render(self) -> str:
+        tasks = []
+        for item in self._items:
+            if isinstance(item, ContextProvider):
+                tasks.append(item.render())
+            elif isinstance(item, ContentBlock):
+                # 为了统一处理，将 ContentBlock 也包装成一个已完成的 Future
+                future = asyncio.Future()
+                future.set_result(item)
+                tasks.append(future)
+
+        blocks = await asyncio.gather(*tasks)
+        return "\n\n".join(b.content for b in blocks if b and b.content)
+    def pop(self, name: str) -> Optional[Item]:
+        for i, item in enumerate(self._items):
+            if hasattr(item, 'name') and item.name == name: return self._items.pop(i)
+        return None
+    def insert(self, index: int, item: Item): self._items.insert(index, item)
+    def append(self, item: Item): self._items.append(item)
+    def providers(self) -> List[ContextProvider]: return [item for item in self._items if isinstance(item, ContextProvider)]
+    def __repr__(self): return f"Content(items={[item.name for item in self._items if hasattr(item, 'name')]})"
+
+class Message(ABC):
+    def __init__(self, role: str, *initial_items: Item): self.role = role; self.content = MessageContent(list(initial_items))
+    async def to_dict(self) -> Optional[Dict[str, Any]]:
+        rendered_content = await self.content.render()
+        if not rendered_content: return None
+        return {"role": self.role, "content": rendered_content}
+
+class SystemMessage(Message):
+    def __init__(self, *items): super().__init__("system", *items)
+class UserMessage(Message):
+    def __init__(self, *items): super().__init__("user", *items)
+
+# 4. 上下文构建器 (内部使用)
+class ContextBuilder:
+    def __init__(self, providers: List[ContextProvider]): self.providers = {p.name: p for p in providers}
+    def get_provider(self, name: str) -> Optional[ContextProvider]: return self.providers.get(name)
+
+# 5. 顶层容器: Messages
+class Messages:
+    def __init__(self, *initial_messages: Message):
+        self._messages: List[Message] = list(initial_messages)
+        all_providers = []
+        for msg in self._messages: all_providers.extend(msg.content.providers())
+        self._context_builder = ContextBuilder(all_providers)
+    def provider(self, name: str) -> Optional[ContextProvider]: return self._context_builder.get_provider(name)
+    def pop(self, name: str) -> Optional[Item]:
+        for message in self._messages:
+            popped_item = message.content.pop(name)
+            if popped_item: return popped_item
+        return None
+    async def render(self) -> List[Dict[str, Any]]:
+        tasks = [msg.to_dict() for msg in self._messages]
+        results = await asyncio.gather(*tasks)
+        return [res for res in results if res]
+    def append(self, message: Message):
+        self._messages.append(message)
+        for p in message.content.providers():
+            if p.name not in self._context_builder.providers: self._context_builder.providers[p.name] = p
+    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", "这是我的初始问题。"))
+    )
+
+    print("\n--- 渲染后的初始 Messages (首次渲染，全部刷新) ---")
+    for msg_dict in await messages.render(): print(msg_dict)
+    print("-" * 40)
+
+    # --- 3. 演示穿透更新 ---
+    print("\n>>> 场景 B: 穿透更新 File Provider，渲染时自动刷新")
+
+    # 直接通过 messages 对象穿透访问并更新 files 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(): print(msg_dict)
+    print("-" * 40)
+
+    # --- 4. 演示全局 Pop 和通过索引 Insert ---
+    print("\n>>> 场景 C: 全局 Pop 工具提供者，并 Insert 到 UserMessage 中")
+
+    # a. 全局弹出 'tools' Provider
+    popped_tools_provider = messages.pop("tools")
+
+    # b. 将弹出的 Provider 插入到第一个 UserMessage (索引为1) 的开头
+    if popped_tools_provider:
+        # 通过索引精确定位
+        messages[1].content.insert(0, popped_tools_provider)
+        print(f"\n已成功将 '{popped_tools_provider.name}' 提供者移动到用户消息。")
+
+    print("\n--- Pop 和 Insert 后渲染的 Messages (验证移动效果) ---")
+    for msg_dict in await messages.render(): print(msg_dict)
+    print("-" * 40)
+
+if __name__ == "__main__":
+    asyncio.run(run_demo())

aient/architext/test.py

@@ -0,0 +1,92 @@
+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()
+
+        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 验证缓存和刷新逻辑"""
+        # 为 files_provider 的 _fetch_content 方法创建一个 mock
+        # 我们希望它在被调用时仍然返回真实的结果，所以使用 side_effect
+        original_fetch = self.files_provider._fetch_content
+        self.files_provider._fetch_content = AsyncMock(side_effect=original_fetch)
+
+        messages = Messages(UserMessage(self.files_provider))
+
+        # 1. 初始文件内容为空，渲染一次
+        self.files_provider.update("path1", "content1")
+        await messages.render()
+        # _fetch_content 应该被调用了 1 次
+        self.assertEqual(self.files_provider._fetch_content.call_count, 1)
+
+        # 2. 再次渲染，内容未变，不应再次调用 _fetch_content
+        await messages.render()
+        # 调用次数应该仍然是 1，证明缓存生效
+        self.assertEqual(self.files_provider._fetch_content.call_count, 1)
+
+        # 3. 更新文件内容，这会标记 provider 为 stale
+        self.files_provider.update("path2", "content2")
+
+        # 4. 再次渲染，现在应该会重新调用 _fetch_content
+        rendered = await 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()
+        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 = await messages.render()
+        self.assertFalse(any("<tools>" in msg['content'] for msg in rendered_after_pop if msg['role'] == 'system'))
+
+        # 通过索引将弹出的provider插入到UserMessage的开头
+        messages[1].content.insert(0, popped_tools_provider)
+
+        # 验证 insert 后的状态
+        rendered_after_insert = await 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>"))
+
+if __name__ == '__main__':
+    # 为了在普通脚本环境中运行，添加这两行
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestContextManagement))
+    runner = unittest.TextTestRunner()
+    runner.run(suite)

{aient-1.1.89.dist-info → aient-1.1.90.dist-info}/METADATA

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

{aient-1.1.89.dist-info → aient-1.1.90.dist-info}/RECORD

@@ -1,4 +1,7 @@
 aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
+aient/architext/test.py,sha256=nLrF8AkVO1minNf8Us1FS4YkGuXhwMTp8E-VRUvUXh8,4115
+aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
+aient/architext/architext/core.py,sha256=l-bjazODG5tkYQ_fVS8df-xg0TFkBK5oVOF8Uz5Wdqg,7843
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=KMlCRLjtq1wQHZTJGqnbWhPS2cHq6eLdnk7peKDrzR8,7490
@@ -30,8 +33,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.89.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.89.dist-info/METADATA,sha256=nm5ByqWMd1QUeKvHdPUnzKwapeaRFxfqhCPCOnClxnE,4842
-aient-1.1.89.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.89.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.89.dist-info/RECORD,,
+aient-1.1.90.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.90.dist-info/METADATA,sha256=IHi6EZF4kBr85Ape07JXmYtzBlwha3yNkst8uf9oSEQ,4842
+aient-1.1.90.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.90.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.90.dist-info/RECORD,,