jarvis-ai-assistant 0.1.205__py3-none-any.whl → 0.1.207__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/edit_file_handler.py

@@ -2,8 +2,8 @@ import os
 import re
 from typing import Any, Dict, List, Tuple
 
-from yaspin import yaspin # type: ignore
-from yaspin.core import Yaspin # type: ignore
+from yaspin import yaspin  # type: ignore
+from yaspin.core import Yaspin  # type: ignore
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -147,7 +147,7 @@ class EditFileHandler(OutputHandler):
                     "文件路径2": [...]
                 }
         """
-        patches = {}
+        patches: Dict[str, List[Dict[str, str]]] = {}
         for match in self.patch_pattern.finditer(response):
             # Get the file path from the appropriate capture group
             file_path = match.group(1) or match.group(2) or match.group(3)
@@ -387,7 +387,8 @@ class EditFileHandler(OutputHandler):
                 # 检查是否被中断
                 if get_interrupt():
                     set_interrupt(False)
-                    user_input = agent.multiline_inputer("补丁应用被中断，请输入补充信息:")
+                    with spinner.hidden():
+                        user_input = agent.multiline_inputer("补丁应用被中断，请输入补充信息:")
                     if not user_input.strip():
                         return False, "用户中断了补丁应用"
                     return False, f"用户中断了补丁应用并提供了补充信息: {user_input}"

jarvis/jarvis_data/config_schema.json

@@ -159,7 +159,7 @@
     "JARVIS_CONFIRM_BEFORE_APPLY_PATCH": {
       "type": "boolean",
       "description": "应用补丁前是否需要确认",
-      "default": true
+      "default": false
     },
     "JARVIS_MAX_TOOL_CALL_COUNT": {
       "type": "number",

jarvis/jarvis_platform/base.py

@@ -71,28 +71,29 @@ class BasePlatform(ABC):
             while_true(lambda: while_success(lambda: self.chat(prefix_prompt), 5), 5)
             submit_count = 0
             length = 0
+            response = ""
             for input in inputs:
                 submit_count += 1
                 length += len(input)
                 print(
                     f"正在提交第{submit_count}部分（共{len(inputs)}部分({length}/{len(message)})）"
                 )
-                list(
-                    while_true(
-                        lambda: while_success(
-                            lambda: self.chat(
-                                f"<part_content>{input}</part_content>\n\n请返回<已收到>，不需要返回其他任何内容"
-                            ),
-                            5,
+                
+                response += "\n" + while_true(
+                    lambda: while_success(
+                        lambda: self.chat(
+                            f"<part_content>{input}</part_content>\n\n请返回<已收到>，不需要返回其他任何内容"
                         ),
                         5,
-                    )
+                    ),
+                    5,
                 )
+                
                 print(
                     f"提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
                 )
             print("提交完成 ✅")
-            response = while_true(
+            response += "\n" + while_true(
                 lambda: while_success(
                     lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5
                 ),

jarvis/jarvis_utils/config.py

@@ -178,7 +178,7 @@ def is_confirm_before_apply_patch() -> bool:
     返回：
         bool: 如果需要确认则返回True，默认为False
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_CONFIRM_BEFORE_APPLY_PATCH", True) == True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_CONFIRM_BEFORE_APPLY_PATCH", False) == True
 
 
 def get_max_tool_call_count() -> int:

{jarvis_ai_assistant-0.1.205.dist-info → jarvis_ai_assistant-0.1.207.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.205
+Version: 0.1.207
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -529,7 +529,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 推理任务使用的平台 |
 | `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 推理任务使用的模型 |
 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
-| `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
+| `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | false | 应用补丁前是否需要确认 |
 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
 | `JARVIS_AUTO_UPDATE` | true | 是否自动更新Jarvis |
 | `JARVIS_MAX_BIG_CONTENT_SIZE` | 160000 | 最大大内容大小 |
@@ -569,14 +569,14 @@ OPENAI_API_BASE: https://api.openai.com/v1
 |------|------|
 | `'Summary'` | 总结当前会话并清空历史记录 |
 | `'Clear'` | 清空当前会话 |
-| `'CodeBase'` | 查询代码库 |
-| `'Web'` | 网页搜索 |
-| `'Methodology'` | 查找相关方法论 |
-| `'Plan'` | 生成代码修改计划 |
-| `'FindRelatedFiles'` | 查找相关文件 |
-| `'FindMethodology'` | 查找方法论 |
+| `'ToolUsage'` | 显示可用工具列表及使用方法 |
+| `'ReloadConfig'` | 重新加载配置文件 |
+| `'Web'` | 网页搜索，支持多种提问格式 |
+| `'Plan'` | 生成代码修改计划，提供详细需求描述 |
+| `'FindRelatedFiles'` | 查找与功能相关的文件 |
 | `'Dev'` | 调用create_code_agent开发需求 |
 | `'Fix'` | 修复问题 |
+| `'Check'` | 执行静态代码检查，包括错误和风格问题 |
 
 ### 3. 自定义替换配置
 在`~/.jarvis/config.yaml`中添加：

{jarvis_ai_assistant-0.1.205.dist-info → jarvis_ai_assistant-0.1.207.dist-info}/RECORD

@@ -1,7 +1,7 @@
-jarvis/__init__.py,sha256=AD-c4S6W2qnfY5YYsnCHttsVd9Wwv1HTyopZCkPV7y0,75
+jarvis/__init__.py,sha256=fLRFf9Q9VVDhiUsd8ZYwNpzWKfK7gZo56QY7mxlyIbk,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=QHimoPGfg2oftmoV8cENl09tc83gnnlXk58D2rIOEJM,16952
+jarvis/jarvis_agent/edit_file_handler.py,sha256=69b3lHsJYShHnwZ9InF41bJlJLbvDI52yIeENzxiBuU,17034
 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
@@ -30,7 +30,7 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=aRFYhQQvTgbYd-uY5pc8UHIUA
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZEQXPG1Jqc2sNTGp5c,2355
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
-jarvis/jarvis_data/config_schema.json,sha256=yMXCNy8-CRL44r9GKBClvX6LBX20cpm7QOW9TSffAbs,6533
+jarvis/jarvis_data/config_schema.json,sha256=3lTOxxikuLNsy5wHgaYY3bBQHorTclWewHr4GXVtVBw,6534
 jarvis/jarvis_data/huggingface.tar.gz,sha256=dWKnc_tvyx-I_ZkXo91O0b38KxDmLW1ZbmJ3E6fCl_k,1120205
 jarvis/jarvis_dev/main.py,sha256=1elwLV0uKX0CjjlAEKG5uTYHJz5K3qEki49Pv7KMLFw,40919
 jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -46,7 +46,7 @@ jarvis/jarvis_methodology/main.py,sha256=NMtd6DRn-Q8NcYtQ3qgTKUp9RW0cDGJod8ZXebl
 jarvis/jarvis_multi_agent/__init__.py,sha256=sDd3sK88dS7_qAz2ywIAaEWdQ4iRVCiuBu2rQQmrKbU,4512
 jarvis/jarvis_multi_agent/main.py,sha256=h7VUSwoPrES0XTK8z5kt3XLX1mmcm8UEuFEHQOUWPH4,1696
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
-jarvis/jarvis_platform/base.py,sha256=h0PpzqKlp1wmHaES16i6ZT4ChW-epKe1r3gvvqP1Gd4,7777
+jarvis/jarvis_platform/base.py,sha256=bPmXY9JBfpqbzCYsh0wGTzPfbCJHUekR3RUBE3-8hys,7788
 jarvis/jarvis_platform/human.py,sha256=r8Vlltp_LirJZeZh1Mmi30iJr9tl1JaNFoqthSRHF6o,2826
 jarvis/jarvis_platform/kimi.py,sha256=uIpSWQ3MqDBYYMROeXin_YqM2LFrovMICKpwLWO1ODo,12784
 jarvis/jarvis_platform/openai.py,sha256=uEjBikfFj7kp5wondLvOx4WdkmTX0aqF6kixxAufcHg,4806
@@ -80,7 +80,7 @@ jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 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=9QKElsyIoZaq4ssZRlCfJPf2i92WuKIHlqOfyBZQmLs,2939
-jarvis/jarvis_utils/config.py,sha256=OomZRIeRHiBntKXdqYP1ArI8aqRFqtMlLkd9-VSd5dA,7364
+jarvis/jarvis_utils/config.py,sha256=DB9zjVwSFs5h8mABYXrz1xv-MAjYarSsPNB9ysI1O6c,7365
 jarvis/jarvis_utils/embedding.py,sha256=suqKOgH4cq2HYj4xvNpqDPN9pyc3hTCl934xYonF6qk,3922
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
 jarvis/jarvis_utils/git_utils.py,sha256=E1ibh4qTJ84JuweDex3nF4jrSMsXk9pNJ58lVG9NF6A,18926
@@ -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.205.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.205.dist-info/METADATA,sha256=oB5LeBNwK-14rRo3EXWZtCZdZxZUJ-GlL-VaIl8zAwo,20215
-jarvis_ai_assistant-0.1.205.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.205.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.205.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.205.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.207.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.207.dist-info/METADATA,sha256=j1hxahQxId3IW6wFbAzhyoSCYkWLOeN4nxd3HrtAqPQ,20340
+jarvis_ai_assistant-0.1.207.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.207.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.207.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.207.dist-info/RECORD,,