jarvis-ai-assistant 0.1.161__tar.gz → 0.1.162__tar.gz

{jarvis_ai_assistant-0.1.161/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.162}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.161
+Version: 0.1.162
 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.161 → jarvis_ai_assistant-0.1.162}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.161"
+version = "0.1.162"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.1.161 → jarvis_ai_assistant-0.1.162}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.161",
+    version="0.1.162",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.161 → jarvis_ai_assistant-0.1.162}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.161"
+__version__ = "0.1.162"

{jarvis_ai_assistant-0.1.161 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_agent/__init__.py

@@ -5,7 +5,6 @@ from typing import Any, Callable, List, Optional, Tuple, Union
 from yaspin import yaspin # type: ignore
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
-from jarvis.jarvis_agent.patch import PatchOutputHandler
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
@@ -180,7 +179,7 @@ class Agent:
         self.model.set_suppress_output(False)
 
         from jarvis.jarvis_tools.registry import ToolRegistry
-        self.output_handler = output_handler if output_handler else [ToolRegistry(), PatchOutputHandler()]
+        self.output_handler = output_handler if output_handler else [ToolRegistry()]
         self.multiline_inputer = multiline_inputer if multiline_inputer else get_multiline_input
 
         self.prompt = ""

{jarvis_ai_assistant-0.1.161 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_agent/jarvis.py

@@ -15,7 +15,6 @@ from jarvis.jarvis_agent import (
      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
@@ -123,7 +122,7 @@ def main() -> None:
             platform=args.platform,
             model_name=args.model,
             input_handler=[file_input_handler, shell_input_handler, builtin_input_handler],
-            output_handler=[ToolRegistry(), PatchOutputHandler()],
+            output_handler=[ToolRegistry()],
             need_summary=False
         )
 

{jarvis_ai_assistant-0.1.161 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -16,7 +16,6 @@ from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
 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.patch import PatchOutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.registry import ToolRegistry
@@ -51,9 +50,8 @@ class CodeAgent:
             "read_code",
             "methodology",
             "chdir",
-            "create_code_agent",
             "find_methodology",
-            "virtual_tty",
+            "edit_file",
         ])
         code_system_prompt = """
 <code_engineer_guide>
@@ -204,7 +202,13 @@ class CodeAgent:
 - loc比wc -l提供更多代码统计信息，应优先使用
 - 针对不同编程语言选择对应的代码质量检查工具
 - 不要留下未实现的代码
-- 对于非常复杂的需求，可以使用create_code_agent工具，但是要提供完整的上下文信息
+
+### 代码编辑规范
+- 使用edit_file工具进行代码修改时，必须遵循最小补丁原则
+- 只提供需要修改的代码部分，不要提供完整文件内容
+- 保持原始代码的缩进、空行和格式风格
+- 每个修改必须包含清晰的修改理由
+- 新建文件时可以提供完整内容，修改现有文件时只提供差异部分
 </notes>
 </code_engineer_guide>
 """
@@ -220,7 +224,7 @@ class CodeAgent:
             system_prompt=code_system_prompt,
             name="CodeAgent",
             auto_complete=False,
-            output_handler=[tool_registry, PatchOutputHandler()],
+            output_handler=[tool_registry],
             platform=platform_instance,
             input_handler=[
                 shell_input_handler,

{jarvis_ai_assistant-0.1.161 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_dev/main.py

@@ -3,7 +3,8 @@ from jarvis.jarvis_multi_agent import MultiAgent
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import ct, ot, init_env
+from jarvis.jarvis_utils.tag import ct, ot
+from jarvis.jarvis_utils.utils import init_env
 
 # 定义每个角色的系统提示
 PM_PROMPT = f"""
@@ -994,7 +995,8 @@ def create_dev_team() -> MultiAgent:
         "search_web",
         "execute_script",
         "methodology",
-        "ask_codebase"
+        "ask_codebase",
+        "edit_file",
     ])
 
     BA_output_handler = ToolRegistry()
@@ -1005,7 +1007,8 @@ def create_dev_team() -> MultiAgent:
         "execute_script",
         "read_webpage",
         "methodology",
-        "ask_codebase"
+        "ask_codebase",
+        "edit_file",
     ])
 
     SA_output_handler = ToolRegistry()
@@ -1015,7 +1018,8 @@ def create_dev_team() -> MultiAgent:
         "ask_codebase",
         "execute_script",
         "read_code",
-        "methodology"
+        "methodology",
+        "edit_file",
     ])
 
     TL_output_handler = ToolRegistry()
@@ -1025,6 +1029,7 @@ def create_dev_team() -> MultiAgent:
         "lsp_get_diagnostics",
         "execute_script",
         "methodology",
+        "edit_file",
     ])
 
     DEV_output_handler = ToolRegistry()
@@ -1036,6 +1041,7 @@ def create_dev_team() -> MultiAgent:
         "read_code",
         "create_sub_agent",
         "methodology",
+        "edit_file",
     ])
 
     QA_output_handler = ToolRegistry()
@@ -1048,6 +1054,7 @@ def create_dev_team() -> MultiAgent:
         "execute_script",
         "read_code",
         "methodology",
+        "edit_file",
     ])
 
     # Update PM prompt with tool usage guidance

{jarvis_ai_assistant-0.1.161 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_git_utils/git_commiter.py

@@ -153,9 +153,10 @@ class GitCommitTool:
                             except Exception as e:
                                 spinner.write(f"⚠️ 上传文件时出错: {str(e)}")
                                 upload_success = False
-                        
                         # 根据上传状态准备完整的提示
                         if upload_success:
+                            # 尝试生成提交信息
+                            spinner.text = "正在生成提交消息..."
                             # 使用上传的文件
                             prompt = base_prompt + f'''
         # 变更概述
@@ -178,8 +179,6 @@ class GitCommitTool:
         '''
                                 commit_message = platform.chat_until_success(prompt)
                         
-                        # 尝试生成提交信息
-                        spinner.text = "正在生成提交消息..."
                         while True:
                             # 只在特定情况下重新获取commit_message
                             if not upload_success and not is_large_content and not commit_message:

jarvis_ai_assistant-0.1.161/src/jarvis/jarvis_agent/patch.py → jarvis_ai_assistant-0.1.162/src/jarvis/jarvis_tools/edit_file.py

@@ -1,7 +1,10 @@
+from pydoc import describe
 import re
 from typing import Dict, Any, Tuple
 import os
 
+from networkx import descendants
+
 from yaspin import yaspin # type: ignore
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
@@ -18,35 +21,15 @@ from jarvis.jarvis_utils.utils import is_context_overflow, get_file_line_count,
 from jarvis.jarvis_utils.tag import ot, ct
 
 
-class PatchOutputHandler(OutputHandler):
-    def name(self) -> str:
-        return "PATCH"
-
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
-        return False, apply_patch(response, agent)
-
-    def can_handle(self, response: str) -> bool:
-        if _has_patch_block(response):
-            return True
-        return False
+class PatchOutputHandler:
 
-    def prompt(self) -> str:
-        return f"""
-# 代码补丁规范
+    name = "edit_file"
+    description = """代码编辑工具，用于编辑文件
+# 代码编辑规范
 
 ## 重要提示
 我可以看到完整的代码，所以不需要生成完整的代码，只需要提供修改的代码片段即可。请尽量精简补丁内容，只包含必要的上下文和修改部分。特别注意：不要提供完整文件内容，只提供需要修改的部分！
 
-## 补丁格式定义
-使用{ot("PATCH")}块来精确指定代码更改：
-```
-{ot("PATCH")}
-File: [文件路径]
-Reason: [修改原因]
-[代码修改说明，不用输出完整的代码，仅输出修改的片段即可]
-{ct("PATCH")}
-```
-
 ## 核心原则
 1. **精准修改**：只显示需要修改的代码部分，不需要展示整个文件内容
 2. **最小补丁原则**：始终生成最小范围的补丁，只包含必要的上下文和实际修改
@@ -71,22 +54,6 @@ Reason: [修改原因]
    - 如果原代码行尾没有空格，补丁也不应添加行尾空格
    - 如果原代码使用特定的行尾注释风格，补丁也应保持该风格
 
-## 补丁示例
-```
-{ot("PATCH")}
-File: src/utils/math.py
-Reason: 修复除零错误，增加参数验证以提高函数健壮性
-def safe_divide(a, b):
-    # 添加参数验证
-    if b == 0:
-        raise ValueError("除数不能为零")
-    return a / b
-# 现有代码 ...
-def add(a, b):
-    return a + b
-{ct("PATCH")}
-```
-
 ## 最佳实践
 - 每个补丁专注于单一职责的修改
 - 避免包含过多无关代码
@@ -96,77 +63,47 @@ def add(a, b):
 - 绝不提供完整文件内容，除非是新建文件
 - 每个文件的修改是独立的，不能出现“参照xxx文件的修改”这样的描述
 - 不要出现未实现的代码，如：TODO
-"""
-    
-def _has_patch_block(patch_str: str) -> bool:
-    """判断是否存在补丁块"""
-    return re.search(ot("PATCH")+r'\n?(.*?)\n?' +
-                     ct("PATCH"), patch_str, re.DOTALL) is not None
-
-
-def _parse_patch(patch_str: str) -> Tuple[Dict[str, str], str]:
-    """解析新的上下文补丁格式"""
-    result = {}
-    patches = re.findall(ot("PATCH")+r'\n?(.*?)\n?' +
-                         ct("PATCH"), patch_str, re.DOTALL)
-    if patches:
-        for patch in patches:
-            first_line = patch.splitlines()[0]
-            sm = re.match(r'^File:\s*(.+)$', first_line)
-            if not sm:
-                return ({}, f"""无效的补丁格式，正确格式应该为：
-{ot("PATCH")}
-File: [文件路径]
-Reason: [修改原因]
-[代码修改说明，不用输出完整的代码，仅输出修改的片段即可]
-{ct("PATCH")}""")
-            filepath = os.path.abspath(sm.group(1).strip())
-            if filepath not in result:
-                result[filepath] = patch
-            else:
-                result[filepath] += "\n\n" + patch
-    return result, ""
+- 如果要修改的内容较多，请分多次修改
+    """
+    parameters = {
+        "type": "object",
+        "properties": {
+            "file": {"type": "string", "description": "文件路径"},
+            "reason": {"type": "string", "description": "修改原因"},
+            "content": {"type": "string", "description": "补丁内容"}
+        }
+    }
 
 
-def apply_patch(output_str: str, agent: Any) -> str:
-    """Apply patches to files"""
-    with yaspin(text="正在应用补丁...", color="cyan") as spinner:
-        try:
-            patches, error_msg = _parse_patch(output_str)
-            if error_msg:
-                spinner.text = "补丁格式错误"
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Apply patches to files"""
+
+        from jarvis.jarvis_agent import Agent
+        filepath = args["file"]
+        patch_content = args["content"]
+        agent: Agent = args["agent"]
+
+        with yaspin(text="正在应用补丁...", color="cyan") as spinner:
+
+            # 获取当前提交hash作为起始点
+            spinner.text = "开始获取当前提交hash..."
+            start_hash = get_latest_commit_hash()
+            spinner.write("✅ 当前提交hash获取完成")
+
+            not_read_file = not has_read_file(filepath) and os.path.exists(filepath) and os.path.getsize(filepath) > 0
+            if not_read_file:
+                spinner.text=f"以下文件未读取: {filepath}，应用补丁存在风险，将先读取文件后再生成补丁"
                 spinner.fail("❌")
-                return error_msg
-        except Exception as e:
-            spinner.text = "解析补丁失败"
-            spinner.fail("❌")
-            return f"解析补丁失败: {str(e)}"
-
-        # 获取当前提交hash作为起始点
-        spinner.text = "开始获取当前提交hash..."
-        start_hash = get_latest_commit_hash()
-        spinner.write("✅ 当前提交hash获取完成")
-
-        not_read_file = [
-            f for f in patches.keys() 
-            if not has_read_file(f) 
-            and os.path.exists(f) 
-            and os.path.getsize(f) > 0
-        ]
-        if not_read_file:
-            spinner.text=f"以下文件未读取: {not_read_file}，应用补丁存在风险，将先读取文件后再生成补丁"
-            spinner.fail("❌")
-            return f"以下文件未读取: {not_read_file}，应用补丁存在风险，请先读取文件后再生成补丁"
+                return {
+                    "success": False,
+                    "stdout": f"以下文件未读取: {filepath}，应用补丁存在风险，请先读取文件后再生成补丁",
+                    "stderr": ""
+                }
 
-        # 检查是否有文件在Git仓库外
-        in_git_repo = True
-        for filepath in patches.keys():
-            if not _is_file_in_git_repo(filepath):
-                in_git_repo = False
-                break
+            # 检查是否有文件在Git仓库外
+            in_git_repo = _is_file_in_git_repo(filepath)
 
-        # 按文件逐个处理
-        for filepath, patch_content in patches.items():
             try:
                 spinner.text = f"正在处理文件: {filepath}"
                 if not os.path.exists(filepath):
@@ -188,59 +125,74 @@ def apply_patch(output_str: str, agent: Any) -> str:
                 revert_file(filepath)  # 回滚单个文件
                 spinner.write(f"✅ 文件 {filepath} 回滚完成")
 
-        final_ret = ""
-        if in_git_repo:
-            diff = get_diff()
-            if diff:
-                PrettyOutput.print(diff, OutputType.CODE, lang="diff")
-                with spinner.hidden():
-                    commited = handle_commit_workflow()
-                if commited:
-                    # 获取提交信息
-                    end_hash = get_latest_commit_hash()
-                    commits = get_commits_between(start_hash, end_hash)
+            final_ret = ""
+            if in_git_repo:
+                diff = get_diff()
+                if diff:
+                    PrettyOutput.print(diff, OutputType.CODE, lang="diff")
+                    with spinner.hidden():
+                        commited = handle_commit_workflow()
+                    if commited:
+                        # 获取提交信息
+                        end_hash = get_latest_commit_hash()
+                        commits = get_commits_between(start_hash, end_hash)
 
-                    # 添加提交信息到final_ret
-                    if commits:
-                        final_ret += "✅ 补丁已应用\n"
-                        final_ret += "# 提交信息:\n"
-                        for commit_hash, commit_message in commits:
-                            final_ret += f"- {commit_hash[:7]}: {commit_message}\n"
+                        # 添加提交信息到final_ret
+                        if commits:
+                            final_ret += "✅ 补丁已应用\n"
+                            final_ret += "# 提交信息:\n"
+                            for commit_hash, commit_message in commits:
+                                final_ret += f"- {commit_hash[:7]}: {commit_message}\n"
 
-                        final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
+                            final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
-                        # 修改后的提示逻辑
-                        addon_prompt = f"如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
-                        addon_prompt += "如果有任何信息不明确，调用工具获取信息\n"
-                        addon_prompt += "每次响应必须且只能包含一个操作\n"
+                            # 修改后的提示逻辑
+                            addon_prompt = f"如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要输出新的PATCH，不要实现任何超出用户需求外的内容\n"
+                            addon_prompt += "如果有任何信息不明确，调用工具获取信息\n"
+                            addon_prompt += "每次响应必须且只能包含一个操作\n"
 
-                        agent.set_addon_prompt(addon_prompt)
+                            agent.set_addon_prompt(addon_prompt)
 
+                        else:
+                            final_ret += "✅ 补丁已应用（没有新的提交）"
                     else:
-                        final_ret += "✅ 补丁已应用（没有新的提交）"
+                        final_ret += "❌ 补丁应用被拒绝\n"
+                        final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
                 else:
-                    final_ret += "❌ 补丁应用被拒绝\n"
-                    final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
+                    commited = False
+                    final_ret += "❌ 没有要提交的更改\n"
             else:
-                commited = False
-                final_ret += "❌ 没有要提交的更改\n"
-        else:
-            # 对于Git仓库外的文件，直接返回成功
-            final_ret += "✅ 补丁已应用（文件不在Git仓库中）"
-            commited = True
-        # 用户确认最终结果
-        with spinner.hidden():
-            if commited:
-                return final_ret
-            PrettyOutput.print(final_ret, OutputType.USER, lang="markdown")
-            if not is_confirm_before_apply_patch() or user_confirm("是否使用此回复？", default=True):
-                return final_ret
-            custom_reply = get_multiline_input("请输入自定义回复")
-            if not custom_reply.strip():  # 如果自定义回复为空，返回空字符串
-                return ""
-            agent.set_addon_prompt(custom_reply)
-            return final_ret
-
+                # 对于Git仓库外的文件，直接返回成功
+                final_ret += "✅ 补丁已应用（文件不在Git仓库中）"
+                commited = True
+            # 用户确认最终结果
+            with spinner.hidden():
+                if commited:
+                    return {
+                        "success": True,
+                        "stdout": final_ret,
+                        "stderr": ""
+                    }
+                PrettyOutput.print(final_ret, OutputType.USER, lang="markdown")
+                if not is_confirm_before_apply_patch() or user_confirm("是否使用此回复？", default=True):
+                    return {
+                        "success": True,
+                        "stdout": final_ret,
+                        "stderr": ""
+                    }
+                custom_reply = get_multiline_input("请输入自定义回复")
+                if not custom_reply.strip():  # 如果自定义回复为空，返回空字符串
+                    return {
+                        "success": True,
+                        "stdout": final_ret,
+                        "stderr": ""
+                    }
+                agent.set_addon_prompt(custom_reply)
+                return {
+                    "success": True,
+                    "stdout": final_ret,
+                    "stderr": ""
+                }
 
 def _is_file_in_git_repo(filepath: str) -> bool:
     """检查文件是否在当前Git仓库中"""
@@ -532,19 +484,19 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 
 ## 输出模板
 {ot("DIFF")}
->>>>>> SEARCH
+{">" * 5} SEARCH
 [需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
 {'='*5}
 [替换后的新代码]
-<<<<<< REPLACE
+{"<" * 5} REPLACE
 {ct("DIFF")}
 
 {ot("DIFF")}
->>>>>> SEARCH
+{">" * 5} SEARCH
 [另一处需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
 {'='*5}
 [另一处替换后的新代码]
-<<<<<< REPLACE
+{"<" * 5} REPLACE
 {ct("DIFF")}
 """
             

{jarvis_ai_assistant-0.1.161 → jarvis_ai_assistant-0.1.162/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.161
+Version: 0.1.162
 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.161 → jarvis_ai_assistant-0.1.162}/src/jarvis_ai_assistant.egg-info/SOURCES.txt

@@ -10,7 +10,6 @@ src/jarvis/jarvis_agent/file_input_handler.py
 src/jarvis/jarvis_agent/jarvis.py
 src/jarvis/jarvis_agent/main.py
 src/jarvis/jarvis_agent/output_handler.py
-src/jarvis/jarvis_agent/patch.py
 src/jarvis/jarvis_agent/shell_input_handler.py
 src/jarvis/jarvis_code_agent/__init__.py
 src/jarvis/jarvis_code_agent/code_agent.py
@@ -71,6 +70,7 @@ src/jarvis/jarvis_tools/chdir.py
 src/jarvis/jarvis_tools/code_plan.py
 src/jarvis/jarvis_tools/create_code_agent.py
 src/jarvis/jarvis_tools/create_sub_agent.py
+src/jarvis/jarvis_tools/edit_file.py
 src/jarvis/jarvis_tools/execute_script.py
 src/jarvis/jarvis_tools/file_analyzer.py
 src/jarvis/jarvis_tools/file_operation.py