jarvis-ai-assistant 0.3.22__py3-none-any.whl → 0.3.23__py3-none-any.whl

jarvis/__init__.py

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

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/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/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/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/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.dist-info → jarvis_ai_assistant-0.3.23.dist-info}/METADATA

@@ -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.dist-info → jarvis_ai_assistant-0.3.23.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=QFERakZ0sl8VVVJdU-RAokYHztJs5dDSjfQ0yDBE9s4,74
+jarvis/__init__.py,sha256=d-XQQYWC2fZQq61hVFWvQFkyK2wabUSG4ml0M6WdOtA,74
 jarvis/jarvis_agent/__init__.py,sha256=Tahx-vDms17nh0dPIf4BbuyyAzvG6AgEXY28mH0_Nks,34592
 jarvis/jarvis_agent/agent_manager.py,sha256=YzpMiF0H2-eyk2kn2o24Bkj3bXsQx7Pv2vfD4gWepo0,2893
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=wS-FqpT3pIXwHn1dfL3SpXonUKWgVThbQueUIeyRc2U,2917
@@ -21,7 +21,7 @@ jarvis/jarvis_agent/task_manager.py,sha256=7OpLHLwBmxRFN37CCoVOPCUxjyo3dtE3sJ5oj
 jarvis/jarvis_agent/tool_executor.py,sha256=k73cKhZEZpljvui4ZxALlFEIE-iLzJ32Softsmiwzqk,1896
 jarvis/jarvis_agent/tool_share_manager.py,sha256=Do08FRxis0ynwR2a6iRoa6Yq0qCP8NkuhMbPrimaxMA,5169
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=d1LUPTcVBNQVkucFf0hop8EKDrEIWij4mgvi-ri4KFE,31577
+jarvis/jarvis_code_agent/code_agent.py,sha256=kPKx7GlQGL_YadYvv9Vk_rt_D6tUTTKLWpNhr-gvd_g,31575
 jarvis/jarvis_code_agent/lint.py,sha256=LZPsfyZPMo7Wm7LN4osZocuNJwZx1ojacO3MlF870x8,4009
 jarvis/jarvis_code_analysis/code_review.py,sha256=8Ai5UdptEYem7Hj-VXIk4zXS6ySuFXRzl0GIc6ZKeLc,35798
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
@@ -76,9 +76,9 @@ jarvis/jarvis_rag/cli.py,sha256=9TOFchODRnMWcXxFZKgnSE_yNLUfZQ_V3yjQQxEnUZI,1705
 jarvis/jarvis_rag/embedding_manager.py,sha256=Rd8q9V8oiXOgeccPskwsFoxMk8u2wZD3eb_1ieYu8y4,3704
 jarvis/jarvis_rag/llm_interface.py,sha256=INosZrt4d5Dvc3ePI3up2QOeyraC_p8L3w9j8BjdIj8,4580
 jarvis/jarvis_rag/query_rewriter.py,sha256=LGAWZ8kwH_dpquuYqc4QWC7IXmHX3SsnPSYMWOn-nDE,4072
-jarvis/jarvis_rag/rag_pipeline.py,sha256=TgPpsUrzZlD07QQuszcrDFnmkFC6YVXOrShVcWzEq78,12775
+jarvis/jarvis_rag/rag_pipeline.py,sha256=VkVTtYLL6dW12FSrZGJcWglcWqZMpZWELWO6aW-i9RU,12839
 jarvis/jarvis_rag/reranker.py,sha256=Uzn4n1bNj4kWyQu9-z-jK_5dAU6drn5jEugML-kFHg8,1885
-jarvis/jarvis_rag/retriever.py,sha256=gFgeSslc-N7TDdD4U7yyYPtqrbbjAHZlFNTctyIeusc,18178
+jarvis/jarvis_rag/retriever.py,sha256=kBHd3O6rXxc09AuuZlAQgKrxvx0RrB_IX6_3Ryf_aVw,18328
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=J5O58K5KvUvB_ghbT5XwIi5QGXD3DiBlGDs0wYYvy-w,15197
 jarvis/jarvis_stats/__init__.py,sha256=jJzgP43nxzLbNGs8Do4Jfta1PNCJMf1Oq9YTPd6EnFM,342
