aient 1.2.35__py3-none-any.whl → 1.2.36__py3-none-any.whl

aient/architext/architext/core.py

@@ -324,19 +324,21 @@ class Images(ContextProvider):
 
 # 3. 消息类 (已合并 MessageContent)
 class Message(ABC):
-    def __init__(self, role: str, *initial_items: Union[ContextProvider, str, list]):
+    def __init__(self, role: str, *initial_items: Union[ContextProvider, str, list, 'Message']):
         self.role = role
         processed_items = []
         for item in initial_items:
             if item is None:
                 continue
-            if isinstance(item, str):
-                # Check if the string contains placeholders from f-string rendering
+
+            # This is the new recursive flattening logic
+            if isinstance(item, Message):
+                processed_items.extend(item.provider())
+            elif isinstance(item, str):
                 import re
                 placeholder_pattern = re.compile(r'(__provider_placeholder_[a-f0-9]{32}__)')
                 parts = placeholder_pattern.split(item)
-
-                if len(parts) > 1: # Placeholders were found
+                if len(parts) > 1:
                     for part in parts:
                         if not part: continue
                         if placeholder_pattern.match(part):
@@ -345,18 +347,14 @@ class Message(ABC):
                                 processed_items.append(provider)
                         else:
                             processed_items.append(Texts(text=part))
-                else: # No placeholders, just a regular string
+                else:
                     processed_items.append(Texts(text=item))
-
-            elif isinstance(item, Message):
-                processed_items.extend(item.provider())
             elif isinstance(item, ContextProvider):
                 processed_items.append(item)
             elif isinstance(item, list):
                 for sub_item in item:
                     if not isinstance(sub_item, dict) or 'type' not in sub_item:
                         raise ValueError("List items must be dicts with a 'type' key.")
-
                     item_type = sub_item['type']
                     if item_type == 'text':
                         processed_items.append(Texts(text=sub_item.get('text', '')))
@@ -519,10 +517,27 @@ class Message(ABC):
         """提供类似字典的 .get() 方法来访问属性。"""
         return getattr(self, key, default)
 
-    async def render_latest(self) -> Optional[Dict[str, Any]]:
-        """Refreshes all providers in the message and returns the rendered dictionary."""
+    async def refresh(self):
+        """刷新此消息中的所有 provider。"""
         tasks = [provider.refresh() for provider in self._items]
         await asyncio.gather(*tasks)
+
+    async def render(self) -> Optional[Dict[str, Any]]:
+        """
+        渲染消息为字典。首次调用时会隐式刷新以确保动态内容被加载。
+        后续调用将返回缓存版本，除非手动调用了 refresh()。
+        """
+        # 检查是否是首次渲染
+        is_first_render = not all(hasattr(p, '_cached_content') and p._cached_content is not None for p in self._items if p._is_stale)
+
+        if is_first_render:
+            await self.refresh()
+
+        return self.to_dict()
+
+    async def render_latest(self) -> Optional[Dict[str, Any]]:
+        """始终刷新并返回最新的渲染结果。"""
+        await self.refresh()
         return self.to_dict()
 
     def to_dict(self) -> Optional[Dict[str, Any]]:
@@ -595,12 +610,20 @@ 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):
-        # 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))
+    def __init__(self, tool_call_id: str, content: Union[str, Message]):
+        # The base Message class now handles the absorption of a Message object.
+        # We just need to pass the content to the parent __init__.
+        # For ToolResults, we primarily care about the textual content.
+        if isinstance(content, Message):
+             # Extract only text-like providers to pass to the parent
+            text_providers = [p for p in content.provider() if not isinstance(p, Images)]
+            super().__init__("tool", *text_providers)
+        else:
+            super().__init__("tool", content)
+
         self.tool_call_id = tool_call_id
