aient 1.2.30__py3-none-any.whl → 1.2.32__py3-none-any.whl

aient/architext/architext/core.py

@@ -104,9 +104,10 @@ class ContextProvider(ABC):
         return NotImplemented
 
 class Texts(ContextProvider):
-    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None, visible: bool = True):
+    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None, visible: bool = True, newline: bool = False):
         if text is None and name is None:
             raise ValueError("Either 'text' or 'name' must be provided.")
+        self.newline = newline
 
         # Ensure that non-callable inputs are treated as strings
         if not callable(text):
@@ -373,8 +374,11 @@ class Message(ABC):
         for item in self._items:
             block = item.get_content_block()
             if block and block.content is not None:
+                # Check if it's a Texts provider with newline=True
+                # and it's not the very first item with content.
+                if isinstance(item, Texts) and hasattr(item, 'newline') and item.newline and final_parts:
+                    final_parts.append("\n\n")
                 final_parts.append(block.content)
-
         return "".join(final_parts)
 
     def pop(self, name: str) -> Optional[ContextProvider]:
@@ -468,6 +472,35 @@ class Message(ABC):
         # and our custom __eq__ on ContextProvider handles the comparison logic.
         return item in self._items
 
+    def has(self, provider_type: type) -> bool:
+        """Checks if the message contains a provider of a specific type."""
+        if not isinstance(provider_type, type) or not issubclass(provider_type, ContextProvider):
+            raise TypeError("provider_type must be a subclass of ContextProvider")
+        return any(isinstance(p, provider_type) for p in self._items)
+
+    def lstrip(self, provider_type: type):
+        """
+        从消息的左侧（开头）移除所有指定类型的 provider。
+        移除操作会一直持续，直到遇到一个不同类型的 provider 为止。
+        """
+        while self._items and type(self._items[0]) is provider_type:
+            self.pop(self._items[0].name)
+
+    def rstrip(self, provider_type: type):
+        """
+        从消息的右侧（末尾）移除所有指定类型的 provider。
+        移除操作会一直持续，直到遇到一个不同类型的 provider 为止。
+        """
+        while self._items and type(self._items[-1]) is provider_type:
+            self.pop(self._items[-1].name)
+
+    def strip(self, provider_type: type):
+        """
+        从消息的两侧移除所有指定类型的 provider。
+        """
+        self.lstrip(provider_type)
+        self.rstrip(provider_type)
+
     def __bool__(self) -> bool:
         return bool(self._items)
     def get(self, key: str, default: Any = None) -> Any:

aient/architext/test/test.py

@@ -1454,6 +1454,130 @@ Files: {Files(visible=True, name="files")}
         self.assertEqual(len(message_mixed.provider()), 1)
         self.assertIsInstance(message_mixed.provider()[0], Texts)
 
+    async def test_zaa_has_method_for_provider_type_check(self):
+        """测试 Message.has(type) 方法是否能正确检查 provider 类型"""
+        # 1. 创建一个混合类型的消息
+        message_with_text = UserMessage(Texts("hi"), Images("url"))
+
+        # 2. 测试存在的情况
+        # This line is expected to fail with an AttributeError before implementation
+        self.assertTrue(message_with_text.has(Texts))
+        self.assertTrue(message_with_text.has(Images))
+
+        # 3. 测试不存在的情况
+        self.assertFalse(message_with_text.has(Tools))
+
+        # 4. 测试空消息
+        empty_message = UserMessage()
+        self.assertFalse(empty_message.has(Texts))
+
+        # 5. 测试传入无效类型
+        with self.assertRaises(TypeError):
+            message_with_text.has(str)
+
+        with self.assertRaises(TypeError):
+            # Also test with a class that is not a subclass of ContextProvider
+            class NotAProvider: pass
+            message_with_text.has(NotAProvider)
+
+    async def test_zab_lstrip_and_rstrip(self):
+        """测试 lstrip, rstrip, 和 strip 方法是否能正确移除两侧的特定类型的 provider"""
+        # 1. 定义一个用于测试的子类
+        class SpecialTexts(Texts):
+            pass
+        url = "data:image/png;base64,FAKE_IMG"
+
+        # 2. 创建一个复杂的测试消息
+        message = UserMessage(
+            Texts("leading1"),
+            Texts("leading2"),
+            Images(url, name="image1"),
+            Texts("middle"),
+            SpecialTexts("special_middle"),
+            Images(url, name="image2"),
+            Texts("trailing1"),
+            SpecialTexts("special_trailing"), # rstrip(Texts) should stop here
+            Texts("trailing2")
+        )
+
+        # 3. 测试 rstrip(Texts)
+        r_stripped_message = UserMessage(*message.provider()) # 创建副本
+        r_stripped_message.rstrip(Texts)
+        # 应移除 "trailing2"，但在 "special_trailing" 处停止
+        self.assertEqual(len(r_stripped_message), 8)
+        self.assertIs(type(r_stripped_message[-1]), SpecialTexts)
+
+        # 4. 测试 lstrip(Texts)
+        l_stripped_message = UserMessage(*message.provider()) # 创建副本
+        l_stripped_message.lstrip(Texts)
+        # 应移除 "leading1" 和 "leading2"，但在 "image1" 处停止
+        self.assertEqual(len(l_stripped_message), 7)
+        self.assertIs(type(l_stripped_message[0]), Images)
+
+        # 5. 测试 strip(Texts)
+        stripped_message = UserMessage(*message.provider()) # 创建副本
+        stripped_message.strip(Texts)
+        # 应同时移除 "leading1", "leading2", 和 "trailing2"
+        self.assertEqual(len(stripped_message), 6)
+        self.assertIs(type(stripped_message[0]), Images)
+        self.assertIs(type(stripped_message[-1]), SpecialTexts)
+
+        # 6. 测试在一个只包含一种类型的消息上进行剥离
+        only_texts = UserMessage(Texts("a"), Texts("b"))
+        only_texts.strip(Texts)
+        self.assertEqual(len(only_texts), 0)
+
+        # 7. 测试剥离一个不包含目标类型的消息
+        only_images = UserMessage(Images("url1"), Images("url2"))
+        only_images.strip(Texts)
+        self.assertEqual(len(only_images), 2) # 不应改变
+
+        # 8. 测试在一个空消息上进行剥离
+        empty_message = UserMessage()
+        empty_message.strip(Texts)
+        self.assertEqual(len(empty_message), 0)
+
+        # 9. 测试剥离子类
+        message_ending_with_special = UserMessage(Texts("a"), SpecialTexts("b"))
+        message_ending_with_special.rstrip(SpecialTexts)
+        self.assertEqual(len(message_ending_with_special), 1)
+        self.assertIsInstance(message_ending_with_special[0], Texts)
+
+    async def test_zac_texts_join_parameter(self):
+        """测试 Texts provider 是否支持通过参数控制拼接方式"""
+        # 1. 测试默认行为：直接拼接
+        message_default = UserMessage(
+            Texts("First line."),
+            Texts("Second line.")
+        )
+        rendered_default = await message_default.render_latest()
+        self.assertEqual(rendered_default['content'], "First line.Second line.")
+
+        # 2. 测试新功能：使用 \n\n 拼接
+        # 假设新参数为 `newline=True`
+        message_newline = UserMessage(
+            Texts("First paragraph."),
+            Texts("Second paragraph.", newline=True)
+        )
+        rendered_newline = await message_newline.render_latest()
+        self.assertEqual(rendered_newline['content'], "First paragraph.\n\nSecond paragraph.")
+
+        # 3. 测试多个 provider 的情况
+        message_multiple = UserMessage(
+            Texts("First."),
+            Texts("Second.", newline=True),
+            Texts("Third.", newline=True)
+        )
+        rendered_multiple = await message_multiple.render_latest()
+        self.assertEqual(rendered_multiple['content'], "First.\n\nSecond.\n\nThird.")
+
+        # 4. 测试只有一个 provider 的情况
+        message_single = UserMessage(
+            Texts("Only one.", newline=True)
+        )
+        rendered_single = await message_single.render_latest()
+        self.assertEqual(rendered_single['content'], "Only one.")
+
 
 # ==============================================================================
 # 6. 演示

