jarvis-ai-assistant 0.1.115__py3-none-any.whl → 0.1.117__py3-none-any.whl

jarvis/jarvis_rag/main.py

@@ -3,8 +3,8 @@ import numpy as np
 import faiss
 from typing import List, Tuple, Optional, Dict
 import pickle
-from 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.utils import init_env
+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
@@ -642,32 +642,64 @@ class RAGTool:
     def ask(self, question: str) -> Optional[str]:
         """Ask questions about documents with enhanced context building"""
         try:
-            # 搜索相关文档
             results = self.search(question)
             if not results:
                 return None
             
-            # 构建提示词
-            prompt = f"""Based on the following document fragments, please answer the user's question accurately and comprehensively.
-
+            prompt = f"""
+# 🤖 Role Definition
+You are a document analysis expert who provides accurate and comprehensive answers based on provided documents.
+
+# 🎯 Core Responsibilities
+- Analyze document fragments thoroughly
+- Answer questions accurately
+- Reference source documents
+- Identify missing information
+- Maintain professional tone
+
+# 📋 Answer Requirements
+## Content Quality
+- Base answers strictly on provided documents
+- Be specific and precise
+- Include relevant quotes when helpful
+- Indicate any information gaps
+- Use professional language
+
+## Answer Structure
+1. Direct Answer
+   - Clear and concise response
+   - Based on document evidence
+   - Professional terminology
+
+2. Supporting Details
+   - Relevant document quotes
+   - File references
+   - Context explanation
+
+3. Information Gaps (if any)
+   - Missing information
+   - Additional context needed
+   - Potential limitations
+
+# 🔍 Analysis Context
 Question: {question}
 
-Relevant documents (ordered by relevance):
+Relevant Documents (by relevance):
 """
-            # 添加上下文，控制长度
+
+            # Add context with length control
             available_count = self.max_token_count - get_context_token_count(prompt) - 1000
             current_count = 0
             
             for doc, score in results:
                 doc_content = f"""
-[Score: {score:.3f}] {doc.metadata['file_path']}:
+## Document Fragment [Score: {score:.3f}]
+Source: {doc.metadata['file_path']}
+```
 {doc.content}
+```
 ---
 """
-                prompt += "Answer Format:\n"
-                prompt += "1. Answer the question accurately and comprehensively.\n"
-                prompt += "2. If the documents don't fully answer the question, please indicate what information is missing.\n"
-                prompt += "3. Reference the documents in the answer.\n"
                 if current_count + get_context_token_count(doc_content) > available_count:
                     PrettyOutput.print(
                         "由于上下文长度限制，部分内容被省略",
@@ -677,14 +709,19 @@ Relevant documents (ordered by relevance):
                     
                 prompt += doc_content
                 current_count += get_context_token_count(doc_content)
-            
-            prompt += "\nIf the documents don't fully answer the question, please indicate what information is missing."
-            
-            # 使用 normal 平台处理文档问答
+
+            prompt += """
+# ❗ Important Rules
+1. Only use provided documents
+2. Be precise and accurate
+3. Quote sources when relevant
+4. Indicate missing information
+5. Maintain professional tone
+6. Answer in user's language
+"""
+
             model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
-            response = model.chat_until_success(prompt)
-            
-            return response
+            return model.chat_until_success(prompt)
             
         except Exception as e:
             PrettyOutput.print(f"回答失败：{str(e)}", OutputType.ERROR)

jarvis/jarvis_smart_shell/main.py

@@ -8,7 +8,7 @@ from yaspin import yaspin # type: ignore
 from yaspin.spinners import Spinners # type: ignore
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.utils import PrettyOutput, OutputType, get_shell_name, init_env
+from jarvis.jarvis_utils import PrettyOutput, OutputType, get_multiline_input, get_shell_name, init_env
 
 def execute_command(command: str) -> None:
     """Show command and allow user to edit, then execute, Ctrl+C to cancel"""
@@ -46,43 +46,63 @@ def process_request(request: str) -> Optional[str]:
         current_path = os.getcwd()
         
         # Set system prompt
-        system_message = f"""You are a shell command generation assistant.
+        system_message = """
+# 🤖 Role Definition
+You are a shell command generation expert who converts natural language requirements into precise shell commands.
 
-Your only task is to convert user's natural language requirements into corresponding shell commands.
+# 🎯 Core Responsibilities
+- Convert natural language to shell commands
+- Generate accurate and efficient commands
+- Follow strict output format rules
+- Maintain command simplicity
 
-Strict requirements:
-1. Only return the shell command itself
-2. Do not add any markers (like ```, /**/, // etc.)
-3. Do not add any explanations or descriptions
-4. Do not add any line breaks or extra spaces
-5. If multiple commands are needed, connect them with &&
+# 📋 Output Requirements
+## Format Rules
+1. Return ONLY the command
+2. NO markers (```, /*, //)
+3. NO explanations
+4. NO line breaks
+5. NO extra spaces
+6. Multiple commands: use &&
 
-Example input:
-"Find all Python files in the current directory"
+## Command Style
+- Use standard shell syntax
+- Keep commands concise
+- Follow best practices
+- Ensure proper quoting
+- Handle spaces correctly
 
-Example output:
-find . -name "*.py"
+# 📝 Example Format
+Input: "Find all Python files in the current directory"
+Output: find . -name "*.py"
 
-Remember: Only return the command itself, without any additional content.
+# ❗ Critical Rules
+1. ONLY output the command
+2. NO additional content
+3. NO formatting markers
+4. NO explanations
+5. ONE line only
+
+# 💡 Command Guidelines
+- Use standard tools
+- Prefer portable syntax
+- Handle edge cases
+- Escape special chars
+- Quote when needed
 """
         model.set_system_message(system_message)
 
         prefix = f"Current path: {current_path}\n"
         prefix += f"Current shell: {shell}\n"
         
-        # 使用yaspin显示Thinking状态
-        with yaspin(Spinners.dots, text="Thinking", color="yellow") as spinner:
-            # 处理请求
-            result = model.chat_until_success(prefix + request)
-            
-            # 提取命令
-            if result and isinstance(result, str):
-                command = result.strip()
-                spinner.ok("✓")
-                return command
-            
-            spinner.fail("✗")
-            return None
+        result = model.chat_until_success(prefix + request)
+        
+        # 提取命令
+        if result and isinstance(result, str):
+            command = result.strip()
+            return command
+        
+        return None
         
     except Exception as e:
         PrettyOutput.print(f"处理请求失败: {str(e)}", OutputType.WARNING)
@@ -101,15 +121,21 @@ Example:
   %(prog)s "Find documents modified in the last week"
 """)
     
-    # 添加参数
+    # 修改为可选参数，添加从stdin读取的支持
     parser.add_argument(
         "request",
-        help="描述您想要执行的操作, 用自然语言描述"
+        nargs='?',  # 设置为可选参数
+        help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取"
     )
     
     # 解析参数
     args = parser.parse_args()
     
+    # 添加标准输入处理
+    if not args.request:
+        # 检查是否在交互式终端中运行
+        args.request = get_multiline_input(tip="请输入您要执行的功能：")
+    
     # 处理请求
     command = process_request(args.request)
     

jarvis/jarvis_tools/ask_codebase.py

@@ -1,5 +1,5 @@
 from typing import Dict, Any
-from jarvis.utils import OutputType, PrettyOutput, dont_use_local_model, find_git_root
+from jarvis.jarvis_utils import OutputType, PrettyOutput, dont_use_local_model, find_git_root
 from jarvis.jarvis_codebase.main import CodeBase
 
 class AskCodebaseTool:

jarvis/jarvis_tools/ask_user.py

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

jarvis/jarvis_tools/chdir.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any
 import os
-from jarvis.utils import PrettyOutput, OutputType
+from jarvis.jarvis_utils import PrettyOutput, OutputType
 
 class ChdirTool:
     name = "chdir"

jarvis/jarvis_tools/code_review.py

@@ -3,8 +3,8 @@ import subprocess
 import yaml
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.utils import OutputType, PrettyOutput, init_env, find_git_root
-from jarvis.agent import Agent
+from jarvis.jarvis_utils import OutputType, PrettyOutput, init_env, find_git_root
+from jarvis.jarvis_agent import Agent
 import re
 
 class CodeReviewTool:
@@ -168,7 +168,7 @@ OUTPUT REQUIREMENTS:
   suggestion: # Specific, actionable improvements for the observed code
 </REPORT>""",
                 is_sub_agent=True,
-                tool_registry=tool_registry,
+                output_handler=[tool_registry],
                 platform=PlatformRegistry().get_thinking_platform(),
                 auto_complete=True
             )

jarvis/jarvis_tools/create_code_agent.py

@@ -3,7 +3,7 @@ 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.utils import OutputType, PrettyOutput, has_uncommitted_changes
+from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes
 
 class CreateCodeAgentTool:
     """Tool for managing the code development workflow."""

jarvis/jarvis_tools/create_sub_agent.py

@@ -1,9 +1,9 @@
 from typing import Dict, Any
 
 
-from jarvis.agent import Agent, origin_agent_system_prompt
+from jarvis.jarvis_agent import Agent, origin_agent_system_prompt
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils import OutputType, PrettyOutput
 
 
 class SubAgentTool:

jarvis/jarvis_tools/execute_shell.py

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

jarvis/jarvis_tools/file_operation.py

@@ -1,7 +1,7 @@
 from typing import Dict, Any, List, Union
 import os
 
-from jarvis.utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils import OutputType, PrettyOutput
 
 
 class FileOperationTool:
@@ -38,25 +38,27 @@ class FileOperationTool:
             PrettyOutput.print(f"文件操作: {operation} - {abs_path}", OutputType.INFO)
             
             if operation == "read":
-                if not os.path.exists(filepath):
+                if not os.path.exists(abs_path):
+                    PrettyOutput.print(f"文件不存在: {abs_path}", OutputType.WARNING)
                     return {
                         "success": False,
                         "stdout": "",
-                        "stderr": f"文件不存在: {filepath}"
+                        "stderr": f"文件不存在: {abs_path}"
                     }
                     
-                if os.path.getsize(filepath) > 10 * 1024 * 1024:  # 10MB
+                if os.path.getsize(abs_path) > 10 * 1024 * 1024:  # 10MB
+                    PrettyOutput.print(f"文件太大: {abs_path}", OutputType.WARNING)
                     return {
                         "success": False,
                         "stdout": "",
                         "stderr": "File too large (>10MB)"
                     }
                     
-                content = open(filepath, 'r', encoding='utf-8').read()
-                output = f"File: {filepath}\n{content}"
+                content = open(abs_path, 'r', encoding='utf-8').read()
+                output = f"File: {abs_path}\n{content}"
                 
                 # Print file content
-                PrettyOutput.print(f"读取文件: {filepath}\n{content}", OutputType.INFO)
+                PrettyOutput.print(f"读取文件: {abs_path}\n{content}", OutputType.INFO)
                 
                 return {
                     "success": True,
@@ -65,17 +67,17 @@ class FileOperationTool:
                 }
                 
             elif operation == "write":
-                os.makedirs(os.path.dirname(os.path.abspath(filepath)), exist_ok=True)
-                with open(filepath, 'w', encoding='utf-8') as f:
+                os.makedirs(os.path.dirname(os.path.abspath(abs_path)), exist_ok=True)
+                with open(abs_path, 'w', encoding='utf-8') as f:
                     f.write(content)
                 
-                PrettyOutput.print(f"写入文件: {filepath}", OutputType.INFO)
+                PrettyOutput.print(f"写入文件: {abs_path}", OutputType.INFO)
                 return {
                     "success": True,
-                    "stdout": f"Successfully wrote content to {filepath}",
+                    "stdout": f"Successfully wrote content to {abs_path}",
                     "stderr": ""
                 }
-            
+            PrettyOutput.print(f"未知操作: {operation}", OutputType.WARNING)
             return {
                 "success": False,
                 "stdout": "",
@@ -87,7 +89,7 @@ class FileOperationTool:
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"File operation failed for {filepath}: {str(e)}"
+                "stderr": f"File operation failed for {abs_path}: {str(e)}"
             }
 
     def execute(self, args: Dict) -> Dict[str, Any]:
