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

jarvis/jarvis_tools/git_commiter.py

@@ -4,6 +4,7 @@ import subprocess
 from typing import Dict, Any
 import tempfile
 import yaml
+from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 import sys
 import argparse
@@ -15,13 +16,13 @@ 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"
+    description = "根据代码变更自动生成并执行Git提交"
     parameters = {
         "type": "object",
         "properties": {
             "lang": {
                 "type": "string",
-                "description": "Language for commit message",
+                "description": "提交信息的语言",
                 "default": "Chinese"
             }
         },
@@ -54,59 +55,68 @@ class GitCommitTool:
                 PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
                 return {"success": True, "stdout": "No changes to commit", "stderr": ""}
             
-            PrettyOutput.print("准备添加文件到提交...", OutputType.SYSTEM)
-            subprocess.Popen(
-                ["git", "add", "."],
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL
-            ).wait()
-            
-            PrettyOutput.print("获取差异...", OutputType.SYSTEM)
-            process = subprocess.Popen(
-                ["git", "diff", "--cached", "--exit-code"],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE
-            )
-            diff = process.communicate()[0].decode()
-            PrettyOutput.print(diff, OutputType.CODE, lang="diff")
-            
-            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
-</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 for every change, using present tense
-5. Do not omit any changes
-# Analysis Material
-{diff}
-'''
-            
-            PrettyOutput.print("生成提交消息...", OutputType.SYSTEM)
-            platform = PlatformRegistry().get_codegen_platform()
-            platform.set_suppress_output(True)
-            commit_message = platform.chat_until_success(prompt)
-            commit_message = self._extract_commit_message(commit_message)
-            
-            # 使用临时文件处理提交消息
-            with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
-                tmp_file.write(commit_message)
-                tmp_file.flush()  # 确保内容写入文件
-                commit_cmd = ["git", "commit", "-F", tmp_file.name]
-                PrettyOutput.print("提交...", OutputType.INFO)
+            with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
+                # 添加文件
+                spinner.text = "正在添加文件到提交..."
                 subprocess.Popen(
-                    commit_cmd,
+                    ["git", "add", "."],
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL
                 ).wait()
+                spinner.write("✅ 添加文件到提交")
+                
+                # 获取差异
+                spinner.text = "正在获取代码差异..."
+                process = subprocess.Popen(
+                    ["git", "diff", "--cached", "--exit-code"],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE
+                )
+                diff = process.communicate()[0].decode()
+                spinner.write("✅ 获取差异")
+                
+                # 生成提交信息
+                spinner.text = "正在生成提交消息..."
+                prompt = f'''根据以下规则生成提交信息：
+                提交信息应使用{args.get('lang', '中文')}书写
+    # 必需结构
+    必须使用以下格式：
+    <COMMIT_MESSAGE>
+    <类型>(<范围>): <主题>
+    使用祈使语气描述变更内容
+    </COMMIT_MESSAGE>
+    # 格式规则
+    1. 类型: fix, feat, docs, style, refactor, test, chore
+    2. 范围表示模块 (例如: auth, database)
+    3. 主题行 <= 72个字符，不以句号结尾
+    4. 正文使用现在时态解释每个变更的内容和原因
+    5. 不要遗漏任何变更
+    # 分析材料
+    {diff}
+    '''
+                platform = PlatformRegistry().get_codegen_platform()
+                commit_message = platform.chat_until_success(prompt)
+                commit_message = self._extract_commit_message(commit_message)
+                spinner.write("✅ 生成提交消息")
+                
+                # 执行提交
+                spinner.text = "正在准备提交..."
+                with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
+                    tmp_file.write(commit_message)
+                    tmp_file.flush()
+                    spinner.text = "正在执行提交..."
+                    commit_cmd = ["git", "commit", "-F", tmp_file.name]
+                    subprocess.Popen(
+                        commit_cmd,
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL
+                    ).wait()
+                    spinner.write("✅ 提交")
+
+                commit_hash = self._get_last_commit_hash()
+                spinner.text = "完成提交"
+                spinner.ok("✅")
 
-            commit_hash = self._get_last_commit_hash()
             PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
 
             return {
@@ -116,7 +126,7 @@ Body description in imperative mood
                     "commit_message": commit_message
                 }),
                 "stderr": ""
-            }
+                }
 
         except Exception as e:
             return {

jarvis/jarvis_tools/lsp_find_definition.py

@@ -3,15 +3,15 @@ from typing import Dict, Any
 from jarvis.jarvis_lsp.registry import LSPRegistry
 
 class LSPFindDefinitionTool:
-    """Tool for finding symbol definitions in code using LSP."""
+    """使用LSP在代码中查找符号定义的工具"""
     
     name = "lsp_find_definition"
-    description = "Find the definition of a symbol in code"
+    description = "在代码中查找符号的定义"
     parameters = {
-        "file_path": "Path to the file containing the symbol",
-        "line": "Line number (0-based) of the symbol",
-        "character": "Character position in the line",
-        "language": f"Programming language of the file ({', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())})"
+        "file_path": "包含符号的文件路径",
+        "line": "符号所在的行号（从0开始）",
+        "character": "符号在行中的字符位置",
+        "language": f"文件的编程语言（{', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())}）"
     }
     
     @staticmethod
@@ -131,4 +131,4 @@ class LSPFindDefinitionTool:
             }
         finally:
             if lsp:
-                lsp.shutdown()
+                lsp.shutdown()

jarvis/jarvis_tools/lsp_prepare_rename.py

@@ -3,15 +3,15 @@ from typing import Dict, Any
 from jarvis.jarvis_lsp.registry import LSPRegistry
 
 class LSPPrepareRenameTool:
-    """Tool for checking if a symbol can be renamed using LSP."""
+    """使用LSP检查符号是否可以安全重命名并显示所有受影响位置的工具"""
     
     name = "lsp_prepare_rename"
-    description = "Check if a symbol can be safely renamed and show all locations that would be affected"
+    description = "检查符号是否可以安全重命名，并显示所有受影响的位置"
     parameters = {
-        "file_path": "Path to the file containing the symbol",
-        "line": "Line number (0-based) of the symbol",
-        "character": "Character position in the line",
-        "language": f"Programming language of the file ({', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())})"
+        "file_path": "包含符号的文件路径",
+        "line": "符号所在的行号（从0开始）",
+        "character": "符号在行中的字符位置",
+        "language": f"文件的编程语言（{', '.join(LSPRegistry.get_global_lsp_registry().get_supported_languages())}）"
     }
     
     @staticmethod
@@ -127,4 +127,4 @@ class LSPPrepareRenameTool:
             }
         finally:
             if lsp:
-                lsp.shutdown()
+                lsp.shutdown()

jarvis/jarvis_tools/methodology.py

@@ -8,25 +8,25 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class MethodologyTool:
-    """Experience management tool"""
+    """经验管理工具"""
     
     name = "methodology"
-    description = "Manage problem-solving methodologies, supporting add, update, and delete operations"
+    description = "管理问题解决方法论，支持添加、更新和删除操作"
     parameters = {
         "type": "object",
         "properties": {
             "operation": {
                 "type": "string",
-                "description": "Operation type (delete/update/add)",
+                "description": "操作类型（delete/update/add）",
                 "enum": ["delete", "update", "add"]
             },
             "problem_type": {
                 "type": "string",
-                "description": "Problem type, e.g., code_review, bug_fix, etc."
+                "description": "问题类型，例如：code_review, bug_fix 等"
             },
             "content": {
                 "type": "string",
-                "description": "Methodology content (required for update/add)",
+                "description": "方法论内容（更新和添加时必填）",
                 "optional": True
             }
         },
@@ -60,7 +60,7 @@ class MethodologyTool:
         except Exception as e:
             PrettyOutput.print(f"加载方法论失败: {str(e)}", OutputType.ERROR)
             return {}
-            
+                
     def _save_methodologies(self, methodologies: Dict):
         """Save all methodologies"""
         try:

jarvis/jarvis_tools/rag.py

@@ -6,21 +6,21 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class RAGTool:
     name = "rag"
-    description = "Ask questions based on a document directory, supporting multiple document formats (txt, pdf, docx, etc.)"
+    description = "基于文档目录进行问答，支持多种文档格式（txt、pdf、docx等）"
     parameters = {
         "type": "object",
         "properties": {
             "dir": {
                 "type": "string",
-                "description": "Document directory path, supports both relative and absolute paths"
+                "description": "文档目录路径，支持相对路径和绝对路径"
             },
             "question": {
                 "type": "string",
-                "description": "The question to ask"
+                "description": "要询问的问题"
             },
             "rebuild_index": {
                 "type": "boolean",
-                "description": "Whether to rebuild the index",
+                "description": "是否重建索引",
                 "default": False
             }
         },
@@ -145,4 +145,4 @@ def main():
         PrettyOutput.print(result["stderr"], OutputType.WARNING)
 
 if __name__ == "__main__":
-    main() 
+    main()

jarvis/jarvis_tools/read_webpage.py

@@ -1,18 +1,19 @@
 from typing import Dict, Any
 import requests
 from bs4 import BeautifulSoup
+from yaspin import yaspin
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class WebpageTool:
     name = "read_webpage"
-    description = "Read webpage content, extract title, text and hyperlinks"
+    description = "读取网页内容，提取标题、文本和超链接"
     parameters = {
         "type": "object",
         "properties": {
             "url": {
                 "type": "string",
-                "description": "The URL of the webpage to read"
+                "description": "要读取的网页URL"
             }
         },
         "required": ["url"]
@@ -29,48 +30,67 @@ class WebpageTool:
             }
             
             # Send request
-            PrettyOutput.print(f"正在读取网页：{url}", OutputType.INFO)
-            response = requests.get(url, headers=headers, timeout=10)
-            response.raise_for_status()
+            with yaspin(text="正在读取网页...", color="cyan") as spinner:
+                response = requests.get(url, headers=headers, timeout=10)
+                response.raise_for_status()
+                spinner.text = "网页读取完成"
+                spinner.ok("✅")
+                
             
             # Use correct encoding
+
             response.encoding = response.apparent_encoding
             
             # Parse HTML
-            soup = BeautifulSoup(response.text, 'html.parser')
+            with yaspin(text="正在解析网页...", color="cyan") as spinner:
+                soup = BeautifulSoup(response.text, 'html.parser')
+                spinner.text = "网页解析完成"
+                spinner.ok("✅")
             
             # Remove script and style tags
-            for script in soup(["script", "style"]):
-                script.decompose()
+            with yaspin(text="正在移除脚本和样式...", color="cyan") as spinner:
+                for script in soup(["script", "style"]):
+                    script.decompose()
+                spinner.text = "脚本和样式移除完成"
+                spinner.ok("✅")
             
             # Extract title
-            title = soup.title.string if soup.title else ""
-            title = title.strip() if title else "No title"
-            
-            # Extract text and links
-            text_parts = []
-            links = []
+            with yaspin(text="正在提取标题...", color="cyan") as spinner:
+                title = soup.title.string if soup.title else ""
+                title = title.strip() if title else "No title"
+                spinner.text = "标题提取完成"
+                spinner.ok("✅")
             
-            # Process content and collect links
-            for element in soup.descendants:
-                if element.name == 'a' and element.get('href'): # type: ignore
-                    href = element.get('href') # type: ignore
-                    text = element.get_text(strip=True)
-                    if text and href:
-                        links.append(f"[{text}]({href})")
-                elif isinstance(element, str) and element.strip():
-                    text_parts.append(element.strip())
+            with yaspin(text="正在提取文本和链接...", color="cyan") as spinner:
+                # Extract text and links
+                text_parts = []
+                links = []
+                
+                # Process content and collect links
+                for element in soup.descendants:
+                    if element.name == 'a' and element.get('href'): # type: ignore
+                        href = element.get('href') # type: ignore
+                        text = element.get_text(strip=True)
+                        if text and href:
+                            links.append(f"[{text}]({href})")
+                    elif isinstance(element, str) and element.strip():
+                        text_parts.append(element.strip())
+                spinner.text = "文本和链接提取完成"
+                spinner.ok("✅")
             
             # Build output
-            output = [
-                f"Title: {title}",
-                "",
-                "Text content:",
-                "\n".join(text_parts),
-                "",
-                "Links found:",
-                "\n".join(links) if links else "No links found"
-            ]
+            with yaspin(text="正在构建输出...", color="cyan") as spinner:
+                output = [
+                    f"Title: {title}",
+                    "",
+                    "Text content:",
+                    "\n".join(text_parts),
+                    "",
+                    "Links found:",
+                    "\n".join(links) if links else "No links found"
+                ]
+                spinner.text = "输出构建完成"
+                spinner.ok("✅")
             
             return {
                 "success": True,