jarvis-ai-assistant 0.1.110__py3-none-any.whl → 0.1.112__py3-none-any.whl

jarvis/jarvis_code_agent/file_select.py

@@ -2,7 +2,7 @@ import os
 import re
 from typing import Dict, List
 from prompt_toolkit import PromptSession
-from prompt_toolkit.completion import WordCompleter, Completer, Completion
+from prompt_toolkit.completion import Completer, Completion
 from jarvis.utils import OutputType, PrettyOutput, get_single_line_input, user_confirm
 
 
@@ -42,7 +42,7 @@ def _parse_file_selection(input_str: str, max_index: int) -> List[int]:
                 if start <= end:
                     selected.update(range(start, end + 1))
             except ValueError:
-                PrettyOutput.print(f"Ignore invalid range expression: {part}", OutputType.WARNING)
+                PrettyOutput.print(f"忽略无效的范围表达式: {part}", OutputType.WARNING)
         # Process single number
         else:
             try:
@@ -50,9 +50,9 @@ def _parse_file_selection(input_str: str, max_index: int) -> List[int]:
                 if 0 <= index < max_index:
                     selected.add(index)
                 else:
-                    PrettyOutput.print(f"Ignore index out of range: {part}", OutputType.WARNING)
+                    PrettyOutput.print(f"忽略超出范围的索引: {part}", OutputType.WARNING)
             except ValueError:
-                PrettyOutput.print(f"Ignore invalid number: {part}", OutputType.WARNING)
+                PrettyOutput.print(f"忽略无效的数字: {part}", OutputType.WARNING)
     
     return sorted(list(selected))
 
@@ -125,32 +125,32 @@ def _fuzzy_match_files(root_dir: str, pattern: str) -> List[str]:
     
     return sorted(matches)
 
-def select_files(related_files: List[str], root_dir: str) -> List[str]:
+def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dict[str, str]]:
     """Let the user select and supplement related files"""
-    PrettyOutput.section("Related files", OutputType.INFO)
-    
+    PrettyOutput.section("相关文件", OutputType.INFO)
+
     output = ""
     # Display found files
     selected_files = list(related_files)  # Default select all
     for i, file in enumerate(related_files, 1):
-        output += f"[{i}] {file}\n"
+        output += f"[{i}] {file['file']} ({file['reason']})\n"
 
     PrettyOutput.print(output, OutputType.INFO, lang="markdown")
     
     if len(related_files) > 0:
         # Ask the user if they need to adjust the file list
-        if user_confirm("Do you need to adjust the file list?", False):
+        if user_confirm("是否需要调整文件列表？", False):
             # Let the user select files
-            numbers = get_single_line_input("Please enter the file numbers to include (support: 1,3-6 format, press Enter to keep the current selection)").strip()
+            numbers = get_single_line_input("请输入要包含的文件编号（支持: 1,3-6格式, 按回车保持当前选择）").strip()
             if numbers:
                 selected_indices = _parse_file_selection(numbers, len(related_files))
                 if selected_indices:
                     selected_files = [related_files[i] for i in selected_indices]
                 else:
-                    PrettyOutput.print("No valid files selected, keep the current selection", OutputType.WARNING)
+                    PrettyOutput.print("没有有效的文件被选择, 保持当前选择", OutputType.WARNING)
     
     # Ask if they need to supplement files
-    if user_confirm("Do you need to supplement other files?", False):
+    if user_confirm("是否需要补充其他文件？", False):
         # Create file completion session
         session = PromptSession(
             completer=_get_file_completer(root_dir),
@@ -158,7 +158,7 @@ def select_files(related_files: List[str], root_dir: str) -> List[str]:
         )
         
         while True:
-            PrettyOutput.print("Please enter the file path to supplement (support Tab completion and *? wildcard, input empty line to end):", OutputType.INFO)
+            PrettyOutput.print("请输入要补充的文件路径（支持Tab补全和*?通配符, 输入空行结束）", OutputType.INFO)
             try:
                 file_path = session.prompt(">>> ").strip()
             except KeyboardInterrupt:
@@ -171,16 +171,16 @@ def select_files(related_files: List[str], root_dir: str) -> List[str]:
             if '*' in file_path or '?' in file_path:
                 matches = _fuzzy_match_files(root_dir, file_path)
                 if not matches:
-                    PrettyOutput.print("No matching files found", OutputType.WARNING)
+                    PrettyOutput.print("没有找到匹配的文件", OutputType.WARNING)
                     continue
                     
                 # Display matching files
