jarvis-ai-assistant 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

jarvis/jarvis_code_analysis/code_review.py

@@ -17,7 +17,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 
-app = typer.Typer(help="Autonomous code review tool")
+app = typer.Typer(help="自动代码审查工具")
 
 
 class CodeReviewTool:
@@ -300,7 +300,7 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True
+                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
                     )
                     if not diff_output:
                         return {
@@ -310,11 +310,13 @@ class CodeReviewTool:
                         }
 
                     # Extract changed files using git command
-                    files_cmd = f"git show --name-only --pretty=format: {commit_sha} | grep -v '^$'"
+                    # Use git show with proper formatting to avoid needing grep
+                    files_cmd = f"git show --name-only --pretty=format: {commit_sha}"
                     try:
                         files_output = subprocess.check_output(
                             files_cmd, shell=True, text=True
                         )
+                        # Filter out empty lines without using grep
                         file_paths = [
                             f.strip() for f in files_output.split("\n") if f.strip()
                         ]
@@ -337,7 +339,7 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True
+                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
                     )
                     if not diff_output:
                         return {
@@ -379,7 +381,7 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True
+                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
                     )
                     if not diff_output:
                         return {
@@ -578,7 +580,7 @@ class CodeReviewTool:
 
                 tool_registry = ToolRegistry()
                 tool_registry.dont_use_tools(["code_review"])
-                
+
                 # Use the provided agent's model_group or get it from globals
                 calling_agent = agent or get_agent(current_agent_name)
                 model_group = None
@@ -653,7 +655,7 @@ class CodeReviewTool:
 {ot("REPORT")}
 [在此处插入完整MARKDOWN格式的审查报告]
 {ct("REPORT")}""",
-                    output_handler=[tool_registry],
+                    output_handler=[tool_registry],  # type: ignore
                     llm_type="thinking",
                     auto_complete=False,
                 )
@@ -769,10 +771,10 @@ def extract_code_report(result: str) -> str:
 
 @app.command("commit")
 def review_commit(
-    commit: str = typer.Argument(..., help="Commit SHA to review"),
-    root_dir: str = typer.Option(".", "--root-dir", help="Root directory of the codebase"),
+    commit: str = typer.Argument(..., help="要审查的提交SHA"),
+    root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
 ):
-    """Review specific commit"""
+    """审查指定的提交"""
     tool = CodeReviewTool()
     tool_args = {"review_type": "commit", "commit_sha": commit, "root_dir": root_dir}
     result = tool.execute(tool_args)
@@ -786,9 +788,9 @@ def review_commit(
 
 @app.command("current")
 def review_current(
-    root_dir: str = typer.Option(".", "--root-dir", help="Root directory of the codebase"),
+    root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
 ):
-    """Review current changes"""
+    """审查当前的变更"""
     tool = CodeReviewTool()
     tool_args = {"review_type": "current", "root_dir": root_dir}
     result = tool.execute(tool_args)
@@ -802,11 +804,11 @@ def review_current(
 
 @app.command("range")
 def review_range(
-    start_commit: str = typer.Argument(..., help="Start commit SHA"),
-    end_commit: str = typer.Argument(..., help="End commit SHA"),
-    root_dir: str = typer.Option(".", "--root-dir", help="Root directory of the codebase"),
+    start_commit: str = typer.Argument(..., help="起始提交SHA"),
+    end_commit: str = typer.Argument(..., help="结束提交SHA"),
+    root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
 ):
-    """Review commit range"""
+    """审查提交范围"""
     tool = CodeReviewTool()
     tool_args = {
         "review_type": "range",
@@ -825,10 +827,10 @@ def review_range(
 
 @app.command("file")
 def review_file(
-    file: str = typer.Argument(..., help="File path to review"),
-    root_dir: str = typer.Option(".", "--root-dir", help="Root directory of the codebase"),
+    file: str = typer.Argument(..., help="要审查的文件路径"),
+    root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
 ):
-    """Review specific file"""
+    """审查指定的文件"""
     tool = CodeReviewTool()
     tool_args = {"review_type": "file", "file_path": file, "root_dir": root_dir}
     result = tool.execute(tool_args)

jarvis/jarvis_data/config_schema.json

@@ -139,40 +139,49 @@
     "JARVIS_THINKING_MODEL": {
       "type": "string",
       "description": "思考操作模型名称",
-      "default": "deep_seek"
+      "default": "deep_seek_v3"
     },
-    "JARVIS_MODEL_GROUP": {
+    "JARVIS_LLM_GROUP": {
       "type": "string",
-      "description": "选择一个预定义的模型组"
+      "description": "选择一个预定义的模型组",
+      "default": ""
     },
-    "JARVIS_MODEL_GROUPS": {
+    "JARVIS_LLM_GROUPS": {
       "type": "array",
       "description": "预定义的模型配置组",
+      "default": [],
       "items": {
         "type": "object",
         "additionalProperties": {
           "type": "object",
           "properties": {
             "JARVIS_PLATFORM": {
-              "type": "string"
+              "type": "string",
+              "default": "yuanbao"
             },
             "JARVIS_MODEL": {
-              "type": "string"
+              "type": "string",
+              "default": "deep_seek_v3"
             },
             "JARVIS_THINKING_PLATFORM": {
-              "type": "string"
+              "type": "string",
+              "default": "yuanbao"
             },
             "JARVIS_THINKING_MODEL": {
-              "type": "string"
+              "type": "string",
+              "default": "deep_seek_v3"
             },
             "JARVIS_MAX_TOKEN_COUNT": {
-              "type": "number"
+              "type": "number",
+              "default": 960000
             },
             "JARVIS_MAX_INPUT_TOKEN_COUNT": {
-              "type": "number"
+              "type": "number",
+              "default": 32000
             },
             "JARVIS_MAX_BIG_CONTENT_SIZE": {
-              "type": "number"
+              "type": "number",
+              "default": 160000
             }
           },
           "required": [
@@ -225,6 +234,14 @@
       },
       "default": []
     },
+    "JARVIS_METHODOLOGY_DIRS": {
+      "type": "array",
+      "description": "方法论加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
     "JARVIS_PRINT_PROMPT": {
       "type": "boolean",
       "description": "是否打印提示",
@@ -235,24 +252,70 @@
       "description": "是否启用静态代码分析",
       "default": true
     },
+    "JARVIS_RAG_GROUP": {
+      "type": "string",
+      "description": "选择一个预定义的RAG配置组",
+      "default": ""
+    },
+    "JARVIS_RAG_GROUPS": {
+      "type": "array",
+      "description": "预定义的RAG配置组",
+      "default": [],
+      "items": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object",
+          "properties": {
+            "embedding_model": {
+              "type": "string",
+              "default": "BAAI/bge-m3"
+            },
+            "rerank_model": {
+              "type": "string",
+              "default": "BAAI/bge-reranker-v2-m3"
+            },
+            "use_bm25": {
+              "type": "boolean",
+              "default": true
+            },
+            "use_rerank": {
+              "type": "boolean",
+              "default": true
+            }
+          }
+        }
+      }
+    },
     "JARVIS_RAG": {
       "type": "object",
-      "description": "RAG框架的配置",
+      "description": "RAG框架的顶层配置。注意：此处的设置将覆盖任何由JARVIS_RAG_GROUP选择的组配置。",
       "properties": {
         "embedding_model": {
           "type": "string",
-          "default": "BAAI/bge-base-zh-v1.5",
-          "description": "用于RAG的嵌入模型的名称, 默认为 'BAAI/bge-base-zh-v1.5'"
+          "default": "BAAI/bge-m3",
+          "description": "用于RAG的嵌入模型的名称, 默认为 'BAAI/bge-m3'"
         },
         "rerank_model": {
           "type": "string",
-          "default": "BAAI/bge-reranker-base",
-          "description": "用于RAG的rerank模型的名称, 默认为 'BAAI/bge-reranker-base'"
+          "default": "BAAI/bge-reranker-v2-m3",
+          "description": "用于RAG的rerank模型的名称, 默认为 'BAAI/bge-reranker-v2-m3'"
+        },
+        "use_bm25": {
+          "type": "boolean",
+          "default": true,
+          "description": "是否在RAG中为检索使用BM25, 默认为 true"
+        },
+        "use_rerank": {
+          "type": "boolean",
+          "default": true,
+          "description": "是否在RAG中为检索使用rerank, 默认为 true"
         }
       },
       "default": {
-        "embedding_model": "BAAI/bge-base-zh-v1.5",
-        "rerank_model": "BAAI/bge-reranker-base"
+        "embedding_model": "BAAI/bge-m3",
+        "rerank_model": "BAAI/bge-reranker-v2-m3",
+        "use_bm25": true,
+        "use_rerank": true
       }
     },
     "JARVIS_REPLACE_MAP": {
@@ -306,6 +369,11 @@
     "OYI_API_KEY": {
       "type": "string",
       "description": "Oyi API Key"
+    },
+    "SHELL": {
+      "type": "string",
+      "description": "系统Shell路径，用于获取当前使用的shell类型",
+      "default": "/bin/bash"
     }
   },
   "additionalProperties": true

jarvis/jarvis_git_squash/main.py

@@ -9,7 +9,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.input import user_confirm
 
-app = typer.Typer(help="Git squash tool")
+app = typer.Typer(help="Git压缩工具")
 
 
 class GitSquashTool:
@@ -53,8 +53,8 @@ class GitSquashTool:
 
 @app.command()
 def cli(
-    commit_hash: str = typer.Argument(..., help="Base commit hash to squash from"),
-    lang: str = typer.Option("Chinese", "--lang", help="Language for commit messages"),
+    commit_hash: str = typer.Argument(..., help="要压缩的基础提交哈希"),
+    lang: str = typer.Option("Chinese", "--lang", help="提交信息的语言"),
 ):
     init_env("欢迎使用 Jarvis-GitSquash，您的Git压缩助手已准备就绪！")
     tool = GitSquashTool()

jarvis/jarvis_git_utils/git_commiter.py

@@ -21,7 +21,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 
-app = typer.Typer(help="Git commit tool")
+app = typer.Typer(help="Git提交工具")
 
 
 class GitCommitTool:
@@ -258,17 +258,38 @@ commit信息
 
                 # 执行提交
                 print("⚙️ 正在准备提交...")
-                with tempfile.NamedTemporaryFile(mode="w", delete=True) as tmp_file:
+                # Windows 兼容性：使用 delete=False 避免权限错误
+                tmp_file = tempfile.NamedTemporaryFile(mode="w", delete=False)
+                tmp_file_path = tmp_file.name
+                try:
                     tmp_file.write(commit_message)
-                    tmp_file.flush()
+                    tmp_file.close()  # Windows 需要先关闭文件才能被其他进程读取
+
                     print("💾 正在执行提交...")
-                    commit_cmd = ["git", "commit", "-F", tmp_file.name]
-                    subprocess.Popen(
+                    commit_cmd = ["git", "commit", "-F", tmp_file_path]
+                    process = subprocess.Popen(
                         commit_cmd,
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.DEVNULL,
-                    ).wait()
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                    )
+                    stdout, stderr = process.communicate()
+
+                    if process.returncode != 0:
+                        # 如果提交失败，重置暂存区
+                        subprocess.run(["git", "reset", "HEAD"], check=False)
+                        error_msg = (
+                            stderr.strip() if stderr else "Unknown git commit error"
+                        )
+                        raise Exception(f"Git commit failed: {error_msg}")
+
                     print("✅ 提交")
+                finally:
+                    # 手动删除临时文件
+                    try:
+                        os.unlink(tmp_file_path)
+                    except Exception:
+                        pass
 
                 commit_hash = self._get_last_commit_hash()
                 print("✅ 完成提交")
@@ -310,17 +331,17 @@ commit信息
 @app.command()
 def cli(
     root_dir: str = typer.Option(
-        ".", "--root-dir", help="Root directory of the Git repository"
+        ".", "--root-dir", help="Git仓库的根目录路径"
     ),
     prefix: str = typer.Option(
         "",
         "--prefix",
-        help="Prefix to prepend to commit message (separated by space)",
+        help="提交信息前缀（用空格分隔）",
     ),
     suffix: str = typer.Option(
         "",
         "--suffix",
-        help="Suffix to append to commit message (separated by newline)",
+        help="提交信息后缀（用换行分隔）",
     ),
 ):
     init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -50,9 +50,9 @@ class SSEMcpClient(McpClient):
         self.sse_thread: Optional[threading.Thread] = None
         self.messages_endpoint: Optional[str] = None
         self.session_id: Optional[str] = None
-        self.pending_requests = {}  # 存储等待响应的请求 {id: Event}
-        self.request_results = {}  # 存储请求结果 {id: result}
-        self.notification_handlers = {}
+        self.pending_requests: Dict[str, threading.Event] = {}  # 存储等待响应的请求 {id: Event}
+        self.request_results: Dict[str, Dict[str, Any]] = {}  # 存储请求结果 {id: result}
+        self.notification_handlers: Dict[str, List[Callable]] = {}
         self.event_lock = threading.Lock()
         self.request_id_counter = 0
 
@@ -95,9 +95,7 @@ class SSEMcpClient(McpClient):
 
             # 验证服务器响应
             if "result" not in response:
-                raise RuntimeError(
-                    f"初始化失败: {response.get('error', 'Unknown error')}"
-                )
+                raise RuntimeError(f"初始化失败: {response.get('error', 'Unknown error')}")
 
             # 发送initialized通知
             self._send_notification("notifications/initialized", {})

jarvis/jarvis_mcp/streamable_mcp_client.py

@@ -45,9 +45,9 @@ class StreamableMcpClient(McpClient):
         self.session.headers.update(extra_headers)
 
         # 请求相关属性
-        self.pending_requests = {}  # 存储等待响应的请求 {id: Event}
-        self.request_results = {}  # 存储请求结果 {id: result}
-        self.notification_handlers = {}
+        self.pending_requests: Dict[str, threading.Event] = {}  # 存储等待响应的请求 {id: Event}
+        self.request_results: Dict[str, Dict[str, Any]] = {}  # 存储请求结果 {id: result}
+        self.notification_handlers: Dict[str, List[Callable]] = {}
         self.event_lock = threading.Lock()
         self.request_id_counter = 0
 
@@ -70,9 +70,7 @@ class StreamableMcpClient(McpClient):
 
             # 验证服务器响应
             if "result" not in response:
-                raise RuntimeError(
-                    f"初始化失败: {response.get('error', 'Unknown error')}"
-                )
+                raise RuntimeError(f"初始化失败: {response.get('error', 'Unknown error')}")
 
             # 发送initialized通知
             self._send_notification("notifications/initialized", {})
@@ -143,9 +141,7 @@ class StreamableMcpClient(McpClient):
 
             # 发送请求到Streamable HTTP端点
             mcp_url = urljoin(self.base_url, "mcp")
-            response = self.session.post(
-                mcp_url, json=request, stream=True  # 启用流式传输
-            )
+            response = self.session.post(mcp_url, json=request, stream=True)  # 启用流式传输
             response.raise_for_status()
 
             # 处理流式响应

jarvis/jarvis_platform/tongyi.py

@@ -81,10 +81,10 @@ class TongyiPlatform(BasePlatform):
                 "contentType": "text",
                 "role": "user",
                 "ext": {
-                    "searchType": "",
+                    "searchType": "depth" if self.web else "",
                     "pptGenerate": False,
-                    "deepThink": False,
-                    "deepResearch": False,
+                    "deepThink": self.model_name == "Thinking",
+                    "deepResearch": self.model_name == "Deep-Research",
                 },
             }
         ]
@@ -98,10 +98,10 @@ class TongyiPlatform(BasePlatform):
                     "contentType": "text",
                     "role": "system",
                     "ext": {
-                        "searchType": "",
+                        "searchType": "depth" if self.web else "",
                         "pptGenerate": False,
-                        "deepThink": False,
-                        "deepResearch": False,
+                        "deepThink": self.model_name == "Thinking",
+                        "deepResearch": self.model_name == "Deep-Research",
                     },
                 },
             )
@@ -140,13 +140,13 @@ class TongyiPlatform(BasePlatform):
             "parentMsgId": self.msg_id,
             "params": {
                 "agentId": "",
-                "searchType": "",
+                "searchType": "depth" if self.web else "",
                 "pptGenerate": False,
                 "bizScene": "code_chat" if self.model_name == "Code-Chat" else "",
                 "bizSceneInfo": {},
                 "specifiedModel": "",
-                "deepThink": True if self.model_name == "Thinking" else False,
-                "deepResearch": False,
+                "deepThink": self.model_name == "Thinking",
+                "deepResearch": self.model_name == "Deep-Research",
                 "fileUploadBatchId": (
                     self.uploaded_file_info[0]["batchId"]
                     if self.uploaded_file_info