jarvis-ai-assistant 0.1.198__py3-none-any.whl → 0.1.200__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -821,6 +821,11 @@ arguments:
                             f"模型交互期间被中断，请输入用户干预信息："
                         )
                         if user_input:
+                            # 如果有工具调用且用户确认继续，则将干预信息和工具执行结果拼接为prompt
+                            if any(handler.can_handle(current_response) for handler in self.output_handler):
+                                if user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
+                                    self.prompt = f"{user_input}\n\n{current_response}"
+                                    continue
                             self.prompt += f"{user_input}"
                             continue
 

jarvis/jarvis_agent/builtin_input_handler.py

@@ -45,6 +45,7 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
                 tool_registry_ if tool_registry_ else ToolRegistry()
             )
             agent.set_addon_prompt(tool_registry.prompt())
+            return "", False
         elif tag == "ReloadConfig":
             from jarvis.jarvis_utils.utils import load_config
 

jarvis/jarvis_platform/yuanbao.py

@@ -98,7 +98,7 @@ class YuanbaoPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, data=payload), sleep_time=5
+                lambda: requests.post(url, headers=headers, data=payload, timeout=600), sleep_time=5
             )
             response_json = response.json()
 
@@ -264,7 +264,7 @@ class YuanbaoPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload), sleep_time=5
+                lambda: requests.post(url, headers=headers, json=payload, timeout=600), sleep_time=5
             )
 
             if response.status_code != 200:
@@ -482,7 +482,7 @@ class YuanbaoPlatform(BasePlatform):
         try:
             # 发送消息请求，获取流式响应
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload, stream=True),
+                lambda: requests.post(url, headers=headers, json=payload, stream=True, timeout=600),
                 sleep_time=5,
             )
 
@@ -556,7 +556,7 @@ class YuanbaoPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: requests.post(url, headers=headers, json=payload), sleep_time=5
+                lambda: requests.post(url, headers=headers, json=payload, timeout=600), sleep_time=5
             )
 
             if response.status_code == 200:

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/builtin_replace_map.py

@@ -96,92 +96,4 @@ code_plan工具将：
 """,
         "description": "执行静态代码检查",
     },
-    "ToolHelp": {
-        "append": False,
-        "template": """
-<tool_system_guide>
-<introduction>
-# 🛠️ 工具使用系统
-您正在使用一个需要精确格式和严格规则的工具执行系统。
-</introduction>
-
-<format>
-# 📋 工具调用格式
-{ot("TOOL_CALL")}
-want: 想要从执行结果中获取到的信息，如果工具输出内容过长，会根据此字段尝试提取有效信息
-name: 工具名称
-arguments:
-  param1: 值1
-  param2: 值2
-{ct("TOOL_CALL")}
-</format>
-
-<rules>
-# ❗ 关键规则
-<rule>
-### 1. 每次只使用一个工具
-- 一次只执行一个工具
-- 等待结果后再进行下一步
-</rule>
-
-<rule>
-### 2. 严格遵守格式
-- 完全按照上述格式
-- 使用正确的YAML格式，2个空格作为缩进
-- 包含所有必需参数
-</rule>
-
-<rule>
-### 3. 结果处理
-- 等待执行结果
-- 不要假设结果
-- 不要创建虚假响应
-- 不要想象对话
-</rule>
-
-<rule>
-### 4. 信息管理
-- 如果信息不足，询问用户
-- 跳过不必要的步骤
-- 如果卡住，请求指导
-- 不要在没有完整信息的情况下继续
-</rule>
-</rules>
-
-<string_format>
-# 📝 字符串参数格式
-始终使用 |2 语法表示字符串参数，防止多行字符串行首空格引起歧义：
-
-{ot("TOOL_CALL")}
-want: 当前的git状态，期望获取xxx的提交记录
-name: execute_script
-arguments:
-  interpreter: bash
-  script_cotent: |2
-    git status --porcelain
-{ct("TOOL_CALL")}
-</string_format>
-
-<best_practices>
-# 💡 最佳实践
-- 准备好后立即开始执行
-- 无需请求许可即可开始
-- 使用正确的字符串格式
-- 监控进度并调整
-- 遇到困难时请求帮助
-</best_practices>
-
-<common_errors>
-# ⚠️ 常见错误
-- 同时调用多个工具
-- 字符串参数缺少 |2
-- 假设工具结果
-- 创建虚构对话
-- 在没有所需信息的情况下继续
-- yaml 格式错误
-</common_errors>
-</tool_system_guide>
-""",
-        "description": "工具使用系统",
-    },
 }

jarvis/jarvis_utils/utils.py

@@ -3,6 +3,7 @@ import hashlib
 import os
 import signal
 import subprocess
+import sys
 import tarfile
 import time
 from pathlib import Path
@@ -90,7 +91,11 @@ def init_env(welcome_str: str, config_file: Optional[str] = None) -> None:
         # 检查是否是git仓库并更新
     from jarvis.jarvis_utils.git_utils import check_and_update_git_repo
 
-    check_and_update_git_repo(str(script_dir))
+    if check_and_update_git_repo(str(script_dir)):
+        # 更新成功，用当前命令行参数启动新进程
+        os.execv(sys.executable, [sys.executable] + sys.argv)
+        # 如果execv失败，退出当前进程
+        sys.exit(0)
 
 
 def load_config():
@@ -273,9 +278,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.dist-info → jarvis_ai_assistant-0.1.200.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
-jarvis/__init__.py,sha256=Ir1_uW7TcquoBOm25uhvdYhSDr2TWwS0R_QGOUXidP0,75
-jarvis/jarvis_agent/__init__.py,sha256=3CfmmDU9ccEtJmRAtY86cdBm6NUYWatAsbgQFjs0t6M,33880
-jarvis/jarvis_agent/builtin_input_handler.py,sha256=4CCEtVLRBIpkhDUKd54VcX1JFCIWCvDqDh4B1H-eSn0,2187
+jarvis/__init__.py,sha256=ePqWF92FI0LF1Btg_GrnhZEoxtiseFY4-wiB5EEsh-U,75
+jarvis/jarvis_agent/__init__.py,sha256=X5BWIOzxXUWtCbpDkTFfUYskf6sbNzb1qQu8nQ4NN1k,34371
+jarvis/jarvis_agent/builtin_input_handler.py,sha256=1V7kV5Zhw2HE3Xgjs1R-43RZ2huq3Kg-32NCdNnyZmA,2216
 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
@@ -51,7 +51,7 @@ jarvis/jarvis_platform/kimi.py,sha256=uIpSWQ3MqDBYYMROeXin_YqM2LFrovMICKpwLWO1OD
 jarvis/jarvis_platform/openai.py,sha256=uEjBikfFj7kp5wondLvOx4WdkmTX0aqF6kixxAufcHg,4806
 jarvis/jarvis_platform/registry.py,sha256=Sz4ADAaxuufpAQG0KSQZuL1yALzH-aF3FDapkNn5foE,8107
 jarvis/jarvis_platform/tongyi.py,sha256=zu1bE-LdF_Sohwb5FxoIkDOTI0Lv5G_XhuSOPI20Gf8,21190
-jarvis/jarvis_platform/yuanbao.py,sha256=1PagfRWvGylUaeUe7yiBnGjYZ1HQk3uruogfKem84ss,21394
+jarvis/jarvis_platform/yuanbao.py,sha256=nzdizTNM1d9OWfxkAZjBkhA_hllNPekpcv2vhJiPUB0,21446
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform_manager/main.py,sha256=BdBH2tPzq7p9Mvii7abu6M7uj4lfG05gwjYfMqU5HUA,29567
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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,13 +72,13 @@ 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
 jarvis/jarvis_tools/cli/main.py,sha256=Mg6TQDxMdzB1Ua1UrZ2EE-uQWsbaeojWaEGHJp2HimA,6375
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
-jarvis/jarvis_utils/builtin_replace_map.py,sha256=s7C5wKhoKkv-O4ltMcDzNpv5oGPC1EbXgiohPHAqksw,4892
+jarvis/jarvis_utils/builtin_replace_map.py,sha256=9QKElsyIoZaq4ssZRlCfJPf2i92WuKIHlqOfyBZQmLs,2939
 jarvis/jarvis_utils/config.py,sha256=OomZRIeRHiBntKXdqYP1ArI8aqRFqtMlLkd9-VSd5dA,7364
 jarvis/jarvis_utils/embedding.py,sha256=suqKOgH4cq2HYj4xvNpqDPN9pyc3hTCl934xYonF6qk,3922
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
@@ -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.198.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.198.dist-info/METADATA,sha256=DuyATtZZbn9V7qS0YtIBAfsp1a9bBfkL9Agp21YUeWk,20215
-jarvis_ai_assistant-0.1.198.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.198.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.198.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.198.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=RYFQx7OkOu3fe_QhS-5jx7O06k_58X14S-9PFJgwOa4,12178
+jarvis_ai_assistant-0.1.200.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.200.dist-info/METADATA,sha256=ZCSRI6f3QMXnALhhPRM0ZjlnWQUYn0AhoqbtsA0xzRk,20215
+jarvis_ai_assistant-0.1.200.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.200.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.200.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.200.dist-info/RECORD,,