-                PrettyOutput.print("Found the following matching files:", OutputType.INFO)
+                PrettyOutput.print("找到以下匹配的文件:", OutputType.INFO)
                 for i, path in enumerate(matches, 1):
                     PrettyOutput.print(f"[{i}] {path}", OutputType.INFO)
                     
                 # Let the user select
-                numbers = get_single_line_input("Please select the file numbers to add (support: 1,3-6 format, press Enter to select all)").strip()
+                numbers = get_single_line_input("请选择要添加的文件编号（支持: 1,3-6格式, 按回车选择所有）").strip()
                 if numbers:
                     indices = _parse_file_selection(numbers, len(matches))
                     if not indices:
@@ -195,13 +195,13 @@ def select_files(related_files: List[str], root_dir: str) -> List[str]:
             for path in paths_to_add:
                 full_path = os.path.join(root_dir, path)
                 if not os.path.isfile(full_path):
-                    PrettyOutput.print(f"File does not exist: {path}", OutputType.ERROR)
+                    PrettyOutput.print(f"文件不存在: {path}", OutputType.ERROR)
                     continue
                 
                 try:
-                    selected_files.append(path)
-                    PrettyOutput.print(f"File added: {path}", OutputType.SUCCESS)
+                    selected_files.append({"file": path, "reason": "User Added"})
+                    PrettyOutput.print(f"文件已添加: {path}", OutputType.SUCCESS)
                 except Exception as e:
-                    PrettyOutput.print(f"Failed to read file: {str(e)}", OutputType.ERROR)
+                    PrettyOutput.print(f"读取文件失败: {str(e)}", OutputType.ERROR)
     
     return selected_files

jarvis/jarvis_code_agent/patch.py

@@ -2,13 +2,13 @@ import re
 from typing import Dict, Any, List
 import os
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
-from jarvis.utils import OutputType, PrettyOutput, has_uncommitted_changes, user_confirm
+from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, user_confirm
 
 
 def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
     """Parse patches from string with format:
     <PATCH>
-    > /path/to/file start_line,end_line
+    > path/to/file start_line,end_line
     content_line1
     content_line2
     ...
@@ -77,12 +77,12 @@ def apply_patch(output_str: str)->str:
                     # Write new file
                     with open(filepath, 'w', encoding='utf-8') as f:
                         f.writelines(new_content)
-                    PrettyOutput.print(f"Created new file {filepath} successfully\n", OutputType.SUCCESS)
+                    PrettyOutput.print(f"成功创建新文件 {filepath}", OutputType.SUCCESS)
                     continue
 
                 # Regular patch logic for existing files
                 if not os.path.exists(filepath):
-                    PrettyOutput.print(f"File not found: {filepath}", OutputType.WARNING)
+                    PrettyOutput.print(f"文件不存在: {filepath}", OutputType.WARNING)
                     continue
                     
                 # Read original file content
@@ -90,7 +90,7 @@ def apply_patch(output_str: str)->str:
                 
                 # Validate line numbers
                 if start_line < 0 or end_line > len(lines) + 1 or start_line > end_line:
-                    PrettyOutput.print(f"Invalid line range [{start_line}, {end_line}) for file: {filepath}", OutputType.WARNING)
+                    PrettyOutput.print(f"无效的行范围 [{start_line}, {end_line}) 对于文件: {filepath}", OutputType.WARNING)
                     continue
                     
                 # Create new content
@@ -99,15 +99,21 @@ def apply_patch(output_str: str)->str:
                 # Write back to file
                 open(filepath, 'w', encoding='utf-8').writelines(lines)
 
-                PrettyOutput.print(f"Applied patch to {filepath} successfully\n", OutputType.SUCCESS)
+                PrettyOutput.print(f"成功应用补丁到 {filepath}", OutputType.SUCCESS)
             
         except Exception as e:
-            PrettyOutput.print(f"Error applying patch to {filepath}: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"应用补丁到 {filepath} 失败: {str(e)}", OutputType.ERROR)
             continue
-    
+    ret = ""
     if has_uncommitted_changes():
-        handle_commit_workflow()
-    return ""
+        if handle_commit_workflow():
+            ret += "Successfully applied the patch"
+        else:
+            ret += "User rejected the patch"
+        user_input = get_multiline_input("你可以继续输入: ")
+        if user_input:
+            ret += user_input
+    return ret
     
 def handle_commit_workflow()->bool:
     """Handle the git commit workflow and return the commit details.