@@ -120,7 +122,7 @@ class FileOperationTool:
                     continue
                 
                 content = file_info.get("content", "") if operation == "write" else ""
-                result = self._handle_single_file(operation, file_info["path"], content)
+                result = self._handle_single_file(operation, file_info["path"].strip(), content)
                 
                 if result["success"]:
                     all_outputs.append(result["stdout"])

jarvis/jarvis_tools/git_commiter.py

@@ -4,7 +4,7 @@ from typing import Dict, Any
 
 import yaml
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.utils import OutputType, PrettyOutput, has_uncommitted_changes, init_env
+from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes, init_env
 import sys
 
 
@@ -53,7 +53,7 @@ class GitCommitTool:
 
             commit_hash = self._get_last_commit_hash()
 
-            PrettyOutput.section(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
+            PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
 
             return {"success": True, "stdout": yaml.safe_dump({"commit_hash": commit_hash, "commit_message": commit_message}), "stderr": ""}
 

jarvis/jarvis_tools/methodology.py

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

jarvis/jarvis_tools/rag.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any
 import os
-from jarvis.utils import OutputType, PrettyOutput, dont_use_local_model
+from jarvis.jarvis_utils import OutputType, PrettyOutput, dont_use_local_model
 from jarvis.jarvis_rag.main import RAGTool as RAGCore
 
 class RAGTool:

jarvis/jarvis_tools/read_code.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any, List
 import os
-from jarvis.utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils import OutputType, PrettyOutput
 
 
 class ReadCodeTool:
@@ -51,17 +51,19 @@ class ReadCodeTool:
             Dict containing operation result
         """
         try:
-            abs_path = os.path.abspath(filepath)
+            abs_path = os.path.abspath(filepath.strip())
             PrettyOutput.print(f"正在读取代码文件：{abs_path}", OutputType.INFO)
             
-            if not os.path.exists(filepath):
+            if not os.path.exists(abs_path):
+                PrettyOutput.print(f"文件不存在: {abs_path}", OutputType.WARNING)
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": f"File does not exist: {filepath}"
+                    "stderr": f"File does not exist: {abs_path}"
                 }
                 
-            if os.path.getsize(filepath) > 10 * 1024 * 1024:  # 10MB
+            if os.path.getsize(abs_path) > 10 * 1024 * 1024:  # 10MB
+                PrettyOutput.print(f"文件太大: {abs_path}", OutputType.WARNING)
                 return {
                     "success": False,
                     "stdout": "",
@@ -69,20 +71,28 @@ class ReadCodeTool:
                 }
                 
             try:
-                with open(filepath, 'r', encoding='utf-8') as f:
-                    lines = f.readlines()
+                lines = open(abs_path, 'r', encoding='utf-8').readlines()
             except UnicodeDecodeError:
+                PrettyOutput.print(f"文件解码失败: {abs_path}", OutputType.WARNING)
                 return {
                     "success": False,
                     "stdout": "",
                     "stderr": "Failed to decode file with UTF-8 encoding"
                 }
+            except Exception as e:
+                PrettyOutput.print(f"读取文件失败: {abs_path}", OutputType.WARNING)
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"Failed to read file: {str(e)}"
+                }
                 
             if start_line < 0:
                 start_line = 0
             if end_line == -1 or end_line > len(lines):
                 end_line = len(lines)
             if start_line >= end_line:
+                PrettyOutput.print(f"无效的行范围: [{start_line}, {end_line})", OutputType.WARNING)
                 return {
                     "success": False,
                     "stdout": "",
@@ -96,7 +106,7 @@ class ReadCodeTool:
                 
             content = "".join(formatted_lines)
             output = f"File: {filepath}\nLines: [{start_line}, {end_line})\n{content}"
-            
+            PrettyOutput.print(output, OutputType.CODE)
             return {
                 "success": True,
                 "stdout": output,
@@ -104,6 +114,7 @@ class ReadCodeTool:
             }
             
         except Exception as e:
+            PrettyOutput.print(f"读取代码失败: {filepath}", OutputType.WARNING)
             return {
                 "success": False,
                 "stdout": "",

jarvis/jarvis_tools/read_webpage.py

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