aient 1.2.15__tar.gz → 1.2.17__tar.gz

{aient-1.2.15 → aient-1.2.17}/PKG-INFO

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

{aient-1.2.15 → aient-1.2.17}/aient/architext/architext/core.py

@@ -96,6 +96,13 @@ 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, visible: bool = True):
         if text is None and name is None:
@@ -665,30 +672,48 @@ class Messages:
             return Messages(*self._messages[index])
         return self._messages[index]
 
-    def __setitem__(self, index: slice, value: 'Messages'):
-        if not isinstance(index, slice) or not isinstance(value, Messages):
-            raise TypeError("Unsupported operand type(s) for slice assignment")
-
-        # Basic slice assignment logic.
-        # A more robust implementation would handle step and negative indices.
-        start, stop, step = index.indices(len(self._messages))
+    def __setitem__(self, index: Union[int, slice], value: Union[Message, 'Messages']):
+        if isinstance(index, int):
+            if not isinstance(value, Message):
+                raise TypeError("When assigning to an index, the value must be a Message.")
 
-        if step != 1:
-            raise ValueError("Slice assignment with step is not supported.")
+            if not (-len(self._messages) <= index < len(self._messages)):
+                raise IndexError("Messages assignment index out of range")
 
-        # Remove old providers from the index
-        for i in range(start, stop):
-            for provider in self._messages[i].provider():
+            # Get old message to remove its providers
+            old_message = self._messages[index]
+            for provider in old_message.provider():
                 self._notify_provider_removed(provider)
 
-        # Replace the slice in the list
-        self._messages[start:stop] = value._messages
+            # Assign new message
+            self._messages[index] = value
+            value._parent_messages = self
+            for provider in value.provider():
+                self._notify_provider_added(provider, value)
+
+        elif isinstance(index, slice):
+            if not isinstance(value, Messages):
+                raise TypeError("When assigning to a slice, the value must be a Messages object.")
 
-        # Add new providers to the index and set parent
-        for msg in value:
-            msg._parent_messages = self
-            for provider in msg.provider():
-                self._notify_provider_added(provider, msg)
+            start, stop, step = index.indices(len(self._messages))
+            if step != 1:
+                raise ValueError("Slice assignment with step is not supported.")
+
+            # Remove old providers from the index
+            for i in range(start, stop):
+                for provider in self._messages[i].provider():
+                    self._notify_provider_removed(provider)
+
+            # Replace the slice in the list
+            self._messages[start:stop] = value._messages
+
+            # Add new providers to the index and set parent
+            for msg in value:
+                msg._parent_messages = self
+                for provider in msg.provider():
+                    self._notify_provider_added(provider, msg)
+        else:
+            raise TypeError("Unsupported operand type(s) for assignment")
 
     def __len__(self) -> int: return len(self._messages)
     def __iter__(self): return iter(self._messages)

{aient-1.2.15 → aient-1.2.17}/aient/architext/test/test.py

@@ -1341,6 +1341,74 @@ Files: {Files(visible=True, name="files")}
             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)
+
+    async def test_zh_provider_plus_message_assignment(self):
+        """测试 ContextProvider + Message 的结果可以赋值回 Messages 列表"""
+        # 1. 准备 provider 和 messages
+        text_provider = Texts("Prefix text.")
+        messages = Messages(
+            UserMessage("Initial user message.")
+        )
+
+        # 2. 执行操作
+        # 这行代码在修改 __setitem__ 之前应该会失败
+        messages[0] = text_provider + messages[0]
+
+        # 3. 验证结果
+        self.assertEqual(len(messages), 1)
+        self.assertEqual(len(messages[0]), 2) # Now UserMessage has two providers
+
+        # 4. 验证内容
+        rendered = await messages.render_latest()
+        self.assertEqual(rendered[0]['content'], "Prefix text.Initial user message.")
+
+        # 5. 验证 provider 索引
+        self.assertIsNotNone(messages.provider(text_provider.name))
+
 
 # ==============================================================================
 # 6. 演示

{aient-1.2.15 → aient-1.2.17}/aient.egg-info/PKG-INFO

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

{aient-1.2.15 → aient-1.2.17}/pyproject.toml

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