jarvis-ai-assistant 0.1.132__py3-none-any.whl → 0.1.138__py3-none-any.whl

jarvis/jarvis_agent/builtin_input_handler.py

@@ -6,20 +6,20 @@ from typing import Any, Tuple
 def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
     """
     处理内置的特殊输入标记，并追加相应的提示词
-    
+
     参数：
         user_input: 用户输入
         agent: 代理对象
-        
+
     返回：
         Tuple[str, bool]: 处理后的输入和是否需要进一步处理
     """
     # 查找特殊标记
     special_tags = re.findall(r"'<([^>]+)>'", user_input)
-    
+
     if not special_tags:
         return user_input, False
-    
+
     # 使用集合去重
     processed_tags = set()
     # 处理每个标记
@@ -27,7 +27,7 @@ def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
         if tag in processed_tags:
             continue
         processed_tags.add(tag)
-        
+
         if tag == "CodeBase":
             user_input = user_input.replace(f"'<{tag}>'", "")
             user_input += """
@@ -68,6 +68,16 @@ def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
             agent.clear()
             if not user_input.strip():
                 return "", True
+        elif tag == "Methodology":
+            user_input = user_input.replace(f"'<{tag}>'", "")
+            user_input += """
+请使用find_methodology工具查找相关方法论，可以使用的提问格式包括：
+1. 关于xxx的方法论有哪些？
+2. 如何解决xxx问题？
+3. xxx的最佳实践是什么？
+4. 处理xxx的标准流程是什么？
+5. 实现xxx的参考方案有哪些？
+"""
         # 移除对未知标记的警告输出
-    
+
     return user_input, False

jarvis/jarvis_agent/file_input_handler.py

@@ -13,7 +13,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
     prompt = user_input
     files = []
-    
+
     file_refs = re.findall(r"'([^']+)'", user_input)
     for ref in file_refs:
         # Handle file:start,end or file:start:end format
@@ -22,12 +22,12 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
             # Initialize with default values
             start_line = 1  # 1-based
             end_line = -1
-            
+
             # Process line range if specified
             if ',' in line_range or ':' in line_range:
                 try:
                     raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
-                    
+
                     # Handle special values and Python-style negative indices
                     try:
                         with open(file_path, 'r', encoding='utf-8', errors="ignore") as f:
@@ -41,24 +41,24 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                         end_line = total_lines
                     else:
                         start_line = raw_start if raw_start > 0 else total_lines + raw_start + 1
-                    
+
                     # Process end line
                     if raw_end == 0:  # 0表示整个文件（如果start也是0）
                         end_line = total_lines
                     else:
                         end_line = raw_end if raw_end > 0 else total_lines + raw_end + 1
-                    
+
                     # Auto-correct ranges
                     start_line = max(1, min(start_line, total_lines))
                     end_line = max(start_line, min(end_line, total_lines))
-                    
+
                     # Final validation
                     if start_line < 1 or end_line > total_lines or start_line > end_line:
                         raise ValueError
 
                 except:
                     continue
-            
+
             # Add file if it exists
             if os.path.isfile(file_path):
                 files.append({
@@ -74,7 +74,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                     "start_line": 1,  # 1-based
                     "end_line": -1
                 })
-        
+
     # Read and process files if any were found
     if files:
         with yaspin(text="正在读取文件...", color="cyan") as spinner:
@@ -83,6 +83,6 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                 spinner.text = "文件读取完成"
                 spinner.ok("✅")
                 return result["stdout"] + "\n" + prompt, False
-    
+
     return prompt, False
 

jarvis/jarvis_agent/jarvis.py

@@ -0,0 +1,143 @@
+import argparse
+import os
+
+from prompt_toolkit import prompt
+import yaml
+from yaspin import yaspin
+from jarvis.jarvis_agent import (
+     PrettyOutput, OutputType,
+     get_multiline_input,
+     Agent,  # 显式导入关键组件
+     origin_agent_system_prompt
+)
+from jarvis.jarvis_agent.patch import PatchOutputHandler
+from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_agent.file_input_handler import file_input_handler
+from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
+from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
+
+
+def _load_tasks() -> dict:
+    """Load tasks from .jarvis files in user home and current directory."""
+    tasks = {}
+
+    # Check .jarvis/pre-command in user directory
+    user_jarvis = os.path.expanduser("~/.jarvis/pre-command")
+    if os.path.exists(user_jarvis):
+        with yaspin(text=f"从{user_jarvis}加载预定义任务...", color="cyan") as spinner:
+            try:
+                with open(user_jarvis, "r", encoding="utf-8", errors="ignore") as f:
+                    user_tasks = yaml.safe_load(f)
+
+                if isinstance(user_tasks, dict):
+                    # Validate and add user directory tasks
+                    for name, desc in user_tasks.items():
+                        if desc:  # Ensure description is not empty
+                            tasks[str(name)] = str(desc)
+                spinner.text = "预定义任务加载完成"
+                spinner.ok("✅")
+            except Exception as e:
+                spinner.text = "预定义任务加载失败"
+                spinner.fail("❌")
+
+    # Check .jarvis/pre-command in current directory
+    if os.path.exists(".jarvis/pre-command"):
+        with yaspin(text=f"从{os.path.abspath('.jarvis/pre-command')}加载预定义任务...", color="cyan") as spinner:
+            try:
+                with open(".jarvis/pre-command", "r", encoding="utf-8", errors="ignore") as f:
+                    local_tasks = yaml.safe_load(f)
+
+                if isinstance(local_tasks, dict):
+                    # Validate and add current directory tasks, overwrite user directory tasks if there is a name conflict
+                    for name, desc in local_tasks.items():
+                        if desc:  # Ensure description is not empty
+                            tasks[str(name)] = str(desc)
+                spinner.text = "预定义任务加载完成"
+                spinner.ok("✅")
+            except Exception as e:
+                spinner.text = "预定义任务加载失败"
+                spinner.fail("❌")
+
+    return tasks
+
+def _select_task(tasks: dict) -> str:
+    """Let user select a task from the list or skip. Returns task description if selected."""
+    if not tasks:
+        return ""
+    # Convert tasks to list for ordered display
+    task_names = list(tasks.keys())
+
+    task_list = ["可用任务:"]
+    for i, name in enumerate(task_names, 1):
+        task_list.append(f"[{i}] {name}")
+    task_list.append("[0] 跳过预定义任务")
+    PrettyOutput.print("\n".join(task_list), OutputType.INFO)
+
+
+    while True:
+        try:
+            choice = prompt(
+                "\n请选择一个任务编号（0 跳过预定义任务）：",
+            ).strip()
+
+            if not choice:
+                return ""
+
+            choice = int(choice)
+            if choice == 0:
+                return ""
+            elif 1 <= choice <= len(task_names):
+                selected_name = task_names[choice - 1]
+                return tasks[selected_name]  # Return the task description
+            else:
+                PrettyOutput.print("无效的选择。请选择列表中的一个号码。", OutputType.WARNING)
+
+        except KeyboardInterrupt:
+            return ""  # Return empty on Ctrl+C
+        except EOFError:
+            return ""  # Return empty on Ctrl+D
+        except Exception as e:
+            PrettyOutput.print(f"选择任务失败: {str(e)}", OutputType.ERROR)
+            continue
+
+
+
+
+def main() -> int:
+    """Jarvis main entry point"""
+    init_env()
+    parser = argparse.ArgumentParser(description='Jarvis AI assistant')
+    parser.add_argument('-p', '--platform', type=str, help='Platform to use')
+    parser.add_argument('-m', '--model', type=str, help='Model to use')
+    args = parser.parse_args()
+
+    try:
+        agent = Agent(
+            system_prompt=origin_agent_system_prompt,
+            platform=args.platform,
+            model_name=args.model,
+            input_handler=[file_input_handler, shell_input_handler, builtin_input_handler], # type: ignore
+            output_handler=[ToolRegistry(), PatchOutputHandler()],
+            need_summary=False
+        )
+
+        tasks = _load_tasks()
+        if tasks:
+            selected_task = _select_task(tasks)
+            if selected_task:
+                PrettyOutput.print(f"执行任务: {selected_task}", OutputType.INFO)
+                agent.run(selected_task)
+                return 0
+
+        user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
+        if user_input:
+            agent.run(user_input)
+        return 0
+
+    except Exception as e:
+        PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)
+        return 1
+
+if __name__ == "__main__":
+    exit(main())

jarvis/jarvis_agent/main.py

@@ -7,22 +7,20 @@ from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_utils.utils import init_env
 
-# 从__init__.py导入系统提示
-from jarvis.jarvis_agent import origin_agent_system_prompt
 
 def load_config(config_path: str) -> dict:
     """Load configuration from YAML file
