jarvis-ai-assistant 0.1.123__py3-none-any.whl → 0.1.125__py3-none-any.whl

jarvis/jarvis_tools/git_commiter.py

@@ -1,4 +1,3 @@
-import os
 import re
 import shlex
 import subprocess
@@ -6,15 +5,28 @@ from typing import Dict, Any
 import tempfile
 import yaml
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes, init_env
 import sys
+import argparse
+
+from jarvis.jarvis_utils.git_utils import has_uncommitted_changes
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env
 
 
 class GitCommitTool:
     name = "git_commit_agent"
     description = "Automatically generate and execute git commits based on code changes"
-    parameters = {"properties": {}, "required": []}
-
+    parameters = {
+        "type": "object",
+        "properties": {
+            "lang": {
+                "type": "string",
+                "description": "Language for commit message",
+                "default": "Chinese"
+            }
+        },
+        "required": []
+    }
     def _extract_commit_message(self, message):
         """Raw extraction preserving all characters"""
         r = re.search(
@@ -58,27 +70,21 @@ class GitCommitTool:
             diff = process.communicate()[0].decode()
             PrettyOutput.print(diff, OutputType.CODE, lang="diff")
             
-            prompt = f'''Generate commit message with the paranoia of someone who's lost production data:
-
-# Format Enforcement Protocol
-FAILURE TO WRAP MESSAGE IN <COMMIT_MESSAGE> TAGS WILL CAUSE SYSTEM REJECTION
-
+            prompt = f'''Generate commit message by the following rules:
+            You should write commit message in {args.get('lang', 'Chinese')}
 # Required Structure
 YOU MUST USE EXACTLY THIS FORMAT:
-
 <COMMIT_MESSAGE>
 <type>(<scope>): <subject>
-
-[Body description in imperative mood]
+Body description in imperative mood
 </COMMIT_MESSAGE>
-
 # Format Rules
 1. Types: fix, feat, docs, style, refactor, test, chore
 2. Scope indicates module (e.g. auth, database)
 3. Subject line <= 72 chars, no period
-4. Body explains WHAT and WHY, using present tense
-
-# Analysis Material (DO NOT INCLUDE IN OUTPUT)
+4. Body explains WHAT and WHY for every change, using present tense
+5. Do not omit any changes
+# Analysis Material
 {diff}
 '''
             
@@ -121,8 +127,11 @@ YOU MUST USE EXACTLY THIS FORMAT:
 
 def main():
     init_env()
+    parser = argparse.ArgumentParser(description='Git commit tool')
+    parser.add_argument('--lang', type=str, default='Chinese', help='Language for commit messages')
+    args = parser.parse_args()
     tool = GitCommitTool()
-    tool.execute({})
+    tool.execute({"lang": args.lang if hasattr(args, 'lang') else 'Chinese'})
 
 if __name__ == "__main__":
     sys.exit(main())

jarvis/jarvis_tools/lsp_find_definition.py

@@ -65,7 +65,7 @@ class LSPFindDefinitionTool:
             
         try:
             # Initialize LSP
-            if not lsp.initialize(os.path.dirname(os.path.abspath(file_path))):
+            if not lsp.initialize(os.path.abspath(os.getcwd())):
                 return {
                     "success": False,
                     "stderr": "LSP initialization failed",

jarvis/jarvis_tools/lsp_find_references.py

@@ -65,7 +65,7 @@ class LSPFindReferencesTool:
             
         try:
             # Initialize LSP
-            if not lsp.initialize(os.path.dirname(os.path.abspath(file_path))):
+            if not lsp.initialize(os.path.abspath(os.getcwd())):
                 return {
                     "success": False,
                     "stderr": "LSP initialization failed",

jarvis/jarvis_tools/lsp_get_diagnostics.py

@@ -1,12 +1,14 @@
 import os
 from typing import Dict, Any
 from jarvis.jarvis_lsp.registry import LSPRegistry
-
 class LSPGetDiagnosticsTool:
     """Tool for getting diagnostics (errors, warnings) from code using LSP."""
     
+    # 工具名称
     name = "lsp_get_diagnostics"
+    # 工具描述
     description = "Get diagnostic information (errors, warnings) from code files"
+    # 工具参数定义
     parameters = {
         "file_path": "Path to the file to analyze",
         "language": f"Programming language of the file ({', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())})"
@@ -14,16 +16,16 @@ class LSPGetDiagnosticsTool:
     
     @staticmethod
     def check() -> bool:
-        """Check if any LSP server is available."""
+        """检查是否有可用的LSP服务器"""
         registry = LSPRegistry.get_global_lsp_registry()
         return len(registry.get_supported_languages()) > 0
     
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        """Execute the tool."""
+        """执行工具的主要逻辑"""
         file_path = args.get("file_path", "")
         language = args.get("language", "")
         
-        # Validate inputs
+        # 验证输入参数
         if not all([file_path, language]):
             return {
                 "success": False,
@@ -31,6 +33,7 @@ class LSPGetDiagnosticsTool:
                 "stdout": ""
             }
             
+        # 检查文件是否存在
         if not os.path.exists(file_path):
             return {
                 "success": False,
@@ -38,10 +41,11 @@ class LSPGetDiagnosticsTool:
                 "stdout": ""
             }
             
-        # Get LSP instance
+        # 获取LSP实例
         registry = LSPRegistry.get_global_lsp_registry()
         lsp = registry.create_lsp(language)
         
+        # 检查语言是否支持
         if not lsp:
             return {
                 "success": False,
@@ -50,17 +54,18 @@ class LSPGetDiagnosticsTool:
             }
             
         try:
-            # Initialize LSP
-            if not lsp.initialize(os.path.dirname(os.path.abspath(file_path))):
+            # 初始化LSP
+            if not lsp.initialize(os.path.abspath(os.getcwd())):
                 return {
                     "success": False,
                     "stderr": "LSP initialization failed",
                     "stdout": ""
                 }
                 
-            # Get diagnostics
+            # 获取诊断信息
             diagnostics = lsp.get_diagnostics(file_path)
             
+            # 如果没有诊断信息
             if not diagnostics:
                 return {
                     "success": True,
@@ -68,16 +73,18 @@ class LSPGetDiagnosticsTool:
                     "stderr": ""
                 }
                 
-            # Format output
+            # 格式化输出
             output = ["Diagnostics:"]
+            # 严重程度映射
             severity_map = {1: "Error", 2: "Warning", 3: "Info", 4: "Hint"}
             
-            # Sort diagnostics by severity and line number
+            # 按严重程度和行号排序诊断信息
             sorted_diagnostics = sorted(
                 diagnostics,
                 key=lambda x: (x["severity"], x["range"]["start"]["line"])
             )
             
+            # 处理每个诊断信息
             for diag in sorted_diagnostics:
                 severity = severity_map.get(diag["severity"], "Unknown")
                 start = diag["range"]["start"]
@@ -90,7 +97,7 @@ class LSPGetDiagnosticsTool:
                     "-" * 60
                 ])
                 
-                # Add related information if available
+                # 处理相关附加信息
                 if diag.get("relatedInformation"):
                     output.append("Related information:")
                     for info in diag["relatedInformation"]:
@@ -117,5 +124,6 @@ class LSPGetDiagnosticsTool:
                 "stdout": ""
             }
         finally:
+            # 确保关闭LSP连接
             if lsp:
                 lsp.shutdown()

jarvis/jarvis_tools/lsp_get_document_symbols.py

@@ -50,7 +50,7 @@ class LSPGetDocumentSymbolsTool:
             
         try:
             # Initialize LSP
-            if not lsp.initialize(os.path.dirname(os.path.abspath(file_path))):
+            if not lsp.initialize(os.path.abspath(os.getcwd())):
                 return {
                     "success": False,
                     "stderr": "LSP initialization failed",

jarvis/jarvis_tools/lsp_prepare_rename.py

@@ -65,7 +65,7 @@ class LSPPrepareRenameTool:
             
         try:
             # Initialize LSP
-            if not lsp.initialize(os.path.dirname(os.path.abspath(file_path))):
+            if not lsp.initialize(os.path.abspath(os.getcwd())):
                 return {
                     "success": False,
                     "stderr": "LSP initialization failed",

jarvis/jarvis_tools/lsp_validate_edit.py

@@ -74,7 +74,7 @@ class LSPValidateEditTool:
             
         try:
             # Initialize LSP
-            if not lsp.initialize(os.path.dirname(os.path.abspath(file_path))):
+            if not lsp.initialize(os.path.abspath(os.getcwd())):
                 return {
                     "success": False,
                     "stderr": "LSP initialization failed",

jarvis/jarvis_tools/methodology.py

@@ -1,7 +1,10 @@
 import os
 import yaml
 from typing import Dict, Optional, Any
-from jarvis.jarvis_utils import OutputType, PrettyOutput, is_use_methodology
+
+from jarvis.jarvis_utils.config import is_use_methodology
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 
 class MethodologyTool:

jarvis/jarvis_tools/rag.py

@@ -1,7 +1,8 @@
 from typing import Dict, Any
 import os
-from jarvis.jarvis_utils import OutputType, PrettyOutput, dont_use_local_model
 from jarvis.jarvis_rag.main import RAGTool as RAGCore
+from jarvis.jarvis_utils.config import dont_use_local_model
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class RAGTool:
     name = "rag"
@@ -48,25 +49,28 @@ class RAGTool:
         return self.rag_instances[dir_path]
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        """Execute document question and answer
+        """执行文档问答
         
         Args:
-            args: A dictionary containing parameters
-                - dir: The document directory path
-                - question: The question to ask
-                - rebuild_index: Whether to rebuild the index
+            args: 包含参数的字典
+                - dir: 文档目录路径
+                - question: 要询问的问题
+                - rebuild_index: 是否重建索引
                 
         Returns:
-            Dict[str, Any]: The execution result
+            Dict[str, Any]: 执行结果，包含以下字段：
+                - success: 布尔值，表示操作是否成功
+                - stdout: 如果成功，包含问题的答案
+                - stderr: 如果失败，包含错误信息
         """
         try:
-            # Get parameters
-            dir_path = os.path.expanduser(args["dir"])  # Expand ~ paths
-            dir_path = os.path.abspath(dir_path)  # Convert to absolute path
+            # 获取参数
+            dir_path = os.path.expanduser(args["dir"])
+            dir_path = os.path.abspath(dir_path)
             question = args["question"]
             rebuild_index = args.get("rebuild_index", False)
             
-            # Check if the directory exists
+            # 检查目录是否存在
             if not os.path.exists(dir_path):
                 return {
                     "success": False,
@@ -74,7 +78,7 @@ class RAGTool:
                     "stderr": f"Directory does not exist: {dir_path}"
                 }
                 
-            # Check if it is a directory
+            # 检查路径是否为目录
             if not os.path.isdir(dir_path):
                 return {
                     "success": False,
@@ -82,18 +86,19 @@ class RAGTool:
                     "stderr": f"The path is not a directory: {dir_path}"
                 }
                 
-            # Get RAG instance
+            # 获取RAG实例
             rag = self._get_rag_instance(dir_path)
             
-            # If you need to rebuild the index or the index does not exist
+            # 如果需要重建索引或索引不存在
             if rebuild_index or not rag.is_index_built():
                 PrettyOutput.print("正在构建文档索引...", OutputType.INFO)
                 rag.build_index(dir_path)
             
-            # Execute question and answer
+            # 执行问答
             PrettyOutput.print(f"问题: {question}", OutputType.INFO)
             response = rag.ask(question)
             
+            # 处理未找到相关文档的情况
             if response is None:
                 return {
                     "success": False,
@@ -101,6 +106,7 @@ class RAGTool:
                     "stderr": "Failed to get answer, possibly no relevant documents found"
                 }
                 
+            # 返回成功响应
             return {
                 "success": True,
                 "stdout": response,
@@ -108,6 +114,7 @@ class RAGTool:
             }
             
         except Exception as e:
+            # 处理任何意外错误
             PrettyOutput.print(f"文档问答失败：{str(e)}", OutputType.ERROR)
             return {
                 "success": False,

jarvis/jarvis_tools/read_code.py

@@ -1,6 +1,7 @@
-from typing import Dict, Any, List
+from typing import Dict, Any
 import os
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class ReadCodeTool:
@@ -119,7 +120,7 @@ class ReadCodeTool:
                 formatted_lines.append(f"{line_num:>5}:{line}")
                 
             content = "".join(formatted_lines)
-            output = f"\n\nFile: {filepath}\nLines: [{start_line}, {end_line}]\n{content}"
+            output = f"\n\nFile: {filepath}\nLines: [{start_line}, {end_line}]\n{content} \n\n" + "="*80 + "\n\n"
             return {
                 "success": True,
                 "stdout": output,

jarvis/jarvis_tools/read_webpage.py

@@ -1,7 +1,8 @@
 from typing import Dict, Any
 import requests
 from bs4 import BeautifulSoup
-from jarvis.jarvis_utils import PrettyOutput, OutputType
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class WebpageTool:
     name = "read_webpage"

jarvis/jarvis_tools/registry.py

@@ -9,7 +9,10 @@ import yaml
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.base import Tool
-from jarvis.jarvis_utils import OutputType, PrettyOutput, get_context_token_count, get_max_token_count
+from jarvis.jarvis_utils.config import get_max_token_count
+from jarvis.jarvis_utils.embedding import get_context_token_count
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 
 tool_call_help = """

jarvis/jarvis_tools/{search.py → search_web.py}

@@ -1,10 +1,13 @@
 from typing import Dict, Any, List
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils import PrettyOutput, OutputType, get_context_token_count, get_max_token_count
 from jarvis.jarvis_tools.read_webpage import WebpageTool
 from playwright.sync_api import sync_playwright
 from urllib.parse import quote
 
+from jarvis.jarvis_utils.config import get_max_token_count
+from jarvis.jarvis_utils.embedding import get_context_token_count
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 def bing_search(query):
     try:
         with sync_playwright() as p:
@@ -62,7 +65,7 @@ def bing_search(query):
         return None
 
 class SearchTool:
-    name = "search"
+    name = "search_web"
     description = "Use Bing search engine to search for information, and extract key information based on the question"
     parameters = {
         "type": "object",
@@ -212,7 +215,6 @@ Please synthesize a final answer that:
                     "stderr": "No search results found"
                 }
             
-            # Collect webpage content
             contents = []
             for i, result in enumerate(results, 1):
                 try:

jarvis/jarvis_tools/select_code_files.py

@@ -1,7 +1,7 @@
 from typing import Dict, Any
 
-from jarvis.jarvis_utils import OutputType, PrettyOutput
 from jarvis.jarvis_code_agent.file_select import select_files
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class CodeFileSelecterTool: