aient 1.2.44__tar.gz → 1.2.46__tar.gz

{aient-1.2.44 → aient-1.2.46}/PKG-INFO

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

{aient-1.2.44 → aient-1.2.46}/aient/architext/architext/core.py

@@ -233,73 +233,116 @@ class Files(ContextProvider):
     def __init__(self, *paths: Union[str, List[str]], name: str = "files", visible: bool = True):
         super().__init__(name, visible=visible)
         self._files: Dict[str, str] = {}
+        self._file_sources: Dict[str, Dict] = {}
 
         file_paths: List[str] = []
         if paths:
-            # Handle the case where the first argument is a list of paths, e.g., Files(['a', 'b'])
             if len(paths) == 1 and isinstance(paths[0], list):
                 file_paths.extend(paths[0])
-            # Handle the case where arguments are individual string paths, e.g., Files('a', 'b')
             else:
                 file_paths.extend(paths)
 
         if file_paths:
             for path in file_paths:
-                try:
-                    with open(path, 'r', encoding='utf-8') as f:
-                        self._files[path] = f.read()
-                except FileNotFoundError:
-                    logging.warning(f"File not found during initialization: {path}. Skipping.")
-                except Exception as e:
-                    logging.error(f"Error reading file {path} during initialization: {e}")
+                self.update(path)
+
+    def _read_from_disk(self, path: str, head: Optional[int] = None) -> str:
+        """Reads content from a file on disk, respecting the head parameter."""
+        try:
+            with open(path, 'r', encoding='utf-8') as f:
+                if head is not None and head > 0:
+                    lines = []
+                    for _ in range(head):
+                        try:
+                            lines.append(next(f))
+                        except StopIteration:
+                            break
+                    return "".join(lines).rstrip('\n')
+                else:
+                    return f.read()
+        except FileNotFoundError:
+            raise
+        except Exception as e:
+            logging.error(f"Error reading file {path}: {e}")
+            return f"[Error: Could not read file at path '{path}': {e}]"
 
     async def refresh(self):
         """
-        Overrides the default refresh behavior. It synchronizes the content of
-        all tracked files with the file system. If a file is not found, its
-        content is updated to reflect the error.
+        Synchronizes content for files sourced from disk.
+        Content set manually is overwritten if the file exists, but preserved if it does not.
         """
         is_changed = False
-        for path in list(self._files.keys()):
-            try:
-                with open(path, 'r', encoding='utf-8') as f:
-                    new_content = f.read()
-                if self._files.get(path) != new_content:
-                    self._files[path] = new_content
-                    is_changed = True
-            except FileNotFoundError:
-                error_msg = f"[Error: File not found at path '{path}']"
-                if self._files.get(path) != error_msg:
-                    self._files[path] = error_msg
-                    is_changed = True
-            except Exception as e:
-                error_msg = f"[Error: Could not read file at path '{path}': {e}]"
-                if self._files.get(path) != error_msg:
-                    self._files[path] = error_msg
-                    is_changed = True
+        for path, spec in list(self._file_sources.items()):
+            if spec.get('source') == 'disk':
+                try:
+                    head = spec.get('head')
+                    new_content = self._read_from_disk(path, head)
+                    if self._files.get(path) != new_content:
+                        self._files[path] = new_content
+                        is_changed = True
+                except FileNotFoundError:
+                    error_msg = f"[Error: File not found at path '{path}']"
+                    if self._files.get(path) != error_msg:
+                        self._files[path] = error_msg
+                        is_changed = True
+            elif spec.get('source') == 'manual':
+                try:
+                    # File exists, so we must overwrite manual content.
+                    head = spec.get('head')
+                    new_content = self._read_from_disk(path, head)
+                    if self._files.get(path) != new_content:
+                        self._files[path] = new_content
+                        is_changed = True
+                    # If we are here, manual content was overwritten by disk content,
+                    # so we should update the source.
+                    self._file_sources[path] = {'source': 'disk'}
+
+                except FileNotFoundError:
+                    # File does not exist, so we keep the manual content. No change.
+                    pass
 
         if is_changed:
             self.mark_stale()
-
         await super().refresh()
 
-    def update(self, path: str, content: Optional[str] = None):
+    def update(self, path: str, content: Optional[str] = None, head: Optional[Union[int, str]] = None):
         """
-        Updates a single file. If content is provided, it updates the file in
-        memory. If content is None, it reads the file from disk.
+        Updates a single file's content and its source specification.
         """
