jarvis-ai-assistant 0.1.126__py3-none-any.whl → 0.1.129__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.126" 
+__version__ = "0.1.129" 

jarvis/jarvis_agent/__init__.py

@@ -3,6 +3,7 @@ from typing import Any, Callable, List, Optional, Tuple, Union
 
 from prompt_toolkit import prompt
 import yaml
+from yaspin import yaspin
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.base import BasePlatform
@@ -48,7 +49,8 @@ class Agent:
                  record_methodology: Optional[bool] = None,
                  need_summary: Optional[bool] = None,
                  max_context_length: Optional[int] = None,
-                 execute_tool_confirm: Optional[bool] = None):
+                 execute_tool_confirm: Optional[bool] = None,
+                 multiline_inputer: Optional[Callable[[str], str]] = None):
         self.name = make_agent_name(name)
         self.description = description
         # 初始化平台和模型
@@ -66,9 +68,10 @@ class Agent:
         if model_name is not None:
             self.model.set_model_name(model_name)
 
+        self.model.set_suppress_output(False)
 
-        self.output_handler = output_handler
-
+        self.output_handler = output_handler if output_handler else [ToolRegistry()]
+        self.multiline_inputer = multiline_inputer if multiline_inputer else get_multiline_input
         
         self.record_methodology = record_methodology if record_methodology is not None else is_record_methodology()
         self.use_methodology = use_methodology if use_methodology is not None else is_use_methodology()
@@ -165,6 +168,7 @@ class Agent:
             message, need_return = handler(message, self)
             if need_return:
                 return message
+        PrettyOutput.section("模型输出", OutputType.SYSTEM)
         return self.model.chat_until_success(message)   # type: ignore
 
 
@@ -184,35 +188,38 @@ class Agent:
         """
         # Create a new model instance to summarize, avoid affecting the main conversation
 
-        PrettyOutput.print("总结对话历史，准备生成摘要，开始新对话...", OutputType.PROGRESS)
-        
-        prompt = """请总结之前对话中的关键信息，包括：
-1. 当前任务目标
-2. 已确认的关键信息
-3. 已尝试的解决方案
-4. 当前进展
-5. 待解决的问题
-
-请用简洁的要点形式描述，突出重要信息。不要包含对话细节。
-"""
-        
-        try:
-            summary = self._call_model(self.prompt + "\n" + prompt)
+        with yaspin(text="正在总结对话历史...", color="cyan") as spinner:
             
-            # 清空当前对话历史，但保留系统消息
-            self.conversation_length = 0  # Reset conversation length
+            prompt = """请总结之前对话中的关键信息，包括：
+    1. 当前任务目标
+    2. 已确认的关键信息
+    3. 已尝试的解决方案
+    4. 当前进展
+    5. 待解决的问题
+
+    请用简洁的要点形式描述，突出重要信息。不要包含对话细节。
+    """
             
-            # 添加总结作为新的上下文
-            self.prompt = f"""以下是之前对话的关键信息总结：
+            try:
+                with spinner.hidden():
+                    summary = self._call_model(self.prompt + "\n" + prompt)
+                
+                # 清空当前对话历史，但保留系统消息
+                self.conversation_length = 0  # Reset conversation length
+                
+                # 添加总结作为新的上下文
+                self.prompt = f"""以下是之前对话的关键信息总结：
 
-{summary}
+    {summary}
 
-请基于以上信息继续完成任务。
-"""
-            self.conversation_length = len(self.prompt)  # 设置新的起始长度
-            
-        except Exception as e:
-            PrettyOutput.print(f"总结对话历史失败: {str(e)}", OutputType.ERROR)
+    请基于以上信息继续完成任务。
+    """
+                self.conversation_length = len(self.prompt)  # 设置新的起始长度
+                spinner.text = "总结对话历史完成"
+                spinner.ok("✅")
+            except Exception as e:
+                spinner.text = "总结对话历史失败"
+                spinner.fail("❌")
 
     def _call_tools(self, response: str) -> Tuple[bool, Any]:
         tool_list = []
@@ -225,7 +232,12 @@ class Agent:
         if len(tool_list) == 0:
             return False, ""
         if not self.execute_tool_confirm or user_confirm(f"需要执行{tool_list[0].name()}确认执行？", True):
-            return tool_list[0].handle(response)
+            with yaspin(text=f"正在执行{tool_list[0].name()}...", color="cyan") as spinner:
+                with spinner.hidden():
+                    result = tool_list[0].handle(response)
+                spinner.text = f"{tool_list[0].name()}执行完成"
+                spinner.ok("✅")
+                return result
         return False, ""
         
 
@@ -239,56 +251,56 @@ class Agent:
             - For main agent: May generate methodology if enabled
             - For sub-agent: May generate summary if enabled
         """
