aient 1.2.1__tar.gz → 1.2.3__tar.gz

{aient-1.2.1 → aient-1.2.3}/PKG-INFO

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

{aient-1.2.1 → aient-1.2.3}/aient/architext/architext/core.py

@@ -142,6 +142,15 @@ class Texts(ContextProvider):
     async def render(self) -> Optional[str]:
         return self.content
 
+    def __eq__(self, other):
+        if not isinstance(other, Texts):
+            return NotImplemented
+        # If either object is dynamic, they are only equal if they are the exact same object.
+        if self._is_dynamic or (hasattr(other, '_is_dynamic') and other._is_dynamic):
+            return self is other
+        # For static content, compare the actual content.
+        return self.content == other.content
+
 class Tools(ContextProvider):
     def __init__(self, tools_json: Optional[List[Dict]] = None, name: str = "tools"):
         super().__init__(name)
@@ -154,6 +163,11 @@ class Tools(ContextProvider):
             return None
         return f"<tools>{str(self._tools_json)}</tools>"
 
+    def __eq__(self, other):
+        if not isinstance(other, Tools):
+            return NotImplemented
+        return self._tools_json == other._tools_json
+
 class Files(ContextProvider):
     def __init__(self, *paths: Union[str, List[str]], name: str = "files"):
         super().__init__(name)
@@ -230,6 +244,11 @@ class Files(ContextProvider):
         if not self._files: return None
         return "<latest_file_content>" + "\n".join([f"<file><file_path>{p}</file_path><file_content>{c}</file_content></file>" for p, c in self._files.items()]) + "\n</latest_file_content>"
 
+    def __eq__(self, other):
+        if not isinstance(other, Files):
+            return NotImplemented
+        return self._files == other._files
+
 class Images(ContextProvider):
     def __init__(self, url: str, name: Optional[str] = None):
         super().__init__(name or url)
@@ -250,6 +269,11 @@ class Images(ContextProvider):
             logging.warning(f"Image file not found: {self.url}. Skipping.")
             return None # Or handle error appropriately
 
+    def __eq__(self, other):
+        if not isinstance(other, Images):
+            return NotImplemented
+        return self.url == other.url
+
 # 3. 消息类 (已合并 MessageContent)
 class Message(ABC):
     def __init__(self, role: str, *initial_items: Union[ContextProvider, str, list]):
@@ -297,6 +321,16 @@ class Message(ABC):
         self._items: List[ContextProvider] = processed_items
         self._parent_messages: Optional['Messages'] = None
 
+    @property
+    def content(self) -> Optional[Union[str, List[Dict[str, Any]]]]:
+        """
+        Renders the message content.
+        For simple text messages, returns a string.
+        For multimodal messages, returns a list of content blocks.
+        """
+        rendered_dict = self.to_dict()
+        return rendered_dict.get('content') if rendered_dict else None
+
     def _render_content(self) -> str:
         final_parts = []
         for item in self._items:
@@ -346,26 +380,36 @@ class Message(ABC):
             return type(self)(*new_items)
         return NotImplemented
 
-    def __getitem__(self, key: str) -> Any:
+    def __getitem__(self, key: Union[str, int]) -> Any:
         """
-        使得 Message 对象支持字典风格的访问 (e.g., message['content'])。
+        使得 Message 对象支持字典风格的访问 (e.g., message['content'])
+        和列表风格的索引访问 (e.g., message[-1])。
         """
-        if key == 'role':
-            return self.role
-        elif key == 'content':
-            # 直接调用 to_dict 并提取 'content'，确保逻辑一致
-            rendered_dict = self.to_dict()
-            return rendered_dict.get('content') if rendered_dict else None
-        # 对于 tool_calls 等特殊属性，也通过 to_dict 获取
-        elif hasattr(self, key):
-            rendered_dict = self.to_dict()
-            if rendered_dict and key in rendered_dict:
-                return rendered_dict[key]
-
-        # 如果在对象本身或其 to_dict() 中都找不到，则引发 KeyError
-        if hasattr(self, key):
-             return getattr(self, key)
-        raise KeyError(f"'{key}'")
+        if isinstance(key, str):
+            if key == 'role':
+                return self.role
+            elif key == 'content':
+                # 直接调用 to_dict 并提取 'content'，确保逻辑一致
+                rendered_dict = self.to_dict()
+                return rendered_dict.get('content') if rendered_dict else None
+            # 对于 tool_calls 等特殊属性，也通过 to_dict 获取
+            elif hasattr(self, key):
+                rendered_dict = self.to_dict()
+                if rendered_dict and key in rendered_dict:
+                    return rendered_dict[key]
+
+            # 如果在对象本身或其 to_dict() 中都找不到，则引发 KeyError
+            if hasattr(self, key):
+                 return getattr(self, key)
+            raise KeyError(f"'{key}'")
+        elif isinstance(key, int):
+            return self._items[key]
+        else:
+            raise TypeError(f"Message indices must be integers or strings, not {type(key).__name__}")
+
+    def __len__(self) -> int:
+        """返回消息中 provider 的数量。"""
+        return len(self._items)
 
     def __repr__(self): return f"Message(role='{self.role}', items={[i.name for i in self._items]})"
     def __bool__(self) -> bool:
@@ -444,15 +488,17 @@ class ToolCalls(Message):
 class ToolResults(Message):
     """Represents a tool message with the result of a single tool call."""
     def __init__(self, tool_call_id: str, content: str):
-        super().__init__("tool")
+        # We pass a Texts provider to the parent so it can be rendered,
+        # but the primary way to access content for ToolResults is via its dict representation.
+        super().__init__("tool", Texts(text=content))
         self.tool_call_id = tool_call_id
-        self.content = content
+        self._content = content
 
     def to_dict(self) -> Dict[str, Any]:
         return {
             "role": self.role,
             "tool_call_id": self.tool_call_id,
-            "content": self.content
+            "content": self._content
         }
 
 # 4. 顶层容器: Messages

{aient-1.2.1 → aient-1.2.3}/aient/architext/test/test.py

@@ -1102,6 +1102,62 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         self.assertIn("Third explanation.", rendered_final[0]['content'])
         self.assertIn("Some other text.", rendered_final[0]['content'])
 
+    async def test_z9_rolemessage_content_access(self):
+        """测试是否支持 RoleMessage.content 来访问渲染好的内容"""
+        # 1. 创建一个简单的 UserMessage
+        user_message = UserMessage("你好, Architext!")
+        # 对于简单的 Texts, refresh 不是必须的, 但这是个好习惯
+        # Message 类本身没有 refresh, 调用其 providers 的 refresh
+        for p in user_message.providers():
+            await p.refresh()
+
+        # 2. 直接访问 .content 属性
+        # 在实现该功能前，这行代码会因 AttributeError 而失败
+        self.assertEqual(user_message.content, "你好, Architext!")
+
+        # 3. 创建一个多模态消息
+        multimodal_message = AssistantMessage(
+            "这是一张图片:",
+            Images(url="data:image/png;base64,FAKE_IMG_DATA")
+        )
+        for p in multimodal_message.providers():
+            await p.refresh()
+
+        # 4. 访问多模态消息的 .content 属性，期望返回一个列表
+        content_list = multimodal_message.content
+        self.assertIsInstance(content_list, list)
+        self.assertEqual(len(content_list), 2)
+        self.assertEqual(content_list[0]['type'], 'text')
+        self.assertEqual(content_list[1]['type'], 'image_url')
+
+        # 5. 测试通过 RoleMessage 工厂创建的消息
+        role_message = RoleMessage('user', "通过工厂创建的内容")
+        for p in role_message.providers():
+            await p.refresh()
+        self.assertEqual(role_message.content, "通过工厂创建的内容")
+
+    async def test_za_message_indexing_and_length(self):
+        """测试 Message 对象是否支持通过索引访问 provider 以及获取长度"""
+        # 1. 创建一个 UserMessage
+        mess = UserMessage(
+            Texts("some instruction"),
+            Texts("hi", name="done")
+        )
+
+        # 2. 测试获取长度
+        # 这在实现 __len__ 之前会失败
+        self.assertEqual(len(mess), 2)
+
+        # 3. 测试通过索引访问
+        # 这在修改 __getitem__ 之前会失败
+        self.assertEqual(mess[-1].name, "done")
+        self.assertEqual(mess[0].name, Texts("some instruction").name)
+        self.assertEqual(mess[0], Texts("some instruction"))
+
+        # 4. 测试索引越界
+        with self.assertRaises(IndexError):
+            _ = mess[2]
+
 # ==============================================================================
 # 6. 演示
 # ==============================================================================

{aient-1.2.1 → aient-1.2.3}/aient.egg-info/PKG-INFO

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

{aient-1.2.1 → aient-1.2.3}/pyproject.toml

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