+        if head is not None:
+            try:
+                head = int(head)
+            except (ValueError, TypeError):
+                logging.warning(f"Invalid 'head' parameter for file '{path}': {head}. Must be an integer. Ignoring.")
+                head = None
+
         if content is not None:
-            self._files[path] = content
+            # New logic: if head is also provided, decide what to do with content.
+            if head is not None and head > 0:
+                try:
+                    # If file exists, prioritize reading from disk.
+                    self._files[path] = self._read_from_disk(path, head)
+                    self._file_sources[path] = {'source': 'disk', 'head': head}
+                except FileNotFoundError:
+                    # If file does not exist, use the provided content's head.
+                    lines = content.split('\n')
+                    self._files[path] = "\n".join(lines[:head])
+                    self._file_sources[path] = {'source': 'manual', 'head': head}
+            else:
+                # Original logic for when only content is provided.
+                self._files[path] = content
+                self._file_sources[path] = {'source': 'manual'}
         else:
+            # Original logic for when only path (and optional head) is provided.
             try:
-                with open(path, 'r', encoding='utf-8') as f:
-                    self._files[path] = f.read()
+                self._files[path] = self._read_from_disk(path, head)
+                spec = {'source': 'disk'}
+                if head is not None and head > 0:
+                    spec['head'] = head
+                self._file_sources[path] = spec
             except FileNotFoundError:
-                logging.error(f"File not found for update: {path}.")
                 self._files[path] = f"[Error: File not found at path '{path}']"
-            except Exception as e:
-                logging.error(f"Error reading file for update {path}: {e}.")
-                self._files[path] = f"[Error: Could not read file at path '{path}': {e}]"
+                self._file_sources[path] = {'source': 'disk'}
         self.mark_stale()
     async def render(self) -> str:
         if not self._files: return None

{aient-1.2.44 → aient-1.2.46}/aient/architext/test/test.py

@@ -1783,6 +1783,107 @@ Files: {Files(visible=True, name="files")}
         self.assertEqual(len(rendered_separated), 1, "被空消息隔开的同角色消息在渲染时应该合并")
         self.assertEqual(rendered_separated[0]['content'], "hihi2", "被空消息隔开的同角色消息合并后内容不正确")
 