-        PrettyOutput.section("任务完成", OutputType.SUCCESS)
-        
         if not self.is_sub_agent:
             if self.record_methodology:
-
-                try:
-                    # 让模型判断是否需要生成方法论
-                    analysis_prompt = """当前任务已结束，请分析是否需要生成方法论。
-    如果你认为需要生成方法论，请先确定是创建新方法论还是更新现有方法论。如果是更新现有方法论，请使用'update'，否则使用'add'。
-    如果你认为不需要方法论，请解释原因。
-    方法论应适用于通用场景，不要包含任务特定信息，如代码提交信息等。
-    方法论应包含：问题重述、最优解决方案、注意事项（如有），除此之外不要包含其他内容。
-    只输出方法论工具调用指令，或不生成方法论的解释。不要输出其他内容。
-    """
-                    self.prompt = analysis_prompt
-                    response = self._call_model(self.prompt)
-                    
-                    self._call_tools(response)
-                    
-                except Exception as e:
-                    PrettyOutput.print(f"生成方法论失败: {str(e)}", OutputType.ERROR)
-            
+                with yaspin(text="正在生成方法论...", color="cyan") as spinner:
+                    try:
+                        
+                        # 让模型判断是否需要生成方法论
+                        analysis_prompt = """当前任务已结束，请分析是否需要生成方法论。
+        如果你认为需要生成方法论，请先确定是创建新方法论还是更新现有方法论。如果是更新现有方法论，请使用'update'，否则使用'add'。
+        如果你认为不需要方法论，请解释原因。
+        方法论应适用于通用场景，不要包含任务特定信息，如代码提交信息等。
+        方法论应包含：问题重述、最优解决方案、注意事项（如有），除此之外不要包含其他内容。
+        只输出方法论工具调用指令，或不生成方法论的解释。不要输出其他内容。
+        """
+                        self.prompt = analysis_prompt
+                        with spinner.hidden():
+                            response = self._call_model(self.prompt)
+
+                        with spinner.hidden():
+                            self._call_tools(response)
+                        spinner.text = "方法论生成完成"
+                        spinner.ok("✅")
+                    except Exception as e:
+                        spinner.text = "方法论生成失败"
+                        spinner.fail("❌")
             return "任务完成"
         
         if self.need_summary:
-            self.prompt = self.summary_prompt
-            return self._call_model(self.prompt)
+            with yaspin(text="正在生成总结...", color="cyan") as spinner:
+                self.prompt = self.summary_prompt
+                with spinner.hidden():
+                    ret = self._call_model(self.prompt)
+                    spinner.text = "总结生成完成"
+                    spinner.ok("✅")
+                    return ret
         
         return "任务完成"
 
 
-    def run(self, user_input: str, file_list: Optional[List[str]] = None) -> Any:
+    def run(self, user_input: str) -> Any:
         """Process user input and execute the task.
         
         Args:
             user_input: My task description or request
-            file_list: Optional list of files to process
             
         Returns:
             str|Dict: Task summary report or message to send
         """
         try:
             set_agent(self.name, self)
