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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.22
+Version: 0.3.23
 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.22 → jarvis_ai_assistant-0.3.23}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.22"
+version = "0.3.23"
 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.22 → jarvis_ai_assistant-0.3.23}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.22",
+    version="0.3.23",
     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.22 → jarvis_ai_assistant-0.3.23}/src/jarvis/__init__.py

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

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

@@ -70,7 +70,6 @@ class CodeAgent:
             "retrieve_memory",
             "clear_memory",
             "sub_code_agent",
-            "edit_file",
         ]
 
         if append_tools:
@@ -87,7 +86,7 @@ class CodeAgent:
             system_prompt=code_system_prompt,
             name="CodeAgent",
             auto_complete=False,
-            output_handler=[tool_registry],  # type: ignore
+            output_handler=[tool_registry, EditFileHandler()],  # type: ignore
             llm_type=llm_type,
             model_group=model_group,
             input_handler=[shell_input_handler, builtin_input_handler],
@@ -640,7 +639,7 @@ class CodeAgent:
                     if lint_tools_info and is_enable_static_analysis():
                         addon_prompt = f"""
 请对以下修改的文件进行静态扫描:
-{file_list}
+    {file_list}
 {tool_info}
 如果本次修改引入了警告和错误，请根据警告和错误信息修复代码
 注意：如果要进行静态检查，需要在所有的修改都完成之后进行集中检查，如果文件有多个检查工具，尽量一次全部调用，不要分多次调用

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

@@ -165,15 +165,19 @@ class JarvisRAGPipeline:
                 f"检测到索引可能不一致：变更 {len(changed)} 个，删除 {len(deleted)} 个。",
                 OutputType.WARNING,
             )
-            for p in (changed[:3] if changed else []):
+            for p in changed[:3] if changed else []:
                 PrettyOutput.print(f"  变更: {p}", OutputType.WARNING)
-            for p in (deleted[:3] if deleted else []):
+            for p in deleted[:3] if deleted else []:
                 PrettyOutput.print(f"  删除: {p}", OutputType.WARNING)
             # 询问用户
-            if get_yes_no("检测到索引变更，是否现在更新索引后再开始检索？", default=True):
+            if get_yes_no(
+                "检测到索引变更，是否现在更新索引后再开始检索？", default=True
+            ):
                 retriever.update_index_for_changes(changed, deleted)
             else:
-                PrettyOutput.print("已跳过索引更新，将直接使用当前索引进行检索。", OutputType.INFO)
+                PrettyOutput.print(
+                    "已跳过索引更新，将直接使用当前索引进行检索。", OutputType.INFO
+                )
         except Exception as e:
             PrettyOutput.print(f"检索前索引检查失败：{e}", OutputType.WARNING)
 

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

@@ -231,7 +231,9 @@ class ChromaRetriever:
                 removed += 1
         if removed > 0:
             self._save_manifest(manifest)
-            PrettyOutput.print(f"已从索引清单中移除 {removed} 个已删除的源文件记录。", OutputType.INFO)
+            PrettyOutput.print(
+                f"已从索引清单中移除 {removed} 个已删除的源文件记录。", OutputType.INFO
+            )
 
     def update_index_for_changes(self, changed: List[str], deleted: List[str]) -> None:
         """
@@ -240,8 +242,12 @@ class ChromaRetriever:
         - 对 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)]))
+        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
@@ -265,9 +271,13 @@ class ChromaRetriever:
                 # 读取源文件内容（作为单文档载入，由 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}))
+                docs_to_add.append(
+                    Document(page_content=content, metadata={"source": src})
+                )
             except Exception as e:
-                PrettyOutput.print(f"重建源 '{src}' 内容时出错: {e}", OutputType.WARNING)
+                PrettyOutput.print(
+                    f"重建源 '{src}' 内容时出错: {e}", OutputType.WARNING
+                )
 
         if docs_to_add:
             try:

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

@@ -146,9 +146,7 @@ class FileSearchReplaceTool:
                         }
                     )
                 else:
-                    PrettyOutput.print(
-                        f"文件 {file_path} 处理失败", OutputType.ERROR
-                    )
+                    PrettyOutput.print(f"文件 {file_path} 处理失败", OutputType.ERROR)
                     file_results.append(
                         {
                             "file": file_path,

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

@@ -613,7 +613,9 @@ class ToolRegistry(OutputHandlerProtocol):
         )
 
     @staticmethod
-    def _extract_tool_calls(content: str) -> Tuple[Dict[str, Dict[str, Any]], str, bool]:
+    def _extract_tool_calls(
+        content: str,
+    ) -> Tuple[Dict[str, Dict[str, Any]], str, bool]:
         """从内容中提取工具调用。
 
         参数:

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

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