-    
+
     Args:
         config_path: Path to the YAML configuration file
-        
+
     Returns:
         dict: Configuration dictionary
     """
     if not os.path.exists(config_path):
         PrettyOutput.print(f"配置文件 {config_path} 不存在，使用默认配置", OutputType.WARNING)
         return {}
-    
+
     with open(config_path, 'r', encoding='utf-8', errors="ignore") as f:
         try:
             config = yaml.safe_load(f)
@@ -35,42 +33,43 @@ def main():
     """Main entry point for Jarvis agent"""
     # Initialize environment
     init_env()
-    
+
     # Set up argument parser
     parser = argparse.ArgumentParser(description='Jarvis AI assistant')
-    parser.add_argument('-c', '--config', type=str, required=True, 
+    parser.add_argument('-c', '--config', type=str, required=True,
                         help='Path to the YAML configuration file')
     parser.add_argument('-t', '--task', type=str,
                         help='Initial task to execute')
     args = parser.parse_args()
-    
+
     # Load configuration
     config = load_config(args.config)
-    
+
     # Create and run agent
     try:
         agent = Agent(**config)
-        
+
         # Run agent with initial task if specified
         if args.task:
             PrettyOutput.print(f"执行初始任务: {args.task}", OutputType.INFO)
             agent.run(args.task)
             return 0
-        
+
         # Enter interactive mode if no initial task
         while True:
             try:
                 user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
                 if not user_input:
                     break
+                agent.set_addon_prompt("如果有必要，请先指定出行动计划，然后根据计划一步步执行")
                 agent.run(user_input)
             except Exception as e:
                 PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
-                
+
     except Exception as e:
         PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)
         return 1
-    
+
     return 0
 
 if __name__ == "__main__":

jarvis/jarvis_agent/output_handler.py

@@ -7,13 +7,13 @@ from typing import Any, Tuple
 
 class OutputHandler(ABC):
     @abstractmethod
-    def handle(self, response: str) -> Tuple[bool, Any]:
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
         pass
-    
+
     @abstractmethod
     def can_handle(self, response: str) -> bool:
         pass
-    
+
     @abstractmethod
     def prompt(self) -> str:
         pass