aient 1.2.14__py3-none-any.whl → 1.2.16__py3-none-any.whl

aient/architext/architext/core.py

@@ -58,11 +58,11 @@ class ContentBlock:
 
 # 2. 上下文提供者 (带缓存)
 class ContextProvider(ABC):
-    def __init__(self, name: str):
+    def __init__(self, name: str, visible: bool = True):
         self.name = name
         self._cached_content: Optional[str] = None
         self._is_stale: bool = True
-        self._visible: bool = True
+        self._visible: bool = visible
 
     def __str__(self):
         # This allows the object to be captured when used inside an f-string.
@@ -96,8 +96,15 @@ class ContextProvider(ABC):
             return ContentBlock(self.name, self._cached_content)
         return None
 
+    def __add__(self, other):
+        if isinstance(other, Message):
+            # Create a new message of the same type as `other`, with `self` prepended.
+            new_items = [self] + other.provider()
+            return type(other)(*new_items)
+        return NotImplemented
+
 class Texts(ContextProvider):
-    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None):
+    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None, visible: bool = True):
         if text is None and name is None:
             raise ValueError("Either 'text' or 'name' must be provided.")
 
@@ -119,7 +126,7 @@ class Texts(ContextProvider):
                 _name = f"text_{h[:8]}"
         else:
             _name = name
-        super().__init__(_name)
+        super().__init__(_name, visible=visible)
 
     async def refresh(self):
         if self._is_dynamic:
@@ -180,8 +187,8 @@ class Texts(ContextProvider):
         return self.content == other.content
 
 class Tools(ContextProvider):
-    def __init__(self, tools_json: Optional[List[Dict]] = None, name: str = "tools"):
-        super().__init__(name)
+    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 []
     def update(self, tools_json: List[Dict]):
         self._tools_json = tools_json
@@ -197,8 +204,8 @@ class Tools(ContextProvider):
         return self._tools_json == other._tools_json
 
 class Files(ContextProvider):
-    def __init__(self, *paths: Union[str, List[str]], name: str = "files"):
-        super().__init__(name)
+    def __init__(self, *paths: Union[str, List[str]], name: str = "files", visible: bool = True):
+        super().__init__(name, visible=visible)
         self._files: Dict[str, str] = {}
 
         file_paths: List[str] = []
@@ -278,8 +285,8 @@ class Files(ContextProvider):
         return self._files == other._files
 
 class Images(ContextProvider):
-    def __init__(self, url: str, name: Optional[str] = None):
-        super().__init__(name or url)
+    def __init__(self, url: str, name: Optional[str] = None, visible: bool = True):
+        super().__init__(name or url, visible=visible)
         self.url = url
     def update(self, url: str):
         self.url = url

aient/architext/test/test.py

@@ -1158,7 +1158,46 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         with self.assertRaises(IndexError):
             _ = mess[2]
 
