jarvis-ai-assistant 0.1.202__py3-none-any.whl → 0.1.203__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.202"
+__version__ = "0.1.203"

jarvis/jarvis_agent/edit_file_handler.py

@@ -1,6 +1,5 @@
 import os
 import re
-from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Tuple
 
 from yaspin import yaspin
@@ -8,7 +7,6 @@ from yaspin.core import Yaspin
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_tools.file_operation import FileOperationTool
 from jarvis.jarvis_utils.git_utils import revert_file
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
@@ -18,7 +16,7 @@ from jarvis.jarvis_utils.utils import is_context_overflow
 class EditFileHandler(OutputHandler):
     def __init__(self):
         self.patch_pattern = re.compile(
-            ot("PATCH file=([^>]+)") + r"\s*"
+            ot("PATCH file=(?:'([^']+)'|\"([^\"]+)\"|([^>]+))") + r"\s*"
             r"(?:"
             + ot("DIFF")
             + r"\s*"
@@ -69,7 +67,7 @@ class EditFileHandler(OutputHandler):
         for file_path, diffs in patches.items():
             file_path = os.path.abspath(file_path)
             file_patches = [
-                {"search": diff["search"], "replace": diff["replace"]} for diff in diffs
+                {"SEARCH": diff["SEARCH"], "REPLACE": diff["REPLACE"]} for diff in diffs
             ]
 
             with yaspin(text=f"正在处理文件 {file_path}...", color="cyan") as spinner:
@@ -132,6 +130,7 @@ class EditFileHandler(OutputHandler):
         该方法使用正则表达式从响应文本中提取文件编辑指令(PATCH块)，
         每个PATCH块可以包含多个DIFF块，每个DIFF块包含一组搜索和替换内容。
         解析后会返回一个字典，键是文件路径，值是该文件对应的补丁列表。
+        如果同一个文件路径出现多次，会将所有DIFF块合并到一起。
 
         Args:
             response: 包含补丁信息的响应字符串，格式应符合PATCH指令规范
@@ -141,25 +140,29 @@ class EditFileHandler(OutputHandler):
                 返回解析后的补丁信息字典，结构为:
                 {
                     "文件路径1": [
-                        {"search": "搜索文本1", "replace": "替换文本1"},
-                        {"search": "搜索文本2", "replace": "替换文本2"}
+                        {"SEARCH": "搜索文本1", "REPLACE": "替换文本1"},
+                        {"SEARCH": "搜索文本2", "REPLACE": "替换文本2"}
                     ],
                     "文件路径2": [...]
                 }
         """
         patches = {}
         for match in self.patch_pattern.finditer(response):
-            file_path = match.group(1)
+            # Get the file path from the appropriate capture group
+            file_path = match.group(1) or match.group(2) or match.group(3)
             diffs = []
             for diff_match in self.diff_pattern.finditer(match.group(0)):
                 diffs.append(
                     {
-                        "search": diff_match.group(1).strip(),
-                        "replace": diff_match.group(2).strip(),
+                        "SEARCH": diff_match.group(1).strip(),
+                        "REPLACE": diff_match.group(2).strip(),
                     }
                 )
             if diffs:
-                patches[file_path] = diffs
+                if file_path in patches:
+                    patches[file_path].extend(diffs)
+                else:
+                    patches[file_path] = diffs
         return patches
 
     @staticmethod
@@ -199,12 +202,16 @@ class EditFileHandler(OutputHandler):
             modified_content = file_content
             patch_count = 0
             for patch in patches:
-                search_text = patch["search"]
-                replace_text = patch["replace"]
+                search_text = patch["SEARCH"]
+                replace_text = patch["REPLACE"]
                 patch_count += 1
 
                 if search_text in modified_content:
                     if modified_content.count(search_text) > 1:
+                        PrettyOutput.print(
+                            f"搜索文本在文件中存在多处匹配：\n{search_text}",
+                            output_type=OutputType.WARNING,
+                        )
                         return False, f"搜索文本在文件中存在多处匹配：\n{search_text}"
                     modified_content = modified_content.replace(
                         search_text, replace_text
@@ -224,6 +231,10 @@ class EditFileHandler(OutputHandler):
                         )
                         if indented_search in modified_content:
                             if modified_content.count(indented_search) > 1:
+                                PrettyOutput.print(
+                                    f"搜索文本在文件中存在多处匹配：\n{indented_search}",
+                                    output_type=OutputType.WARNING,
+                                )
                                 return (
                                     False,
                                     f"搜索文本在文件中存在多处匹配：\n{indented_search}",
@@ -238,6 +249,10 @@ class EditFileHandler(OutputHandler):
                             break
 
                     if not found:
+                        PrettyOutput.print(
+                            f"搜索文本在文件中不存在：\n{search_text}",
+                            output_type=OutputType.WARNING,
+                        )
                         return False, f"搜索文本在文件中不存在：\n{search_text}"
 
             # 写入修改后的内容
@@ -308,8 +323,8 @@ class EditFileHandler(OutputHandler):
                 patch_content.append(
                     {
                         "reason": "根据用户指令修改代码",
-                        "search": patch["search"],
-                        "replace": patch["replace"],
+                        "SEARCH": patch["SEARCH"],
+                        "REPLACE": patch["REPLACE"],
                     }
                 )
 
@@ -390,8 +405,8 @@ class EditFileHandler(OutputHandler):
                 for match in diff_blocks:
                     generated_patches.append(
                         {
-                            "search": match.group(1).strip(),
-                            "replace": match.group(2).strip(),
+                            "SEARCH": match.group(1).strip(),
+                            "REPLACE": match.group(2).strip(),
                         }
                     )
 

{jarvis_ai_assistant-0.1.202.dist-info → jarvis_ai_assistant-0.1.203.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.202
+Version: 0.1.203
 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.202.dist-info → jarvis_ai_assistant-0.1.203.dist-info}/RECORD

@@ -1,7 +1,7 @@
-jarvis/__init__.py,sha256=1uYZEHP44b3jLJZ5d-Ydy94aetzbjTE6KoKfy3CdhSc,75
+jarvis/__init__.py,sha256=6vjQIk71IT0f_EPgzrHvjWl2bp3n_NOJMy-NtNfAZ-g,75
 jarvis/jarvis_agent/__init__.py,sha256=X5BWIOzxXUWtCbpDkTFfUYskf6sbNzb1qQu8nQ4NN1k,34371
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=1V7kV5Zhw2HE3Xgjs1R-43RZ2huq3Kg-32NCdNnyZmA,2216
-jarvis/jarvis_agent/edit_file_handler.py,sha256=ZDHjtggwFrHAOcfOAScKyPHSw9a3NvbKRqRtHjp2w9Q,15545
+jarvis/jarvis_agent/edit_file_handler.py,sha256=EVEKZUon2CbLHQ1id1_5nka_oGJALGv1k1jmKJva3JA,16478
 jarvis/jarvis_agent/jarvis.py,sha256=GH2zi8eXNpW8twiY3LKDEZgGmFC5geB0jlkwFrm7hOQ,6279
 jarvis/jarvis_agent/main.py,sha256=c6bQe-8LXvW2-NBn9Rn_yPYdrwnkJ8KQaSFY2cPvkxw,2775
 jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5pM92KKjAs,1172
@@ -91,9 +91,9 @@ jarvis/jarvis_utils/methodology.py,sha256=MhPrMxMqElyAn54BDfpQdUqrRr7IbSlrLvAI39
 jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=RYFQx7OkOu3fe_QhS-5jx7O06k_58X14S-9PFJgwOa4,12178
-jarvis_ai_assistant-0.1.202.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.202.dist-info/METADATA,sha256=7i5-nQ4XDVbIBrfSebmIaqMOKN6GzZot2a4pJ1OJ_AQ,20215
-jarvis_ai_assistant-0.1.202.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.202.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.202.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.202.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.203.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.203.dist-info/METADATA,sha256=Z2KYARBymf4cu82o1L_vXEo8KXujcOUkbFnb8qZx5Lc,20215
+jarvis_ai_assistant-0.1.203.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.203.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.203.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.203.dist-info/RECORD,,