jarvis-ai-assistant 0.3.21__tar.gz → 0.3.22__tar.gz

{jarvis_ai_assistant-0.3.21/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.21
+Version: 0.3.22
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.21"
+version = "0.3.22"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.21",
+    version="0.3.22",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.21"
+__version__ = "0.3.22"

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -70,6 +70,7 @@ class CodeAgent:
             "retrieve_memory",
             "clear_memory",
             "sub_code_agent",
+            "edit_file",
         ]
 
         if append_tools:
@@ -86,7 +87,7 @@ class CodeAgent:
             system_prompt=code_system_prompt,
             name="CodeAgent",
             auto_complete=False,
-            output_handler=[tool_registry, EditFileHandler()],  # type: ignore
+            output_handler=[tool_registry],  # type: ignore
             llm_type=llm_type,
             model_group=model_group,
             input_handler=[shell_input_handler, builtin_input_handler],
@@ -135,7 +136,7 @@ class CodeAgent:
 - 仅在命令行工具不足时使用专用工具
 
 ## 文件编辑工具使用规范
-- 对于部分文件内容修改，使用PATCH
+- 对于部分文件内容修改，使用edit_file工具
 - 对于需要重写整个文件内容，使用rewrite_file工具
 - 对于简单的修改，可以使用execute_script工具执行shell命令完成
 

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/src/jarvis/jarvis_rag/rag_pipeline.py

@@ -15,6 +15,7 @@ from jarvis.jarvis_utils.config import (
     get_rag_vector_db_path,
     get_rag_embedding_cache_path,
 )
+from jarvis.jarvis_utils.utils import get_yes_no
 
 
 class JarvisRAGPipeline:
@@ -145,6 +146,37 @@ class JarvisRAGPipeline:
             self._query_rewriter = QueryRewriter(JarvisPlatform_LLM())
         return self._query_rewriter
 
+    def _pre_search_update_index_if_needed(self) -> None:
+        """
+        在重写query之前执行：
+        - 检测索引变更（变更/删除）
+        - 询问用户是否立即更新索引
+        - 如确认，则执行增量更新并重建BM25
+        """
+        try:
+            retriever = self._get_retriever()
+            result = retriever.detect_index_changes()
+            changed = result.get("changed", [])
+            deleted = result.get("deleted", [])
+            if not changed and not deleted:
+                return
+            # 打印摘要
+            PrettyOutput.print(
+                f"检测到索引可能不一致：变更 {len(changed)} 个，删除 {len(deleted)} 个。",
+                OutputType.WARNING,
+            )
+            for p in (changed[:3] if changed else []):
+                PrettyOutput.print(f"  变更: {p}", OutputType.WARNING)
+            for p in (deleted[:3] if deleted else []):
+                PrettyOutput.print(f"  删除: {p}", OutputType.WARNING)
+            # 询问用户
+            if get_yes_no("检测到索引变更，是否现在更新索引后再开始检索？", default=True):
+                retriever.update_index_for_changes(changed, deleted)
+            else:
+                PrettyOutput.print("已跳过索引更新，将直接使用当前索引进行检索。", OutputType.INFO)
+        except Exception as e:
+            PrettyOutput.print(f"检索前索引检查失败：{e}", OutputType.WARNING)
+
     def add_documents(self, documents: List[Document]):
         """
         将文档添加到向量知识库。
@@ -190,6 +222,8 @@ class JarvisRAGPipeline:
         返回:
             由LLM生成的答案。
         """
+        # 0. 检测索引变更并可选更新（在重写query之前）
+        self._pre_search_update_index_if_needed()
         # 1. 将原始查询重写为多个查询
         rewritten_queries = self._get_query_rewriter().rewrite(query_text)
 
@@ -259,6 +293,8 @@ class JarvisRAGPipeline:
         返回:
             检索到的文档列表。
         """
+        # 0. 检测索引变更并可选更新（在重写query之前）
+        self._pre_search_update_index_if_needed()
         # 1. 重写查询
         rewritten_queries = self._get_query_rewriter().rewrite(query_text)
 

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/src/jarvis/jarvis_rag/retriever.py

@@ -211,6 +211,95 @@ class ChromaRetriever:
             OutputType.INFO,
         )
 
+    def detect_index_changes(self) -> Dict[str, List[str]]:
+        """
+        公共方法：检测索引变更（变更与删除）。
+        返回:
+            {'changed': List[str], 'deleted': List[str]}
+        """
+        return self._detect_changed_or_deleted()
+
+    def _remove_sources_from_manifest(self, sources: List[str]) -> None:
+        """从manifest中移除指定源文件记录并保存。"""
+        if not sources:
+            return
+        manifest = self._load_manifest()
+        removed = 0
+        for src in set(sources):
+            if src in manifest:
+                manifest.pop(src, None)
+                removed += 1
+        if removed > 0:
+            self._save_manifest(manifest)
+            PrettyOutput.print(f"已从索引清单中移除 {removed} 个已删除的源文件记录。", OutputType.INFO)
+
+    def update_index_for_changes(self, changed: List[str], deleted: List[str]) -> None:
+        """
+        公共方法：根据变更与删除列表更新索引。
+        - 对 deleted: 从向量库按 metadata.source 删除
+        - 对 changed: 先删除旧条目，再从源文件重建并添加
+        - 最后：从集合重建BM25索引，更新manifest
+        """
+        changed = list(dict.fromkeys([p for p in (changed or []) if isinstance(p, str)]))
+        deleted = list(dict.fromkeys([p for p in (deleted or []) if isinstance(p, str)]))
+
+        if not changed and not deleted:
+            return
+
+        # 先处理删除
+        for src in deleted:
+            try:
+                self.collection.delete(where={"source": src})  # type: ignore[arg-type]
+            except Exception as e:
+                PrettyOutput.print(f"删除源 '{src}' 时出错: {e}", OutputType.WARNING)
+
+        # 再处理变更（重建）
+        docs_to_add: List[Document] = []
+        for src in changed:
+            try:
+                # 删除旧条目
+                try:
+                    self.collection.delete(where={"source": src})  # type: ignore[arg-type]
+                except Exception:
+                    pass
+                # 读取源文件内容（作为单文档载入，由 add_documents 进行拆分与嵌入）
+                with open(src, "r", encoding="utf-8", errors="ignore") as f:
+                    content = f.read()
+                docs_to_add.append(Document(page_content=content, metadata={"source": src}))
+            except Exception as e:
+                PrettyOutput.print(f"重建源 '{src}' 内容时出错: {e}", OutputType.WARNING)
+
+        if docs_to_add:
+            try:
+                # 复用现有拆分与嵌入逻辑
+                self.add_documents(docs_to_add)
+            except Exception as e:
+                PrettyOutput.print(f"添加变更文档到索引时出错: {e}", OutputType.ERROR)
+
+        # 重建BM25索引，确保删除后的语料被清理
+        try:
+            all_docs_in_collection = self.collection.get()
+            all_documents = all_docs_in_collection.get("documents") or []
+            self.bm25_corpus = [str(text).split() for text in all_documents if text]
+            self.bm25_index = BM25Okapi(self.bm25_corpus) if self.bm25_corpus else None
+            self._save_bm25_index()
+        except Exception as e:
+            PrettyOutput.print(f"重建BM25索引失败: {e}", OutputType.WARNING)
+
+        # 更新manifest：变更文件更新状态；删除文件从清单中移除
+        try:
+            if changed:
+                self._update_manifest_with_sources(changed)
+            if deleted:
+                self._remove_sources_from_manifest(deleted)
+        except Exception as e:
+            PrettyOutput.print(f"更新索引清单时出错: {e}", OutputType.WARNING)
+
+        PrettyOutput.print(
+            f"索引已更新：变更 {len(changed)} 个，删除 {len(deleted)} 个。",
+            OutputType.SUCCESS,
+        )
+
     def add_documents(
         self, documents: List[Document], chunk_size=1000, chunk_overlap=100
     ):

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/src/jarvis/jarvis_tools/edit_file.py

@@ -31,7 +31,6 @@ class FileSearchReplaceTool:
    - reason: 修改原因描述
    - SEARCH: 需要查找的原始代码(必须包含足够上下文)
    - REPLACE: 替换后的新代码
-3. 工具会自动选择最适合的编辑模式
 
 ## 核心原则
 1. **精准修改**: 只修改必要的代码部分，保持其他部分不变
@@ -132,106 +131,35 @@ class FileSearchReplaceTool:
             file_path = os.path.abspath(file_info["path"])
             changes = file_info["changes"]
 
-            # 创建已处理文件变量，用于失败时回滚
-            original_content = None
-            processed = False
-            file_success = True
-
             try:
-                file_exists = os.path.exists(file_path)
-                content = ""
-
-                try:
-                    # 如果文件存在，则读取内容
-                    if file_exists:
-                        with open(file_path, "r", encoding="utf-8") as f:
-                            content = f.read()
-                            original_content = content
-
-                    success, temp_content = EditFileHandler._fast_edit(
-                        file_path, changes
+                success, result = EditFileHandler._fast_edit(file_path, changes)
+                if success:
+                    stdout_message = f"文件 {file_path} 修改完成"
+                    stdout_messages.append(stdout_message)
+                    overall_success = True
+                    file_results.append(
+                        {
+                            "file": file_path,
+                            "success": True,
+                            "stdout": stdout_message,
+                            "stderr": "",
+                        }
+                    )
+                else:
+                    PrettyOutput.print(
+                        f"文件 {file_path} 处理失败", OutputType.ERROR
                     )
-                    if not success:
-                        PrettyOutput.print(
-                            f"文件 {file_path} 处理失败", OutputType.ERROR
-                        )
-                        file_results.append(
-                            {
-                                "file": file_path,
-                                "success": False,
-                                "stdout": "",
-                                "stderr": temp_content,
-                            }
-                        )
-                        continue
-
-                    # 只有当所有替换操作都成功时，才写回文件
-                    if success and (
-                        temp_content != original_content or not file_exists
-                    ):
-                        # 确保目录存在
-                        os.makedirs(
-                            os.path.dirname(os.path.abspath(file_path)), exist_ok=True
-                        )
-
-                        with open(file_path, "w", encoding="utf-8") as f:
-                            f.write(temp_content)
-
-                        processed = True
-
-                        action = "创建并写入" if not file_exists else "成功修改"
-                        stdout_message = f"文件 {file_path} {action} 完成"
-                        stdout_messages.append(stdout_message)
-
-                        overall_success = True
-
-                        file_results.append(
-                            {
-                                "file": file_path,
-                                "success": True,
-                                "stdout": stdout_message,
-                                "stderr": "",
-                            }
-                        )
-
-                except Exception as e:
-                    stderr_message = f"处理文件 {file_path} 时出错: {str(e)}"
-                    stderr_messages.append(stderr_message)
-                    PrettyOutput.print(stderr_message, OutputType.WARNING)
-                    file_success = False
                     file_results.append(
                         {
                             "file": file_path,
                             "success": False,
                             "stdout": "",
-                            "stderr": stderr_message,
+                            "stderr": result,
                         }
                     )
-
             except Exception as e:
                 error_msg = f"文件搜索替换操作失败: {str(e)}"
                 PrettyOutput.print(error_msg, OutputType.WARNING)
-
-                # 如果有已修改的文件，尝试回滚
-                if processed:
-                    rollback_message = "操作失败，正在回滚修改..."
-                    stderr_messages.append(rollback_message)
-                    PrettyOutput.print(rollback_message, OutputType.WARNING)
-
-                    try:
-                        if original_content is None:
-                            # 如果是新创建的文件，则删除
-                            if os.path.exists(file_path):
-                                os.remove(file_path)
-                            stderr_messages.append(f"已删除新创建的文件: {file_path}")
-                        else:
-                            # 如果是修改的文件，则恢复原内容
-                            with open(file_path, "w", encoding="utf-8") as f:
-                                f.write(original_content)
-                            stderr_messages.append(f"已回滚文件: {file_path}")
-                    except:
-                        stderr_messages.append(f"回滚文件失败: {file_path}")
-
                 file_results.append(
                     {
                         "file": file_path,

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/src/jarvis/jarvis_tools/registry.py

@@ -172,10 +172,14 @@ class ToolRegistry(OutputHandlerProtocol):
 
     def handle(self, response: str, agent_: Any) -> Tuple[bool, Any]:
         try:
-            tool_call, err_msg = self._extract_tool_calls(response)
+            tool_call, err_msg, auto_completed = self._extract_tool_calls(response)
             if err_msg:
                 return False, err_msg
-            return False, self.handle_tool_calls(tool_call, agent_)
+            result = self.handle_tool_calls(tool_call, agent_)
+            if auto_completed:
+                # 如果自动补全了结束标签，在结果中添加说明信息
+                result = f"检测到工具调用缺少结束标签，已自动补全{ct('TOOL_CALL')}。请确保后续工具调用包含完整的开始和结束标签。\n\n{result}"
+            return False, result
         except Exception as e:
             PrettyOutput.print(f"工具调用处理失败: {str(e)}", OutputType.ERROR)
             from jarvis.jarvis_agent import Agent
@@ -609,16 +613,17 @@ class ToolRegistry(OutputHandlerProtocol):
         )
 
     @staticmethod
-    def _extract_tool_calls(content: str) -> Tuple[Dict[str, Dict[str, Any]], str]:
+    def _extract_tool_calls(content: str) -> Tuple[Dict[str, Dict[str, Any]], str, bool]:
         """从内容中提取工具调用。
 
         参数:
             content: 包含工具调用的内容
 
         返回:
-            Tuple[Dict[str, Dict[str, Any]], str]:
+            Tuple[Dict[str, Dict[str, Any]], str, bool]:
                 - 第一个元素是提取的工具调用字典
                 - 第二个元素是错误消息字符串(成功时为"")
+                - 第三个元素是是否自动补全了结束标签
 
         异常:
             Exception: 如果工具调用缺少必要字段
@@ -627,6 +632,7 @@ class ToolRegistry(OutputHandlerProtocol):
         data = re.findall(
             ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"), content, re.DOTALL
         )
+        auto_completed = False
         if not data:
             # can_handle 确保 ot("TOOL_CALL") 在内容中。
             # 如果数据为空，则表示 ct("TOOL_CALL") 可能丢失。
@@ -648,6 +654,7 @@ class ToolRegistry(OutputHandlerProtocol):
                         # Ask user for confirmation
 
                         data = temp_data
+                        auto_completed = True
                     except (yaml.YAMLError, EOFError, KeyboardInterrupt):
                         # Even after fixing, it's not valid YAML, or user cancelled.
                         # Fall through to the original error.
@@ -657,6 +664,7 @@ class ToolRegistry(OutputHandlerProtocol):
                 return (
                     {},
                     f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}",
+                    False,
                 )
         ret = []
         for item in data:
@@ -669,6 +677,7 @@ class ToolRegistry(OutputHandlerProtocol):
                     {e}
 
                 {tool_call_help}""",
+                    False,
                 )
 
             if "name" in msg and "arguments" in msg and "want" in msg:
@@ -679,10 +688,11 @@ class ToolRegistry(OutputHandlerProtocol):
                     f"""工具调用格式错误，请检查工具调用格式（缺少name、arguments、want字段）。
 
                 {tool_call_help}""",
+                    False,
                 )
         if len(ret) > 1:
-            return {}, "检测到多个工具调用，请一次只处理一个工具调用。"
-        return ret[0] if ret else {}, ""
+            return {}, "检测到多个工具调用，请一次只处理一个工具调用。", False
+        return ret[0] if ret else {}, "", auto_completed
 
     def register_tool(
         self,

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22}/src/jarvis/jarvis_utils/utils.py

@@ -29,6 +29,9 @@ from jarvis.jarvis_utils.globals import get_in_chat, get_interrupt, set_interrup
 from jarvis.jarvis_utils.input import user_confirm
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+# 向后兼容：导出 get_yes_no 供外部模块引用
+get_yes_no = user_confirm
+
 g_config_file = None
 
 COMMAND_MAPPING = {

{jarvis_ai_assistant-0.3.21 → jarvis_ai_assistant-0.3.22/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.21
+Version: 0.3.22
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire