jarvis-ai-assistant 0.1.197__py3-none-any.whl → 0.1.199__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -868,7 +868,7 @@ arguments:
             import tempfile
             timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
             history_md = str(Path(tempfile.gettempdir())/f"{self.name}_history_{timestamp}.md")
-            self.history.export_history_to_markdown(tempfile.gettempdir(), history_md, max_files=self.history_count)
+            self.history.export_history_to_markdown(self.history_dir, history_md, max_files=self.history_count)
             self.files.append(history_md)
 
                         # 如果有上传文件，先上传文件
@@ -882,9 +882,16 @@ arguments:
                     for handler in self.input_handler:
                         msg, _ = handler(msg, self)
                     self.prompt = f"{self.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+                else:
+                    if self.files:
+                        self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                    else:
+                        self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
             elif self.files:
                 if not self.model.upload_files(self.files):
                     PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
+                else:
+                    self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
         else:
             if self.files:
                 PrettyOutput.print("不支持上传文件，将忽略文件列表", OutputType.WARNING)

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/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/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.197.dist-info → jarvis_ai_assistant-0.1.199.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=yN1aJh6gZYIZoCWOibxj7NWyO48_EH7fOLOVXD_Dl4w,75
-jarvis/jarvis_agent/__init__.py,sha256=qcer73IfiAd_IaHznBXAg-nzHZdkoCYhRloDFyJRcTM,33346
+jarvis/__init__.py,sha256=tXkivau40d78Z7nHzkRcchadVpBr5PZG5ETLDQcLXio,75
+jarvis/jarvis_agent/__init__.py,sha256=3CfmmDU9ccEtJmRAtY86cdBm6NUYWatAsbgQFjs0t6M,33880
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=4CCEtVLRBIpkhDUKd54VcX1JFCIWCvDqDh4B1H-eSn0,2187
 jarvis/jarvis_agent/jarvis.py,sha256=GH2zi8eXNpW8twiY3LKDEZgGmFC5geB0jlkwFrm7hOQ,6279
 jarvis/jarvis_agent/main.py,sha256=c6bQe-8LXvW2-NBn9Rn_yPYdrwnkJ8KQaSFY2cPvkxw,2775
@@ -63,7 +63,7 @@ jarvis/jarvis_tools/chdir.py,sha256=BlRvggcOeBM7UwHGL8U8hjuNm_WGkH5BdhxmPVJXejw,
 jarvis/jarvis_tools/code_plan.py,sha256=XRXHdkN4O1A4qbShLa4VBHFdRl6YdyMgZxbPPotrqNs,7358
 jarvis/jarvis_tools/create_code_agent.py,sha256=wls2B2iLrIEeG9kSWnJHv1wQ4TNqdD9T5OPoAyN53N0,3384
 jarvis/jarvis_tools/create_sub_agent.py,sha256=ilnApbz7ptNz5o3IrhBTTiNMJGtdeUmkpYL2BFqyI6c,2874
-jarvis/jarvis_tools/edit_file.py,sha256=cIaxWEW5ES1fiNp6Hm5f2MUXHLPzpeeKITukQaMRsKg,18717
+jarvis/jarvis_tools/edit_file.py,sha256=Awe_2zZxRl_2u81pu4VKb9Rom4xzbYpZV07_s7BEhLM,18747
 jarvis/jarvis_tools/execute_script.py,sha256=gMarE5yCCSPU6Dp6HlcL2KT-2xCzR-1p-oQNlYOJK58,6157
 jarvis/jarvis_tools/file_analyzer.py,sha256=SvNLve5AL2d3oQsWSoHouIsAsYanksBnl5RCCsrw2PQ,4604
 jarvis/jarvis_tools/file_operation.py,sha256=b488jf0_l7aP0RkntaNE9WqZXtbdrQTJdmWawJbfC-A,9529
@@ -72,7 +72,7 @@ jarvis/jarvis_tools/methodology.py,sha256=_K4GIDUodGEma3SvNRo7Qs5rliijgNespVLyAP
 jarvis/jarvis_tools/read_code.py,sha256=6mQ3KNGc43FTiLFxMbAN28FTSVhVfkFJ6mob4heXBNM,6663
 jarvis/jarvis_tools/read_webpage.py,sha256=NmDUboVZd4CGHBPRFK6dp3uqVhuGopW1bOi3TcaLDF4,2092
 jarvis/jarvis_tools/registry.py,sha256=ZuD6x4znAGwB-Z7-43f-SAlrFPIVaLiHqzpZp6zc5r4,25729
-jarvis/jarvis_tools/rewrite_file.py,sha256=w-NY9UfDopCLtaUmdOFHHzSQAvTOIYRuM1RbyV0k2Yg,6755
+jarvis/jarvis_tools/rewrite_file.py,sha256=eG_WKg6cVAXmuGwUqlWkcuyay5S8DOzEi8vZCmX3O8w,7255
 jarvis/jarvis_tools/search_web.py,sha256=C-TuBFy25WOSiwRCe7YiL0hnMx0DuHj6upHO5OtkHTA,925
 jarvis/jarvis_tools/virtual_tty.py,sha256=KKr3jpvQWWMPr2o40hlmN6fuXJCN8H4_ma5QU40Citc,16089
 jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -89,10 +89,10 @@ jarvis/jarvis_utils/jarvis_history.py,sha256=Td6cmze9Oc5-Ewz0l9RKYeSg_-fbEu9ZhyE
 jarvis/jarvis_utils/methodology.py,sha256=MhPrMxMqElyAn54BDfpQdUqrRr7IbSlrLvAI39LCgTM,8487
 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=55kIbFXPFEd6770mdy2fZDh96XH0rIFJw2w3rYhE2Cc,11895
-jarvis_ai_assistant-0.1.197.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.197.dist-info/METADATA,sha256=WXBVY2pO7UC4ZppWf6rfgtm61tfqUA3hA0WigWBRs_g,20215
-jarvis_ai_assistant-0.1.197.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.197.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.197.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.197.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=ZtI7UoZxTA2i5koO0GUKZvj8K6RlOmL8dGT4wnm20kE,11966
+jarvis_ai_assistant-0.1.199.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.199.dist-info/METADATA,sha256=66SM4uj6AbqzkyeICMhTL-FAJ_4U1ptY_CqN7MwGjNg,20215
+jarvis_ai_assistant-0.1.199.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.199.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.199.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.199.dist-info/RECORD,,