-        self._content = content
+        # After initialization, render the content to a simple string for _content.
+        self._content = self._render_content()
 
     def to_dict(self) -> Dict[str, Any]:
         return {
@@ -780,7 +803,8 @@ class Messages:
 
     def __len__(self) -> int: return len(self._messages)
     def __iter__(self): return iter(self._messages)
-
+    def __repr__(self):
+        return f"Messages({repr(self._messages)})"
     def __contains__(self, item: Any) -> bool:
         """Checks if a Message or ContextProvider is in the collection."""
         if isinstance(item, Message):

aient/architext/test/test.py

@@ -1598,6 +1598,117 @@ Files: {Files(visible=True, name="files")}
         self.assertEqual(content[1]['type'], 'image_url')
         self.assertEqual(content[1]['image_url']['url'], "data:image/png;base64,FAKE")
 
+    async def test_zae_messages_representation(self):
+        """测试 Messages 对象的 __repr__ 方法是否提供可读的输出"""
+        messages = Messages(
+            UserMessage("Hello"),
+            AssistantMessage("Hi there!")
+        )
+
+        actual_repr = repr(messages)
+
+        # 一个可读的字符串形式应该像 Messages([...]) 这样，并包含其内部 message 的 repr
+        self.assertTrue(actual_repr.startswith("Messages(["), f"期望输出以 'Messages([' 开头，但得到 '{actual_repr}'")
+        self.assertTrue(actual_repr.endswith("])"), f"期望输出以 '])' 结尾，但得到 '{actual_repr}'")
+        self.assertIn("Message(role='user', items=", actual_repr)
+        self.assertIn("Message(role='assistant', items=", actual_repr)
+
+    async def test_zaf_message_absorption(self):
+        """测试Message对象是否能吸收嵌套的Message对象作为其内容"""
+        # 1. ToolResults吸收UserMessage
+        tool_results_1 = ToolResults(tool_call_id="call_1", content=UserMessage("hi"))
+        rendered_1 = await tool_results_1.render_latest()
+        self.assertEqual(rendered_1['content'], "hi")
+        self.assertEqual(rendered_1['tool_call_id'], "call_1")
+
+        # 2. UserMessage吸收AssistantMessage
+        user_message_1 = UserMessage("prefix", AssistantMessage("absorbed content"))
+        rendered_user_1 = await user_message_1.render_latest()
+        self.assertEqual(rendered_user_1['content'], "prefixabsorbed content")
+        self.assertEqual(len(user_message_1.provider()), 2) # Should be flattened
+
+        # 3. 复杂嵌套
+        final_message = ToolResults(tool_call_id="call_final", content=UserMessage("A", AssistantMessage("B", UserMessage("C"))))
+        rendered_final = await final_message.render_latest()
+        self.assertEqual(rendered_final['content'], "ABC")
+
+        # 4. 组合情况: ToolResults(UserMessage(Texts("a"), Texts("b"))) -> content="ab"
+        tool_results_2 = ToolResults(tool_call_id="call_2", content=UserMessage(Texts("a"), Texts("b")))
+        rendered_2 = await tool_results_2.render_latest()
+        self.assertEqual(rendered_2['content'], "ab")
+
+        # 5. 包含多模态内容的情况 (ToolResults应该只提取文本)
+        tool_results_3 = ToolResults(tool_call_id="call_3", content=UserMessage("text part", Images(url="some_url")))
+        rendered_3 = await tool_results_3.render_latest()
+        self.assertEqual(rendered_3['content'], "text part") # Images should be ignored
+
+        # 6. 直接传入字符串的情况应保持不变
+        tool_results_4 = ToolResults(tool_call_id="call_4", content="just a string")
+        rendered_4 = await tool_results_4.render_latest()
+        self.assertEqual(rendered_4['content'], "just a string")
+
+        # 7. 传入一个空的 Message
+        tool_results_5 = ToolResults(tool_call_id="call_5", content=UserMessage())
+        rendered_5 = await tool_results_5.render_latest()
+        self.assertEqual(rendered_5['content'], "")
+
+    async def test_zzb_final_message_render_logic(self):
+        """
+        最终版测试:
+        - render() 首次调用保证获取完整结果。
+        - 后续 render() 调用返回缓存结果，不会自动刷新。
+        - refresh() 显式刷新内容。
+        - render_latest() 总是获取最新内容。
+        """
+        from datetime import datetime
+        import time
+
+        # 1. 创建带有动态 provider 的 Message
+        timestamp_provider = Texts(lambda: str(datetime.now().timestamp()))
+        message = UserMessage("Time: ", timestamp_provider)
+
+        # 2. 第一次调用 render() - 应该刷新并返回完整内容
+        rendered_1 = await message.render()
+        content1 = rendered_1['content']
+        timestamp1_str = content1.replace("Time: ", "")
+        self.assertTrue(timestamp1_str, "render() 第一次调用应返回完整动态内容")
+
+        # 3. 第二次调用 render() - 不应自动刷新，返回缓存的内容
+        time.sleep(1)
+        rendered_2 = await message.render()
+        content2 = rendered_2['content']
+        self.assertEqual(content1, content2, "第二次调用 render() 应返回缓存内容，不应刷新")
+
+        # 4. 调用 refresh() - 显式刷新
+        time.sleep(1)
+        await message.refresh()
+
+        # 5. refresh() 后调用 render() - 应该返回刚刚刷新的新内容
+        rendered_3 = await message.render()
+        content3 = rendered_3['content']
+        timestamp3_str = content3.replace("Time: ", "")
+        self.assertNotEqual(content2, content3, "refresh() 后 render() 应返回新内容")
+
+        # 6. 调用 render_latest() - 总是获取最新内容
+        time.sleep(1)
+        rendered_latest = await message.render_latest()
+        content_latest = rendered_latest['content']
+        timestamp_latest_str = content_latest.replace("Time: ", "")
+        self.assertNotEqual(content3, content_latest, "render_latest() 应总是获取最新内容")
+
+        # 7. 测试 ToolResults
+        tool_results_msg = ToolResults(tool_call_id="call_123", content="Result from tool")
+        # ToolResults's content is static, so render() should always return the same full content
+        rendered_tool_1 = await tool_results_msg.render()
+        self.assertEqual(rendered_tool_1, {
+            "role": "tool",
+            "tool_call_id": "call_123",
+            "content": "Result from tool"
+        })
+        # Subsequent calls should also work
+        rendered_tool_2 = await tool_results_msg.render()
+        self.assertEqual(rendered_tool_1, rendered_tool_2)
+
 
 # ==============================================================================
 # 6. 演示

aient/core/response.py

@@ -45,8 +45,8 @@ async def gemini_json_poccess(response_json):
     if is_thinking:
         content = safe_get(json_data, "parts", 1, "text", default="")
 
-    function_call_name = safe_get(json_data, "functionCall", "name", default=None)
-    function_full_response = safe_get(json_data, "functionCall", "args", default="")
+    function_call_name = safe_get(json_data, "parts", 0, "functionCall", "name", default=None)
+    function_full_response = safe_get(json_data, "parts", 0, "functionCall", "args", default="")
     function_full_response = await asyncio.to_thread(json.dumps, function_full_response) if function_full_response else None
 
     blockReason = safe_get(json_data, 0, "promptFeedback", "blockReason", default=None)

aient/models/chatgpt.py

@@ -435,7 +435,7 @@ class chatgpt(BaseLLM):
             for chunk in process_sync():
                 yield chunk
 
-        if not full_response.strip():
+        if not full_response.strip() and not need_function_call:
             raise EmptyResponseError("Response is empty")
 
         if self.print_log:

{aient-1.2.35.dist-info → aient-1.2.36.dist-info}/METADATA

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

{aient-1.2.35.dist-info → aient-1.2.36.dist-info}/RECORD

@@ -1,14 +1,14 @@
 aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
-aient/architext/architext/core.py,sha256=XKMYDLdaTP6OWmNZLEF-b24KVDkMeM-xyVptmpXoBsU,33112
+aient/architext/architext/core.py,sha256=k5Sza5mrIuv_34T0qUmnFGqAZMFwWhudO96qVlnyA8c,34135
 aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-aient/architext/test/test.py,sha256=jxmEfZaeJWh3dq0f67TBTPMgT0FMK7eiTs9XcyAtFFg,73944
+aient/architext/test/test.py,sha256=pYDGN0Dvy5teeMcuglP4cQaESfjYdKf2Zx5m67cRPjA,79539
 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
 aient/core/models.py,sha256=KMlCRLjtq1wQHZTJGqnbWhPS2cHq6eLdnk7peKDrzR8,7490
 aient/core/request.py,sha256=-KEBd4jWLVC9QYUhb1ZfgkLf4nKE7HKL0A58iULkY7o,76757
-aient/core/response.py,sha256=Z9geTfh2LkGHKAqjelgeleQtfOAYIyM82t9AVB4xsgE,36407
+aient/core/response.py,sha256=nwJcqThjqUdcbLnmE-2xfPCetAwo3US4nYHLQjnzNv4,36431
 aient/core/utils.py,sha256=Z8vTH9w3uS8uubBa65c_aJ11A3OKGYEzm4q0brNZDSk,31594
 aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
@@ -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=cRz_6ocQbEoXREAlr9HteddfIRicE0c8lV_fnWhTXcA,43574
+aient/models/chatgpt.py,sha256=DOm0_tieWj8V_xIQCZy_33PGCebZ8nvKIXXYpzYWw6Y,43601
 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.35.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.2.35.dist-info/METADATA,sha256=Gi2MON1pLGbUcWLcKsE9bdI_3yKomVlbvoOAdWVgDCI,4842
-aient-1.2.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.2.35.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.2.35.dist-info/RECORD,,
+aient-1.2.36.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.2.36.dist-info/METADATA,sha256=saoXdXmCNTcRpt6pY1xgr_SpqNHFfglwjZIBzjVmmAs,4842
+aient-1.2.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.2.36.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.2.36.dist-info/RECORD,,