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

jarvis/__init__.py

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

jarvis/jarvis_agent/edit_file_handler.py

@@ -2,12 +2,13 @@ import os
 import re
 from typing import Any, Dict, List, Tuple
 
-from yaspin import yaspin
-from yaspin.core import Yaspin
+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
 from jarvis.jarvis_utils.git_utils import revert_file
+from jarvis.jarvis_utils.globals import get_interrupt, set_interrupt
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import is_context_overflow
@@ -322,7 +323,6 @@ class EditFileHandler(OutputHandler):
             for patch in patches:
                 patch_content.append(
                     {
-                        "reason": "根据用户指令修改代码",
                         "SEARCH": patch["SEARCH"],
                         "REPLACE": patch["REPLACE"],
                     }
@@ -385,10 +385,12 @@ class EditFileHandler(OutputHandler):
                     response = model.chat_until_success(main_prompt + file_prompt)
 
                 # 检查是否被中断
-                from jarvis.jarvis_utils.globals import get_interrupt
-
                 if get_interrupt():
-                    return False, "用户中断了补丁应用"
+                    set_interrupt(False)
+                    user_input = agent.multiline_inputer("补丁应用被中断，请输入补充信息:")
+                    if not user_input.strip():
+                        return False, "用户中断了补丁应用"
+                    return False, f"用户中断了补丁应用并提供了补充信息: {user_input}"
 
                 # 解析生成的补丁
                 diff_blocks = re.finditer(

jarvis/jarvis_dev/main.py

@@ -1227,7 +1227,7 @@ def main():
     while True:
         try:
             user_input = get_multiline_input(
-                "\nEnter your request (or press Enter to exit): "
+                "\n请输入你的需求："
             )
             if not user_input:
                 break

jarvis/jarvis_platform/base.py

@@ -3,10 +3,10 @@ import re
 from abc import ABC, abstractmethod
 from typing import Generator, List, Tuple
 
-from rich import box
-from rich.live import Live
-from rich.panel import Panel
-from rich.text import Text
+from rich import box # type: ignore
+from rich.live import Live # type: ignore
+from rich.panel import Panel # type: ignore
+from rich.text import Text # type: ignore
 
 from jarvis.jarvis_utils.config import (get_max_input_token_count,
                                         get_pretty_output, is_print_prompt)

jarvis/jarvis_tools/ask_user.py

@@ -3,7 +3,6 @@
 from typing import Any, Dict
 
 # 导入多行输入工具和输出工具
-from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
@@ -41,7 +40,7 @@ class AskUserTool:
             PrettyOutput.print(f"问题: {question}", OutputType.SYSTEM)
 
             # 获取用户输入
-            user_response = get_multiline_input("请输入您的答案 (输入空行结束)")
+            user_response = agent.multiline_inputer("请输入您的答案 (输入空行结束)")
 
             # 返回成功响应，包含用户输入的内容
             return {"success": True, "stdout": user_response, "stderr": ""}

jarvis/jarvis_utils/input.py

@@ -8,16 +8,16 @@
 - 带有模糊匹配的文件路径补全
 - 用于输入控制的自定义键绑定
 """
-from colorama import Fore
-from colorama import Style as ColoramaStyle
-from fuzzywuzzy import process
-from prompt_toolkit import PromptSession
-from prompt_toolkit.completion import (CompleteEvent, Completer, Completion,
-                                       PathCompleter)
-from prompt_toolkit.document import Document
-from prompt_toolkit.formatted_text import FormattedText
-from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.styles import Style as PromptStyle
+from colorama import Fore # type: ignore
+from colorama import Style as ColoramaStyle # type: ignore
+from fuzzywuzzy import process # type: ignore
+from prompt_toolkit import PromptSession # type: ignore
+from prompt_toolkit.completion import (CompleteEvent, Completer, Completion, # type: ignore
+                                       PathCompleter) # type: ignore
+from prompt_toolkit.document import Document # type: ignore
+from prompt_toolkit.formatted_text import FormattedText # type: ignore
+from prompt_toolkit.key_binding import KeyBindings # type: ignore
+from prompt_toolkit.styles import Style as PromptStyle # type: ignore
 
 from jarvis.jarvis_utils.config import get_replace_map
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -217,7 +217,7 @@ def get_multiline_input(tip: str) -> str:
     try:
         import os
 
-        from prompt_toolkit.history import FileHistory
+        from prompt_toolkit.history import FileHistory # type: ignore
 
         from jarvis.jarvis_utils.config import get_data_dir
 

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

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

@@ -1,7 +1,7 @@
-jarvis/__init__.py,sha256=UDh5Y6TS3pEClTKJiBqauJhuIdv8Ac1oL1CV3QMs8k4,75
+jarvis/__init__.py,sha256=AD-c4S6W2qnfY5YYsnCHttsVd9Wwv1HTyopZCkPV7y0,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=Z8pDAXFl9bzreNQm3TfxejOunHcTNXYm8KTu9oBDIfI,16690
+jarvis/jarvis_agent/edit_file_handler.py,sha256=QHimoPGfg2oftmoV8cENl09tc83gnnlXk58D2rIOEJM,16952
 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
@@ -32,7 +32,7 @@ jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQ
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
 jarvis/jarvis_data/config_schema.json,sha256=yMXCNy8-CRL44r9GKBClvX6LBX20cpm7QOW9TSffAbs,6533
 jarvis/jarvis_data/huggingface.tar.gz,sha256=dWKnc_tvyx-I_ZkXo91O0b38KxDmLW1ZbmJ3E6fCl_k,1120205
-jarvis/jarvis_dev/main.py,sha256=zzVDrPQlPJFnHxNjChBAYA8YwIaQYmPxG-bHjIxdL3s,40940
+jarvis/jarvis_dev/main.py,sha256=1elwLV0uKX0CjjlAEKG5uTYHJz5K3qEki49Pv7KMLFw,40919
 jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_details/main.py,sha256=MjpUHB4ErR_SKPBx1TLLK_XLkH427RTtsyVn6EUd88Y,8907
 jarvis/jarvis_git_squash/__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=JmTabJkEG5FdLWnlo70IREixpPS9VWiyfTvaf5h1BfM,7717
+jarvis/jarvis_platform/base.py,sha256=h0PpzqKlp1wmHaES16i6ZT4ChW-epKe1r3gvvqP1Gd4,7777
 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
@@ -58,7 +58,7 @@ jarvis/jarvis_platform_manager/main.py,sha256=BdBH2tPzq7p9Mvii7abu6M7uj4lfG05gwj
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=YfQNGKanhYHAUCh6ZYLpevWpSlaFo_YfteSK9pakjB0,5295
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_tools/ask_user.py,sha256=dSnZbt2XXDxjDj17Mi7-Twg75yHhMzM_FEj_TazJvC8,2068
+jarvis/jarvis_tools/ask_user.py,sha256=w_l9WQK6uhyGGXqtyTsSyiHLNjNfIgzUvOAevjuay-0,2014
 jarvis/jarvis_tools/base.py,sha256=tFVmK6ppsImW2BzHZmrNmMRiOJdW-4aZP6Me3VxdYcA,1194
 jarvis/jarvis_tools/chdir.py,sha256=BlRvggcOeBM7UwHGL8U8hjuNm_WGkH5BdhxmPVJXejw,2509
 jarvis/jarvis_tools/code_plan.py,sha256=XRXHdkN4O1A4qbShLa4VBHFdRl6YdyMgZxbPPotrqNs,7358
@@ -85,15 +85,15 @@ jarvis/jarvis_utils/embedding.py,sha256=suqKOgH4cq2HYj4xvNpqDPN9pyc3hTCl934xYonF
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
 jarvis/jarvis_utils/git_utils.py,sha256=E1ibh4qTJ84JuweDex3nF4jrSMsXk9pNJ58lVG9NF6A,18926
 jarvis/jarvis_utils/globals.py,sha256=9NTMfCVd0jvtloOv14-KE6clhcVStFmyN9jWxLmQ5so,3369
-jarvis/jarvis_utils/input.py,sha256=WOs9hYSiZE3ao5K-UJmC7KyZByYnC1opHGJTUZm7DVo,7884
+jarvis/jarvis_utils/input.py,sha256=ehvHkIgwqnBOHkwOeRCBFRggqOgOZuUdGQXn2ATUFwU,8049
 jarvis/jarvis_utils/jarvis_history.py,sha256=Td6cmze9Oc5-Ewz0l9RKYeSg_-fbEu9ZhyEueHEMcLY,3664
 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=RYFQx7OkOu3fe_QhS-5jx7O06k_58X14S-9PFJgwOa4,12178
-jarvis_ai_assistant-0.1.204.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.204.dist-info/METADATA,sha256=FPuxqPRHqfSMGyttK-ZbHOoYlIjO9Y8Upa2qFUhGMzk,20215
-jarvis_ai_assistant-0.1.204.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.204.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.204.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.204.dist-info/RECORD,,
+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,,