-            PrettyOutput.section("准备环境", OutputType.PLANNING)
-            if file_list:
-                self.model.upload_files(file_list) # type: ignore
-
-            # 显示任务开始
-            PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
-
+            
             self.prompt = f"{user_input}"
 
             if self.first:
@@ -298,9 +310,6 @@ class Agent:
 
             while True:
                 try:
-                    # 显示思考状态
-                    PrettyOutput.print("正在分析任务...", OutputType.PROGRESS)
-                    
                     # 累加对话长度
                     self.conversation_length += get_context_token_count(self.prompt)
                     
@@ -325,7 +334,7 @@ class Agent:
                         return self._complete_task()
                     
                     # 获取用户输入
-                    user_input = get_multiline_input(f"{self.name}: 请输入，或输入空行来结束当前任务：")
+                    user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
 
                     if user_input:
                         self.prompt = user_input
@@ -360,41 +369,46 @@ class Agent:
 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):
-        try:
-            with open(user_jarvis, "r", encoding="utf-8") 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)
-            else:
-                PrettyOutput.print("警告: ~/.jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.WARNING)
-        except Exception as e:
-            PrettyOutput.print(f"加载 ~/.jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
-    
+        with yaspin(text=f"从{user_jarvis}加载预定义任务...", color="cyan") as spinner:
+            try:
+                with open(user_jarvis, "r", encoding="utf-8") 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"):
-        try:
-            with open(".jarvis/pre-command", "r", encoding="utf-8") 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)
-            else:
-                PrettyOutput.print("警告: .jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.WARNING)
-        except Exception as e:
-            PrettyOutput.print(f"加载 .jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
+        with yaspin(text=f"从{os.path.abspath('.jarvis/pre-command')}加载预定义任务...", color="cyan") as spinner:
+            try:
+                with open(".jarvis/pre-command", "r", encoding="utf-8") 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:
@@ -533,7 +547,6 @@ def main():
     # Add argument parser
     init_env()
     parser = argparse.ArgumentParser(description='Jarvis AI assistant')
-    parser.add_argument('-f', '--files', nargs='*', help='List of files to process')
     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()
@@ -548,7 +561,7 @@ def main():
             selected_task = _select_task(tasks)
             if selected_task:
                 PrettyOutput.print(f"执行任务: {selected_task}", OutputType.INFO)
-                agent.run(selected_task, args.files)
+                agent.run(selected_task)
                 return 0
         
         # 如果没有选择预定义任务，进入交互模式
@@ -557,7 +570,7 @@ def main():
                 user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
                 if not user_input:
                     break
-                agent.run(user_input, args.files)
+                agent.run(user_input)
             except Exception as e:
                 PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 

jarvis/jarvis_agent/main.py

@@ -0,0 +1,77 @@
+import argparse
+import yaml
+import os
+from typing import Optional, List
+from jarvis.jarvis_agent import Agent
+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') as f:
+        try:
+            config = yaml.safe_load(f)
+            return config if config else {}
+        except yaml.YAMLError as e:
+            PrettyOutput.print(f"配置文件解析失败: {str(e)}", OutputType.ERROR)
+            return {}
+
+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, 
+                        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.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__":
+    exit(main())

jarvis/jarvis_code_agent/builtin_input_handler.py

@@ -0,0 +1,43 @@
+import re
+from typing import Any, Tuple
+
+from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+
+
+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()
+    # 处理每个标记
+    for tag in special_tags:
+        if tag in processed_tags:
+            continue
+        processed_tags.add(tag)
+        
+        if tag == "CodeBase":
+            user_input = user_input.replace(f"'<{tag}>'", "")
+            user_input += "\n请使用ask_codebase工具查询代码库"
+        elif tag == "Web":
+            user_input = user_input.replace(f"'<{tag}>'", "")
+            user_input += "\n请使用search_web工具进行网页搜索"
+        elif tag == "RAG":
+            user_input = user_input.replace(f"'<{tag}>'", "")
+            user_input += "\n请使用rag工具进行知识库检索"
+        # 移除对未知标记的警告输出
+    
+    return user_input, False

jarvis/jarvis_code_agent/code_agent.py

@@ -3,7 +3,11 @@ import subprocess
 import os
 from typing import Any, Tuple
 
+from yaspin import yaspin
+
 from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_code_agent.builtin_input_handler import builtin_input_handler
+from jarvis.jarvis_code_agent.file_input_handler import file_input_handler
 from jarvis.jarvis_code_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_code_agent.patch import PatchOutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -19,80 +23,6 @@ from jarvis.jarvis_utils.utils import init_env, user_confirm
 
 
 
-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
-        if ':' in ref:
-            file_path, line_range = ref.split(':', 1)
-            # 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') as f:
-                            total_lines = len(f.readlines())
-                    except FileNotFoundError:
-                        PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
-                        continue
-                    # Process start line
-                    if raw_start == 0:  # 0表示整个文件
-                        start_line = 1
-                        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({
-                    "path": file_path,
-                    "start_line": start_line,
-                    "end_line": end_line
-                })
-        else:
-            # Handle simple file path
-            if os.path.isfile(ref):
-                files.append({
-                    "path": ref,
-                    "start_line": 1,  # 1-based
-                    "end_line": -1
-                })
-    
-    # Read and process files if any were found
-    if files:
-        result = FileOperationTool().execute({"operation":"read","files": files})
-        if result["success"]:
-            return result["stdout"] + "\n" + prompt, False
-    
-    return prompt, False
-
-
 
 class CodeAgent:
     def __init__(self):
@@ -203,18 +133,23 @@ class CodeAgent:
                            output_handler=[tool_registry, PatchOutputHandler()], 
                            platform=PlatformRegistry().get_codegen_platform(), 
                            record_methodology=False,
-                           input_handler=[shell_input_handler, file_input_handler],
+                           input_handler=[shell_input_handler, file_input_handler, builtin_input_handler],
                            need_summary=False)
 
     
 
     def _init_env(self):
-        curr_dir = os.getcwd()
-        git_dir = find_git_root(curr_dir)
-        self.root_dir = git_dir
-        if has_uncommitted_changes():
-            git_commiter = GitCommitTool()
-            git_commiter.execute({})
+        with yaspin(text="正在初始化环境...", color="cyan") as spinner: 
+            curr_dir = os.getcwd()
+            git_dir = find_git_root(curr_dir)
+            self.root_dir = git_dir
+            if has_uncommitted_changes():
+                with spinner.hidden():
+                    git_commiter = GitCommitTool()
+                    git_commiter.execute({})
+            else:
+                spinner.text = "环境初始化完成"
+            spinner.ok("✅")
 
     
 
@@ -229,6 +164,7 @@ class CodeAgent:
         """
         try:
             self._init_env()
+            
             start_commit = get_latest_commit_hash()
             
             try:

jarvis/jarvis_code_agent/file_input_handler.py

@@ -0,0 +1,88 @@
+
+
+import os
+import re
+from typing import Any, Tuple
+
+from yaspin import yaspin
+
+from jarvis.jarvis_tools.file_operation import FileOperationTool
+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
+        if ':' in ref:
+            file_path, line_range = ref.split(':', 1)
+            # 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') as f:
+                            total_lines = len(f.readlines())
+                    except FileNotFoundError:
+                        PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
+                        continue
+                    # Process start line
+                    if raw_start == 0:  # 0表示整个文件
+                        start_line = 1
+                        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({
+                    "path": file_path,
+                    "start_line": start_line,
+                    "end_line": end_line
+                })
+        else:
+            # Handle simple file path
+            if os.path.isfile(ref):
+                files.append({
+                    "path": ref,
+                    "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:
+            result = FileOperationTool().execute({"operation":"read","files": files})
+            if result["success"]:
+                spinner.text = "文件读取完成"
+                spinner.ok("✅")
+                return result["stdout"] + "\n" + prompt, False
+    
+    return prompt, False
+