@@ -90,14 +90,14 @@ jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 jarvis/jarvis_tools/ask_user.py,sha256=M6DdLNryCE8y1JcdZHEifUgZkPUEPNKc-zDW5p0Mb1k,2029
 jarvis/jarvis_tools/base.py,sha256=tFZkRlbV_a-pbjM-ci9AYmXVJm__FXuzVWKbQEyz4Ao,1639
 jarvis/jarvis_tools/clear_memory.py,sha256=_GlwqlCAsoHeB24Y1CnjLdMawRTc6cq55AA8Yi5AZg4,8249
-jarvis/jarvis_tools/edit_file.py,sha256=aroyhvPGSwDRYZwm-FsvVxHFE2WAPyviqlMOC1fYETo,7132
+jarvis/jarvis_tools/edit_file.py,sha256=BUz0kfv44kqfNDr3tZKS-7Cn5DDhYl8xhHO7X8x7HQI,7086
 jarvis/jarvis_tools/execute_script.py,sha256=kASNTShHVGlHm7pZZxUeyEZHzHAYiZ-87AzrYVyORMw,6231
 jarvis/jarvis_tools/file_analyzer.py,sha256=uwmcPvRjuAzMznCy5ZqilkQY9dyL6suydMP_zL1ulk8,3914
 jarvis/jarvis_tools/generate_new_tool.py,sha256=OCHkBOCQflgMZXRP4vgX3blnJOUq-_QkcBFRQFj3sj0,7894
 jarvis/jarvis_tools/methodology.py,sha256=_K4GIDUodGEma3SvNRo7Qs5rliijgNespVLyAPN35JU,5233
 jarvis/jarvis_tools/read_code.py,sha256=qeQZ_emyPI5RTFx4HSgLBtWSwh8V5chqMjxu2uKzmfY,6100
 jarvis/jarvis_tools/read_webpage.py,sha256=YTmoalY8y-jdQuoj9IL6ZjXPOevUj2P_9arJngPhbUY,5317
-jarvis/jarvis_tools/registry.py,sha256=oIcHbRLKl62LWmJARMH3KB4aoKNjLGzrIaJarx7GQZU,31859
+jarvis/jarvis_tools/registry.py,sha256=G3xgZ5ECTzAhA0hJlWrB84Shyhn18U9ijlwCn5XsUow,31874
 jarvis/jarvis_tools/retrieve_memory.py,sha256=hQ3s4IgBHtmUPzuWFl5Pc2FLEuT2gdi4l4NlUoO9pQM,8640
 jarvis/jarvis_tools/rewrite_file.py,sha256=CuvjWPTbUaPbex9FKSmw_Ru4r6R-CX_3vqTqCTp8nHA,6959
 jarvis/jarvis_tools/save_memory.py,sha256=QKj6iYZL2XxPX0NnU9HqvoDOpJZ38mJmatDmHLK2r74,7012
@@ -121,9 +121,9 @@ jarvis/jarvis_utils/methodology.py,sha256=fMo8bwd-Iam1yQL8LkPy1gwG4L2uLOTzZHbc07
 jarvis/jarvis_utils/output.py,sha256=svCHLuXHe3Ta_qfoT5DxO80nyYyMfBFIKgziQS__Nmg,13632
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=TuuwdsTkIyEWsbIILyKCGsEmEgDOfkg235sZscScNJk,61562
-jarvis_ai_assistant-0.3.22.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.22.dist-info/METADATA,sha256=Vlh0jMccrAINzllO6_aqR0VxPB2EicVEOJEmym7l5Vo,18513
-jarvis_ai_assistant-0.3.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.22.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.22.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.22.dist-info/RECORD,,
+jarvis_ai_assistant-0.3.23.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.23.dist-info/METADATA,sha256=Y_xzK5pwQB03TgzEUp7mNJJFQR-Ygo0trvHZsmBbryw,18513
+jarvis_ai_assistant-0.3.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.23.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.23.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.23.dist-info/RECORD,,