-    async def test_zb_message_provider_by_name(self):
+    async def test_zb_fstring_provider_invisible_on_init(self):
+        """测试在f-string中初始化的provider可以被设置为不可见"""
+
+        # 1. 在 f-string 中初始化一个 provider 并设置 visible=False
+        # 在修改前，这会因为 __init__ 不接受 'visible' 参数而失败
+        message_with_invisible_provider = f"""
+Tools: {Tools(tools_json=[{"name": "should_not_appear"}], visible=False)}
+Files: {Files(visible=True, name="files")}
+"""
+
+        messages = Messages(UserMessage(message_with_invisible_provider))
+
+        # 2. 准备 Files provider 的内容
+        test_file = "test_invisible_fstring.txt"
+        with open(test_file, "w") as f:
+            f.write("visible content")
+
+        try:
+            files_provider = messages.provider("files")
+            self.assertIsNotNone(files_provider)
+            files_provider.update(test_file)
+
+            # 3. 渲染并验证
+            rendered = await messages.render_latest()
+            self.assertEqual(len(rendered), 1)
+            content = rendered[0]['content']
+
+            # 4. 验证不可见的 provider 的内容没有出现
+            self.assertNotIn("<tools>", content)
+            self.assertNotIn("should_not_appear", content)
+
+            # 5. 验证可见的 provider 的内容正常出现
+            self.assertIn("<latest_file_content>", content)
+            self.assertIn("visible content", content)
+
+        finally:
+            if os.path.exists(test_file):
+                os.remove(test_file)
+
+    async def test_zc_message_provider_by_name(self):
         """测试是否可以通过名称从 Message 对象中获取 provider"""
         # 1. 创建一个包含命名 provider 的 Message
         message = UserMessage(
@@ -1182,7 +1221,7 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         non_existent_provider = message.provider("non_existent")
         self.assertIsNone(non_existent_provider)
 
-    async def test_zc_slicing_support(self):
+    async def test_zd_slicing_support(self):
         """测试 Messages 对象是否支持切片操作"""
         m1 = SystemMessage("1")
         m2 = UserMessage("2")
@@ -1217,7 +1256,7 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         self.assertEqual(len(sliced_single), 1)
         self.assertIs(sliced_single[0], m3)
 
-    async def test_zd_slice_assignment(self):
+    async def test_ze_slice_assignment(self):
         """测试 Messages 对象的切片赋值功能"""
         # 1. Setup initial Messages objects
         m1 = SystemMessage("1")
@@ -1258,7 +1297,7 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         self.assertEqual(messages3[2].content, "C")
         self.assertIsInstance(messages3[1], AssistantMessage)
 
-    async def test_ze_fstring_lambda_serialization(self):
+    async def test_zf_fstring_lambda_serialization(self):
         """测试包含 lambda 的 f-string 消息是否可以被序列化和反序列化"""
         import platform
         import os
@@ -1302,6 +1341,51 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
             if os.path.exists(test_file_path):
                 os.remove(test_file_path)
 
+    async def test_zg_provider_plus_message_addition(self):
+        """测试所有 ContextProvider 子类与 Message 子类相加的功能"""
+        # 1. 准备 providers
+        text_provider = Texts("Some text.")
+        tools_provider = Tools([{"name": "a_tool"}])
+
+        test_file = "test_provider_addition.txt"
+        with open(test_file, "w") as f: f.write("File content.")
+        files_provider = Files(test_file)
+
+        providers_to_test = [text_provider, tools_provider, files_provider]
+
+        # 2. 准备 message aclsdd
+        messages_to_test = [
+            UserMessage(Texts("Initial user message.")),
+            SystemMessage(Texts("Initial system message.")),
+            AssistantMessage(Texts("Initial assistant message."))
+        ]
+
+        try:
+            for provider in providers_to_test:
+                for message in messages_to_test:
+                    with self.subTest(provider=type(provider).__name__, message=type(message).__name__):
+                        # 执行加法操作
+                        result_message = provider + message
+
+                        # 验证结果类型是否与原始 message 相同
+                        self.assertIsInstance(result_message, type(message), f"结果应为 {type(message).__name__} 类型")
+
+                        # 验证 provider 数量
+                        self.assertEqual(len(result_message), 2, "结果消息应包含两个 provider")
+
+                        # 验证 provider 的类型和顺序
+                        result_providers = result_message.provider()
+                        self.assertIsInstance(result_providers[0], type(provider), f"第一个 provider 应为 {type(provider).__name__} 类型")
+                        self.assertIsInstance(result_providers[1], Texts, "第二个 provider 应为 Texts 类型")
+
+                        # 验证原始消息没有被修改
+                        self.assertEqual(len(message), 1)
+
+        finally:
+            # 3. 清理文件
+            if os.path.exists(test_file):
+                os.remove(test_file)
+
 
 # ==============================================================================
 # 6. 演示

{aient-1.2.14.dist-info → aient-1.2.16.dist-info}/METADATA

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

{aient-1.2.14.dist-info → aient-1.2.16.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=lMXqjpSr7J80xuuWv5IHy04kcHbTwHWtRoIcsr6MR3o,28433
+aient/architext/architext/core.py,sha256=KLRixiSd6q2B5Yq62U0q-ebPMySbzJNc8g8VQTsf1C0,28894
 aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-aient/architext/test/test.py,sha256=XOSbDD-hlBnZiu5-500T-sy0m61zsq2SqQgFIoK6TJ0,61137
+aient/architext/test/test.py,sha256=KKQwaxsumYQkbUl2M1tIn0gJyymGH9P8tWxd7A8HRDc,64739
 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.2.14.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.2.14.dist-info/METADATA,sha256=tQdhHerrxIMTpSDXcyzXLWx0W9YoGHQfQlGEmI7tW6k,4842
-aient-1.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.2.14.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.2.14.dist-info/RECORD,,
+aient-1.2.16.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.2.16.dist-info/METADATA,sha256=nPvLpHDPPi-Z8jNKlgdM8m7GNvfhohV5AAvbiHIzHS0,4842
+aient-1.2.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.2.16.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.2.16.dist-info/RECORD,,