jarvis-ai-assistant 0.1.198__tar.gz → 0.1.199__tar.gz

{jarvis_ai_assistant-0.1.198/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.199}/PKG-INFO

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

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

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

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

{jarvis_ai_assistant-0.1.198 → jarvis_ai_assistant-0.1.199}/src/jarvis/jarvis_tools/edit_file.py

@@ -444,7 +444,7 @@ def fast_edit(
             # 如果有多处，报错
             if modified_content.count(search_text) > 1:
                 success = False
-                err_msg = f"搜索文本 {search_text} 在文件中存在多处，请检查补丁内容"
+                err_msg = f"搜索文本 ```\n{search_text}\n``` 在文件中存在多处，请检查补丁内容"
                 break
             # 应用替换
             modified_content = modified_content.replace(search_text, replace_text)
@@ -465,7 +465,7 @@ def fast_edit(
                 if indented_search in modified_content:
                     if modified_content.count(indented_search) > 1:
                         success = False
-                        err_msg = f"搜索文本 {indented_search} 在文件中存在多处，请检查补丁内容"
+                        err_msg = f"搜索文本 ```\n{indented_search}\n``` 在文件中存在多处，请检查补丁内容"
                         break
                     modified_content = modified_content.replace(
                         indented_search, indented_replace
@@ -478,7 +478,7 @@ def fast_edit(
 
             if not found:
                 success = False
-                err_msg = f"搜索文本 {search_text} 在文件中不存在，尝试增加1-16个空格缩进后仍未找到匹配"
+                err_msg = f"搜索文本 ```\n{search_text}\n``` 在文件中不存在，尝试增加1-16个空格缩进后仍未找到匹配"
                 break
     if not success:
         revert_file(filepath)

{jarvis_ai_assistant-0.1.198 → jarvis_ai_assistant-0.1.199}/src/jarvis/jarvis_tools/rewrite_file.py

@@ -86,6 +86,8 @@ class FileRewriteTool:
 
         file_path = args["file"]
         new_content = args["content"]
+        agent = args.get("agent", None)
+        abs_path = os.path.abspath(file_path)
 
         # 创建已处理文件变量，用于失败时回滚
         original_content = None
@@ -97,20 +99,20 @@ class FileRewriteTool:
             try:
                 # 如果文件存在，则读取原内容用于回滚
                 if file_exists:
-                    with open(file_path, "r", encoding="utf-8") as f:
+                    with open(abs_path, "r", encoding="utf-8") as f:
                         original_content = f.read()
 
                 # 确保目录存在
-                os.makedirs(os.path.dirname(os.path.abspath(file_path)), exist_ok=True)
+                os.makedirs(os.path.dirname(abs_path), exist_ok=True)
 
                 # 写入新内容
-                with open(file_path, "w", encoding="utf-8") as f:
+                with open(abs_path, "w", encoding="utf-8") as f:
                     f.write(new_content)
 
                 processed = True
 
                 action = "创建并写入" if not file_exists else "成功重写"
-                stdout_message = f"文件 {file_path} {action}"
+                stdout_message = f"文件 {abs_path} {action}"
                 stdout_messages.append(stdout_message)
                 PrettyOutput.print(stdout_message, OutputType.SUCCESS)
 
@@ -129,14 +131,14 @@ class FileRewriteTool:
                 try:
                     if original_content is None:
                         # 如果是新创建的文件，则删除
-                        if os.path.exists(file_path):
-                            os.remove(file_path)
-                        rollback_file_message = f"已删除新创建的文件: {file_path}"
+                        if os.path.exists(abs_path):
+                            os.remove(abs_path)
+                        rollback_file_message = f"已删除新创建的文件: {abs_path}"
                     else:
                         # 如果是修改的文件，则恢复原内容
-                        with open(file_path, "w", encoding="utf-8") as f:
+                        with open(abs_path, "w", encoding="utf-8") as f:
                             f.write(original_content)
-                        rollback_file_message = f"已回滚文件: {file_path}"
+                        rollback_file_message = f"已回滚文件: {abs_path}"
 
                     stderr_messages.append(rollback_file_message)
                     PrettyOutput.print(rollback_file_message, OutputType.INFO)
@@ -145,6 +147,17 @@ class FileRewriteTool:
                     stderr_messages.append(rollback_error)
                     PrettyOutput.print(rollback_error, OutputType.WARNING)
 
+            # 记录成功处理的文件（使用绝对路径）
+            if success and agent:
+                abs_path = os.path.abspath(file_path)
+                files = agent.get_user_data("files")
+                if files:
+                    if abs_path not in files:
+                        files.append(abs_path)
+                else:
+                    files = [abs_path]
+                agent.set_user_data("files", files)
+
             return {
                 "success": success,
                 "stdout": "\n".join(stdout_messages),

{jarvis_ai_assistant-0.1.198 → jarvis_ai_assistant-0.1.199}/src/jarvis/jarvis_utils/utils.py

@@ -9,7 +9,6 @@ from pathlib import Path
 from typing import Any, Callable, Dict, Optional
 
 import yaml
-
 from jarvis import __version__
 from jarvis.jarvis_utils.config import (get_data_dir, get_max_big_content_size,
                                         set_global_env_data)
@@ -273,9 +272,12 @@ def user_confirm(tip: str, default: bool = True) -> bool:
     返回:
         bool: 用户确认返回True，否则返回False
     """
-    suffix = "[Y/n]" if default else "[y/N]"
-    ret = get_single_line_input(f"{tip} {suffix}: ")
-    return default if ret == "" else ret.lower() == "y"
+    try:
+        suffix = "[Y/n]" if default else "[y/N]"
+        ret = get_single_line_input(f"{tip} {suffix}: ")
+        return default if ret == "" else ret.lower() == "y"
+    except KeyboardInterrupt:
+        return False
 
 
 def get_file_line_count(filename: str) -> int:

{jarvis_ai_assistant-0.1.198 → jarvis_ai_assistant-0.1.199/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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