jarvis-ai-assistant 0.1.201__tar.gz → 0.1.202__tar.gz

{jarvis_ai_assistant-0.1.201/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.202}/PKG-INFO

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

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.201"
+version = "0.1.202"
 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.201 → jarvis_ai_assistant-0.1.202}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.201",
+    version="0.1.202",
     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.201 → jarvis_ai_assistant-0.1.202}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.201 → jarvis_ai_assistant-0.1.202}/src/jarvis/jarvis_agent/edit_file_handler.py

@@ -23,11 +23,11 @@ class EditFileHandler(OutputHandler):
             + ot("DIFF")
             + r"\s*"
             + ot("SEARCH")
-            + r"\s*(.*?)\s*"
+            + r"(.*?)"
             + ct("SEARCH")
             + r"\s*"
             + ot("REPLACE")
-            + r"\s*(.*?)\s*"
+            + r"(.*?)"
             + ct("REPLACE")
             + r"\s*"
             + ct("DIFF")
@@ -39,11 +39,11 @@ class EditFileHandler(OutputHandler):
             ot("DIFF")
             + r"\s*"
             + ot("SEARCH")
-            + r"\s*(.*?)\s*"
+            + r"(.*?)"
             + ct("SEARCH")
             + r"\s*"
             + ot("REPLACE")
-            + r"\s*(.*?)\s*"
+            + r"(.*?)"
             + ct("REPLACE")
             + r"\s*"
             + ct("DIFF"),
@@ -65,7 +65,6 @@ class EditFileHandler(OutputHandler):
             return False, "未找到有效的文件编辑指令"
 
         results = []
-        overall_success = True
 
         for file_path, diffs in patches.items():
             file_path = os.path.abspath(file_path)
@@ -110,15 +109,12 @@ class EditFileHandler(OutputHandler):
         return f"""文件编辑指令格式：
 {ot("PATCH file=文件路径")}
 {ot("DIFF")}
-{ot("SEARCH")}
-原始代码
-{ct("SEARCH")}
-{ot("REPLACE")}
-新代码
-{ct("REPLACE")}
+{ot("SEARCH")}原始代码{ct("SEARCH")}
+{ot("REPLACE")}新代码{ct("REPLACE")}
 {ct("DIFF")}
 {ct("PATCH")}
 
+可以返回多个PATCH块用于同时修改多个文件
 每个PATCH块可以包含多个DIFF块，每个DIFF块包含一组搜索和替换内容。
 搜索文本必须能在文件中唯一匹配，否则编辑将失败。"""
 
@@ -345,19 +341,13 @@ class EditFileHandler(OutputHandler):
 
 ## 输出模板
 {ot("DIFF")}
-{">" * 5} SEARCH
-[需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
-{'='*5}
-[替换后的新代码]
-{"<" * 5} REPLACE
+{ot("SEARCH")}[需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]{ct("SEARCH")}
+{ot("REPLACE")}[替换后的新代码]{ct("REPLACE")}
 {ct("DIFF")}
 
 {ot("DIFF")}
-{">" * 5} SEARCH
-[另一处需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
-{'='*5}
-[另一处替换后的新代码]
-{"<" * 5} REPLACE
+{ot("SEARCH")}[另一处需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]{ct("SEARCH")}
+{ot("REPLACE")}[另一处替换后的新代码]{ct("REPLACE")}
 {ct("DIFF")}
 """
 
@@ -383,7 +373,14 @@ class EditFileHandler(OutputHandler):
                 diff_blocks = re.finditer(
                     ot("DIFF")
                     + r"\s*"
-                    + r">{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?"
+                    + ot("SEARCH")
+                    + r"(.*?)"
+                    + ct("SEARCH")
+                    + r"\s*"
+                    + ot("REPLACE")
+                    + r"(.*?)"
+                    + ct("REPLACE")
+                    + r"\s*"
                     + ct("DIFF"),
                     response,
                     re.DOTALL,

{jarvis_ai_assistant-0.1.201 → jarvis_ai_assistant-0.1.202}/src/jarvis/jarvis_platform/base.py

@@ -82,7 +82,7 @@ class BasePlatform(ABC):
                         while_true(
                             lambda: while_success(
                                 lambda: self.chat(
-                                    f"<part_content>{input}</part_content>请返回已收到"
+                                    f"<part_content>{input}</part_content>\n\n请返回已收到"
                                 ),
                                 5,
                             ),

{jarvis_ai_assistant-0.1.201 → jarvis_ai_assistant-0.1.202/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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