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

jarvis/jarvis_lsp/registry.py

@@ -5,7 +5,7 @@ import re
 import sys
 from typing import Dict, Type, Optional, List
 from jarvis.jarvis_lsp.base import BaseLSP
-from jarvis.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 REQUIRED_METHODS = [
     ('initialize', ['workspace_path']),
@@ -189,7 +189,7 @@ def main():
         PrettyOutput.print(f"没有 LSP 支持的语言: {args.language}", OutputType.WARNING)
         return 1
         
-    if not lsp.initialize(os.path.dirname(os.path.abspath(args.file))):
+    if not lsp.initialize(os.path.abspath(os.getcwd())):
         PrettyOutput.print("LSP 初始化失败", OutputType.WARNING)
         return 1
     

jarvis/jarvis_lsp/rust.py

@@ -4,7 +4,7 @@ import subprocess
 from typing import List, Dict, Optional, Tuple, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
-from jarvis.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class RustLSP(BaseLSP):
     """Rust LSP implementation using rust-analyzer."""

jarvis/jarvis_multi_agent/__init__.py

@@ -5,7 +5,7 @@ import yaml
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.output_handler import OutputHandler
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class AgentConfig:

jarvis/jarvis_platform/ai8.py

@@ -1,11 +1,12 @@
 import os
 from typing import Dict, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import PrettyOutput, OutputType
 import requests
 import json
 import base64
 
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 class AI8Model(BasePlatform):
     """AI8 model implementation"""
     

jarvis/jarvis_platform/base.py

@@ -1,10 +1,8 @@
 from abc import ABC, abstractmethod
 import re
 from typing import Dict, List, Tuple
-
-from jarvis.jarvis_utils import OutputType, PrettyOutput, while_success, while_true
-from yaspin import yaspin
-from yaspin.spinners import Spinners
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
 
 
 class BasePlatform(ABC):
@@ -34,30 +32,27 @@ class BasePlatform(ABC):
             start_time = time.time()
             response = self.chat(message)
             
-            # Calculate statistics
-            if not self.suppress_output:
-                end_time = time.time()
-                duration = end_time - start_time
-                char_count = len(response)
-                
-                # Calculate token count and tokens per second
-                try:
-                    from jarvis.jarvis_utils import get_context_token_count
-                    token_count = get_context_token_count(response)
-                    tokens_per_second = token_count / duration if duration > 0 else 0
-                except Exception as e:
-                    PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
-                    token_count = 0
-                    tokens_per_second = 0
+            end_time = time.time()
+            duration = end_time - start_time
+            char_count = len(response)
+            
+            # Calculate token count and tokens per second
+            try:
+                token_count = get_context_token_count(response)
+                tokens_per_second = token_count / duration if duration > 0 else 0
+            except Exception as e:
+                PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
+                token_count = 0
+                tokens_per_second = 0
 
-                    # Print statistics
-                    PrettyOutput.print(
-                        f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
-                        OutputType.INFO,
-                    )
+            # Print statistics
+            PrettyOutput.print(
+                f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
+                OutputType.INFO,
+            )
 
             # Keep original think tag handling
-            response = re.sub(r'<<think>>.*?</</think>>', '', response, flags=re.DOTALL)
+            response = re.sub(r'<think>.*?</think>', '', response, flags=re.DOTALL)
             return response
                 
         return while_true(lambda: while_success(lambda: _chat(), 5), 5)

jarvis/jarvis_platform/kimi.py

@@ -5,9 +5,8 @@ import os
 import mimetypes
 import time
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import PrettyOutput, OutputType
-from jarvis.jarvis_utils import while_success
-
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import while_success
 class KimiModel(BasePlatform):
     """Kimi model implementation"""
 

jarvis/jarvis_platform/ollama.py

@@ -1,10 +1,12 @@
 import requests
 from typing import List, Dict, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import OutputType, PrettyOutput, get_single_line_input
 import os
 import json
 
+from jarvis.jarvis_utils.input import get_single_line_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 class OllamaPlatform(BasePlatform):
     """Ollama platform implementation"""
     

jarvis/jarvis_platform/openai.py

@@ -2,7 +2,7 @@ from typing import Dict, List, Tuple
 import os
 from openai import OpenAI
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class OpenAIModel(BasePlatform):
     platform_name = "openai"

jarvis/jarvis_platform/oyi.py

@@ -2,10 +2,11 @@ import mimetypes
 import os
 from typing import Dict, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import PrettyOutput, OutputType
 import requests
 import json
 
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 class OyiModel(BasePlatform):
     """Oyi model implementation"""
     

jarvis/jarvis_platform/registry.py

@@ -4,7 +4,8 @@ import os
 import sys
 from typing import Dict, Type, Optional, List
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils import PrettyOutput, OutputType, get_cheap_model_name, get_cheap_platform_name, get_codegen_model_name, get_codegen_platform_name, get_normal_model_name, get_normal_platform_name, get_thinking_model_name, get_thinking_platform_name
+from jarvis.jarvis_utils.config import get_cheap_model_name, get_cheap_platform_name, get_codegen_model_name, get_codegen_platform_name, get_normal_model_name, get_normal_platform_name, get_thinking_model_name, get_thinking_platform_name
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 REQUIRED_METHODS = [
     ('chat', ['message']),           # 方法名和参数列表

jarvis/jarvis_platform_manager/main.py

@@ -1,18 +1,16 @@
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils import PrettyOutput, OutputType, init_env, get_multiline_input
 import asyncio
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel, Field
 from typing import List, Dict, Any, Optional
 import uvicorn
-import io
-from contextlib import redirect_stdout
-import json
-import os
-from datetime import datetime
 from fastapi.middleware.cors import CORSMiddleware
 
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env
+
 def list_platforms():
     """List all supported platforms and models"""
     registry = PlatformRegistry.get_global_platform_registry()

jarvis/jarvis_platform_manager/openai_test.py

@@ -4,7 +4,6 @@ Test script for Jarvis OpenAI-compatible API service.
 """
 
 import argparse
-import os
 import sys
 from openai import OpenAI
 

jarvis/jarvis_rag/main.py

@@ -3,8 +3,6 @@ import numpy as np
 import faiss
 from typing import List, Tuple, Optional, Dict
 import pickle
-from jarvis.jarvis_utils import OutputType, PrettyOutput, get_context_token_count, get_embedding, get_embedding_batch, get_file_md5, get_max_token_count, get_max_paragraph_length, get_min_paragraph_length, get_thread_count, init_gpu_config, load_embedding_model
-from jarvis.jarvis_utils import init_env
 from dataclasses import dataclass
 from tqdm import tqdm
 import fitz  # PyMuPDF for PDF files
@@ -15,6 +13,11 @@ import lzma  # 添加 lzma 导入
 from threading import Lock
 import hashlib
 
+from jarvis.jarvis_utils.config import get_max_paragraph_length, get_max_token_count, get_min_paragraph_length, get_thread_count
+from jarvis.jarvis_utils.embedding import get_context_token_count, get_embedding, get_embedding_batch, load_embedding_model
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import  get_file_md5, init_env, init_gpu_config
+
 @dataclass
 class Document:
     """Document class, for storing document content and metadata"""

jarvis/jarvis_smart_shell/main.py

@@ -4,11 +4,14 @@ import os
 import sys
 import readline
 from typing import Optional
-from yaspin import yaspin # type: ignore
-from yaspin.spinners import Spinners # type: ignore
+
+from yaspin import yaspin
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils import PrettyOutput, OutputType, get_multiline_input, get_shell_name, init_env
+from jarvis.jarvis_utils.config import get_shell_name
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env
 
 def execute_command(command: str) -> None:
     """Show command and allow user to edit, then execute, Ctrl+C to cancel"""
@@ -95,7 +98,9 @@ Output: find . -name "*.py"
         prefix = f"Current path: {current_path}\n"
         prefix += f"Current shell: {shell}\n"
         
-        result = model.chat_until_success(prefix + request)
+        with yaspin(text="正在生成命令...", color="cyan") as spinner:
+            result = model.chat_until_success(prefix + request)
+            spinner.ok("✅ 命令生成成功")
         
         # 提取命令
         if result and isinstance(result, str):

jarvis/jarvis_tools/ask_codebase.py

@@ -1,6 +1,8 @@
 from typing import Dict, Any
-from jarvis.jarvis_utils import OutputType, PrettyOutput, dont_use_local_model, find_git_root
 from jarvis.jarvis_codebase.main import CodeBase
+from jarvis.jarvis_utils.config import dont_use_local_model
+from jarvis.jarvis_utils.git_utils import find_git_root
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class AskCodebaseTool:
     """Tool for intelligent codebase querying and analysis using CodeBase"""
@@ -52,14 +54,20 @@ class AskCodebaseTool:
             codebase = CodeBase(git_root)
 
             # Use ask_codebase method
-            _, response = codebase.ask_codebase(question, top_k)
-
+            files, response = codebase.ask_codebase(question, top_k)
+            
+            # Print found files
+            if files:
+                output = "找到的相关文件:\n"
+                for file in files:
+                    output += f"- {file['file']} ({file['reason']})\n"
+                PrettyOutput.print(output, OutputType.INFO, lang="markdown")
+            
             return {
                 "success": True,
                 "stdout": response,
                 "stderr": ""
             }
-
         except Exception as e:
             error_msg = f"分析代码库失败: {str(e)}"
             PrettyOutput.print(error_msg, OutputType.WARNING)
@@ -68,8 +76,6 @@ class AskCodebaseTool:
                 "stdout": "",
                 "stderr": error_msg
             }
-
-
 def main():
     """Command line interface for the tool"""
     import argparse
@@ -79,7 +85,6 @@ def main():
     parser.add_argument('--top-k', type=int, help='Number of files to analyze', default=20)
     
     args = parser.parse_args()
-    
     tool = AskCodebaseTool()
     result = tool.execute({
         "question": args.question,

jarvis/jarvis_tools/ask_user.py

@@ -1,6 +1,7 @@
 from typing import Dict, Any
-from jarvis.jarvis_tools.base import Tool
-from jarvis.jarvis_utils import get_multiline_input, PrettyOutput, OutputType
+
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class AskUserTool:
     name="ask_user"

jarvis/jarvis_tools/base.py

@@ -1,23 +1,37 @@
 from typing import Dict, Any, Callable
 import json
-
-
-
 class Tool:
+    """工具类，用于封装工具的基本信息和执行方法"""
+    
     def __init__(self, name: str, description: str, parameters: Dict, func: Callable):
+        """
+        初始化工具对象
+        
+        Args:
+            name (str): 工具名称
+            description (str): 工具描述
+            parameters (Dict): 工具参数定义
+            func (Callable): 工具执行函数
+        """
         self.name = name
         self.description = description
         self.parameters = parameters
         self.func = func
-
     def to_dict(self) -> Dict:
-        """Convert to tool format"""
+        """将工具对象转换为字典格式，主要用于序列化"""
         return {
             "name": self.name,
             "description": self.description,
             "parameters": json.dumps(self.parameters, ensure_ascii=False)
         }
-
     def execute(self, arguments: Dict) -> Dict[str, Any]:
-        """Execute tool function"""
+        """
+        执行工具函数
+        
+        Args:
+            arguments (Dict): 工具执行所需的参数
+            
+        Returns:
+            Dict[str, Any]: 工具执行结果
+        """
         return self.func(arguments)

jarvis/jarvis_tools/chdir.py

@@ -1,6 +1,5 @@
 from typing import Dict, Any
 import os
-from jarvis.jarvis_utils import PrettyOutput, OutputType
 
 class ChdirTool:
     name = "chdir"
@@ -17,10 +16,31 @@ class ChdirTool:
     }
     
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """Execute directory change operation with comprehensive error handling.
+        
+        Args:
+            args: Dictionary containing 'path' key with target directory path
+            
+        Returns:
+            Dictionary containing:
+                - success: Boolean indicating operation status
+                - stdout: Success message or empty string
+                - stderr: Error message or empty string
+                
+        Raises:
+            Handles and returns appropriate error messages for:
+                - Non-existent paths
+                - Non-directory paths
+                - Permission errors
+                - Generic exceptions
+        """
+        # Main execution block with comprehensive error handling
         try:
+            # Normalize and expand the input path (handles ~ and relative paths)
             path = os.path.expanduser(args["path"].strip())
             path = os.path.abspath(path)
             
+            # Validate that the target path exists
             if not os.path.exists(path):
                 return {
                     "success": False,
@@ -28,6 +48,7 @@ class ChdirTool:
                     "stderr": f"Directory does not exist: {path}"
                 }
                 
+            # Ensure the path points to a directory, not a file
             if not os.path.isdir(path):
                 return {
                     "success": False,
@@ -35,6 +56,7 @@ class ChdirTool:
                     "stderr": f"The path is not a directory: {path}"
                 }
                 
+            # Capture current directory and attempt to change to new path
             old_path = os.getcwd()
             os.chdir(path)
             
@@ -44,12 +66,14 @@ class ChdirTool:
                 "stderr": ""
             }
             
+        # Handle cases where user lacks directory access permissions
         except PermissionError:
             return {
                 "success": False,
                 "stdout": "",
                 "stderr": f"No permission to access directory: {path}"
             }
+        # Catch-all for any other unexpected errors during directory change
         except Exception as e:
             return {
                 "success": False,

jarvis/jarvis_tools/code_review.py

@@ -1,12 +1,13 @@
-from typing import Dict, Any, List
+from typing import Dict, Any
 import subprocess
-import yaml
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils import OutputType, PrettyOutput, init_env, find_git_root
 from jarvis.jarvis_agent import Agent
 import re
 
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env
+
 class CodeReviewTool:
     name = "code_review"
     description = "Autonomous code review agent for code changes analysis"
@@ -35,10 +36,6 @@ class CodeReviewTool:
         "required": []
     }
 
-    def __init__(self):
-        init_env()
-        self.repo_root = find_git_root()
-
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
             review_type = args.get("review_type", "current").strip()
@@ -170,13 +167,13 @@ PROPOSED DEFENSE:
             agent = Agent(
                 system_prompt=system_prompt,
                 name="Code Review Agent",
-                summary_prompt="""Please generate a concise summary report of the code review, format as yaml:
+                summary_prompt="""Please generate a concise summary report of the code review in Chinese, format as follows:
 <REPORT>
-- file: xxxx.py
-  location: [start_line_number, end_line_number]
-  description: # Only describe issues directly observable in the diff
-  severity: # Critical/Major/Minor based on concrete evidence
-  suggestion: # Specific, actionable improvements for the observed code
+- 文件: xxxx.py
+  位置: [起始行号, 结束行号]
+  描述: # 仅描述在差异中直接观察到的问题
+  严重程度: # 根据具体证据分为严重/重要/次要
+  建议: # 针对观察到的代码的具体改进建议
 </REPORT>""",
                 is_sub_agent=True,
                 output_handler=[tool_registry],
@@ -207,6 +204,8 @@ def extract_code_report(result: str) -> str:
 def main():
     """CLI entry point"""
     import argparse
+
+    init_env()
     
     parser = argparse.ArgumentParser(description='Autonomous code review tool')
     parser.add_argument('--type', choices=['commit', 'current', 'range'], default='current',
@@ -236,7 +235,7 @@ def main():
     result = tool.execute(tool_args)
     
     if result["success"]:
-        PrettyOutput.section("Autonomous Review Result:", OutputType.SUCCESS)
+        PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
         report = extract_code_report(result["stdout"])
         PrettyOutput.print(report, OutputType.SUCCESS, lang="yaml")
         

jarvis/jarvis_tools/create_code_agent.py

@@ -1,9 +1,9 @@
-import os
 from typing import Dict, Any
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.code_review import CodeReviewTool, extract_code_report
-from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes
+from jarvis.jarvis_utils.git_utils import get_latest_commit_hash, has_uncommitted_changes
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class CreateCodeAgentTool:
     """Tool for managing the code development workflow."""
@@ -14,9 +14,6 @@ class CreateCodeAgentTool:
         "requirement": "Technical specifications for code implementation"
     }
     
-    def _get_current_commit(self) -> str:
-        """Get current commit hash."""
-        return os.popen("git rev-parse HEAD").read().strip()
     
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
@@ -42,7 +39,7 @@ class CreateCodeAgentTool:
                     }
             
             # Get current commit hash
-            start_commit = self._get_current_commit()
+            start_commit = get_latest_commit_hash()
             
             # Step 2: Development
             PrettyOutput.print("开始开发...", OutputType.INFO)
@@ -50,7 +47,7 @@ class CreateCodeAgentTool:
             agent.run(requirement)
             
             # Get new commit hash after development
-            end_commit = self._get_current_commit()
+            end_commit = get_latest_commit_hash()
             
             # Step 3: Code Review
             PrettyOutput.print("开始代码审查...", OutputType.INFO)

jarvis/jarvis_tools/create_sub_agent.py

@@ -2,8 +2,8 @@ from typing import Dict, Any
 
 
 from jarvis.jarvis_agent import Agent, origin_agent_system_prompt
-from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 
 class SubAgentTool:

jarvis/jarvis_tools/execute_shell.py

@@ -3,7 +3,9 @@ import os
 import tempfile
 from pathlib import Path
 
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+
 
 
 class ShellTool:

jarvis/jarvis_tools/execute_shell_script.py

@@ -0,0 +1,58 @@
+from typing import Dict, Any
+import os
+import tempfile
+from pathlib import Path
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+
+class ShellScriptTool:
+    name = "execute_shell_script"
+    description = """Execute shell script file and return result"""
+    parameters = {
+        "type": "object",
+        "properties": {
+            "script_content": {
+                "type": "string",
+                "description": "Content of the shell script to execute"
+            }
+        },
+        "required": ["script_content"]
+    }
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute shell script content"""
+        try:
+            script_content = args.get("script_content", "").strip()
+            if not script_content:
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "Missing or empty script_content parameter"
+                }
+            
+            # Create temporary script file
+            script_path = os.path.join(tempfile.gettempdir(), f"jarvis_script_{os.getpid()}.sh")
+            try:
+                with open(script_path, 'w', encoding='utf-8') as f:
+                    f.write(script_content)
+                # Use execute_shell to run the script
+                from jarvis.jarvis_tools.execute_shell import ShellTool
+                shell_tool = ShellTool()
+                result = shell_tool.execute({"command": f"bash {script_path}"})
+                
+                return {
+                    "success": result["success"],
+                    "stdout": result["stdout"],
+                    "stderr": result["stderr"]
+                }
+            finally:
+                # Clean up temporary script file
+                Path(script_path).unlink(missing_ok=True)
+                
+        except Exception as e:
+            PrettyOutput.print(str(e), OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": str(e)
+            }

jarvis/jarvis_tools/file_operation.py

@@ -1,7 +1,8 @@
-from typing import Dict, Any, List, Union
+from typing import Dict, Any
 import os
 
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 
 class FileOperationTool: