jarvis-ai-assistant 0.1.128__tar.gz → 0.1.129__tar.gz

{jarvis_ai_assistant-0.1.128/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.129}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.128
+Version: 0.1.129
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.128 → jarvis_ai_assistant-0.1.129}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.128"
+version = "0.1.129"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -69,3 +69,5 @@ jarvis-code-review = "jarvis.jarvis_tools.code_review:main"
 jgc = "jarvis.jarvis_tools.git_commiter:main"
 jarvis-dev = "jarvis.jarvis_dev.main:main"
 jarvis-git-squash = "jarvis.jarvis_git_squash.main:main"
+jarvis-multi-agent = "jarvis.jarvis_multi_agent:main"
+jarvis-agent = "jarvis.jarvis_agent.main:main"

{jarvis_ai_assistant-0.1.128 → jarvis_ai_assistant-0.1.129}/setup.py

@@ -12,7 +12,7 @@ class CustomInstallCommand(install):
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.128",
+    version="0.1.129",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -63,6 +63,8 @@ setup(
             "jgc=jarvis.jarvis_tools.git_commiter:main",
             "jarvis-dev=jarvis.jarvis_dev.main:main",
             "jarvis-git-squash=jarvis.jarvis_git_squash.main:main",
+            "jarvis-multi-agent=jarvis.jarvis_multi_agent:main",
+            "jarvis-agent=jarvis.jarvis_agent.main:main",
         ],
     },
     python_requires=">=3.8",

{jarvis_ai_assistant-0.1.128 → jarvis_ai_assistant-0.1.129}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.128 → jarvis_ai_assistant-0.1.129}/src/jarvis/jarvis_agent/__init__.py

@@ -49,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
         # 初始化平台和模型
@@ -69,7 +70,8 @@ class Agent:
 
         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()
@@ -287,23 +289,17 @@ class Agent:
         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)
-            with yaspin(text="准备环境...", color="cyan") as spinner:
-                if file_list:
-                    self.model.upload_files(file_list) # type: ignore
-                    spinner.text = "环境准备完成"
-                    spinner.ok("✅")
             
             self.prompt = f"{user_input}"
 
@@ -338,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
@@ -551,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()
@@ -566,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
         
         # 如果没有选择预定义任务，进入交互模式
@@ -575,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_ai_assistant-0.1.129/src/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_ai_assistant-0.1.129/src/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_ai_assistant-0.1.128 → jarvis_ai_assistant-0.1.129}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -6,6 +6,8 @@ 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
@@ -21,83 +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:
-        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
-
-
 
 class CodeAgent:
     def __init__(self):
@@ -208,7 +133,7 @@ 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)
 
     

jarvis_ai_assistant-0.1.129/src/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
+

{jarvis_ai_assistant-0.1.128 → jarvis_ai_assistant-0.1.129}/src/jarvis/jarvis_code_agent/patch.py

@@ -9,6 +9,7 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.execute_shell_script import ShellScriptTool
 from jarvis.jarvis_tools.file_operation import FileOperationTool
+from jarvis.jarvis_tools.read_code import ReadCodeTool
 from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
 from jarvis.jarvis_utils.git_utils import get_commits_between, get_latest_commit_hash
 from jarvis.jarvis_utils.input import get_multiline_input
@@ -39,7 +40,7 @@ Reason: [修改原因]
 --------------------------------
 规则：
 1. 代码片段必须包含足够的上下文（前后各3行）
-2. 我可以看到完整代码，所以只需显示修改的代码部分
+2. 我可以看到完整代码，所以只需显示修改的代码部分，不需要将整个文件内容都显示出来
 3. 保留原始缩进和格式
 4. 对于新文件，提供完整代码
 5. 修改现有文件时，保留周围未更改的代码
@@ -184,7 +185,7 @@ def handle_commit_workflow()->bool:
     commit_result = git_commiter.execute({})
     return commit_result["success"]
 
-# New handler functions below ▼▼▼
+
 def handle_code_operation(filepath: str, patch_content: str) -> bool:
     """处理基于上下文的代码片段"""
     with yaspin(text=f"正在修改文件 {filepath}...", color="cyan") as spinner:
@@ -195,10 +196,11 @@ def handle_code_operation(filepath: str, patch_content: str) -> bool:
                 os.makedirs(os.path.dirname(filepath), exist_ok=True)
                 open(filepath, 'w', encoding='utf-8').close()
                 spinner.write("✅ 文件创建完成")
-            old_file_content = FileOperationTool().execute({"operation": "read", "files": [{"path": filepath}]})
-            if not old_file_content["success"]:
-                spinner.write("❌ 文件读取失败")
-                return False
+            with spinner.hidden():
+                old_file_content = FileOperationTool().execute({"operation": "read", "files": [{"path": filepath}]})
+                if not old_file_content["success"]:
+                    spinner.write("❌ 文件读取失败")
+                    return False
             
             prompt = f"""
     你是一个代码审查员，请审查以下代码并将其与上下文合并。
@@ -222,45 +224,44 @@ def handle_code_operation(filepath: str, patch_content: str) -> bool:
     [merged_code]
     </MERGED_CODE>
     """
-            PrettyOutput.section("代码生成", OutputType.SYSTEM)
             model = PlatformRegistry().get_codegen_platform()
-            model.set_suppress_output(False)
+            model.set_suppress_output(True)
             count = 30
             start_line = -1
             end_line = -1
             code = []
             finished = False
-            with spinner.hidden():
-                while count>0:
-                    count -= 1
-                    response = model.chat_until_success(prompt).splitlines()
-                    try:
-                        start_line = response.index("<MERGED_CODE>") + 1
-                    except:
-                        return False
+            while count>0:
+                count -= 1
+                response = model.chat_until_success(prompt).splitlines()
+                try:
+                    start_line = response.index("<MERGED_CODE>") + 1
                     try:
                         end_line = response.index("</MERGED_CODE>")
+                        code = response[start_line:end_line]
                     except:
-                        return False
-                    code = response[start_line:end_line]
-                    try: 
-                        response.index("<!!!FINISHED!!!>")
-                        finished = True
-                        break
-                    except:
-                        prompt += f"""继续输出接下来的300行代码
-                        要求：
-                        1. 严格保留原始代码的格式、空行和缩进
-                        2. 仅在<MERGED_CODE>块中包含实际代码内容，包括空行和缩进
-                        3. 绝对不要使用markdown代码块（```）或反引号，除非修改的是markdown文件
-                        4. 除了合并后的代码，不要输出任何其他文本
-                        5. 所有代码输出完成后，输出<!!!FINISHED!!!>
-                        """
                         pass
-                if not finished:
-                    spinner.text = "生成代码失败"
-                    spinner.fail("❌")
-                    return False
+                except:
+                    pass
+
+                try: 
+                    response.index("<!!!FINISHED!!!>")
+                    finished = True
+                    break
+                except:
+                    prompt += f"""继续输出接下来的300行代码
+                    要求：
+                    1. 严格保留原始代码的格式、空行和缩进
+                    2. 仅在<MERGED_CODE>块中包含实际代码内容，包括空行和缩进
+                    3. 绝对不要使用markdown代码块（```）或反引号，除非修改的是markdown文件
+                    4. 除了合并后的代码，不要输出任何其他文本
+                    5. 所有代码输出完成后，输出<!!!FINISHED!!!>
+                    """
+                    pass
+            if not finished:
+                spinner.text = "生成代码失败"
+                spinner.fail("❌")
+                return False
             # 写入合并后的代码
             spinner.text = "写入合并后的代码..."
             with open(filepath, 'w', encoding='utf-8') as f:

{jarvis_ai_assistant-0.1.128 → jarvis_ai_assistant-0.1.129}/src/jarvis/jarvis_code_agent/shell_input_handler.py

@@ -3,6 +3,7 @@
 from typing import Any, Tuple
 
 from jarvis.jarvis_tools.execute_shell_script import ShellScriptTool
+from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import user_confirm
 
@@ -16,7 +17,12 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
         script = '\n'.join([c[1:] for c in cmdline])
         PrettyOutput.print(script, OutputType.CODE, lang="bash")
         if user_confirm(f"是否要执行以上shell脚本？", default=True):
-            ShellScriptTool().execute({"script_content": script})
-            return "", True
+            output = ToolRegistry().handle_tool_calls({
+                "name": "execute_shell_script",
+                "arguments": {
+                    "script_content": script
+                }
+            })
+            return f"{user_input}\n\n用户执行以下脚本：\n{script}\n\n执行结果：\n{output}", False
         return user_input, False