+    async def test_zzc_files_update_with_head(self):
+        """测试 Files.update 是否支持 head 参数以及新的 refresh 逻辑"""
+        test_file = "test_file_head.txt"
+        file_content = "Line 1\nLine 2\nLine 3\nLine 4\nLine 5"
+        with open(test_file, "w", encoding='utf-8') as f:
+            f.write(file_content)
+
+        try:
+            messages = Messages(UserMessage(Files(name="files")))
+
+            # 1. Test update with head=3 using the provider from Messages
+            files_provider = messages.provider("files")
+            self.assertIsInstance(files_provider, Files)
+            files_provider.update(path=test_file, head=3)
+
+            rendered_head = await messages.render_latest()
+            expected_head_content = "Line 1\nLine 2\nLine 3"
+            self.assertIn(f"<file_content>{expected_head_content}</file_content>", rendered_head[0]['content'])
+            self.assertNotIn("Line 4", rendered_head[0]['content'])
+
+            # 2. Test update without head (default behavior)
+            files_provider.update(path=test_file)
+            rendered_full = await messages.render_latest()
+            self.assertIn(f"<file_content>{file_content}</file_content>", rendered_full[0]['content'])
+
+            # 3. Test that refresh overwrites manual content when file exists
+            files_provider.update(path=test_file, content="manual content")
+            rendered_overwritten = await messages.render_latest()
+            self.assertIn(f"<file_content>{file_content}</file_content>", rendered_overwritten[0]['content'])
+            self.assertNotIn("manual content", rendered_overwritten[0]['content'])
+
+            # 4. Test that manual content is kept if file does not exist
+            non_existent_file = "non_existent_for_sure.txt"
+            files_provider.update(path=non_existent_file, content="manual content to keep")
+            rendered_kept = await messages.render_latest()
+            self.assertIn("<file_content>manual content to keep</file_content>", rendered_kept[0]['content'])
+
+        finally:
+            if os.path.exists(test_file):
+                os.remove(test_file)
+
+    async def test_zzd_files_update_with_string_head(self):
+        """测试 Files.update 是否能自动将字符串 head 参数转换为整数"""
+        test_file = "test_file_string_head.txt"
+        file_content = "Line 1\nLine 2\nLine 3\nLine 4\nLine 5"
+        with open(test_file, "w", encoding='utf-8') as f:
+            f.write(file_content)
+
+        try:
+            messages = Messages(UserMessage(Files(name="files")))
+
+            # Test update with head="3"
+            files_provider = messages.provider("files")
+            self.assertIsInstance(files_provider, Files)
+            # This is the part that will likely fail before implementation
+            files_provider.update(path=test_file, head="3")
+
+            rendered_head = await messages.render_latest()
+            expected_head_content = "Line 1\nLine 2\nLine 3"
+            self.assertIn(f"<file_content>{expected_head_content}</file_content>", rendered_head[0]['content'])
+            self.assertNotIn("Line 4", rendered_head[0]['content'])
+
+        finally:
+            if os.path.exists(test_file):
+                os.remove(test_file)
+
+    async def test_zzc_files_update_with_head_and_content(self):
+        """测试update同时设置path, content, head时的行为"""
+        existing_file = "test_file_existing.txt"
+        non_existent_file = "test_file_non_existent.txt"
+        existing_content = "Line 1 (from file)\nLine 2 (from file)\nLine 3 (from file)\nLine 4 (from file)"
+        manual_content = "Line 1 (manual)\nLine 2 (manual)\nLine 3 (manual)\nLine 4 (manual)"
+
+        # --- 场景1: 文件存在 ---
+        with open(existing_file, "w", encoding='utf-8') as f:
+            f.write(existing_content)
+        try:
+            messages = Messages(UserMessage(Files(name="files")))
+            files_provider = messages.provider("files")
+            files_provider.update(path=existing_file, content=manual_content, head=2)
+            rendered_existing = await messages.render_latest()
+            expected_existing_head = "Line 1 (from file)\nLine 2 (from file)"
+            self.assertIn(f"<file_content>{expected_existing_head}</file_content>", rendered_existing[0]['content'])
+            self.assertNotIn("manual", rendered_existing[0]['content'])
+        finally:
+            if os.path.exists(existing_file):
+                os.remove(existing_file)
+
+        # --- 场景2: 文件不存在 ---
+        try:
+            messages = Messages(UserMessage(Files(name="files")))
+            files_provider = messages.provider("files")
+            files_provider.update(path=non_existent_file, content=manual_content, head=2)
+            rendered_non_existent = await messages.render_latest()
+            expected_manual_head = "Line 1 (manual)\nLine 2 (manual)"
+            self.assertIn(f"<file_content>{expected_manual_head}</file_content>", rendered_non_existent[0]['content'])
+            self.assertNotIn("from file", rendered_non_existent[0]['content'])
+        finally:
+            if os.path.exists(non_existent_file):
+                os.remove(non_existent_file)
+
 # ==============================================================================
 # 6. 演示
 # ==============================================================================

{aient-1.2.44 → aient-1.2.46}/aient/core/request.py

@@ -1116,6 +1116,9 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
         if "temperature" in payload:
             payload.pop("temperature")
 
+        if "v1/responses" in url:
+            payload.pop("stream_options", None)
+
     # 代码生成/数学解题  0.0
     # 数据抽取/分析	     1.0
     # 通用对话          1.3

{aient-1.2.44 → aient-1.2.46}/aient/core/utils.py

@@ -52,7 +52,7 @@ class BaseAPI:
             self.v1_models: str = urlunparse(parsed_url[:2] + (before_v1 + "models",) + ("",) * 3)
 
         if "v1/responses" in parsed_url.path:
-            self.chat_url: str = urlunparse(parsed_url[:2] + ("v1/responses",) + ("",) * 3)
+            self.chat_url: str = api_url
         else:
             self.chat_url: str = urlunparse(parsed_url[:2] + (before_v1 + "chat/completions",) + ("",) * 3)
         self.image_url: str = urlunparse(parsed_url[:2] + (before_v1 + "images/generations",) + ("",) * 3)

{aient-1.2.44 → aient-1.2.46}/aient/models/chatgpt.py

@@ -615,7 +615,7 @@ class chatgpt(BaseLLM):
                 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)
+                        self.conversation[convo_id].provider("files").update(tool_info['parameter']["file_path"], tool_response, head=safe_get(tool_info, 'parameter', "head", default=None))
                         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

{aient-1.2.44 → aient-1.2.46}/aient.egg-info/PKG-INFO

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

{aient-1.2.44 → aient-1.2.46}/pyproject.toml

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