aient/models/chatgpt.py

@@ -17,6 +17,21 @@ from ..core.request import prepare_request_payload
 from ..core.response import fetch_response_stream, fetch_response
 from ..architext.architext import Messages, SystemMessage, UserMessage, AssistantMessage, ToolCalls, ToolResults, Texts, RoleMessage, Images, Files
 
+class ToolResult(Texts):
+    def __init__(self, tool_name: str, tool_args: str, tool_response: str, name: Optional[str] = None, visible: bool = True, newline: bool = True):
+        super().__init__(text=tool_response, name=name or f"tool_result_{tool_name}", visible=visible, newline=newline)
+        self.tool_name = tool_name
+        self.tool_args = tool_args
+
+    async def render(self) -> Optional[str]:
+        tool_response = await super().render()
+        if tool_response is None:
+            tool_response = ""
+        if self.tool_args:
+            return f"[{self.tool_name}({self.tool_args}) Result]:\n\n{tool_response}"
+        else:
+            return f"[{self.tool_name} Result]:\n\n{tool_response}"
+
 class APITimeoutError(Exception):
     """Custom exception for API timeout errors."""
     pass
@@ -172,8 +187,8 @@ class chatgpt(BaseLLM):
                 self.conversation[convo_id].append(ToolCalls(tool_calls))
                 self.conversation[convo_id].append(ToolResults(tool_call_id=function_call_id, content=message))
             else:
-                last_user_message = self.conversation[convo_id][-1]["content"]
-                if last_user_message != message:
+                last_user_message = self.conversation[convo_id][-1]
+                if last_user_message != UserMessage(message):
                     image_message_list = UserMessage()
                     if isinstance(function_arguments, str):
                         functions_list = json.loads(function_arguments)
@@ -564,7 +579,7 @@ class chatgpt(BaseLLM):
                 tool_calls = function_parameter
 
             # 处理所有工具调用
-            all_responses = []
+            all_responses = UserMessage()
 
             for tool_info in tool_calls:
                 tool_name = tool_info['function_name']
@@ -584,27 +599,28 @@ class chatgpt(BaseLLM):
                             tool_response = chunk.replace("function_response:", "")
                         else:
                             yield chunk
-                if tool_name == "read_file" and "<tool_error>" not in tool_response:
-                    self.conversation[convo_id].provider("files").update(tool_info['parameter']["file_path"], tool_response)
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead file successfully! The file content has been updated in the tag <latest_file_content>.")
-                elif tool_name == "get_knowledge_graph_tree" and "<tool_error>" not in tool_response:
-                    self.conversation[convo_id].provider("knowledge_graph").visible = True
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nGet knowledge graph tree successfully! The knowledge graph tree has been updated in the tag <knowledge_graph_tree>.")
-                elif tool_name == "write_to_file" and "<tool_error>" not in tool_response:
-                    all_responses.append(f"[{tool_name} Result]:\n\n{tool_response}")
-                elif tool_name == "read_image" and "<tool_error>" not in tool_response:
-                    tool_info["base64_image"] = tool_response
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead image successfully!")
-                elif tool_response.startswith("data:image/") and ";base64," in tool_response and "<tool_error>" not in tool_response:
-                    tool_info["base64_image"] = tool_response
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead image successfully!")
-                else:
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
+                final_tool_response = tool_response
+                if "<tool_error>" not in tool_response:
+                    if tool_name == "read_file":
+                        self.conversation[convo_id].provider("files").update(tool_info['parameter']["file_path"], tool_response)
+                        final_tool_response = "Read file successfully! The file content has been updated in the tag <latest_file_content>."
+                    elif tool_name == "get_knowledge_graph_tree":
+                        self.conversation[convo_id].provider("knowledge_graph").visible = True
+                        final_tool_response = "Get knowledge graph tree successfully! The knowledge graph tree has been updated in the tag <knowledge_graph_tree>."
+                    elif tool_name == "write_to_file":
+                        tool_args = None
+                    elif tool_name == "read_image":
+                        tool_info["base64_image"] = tool_response
+                        final_tool_response = "Read image successfully!"
+                    elif tool_response.startswith("data:image/") and ";base64," in tool_response:
+                        tool_info["base64_image"] = tool_response
+                        final_tool_response = "Read image successfully!"
+                all_responses.append(ToolResult(tool_name, tool_args, final_tool_response))
 
             # 合并所有工具响应
-            function_response = "\n\n".join(all_responses).strip()
+            function_response = all_responses
             if missing_required_params:
-                function_response += "\n\n" + "\n\n".join(missing_required_params)
+                function_response.append(Texts("\n\n".join(missing_required_params)))
 
             # 使用第一个工具的名称和参数作为历史记录
             function_call_name = tool_calls[0]['function_name']
@@ -672,7 +688,7 @@ class chatgpt(BaseLLM):
         # 准备会话
         self.system_prompt = system_prompt or self.system_prompt
         if convo_id not in self.conversation or pass_history <= 2:
-            self.reset(convo_id=convo_id, system_prompt=system_prompt)
+            self.reset(convo_id=convo_id, system_prompt=self.system_prompt)
         self.add_to_conversation(prompt, role, convo_id=convo_id, function_name=function_name, total_tokens=total_tokens, function_arguments=function_arguments, pass_history=pass_history, function_call_id=function_call_id)
 
         # 获取请求体
@@ -929,7 +945,7 @@ class chatgpt(BaseLLM):
         """
         self.system_prompt = system_prompt or self.system_prompt
         self.conversation[convo_id] = Messages(
-            SystemMessage(Texts("system_prompt", self.system_prompt), self.conversation[convo_id].provider("files")),
+            SystemMessage(self.system_prompt, self.conversation[convo_id].provider("files")),
         )
         self.tokens_usage[convo_id] = 0
         self.current_tokens[convo_id] = 0

{aient-1.2.30.dist-info → aient-1.2.32.dist-info}/METADATA

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

{aient-1.2.30.dist-info → aient-1.2.32.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=tfaAwdVN0Q1LK9Dz91Yyc83UJeVba-9LYgQ8cyp6xHQ,30887
+aient/architext/architext/core.py,sha256=KHzc6ly4vNYie2kRfPokDGhfTz3CvntuiSd-XyE3cAM,32502
 aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-aient/architext/test/test.py,sha256=uo1hSFnzV-8DeuPE0K3R0-K-cotitLEMidFj7SQn3UQ,67633
+aient/architext/test/test.py,sha256=9OQ12qAs81Ce6KCKXQx4Re0P9VjNuTF4rZRcTRstJVw,72868
 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
@@ -17,7 +17,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 aient/models/audio.py,sha256=FNW4lxG1IhxOU7L8mvcbaeC1nXk_lpUZQlg9ijQ0h_Q,1937
 aient/models/base.py,sha256=HWIGfa2A7OTccvHK0wG1-UlHB-yaWRC7hbi4oR1Mu1Y,7228
-aient/models/chatgpt.py,sha256=A8tZl-a00EZxGYKQBOiNh-kG-YjU-zsj0XbeIzcbf6o,42916
+aient/models/chatgpt.py,sha256=7gvajJ-XJJGWQVHSOzoLgzHe6Dw0RV7O9ZwNt6GNGwg,43339
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -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=ZvGAt_ImJ_CGbDnWgpsWskfSV5fCkpFKRpNQjYL7M7s,11100
 aient/utils/scripts.py,sha256=Q0tS7E9AmdikO7GeDBd_3Ii5opXHCvKjDGqHsXen6_A,40622
-aient-1.2.30.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.2.30.dist-info/METADATA,sha256=uFCKPmb6M_-Fehq-bpgkcFhK6zu6IqlVnGVKsgZH_8g,4842
-aient-1.2.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.2.30.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.2.30.dist-info/RECORD,,
+aient-1.2.32.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.2.32.dist-info/METADATA,sha256=FvKdHORtaNK-IdPsnBTdpgkGXWCdJI5Lm6RsOync1oE,4842
+aient-1.2.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.2.32.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.2.32.dist-info/RECORD,,