@@ -115,11 +121,14 @@ def handle_commit_workflow()->bool:
     Returns:
         tuple[bool, str, str]: (continue_execution, commit_id, commit_message)
     """
+    os.system("git add .")
     diff = os.popen("git diff HEAD").read()
+    os.system("git reset HEAD")
     PrettyOutput.print(diff, OutputType.CODE, lang="diff")
-    if not user_confirm("Do you want to commit the code?", default=True):
+    if not user_confirm("是否要提交代码？", default=True):
         os.system("git reset HEAD")
         os.system("git checkout -- .")
+        os.system("git clean -fd")
         return False
 
     git_commiter = GitCommitTool()

jarvis/jarvis_code_agent/relevant_files.py

@@ -1,27 +1,79 @@
 import os
 import re
-from typing import List
+from typing import Dict, List, Optional, Tuple
 
-import yaml
-from jarvis.agent import Agent
 from jarvis.jarvis_code_agent.file_select import select_files
 from jarvis.jarvis_codebase.main import CodeBase
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.utils import OutputType, PrettyOutput, is_disable_codebase
+from jarvis.utils import OutputType, PrettyOutput
 
+def make_question(requirement: str) -> Optional[str]:
+    """Generate structured questions to gather necessary information for the requirement."""
+    prompt = f"""You are a code analysis expert who helps developers understand existing system implementations. Generate specific questions to investigate:
+- Current system implementations
+- Existing interfaces and integration points
+- Extension mechanisms and patterns
+- Related components and their interactions
 
-def find_relevant_files(user_input: str, root_dir: str) -> List[str]:
-    try:
-        files_from_codebase = []
-        if not is_disable_codebase():
-            PrettyOutput.print("Find files from codebase...", OutputType.INFO)
-            codebase = CodeBase(root_dir)
-            files_from_codebase = codebase.search_similar(user_input)
+Key Instructions:
+1. Focus on understanding the EXISTING system
+2. Ask about interfaces, hooks, and extension points
+3. Investigate integration patterns and dependencies
+4. Explore current implementation details
+
+For example:
+BAD: "How should we implement the new feature?"
+GOOD: "What are the existing extension points in the authentication system that we can use to add the new OAuth provider? Specifically, how does AuthProvider interface work and where is it currently used?"
+
+Consider these investigation aspects:
+
+1. System Architecture:
+   - "What are the existing interfaces/classes that handle [functionality]?"
+   - "How is [feature] currently integrated with other components?"
+   - "Where are the extension points for [system component]?"
+
+2. Implementation Details:
+   - "What is the current workflow for [operation] in the system?"
+   - "How does the system expose hooks/callbacks for [functionality]?"
+   - "Which interfaces/abstract classes are used for [feature] extensibility?"
+
+3. Integration Patterns:
+   - "How do existing components integrate with [system part]?"
+   - "What are the current integration points for [feature]?"
+   - "How does the system handle extensions to [component]?"
 
-        PrettyOutput.print("Find files by agent...", OutputType.INFO)
+4. Extension Mechanisms:
+   - "What patterns are used for extending [functionality]?"
+   - "How do existing plugins/extensions connect to [system]?"
+   - "Where are the configuration points for [feature] customization?"
+
+User Requirement:
+{requirement}
+
+Output Format:
+<QUESTION>
+[Write 3-5 specific questions focusing on existing implementations and extension points. Each question should help understand how to integrate with or extend the current system]
+</QUESTION>
+"""
+    model = PlatformRegistry().get_thinking_platform()
+    response = model.chat_until_success(prompt)
+    response = re.search(r'<QUESTION>(.*?)</QUESTION>', response, re.DOTALL)
+    if response is None:
+        return None
+    return response.group(1)
+
+
+def find_relevant_information(user_input: str, root_dir: str) -> Tuple[List[Dict[str, str]], str]:
+    try:
+        PrettyOutput.print("从代码库中查找文件...", OutputType.INFO)
+        codebase = CodeBase(root_dir)
+        question = make_question(user_input)
+        if question is None:
+            return [], ""
+        files_from_codebase, infomation = codebase.ask_codebase(question)
 
         selected_files = select_files(files_from_codebase, os.getcwd())
-        return selected_files
-    except Exception as e:
-        return []
+        return selected_files, infomation
+    except Exception:
+        PrettyOutput.print("查找相关文件失败", OutputType.ERROR)
+        return [], ""