jarvis-ai-assistant 0.1.191__py3-none-any.whl → 0.1.192__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -772,17 +772,18 @@ arguments:
 
                     if need_return:
                         return self.prompt
-
-                    if self.after_tool_call_cb:
-                        self.after_tool_call_cb(self)
-
+                    
                     if get_interrupt():
                         set_interrupt(False)
                         user_input = self.multiline_inputer(
                             f"模型交互期间被中断，请输入用户干预信息："
                         )
                         if user_input:
-                            self.prompt += f"\n\n用户干预信息：{user_input}"
+                            self.prompt += f"{user_input}"
+                            continue
+
+                    if self.after_tool_call_cb:
+                        self.after_tool_call_cb(self)
 
                     if self.prompt or self.addon_prompt:
                         continue

jarvis/jarvis_code_agent/code_agent.py

@@ -301,12 +301,7 @@ class CodeAgent:
 
                 # 添加提交信息到final_ret
                 if commits:
-                    final_ret += "✅ 补丁已应用\n"
-                    final_ret += "# 提交信息:\n"
-                    for commit_hash, commit_message in commits:
-                        final_ret += f"- {commit_hash[:7]}: {commit_message}\n"
-
-                    final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
+                    final_ret += "代码已修改完成\n"
 
                     # 修改后的提示逻辑
                     lint_tools_info = "\n".join(
@@ -325,9 +320,9 @@ class CodeAgent:
                     """
                         agent.set_addon_prompt(addon_prompt)
                 else:
-                    final_ret += "✅ 补丁已应用（没有新的提交）"
+                    final_ret += "修改没有生效"
             else:
-                final_ret += "❌ 补丁应用被拒绝\n"
+                final_ret += "修改被拒绝\n"
                 final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
         else:
             return

jarvis/jarvis_platform/openai.py

@@ -160,4 +160,13 @@ class OpenAIModel(BasePlatform):
         返回:
             bool: 当前是否支持网页访问 (OpenAI平台始终返回False)
         """
+        return False
+    
+    def support_upload_files(self) -> bool:
+        """
+        检查是否支持上传文件功能
+        
+        返回:
+            bool: 当前是否支持上传文件 (OpenAI平台始终返回False)
+        """
         return False

jarvis/jarvis_utils/globals.py

@@ -24,23 +24,27 @@ current_agent_name: str = ""
 # 表示与大模型交互的深度(>0表示正在交互)
 g_in_chat: int = 0
 # 表示是否接收到中断信号
-g_interrupt: bool = False
+g_interrupt: int = 0
 # 使用自定义主题配置rich控制台
-custom_theme = Theme({
-    "INFO": "yellow",
-    "WARNING": "yellow",
-    "ERROR": "red",
-    "SUCCESS": "green",
-    "SYSTEM": "cyan",
-    "CODE": "green",
-    "RESULT": "blue",
-    "PLANNING": "magenta",
-    "PROGRESS": "white",
-    "DEBUG": "blue",
-    "USER": "green",
-    "TOOL": "yellow",
-})
+custom_theme = Theme(
+    {
+        "INFO": "yellow",
+        "WARNING": "yellow",
+        "ERROR": "red",
+        "SUCCESS": "green",
+        "SYSTEM": "cyan",
+        "CODE": "green",
+        "RESULT": "blue",
+        "PLANNING": "magenta",
+        "PROGRESS": "white",
+        "DEBUG": "blue",
+        "USER": "green",
+        "TOOL": "yellow",
+    }
+)
 console = Console(theme=custom_theme)
+
+
 def make_agent_name(agent_name: str) -> str:
     """
     通过附加后缀生成唯一的代理名称（如果必要）。
@@ -57,6 +61,8 @@ def make_agent_name(agent_name: str) -> str:
             i += 1
         return f"{agent_name}_{i}"
     return agent_name
+
+
 def set_agent(agent_name: str, agent: Any) -> None:
     """
     设置当前代理并将其添加到全局代理集合中。
@@ -68,6 +74,8 @@ def set_agent(agent_name: str, agent: Any) -> None:
     global_agents.add(agent_name)
     global current_agent_name
     current_agent_name = agent_name
+
+
 def get_agent_list() -> str:
     """
     获取表示当前代理状态的格式化字符串。
@@ -75,7 +83,13 @@ def get_agent_list() -> str:
     返回：
         str: 包含代理数量和当前代理名称的格式化字符串
     """
-    return "[" + str(len(global_agents)) + "]" + current_agent_name if global_agents else ""
+    return (
+        "[" + str(len(global_agents)) + "]" + current_agent_name
+        if global_agents
+        else ""
+    )
+
+
 def delete_agent(agent_name: str) -> None:
     """
     从全局代理集合中删除一个代理。
@@ -88,6 +102,7 @@ def delete_agent(agent_name: str) -> None:
         global current_agent_name
         current_agent_name = ""
 
+
 def set_in_chat(status: bool) -> None:
     """
     设置与大模型交互的状态。
@@ -101,6 +116,7 @@ def set_in_chat(status: bool) -> None:
     else:
         g_in_chat = max(0, g_in_chat - 1)
 
+
 def get_in_chat() -> bool:
     """
     获取当前是否正在与大模型交互的状态。
@@ -110,6 +126,7 @@ def get_in_chat() -> bool:
     """
     return g_in_chat > 0
 
+
 def set_interrupt(status: bool) -> None:
     """
     设置中断信号状态。
@@ -118,13 +135,17 @@ def set_interrupt(status: bool) -> None:
         status: 中断状态
     """
     global g_interrupt
-    g_interrupt = status
+    if status:
+        g_interrupt += 1
+    else:
+        g_interrupt = 0
+
 
-def get_interrupt() -> bool:
+def get_interrupt() -> int:
     """
     获取当前中断信号状态。
 
     返回:
-        bool: 当前中断状态
+        int: 当前中断计数
     """
     return g_interrupt

jarvis/jarvis_utils/utils.py

@@ -15,7 +15,7 @@ from jarvis.jarvis_utils.config import get_data_dir, get_max_big_content_size, s
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.input import get_single_line_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.globals import get_in_chat, set_interrupt
+from jarvis.jarvis_utils.globals import get_in_chat, get_interrupt, set_interrupt
 
 
 
@@ -38,10 +38,10 @@ def init_env(welcome_str: str, config_file: Optional[str] = None) -> None:
     
     def sigint_handler(signum, frame):
         if get_in_chat():
-            PrettyOutput.print("接收到SIGINT信号，正在设置中断标志...", OutputType.INFO)
             set_interrupt(True)
+            if get_interrupt() > 5 and original_sigint and callable(original_sigint):
+                original_sigint(signum, frame)
         else:
-            PrettyOutput.print("接收到SIGINT信号，正在优雅退出...", OutputType.INFO)
             if original_sigint and callable(original_sigint):
                 original_sigint(signum, frame)
     

{jarvis_ai_assistant-0.1.191.dist-info → jarvis_ai_assistant-0.1.192.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=cHZhc7P2GKlcTNqDbgIRmnJdpA9XNqfw_meJJM4O-sg,74
-jarvis/jarvis_agent/__init__.py,sha256=NnHJY7yEthpS4w9Yt6cvOeQZGPy-Qx9bnjV-Qo7HE00,29774
+jarvis/__init__.py,sha256=5_sLz94_CMqE2he4vQ7HAZhBu30-NLMM4jT2UvSUt2c,74
+jarvis/jarvis_agent/__init__.py,sha256=ZB3Tt09qwCO68vY62ogzfvvdF4HMQcEV6EjPUsJpuR8,29806
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=f4DaEHPakXcAbgykFP-tiOQP6fh_yGFlZx_h91_j2tQ,1529
 jarvis/jarvis_agent/file_input_handler.py,sha256=OfoYI5on6w5BDUUg4OadFcfWzMsUF70GNrlt9QyauvA,4181
 jarvis/jarvis_agent/jarvis.py,sha256=zfYlwXaZJYfwvNeU5IUSlURyY0pn7QxsHmXBqSptUo8,6105
@@ -7,7 +7,7 @@ jarvis/jarvis_agent/main.py,sha256=miR8wnWBzmbhOfnscyiKo1oI4wZBRU6FEE-k1lkqtiI,2
 jarvis/jarvis_agent/output_handler.py,sha256=7qori-RGrQmdiFepoEe3oPPKJIvRt90l_JDmvCoa4zA,1219
 jarvis/jarvis_agent/shell_input_handler.py,sha256=pi3AtPKrkKc6K9e99S1djKXQ_XrxtP6FrSWebQmRT6E,1261
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=2TG_Hi_2mbiZHUcWnxYs4C30eYpgSedtIYZLs7BbyUk,15827
+jarvis/jarvis_code_agent/code_agent.py,sha256=4nYYPFGSr7U8TGbqhayMOOHK6NZRzd-H4JcM4FDNcMk,15522
 jarvis/jarvis_code_agent/lint.py,sha256=TZlhNbeaoLzO9DzExjN5GAjrt66owd8lyQV56LTfkrs,4370
 jarvis/jarvis_code_analysis/code_review.py,sha256=45MPcXullg55w6E0Xhm2dDj6TGmkUxNNI2LJWexnTKQ,30123
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=cKQ_FOGy5TQgM-YkRCqORo-mUOZaPAJ9VDmZoFX58us,78
@@ -50,7 +50,7 @@ jarvis/jarvis_platform/__init__.py,sha256=0YnsUoM4JkIBOtImFdjfuDbrqQZT3dEaAwSJ62
 jarvis/jarvis_platform/base.py,sha256=MAY2Xe8WECOfisd-7_F8LXqzsIswkVwlVzXEj-D5Vlg,7186
 jarvis/jarvis_platform/human.py,sha256=MkKdwZ8oY5eacjHOEjUCUwDCJJnXtlzU8o8_jJAMdaA,2566
 jarvis/jarvis_platform/kimi.py,sha256=m45UlTkE3XhZZ3XfQk4degpKWsy5yrdzBHi9pDvmoZk,12100
-jarvis/jarvis_platform/openai.py,sha256=Kj0ZUQ9RRx1fpCN8J8sXcuXnK5bp9AmhzlcZLH9aWsc,4740
+jarvis/jarvis_platform/openai.py,sha256=iXsJ52e7zGaKNho1Lzg4_rjXUwLn0wpVmWCLZ0k4xU8,4985
 jarvis/jarvis_platform/registry.py,sha256=qq19f9HoISxpVf09t1oEuOgzLXP8QT1mDzWAI5ifIHc,7819
 jarvis/jarvis_platform/tongyi.py,sha256=Q0MCqKofuoQpp6XiYBdgO6LA4vJPEiTvVvKGgwJcpII,21062
 jarvis/jarvis_platform/yuanbao.py,sha256=wpJxYS8lF9c-1F5S6pFSdKhipXkQREtErtn5WgCblCQ,20750
@@ -85,15 +85,15 @@ jarvis/jarvis_utils/config.py,sha256=Z7pZsSYXJkc2RzUhJ-_VvQA3xOLo6LEo4nEE1ftyQY8
 jarvis/jarvis_utils/embedding.py,sha256=J8YAqIEj16TJIPEG24uvUlPHeN-5zq0JW_hbNLizQug,3832
 jarvis/jarvis_utils/file_processors.py,sha256=G5kQI7vCGIDnjgAB5J1dYIR102u6WUv3IhcWFfDh_gs,2977
 jarvis/jarvis_utils/git_utils.py,sha256=k0rrMAbKwnD7hztmtegxtFFiCzyID4p2oHKTycE2Q-4,15070
-jarvis/jarvis_utils/globals.py,sha256=13mShJwkBQxyilUZVIThN11j17QQDGHRjS3UMRMewac,3231
+jarvis/jarvis_utils/globals.py,sha256=908DizIMrInuOlirTp5lsOfqbD6K2v18P_J7A8nrdus,3375
 jarvis/jarvis_utils/input.py,sha256=FkLW7MXL8awQUghFLQnW1r5F1wV8K3EZeVPwHFRHJTo,7458
 jarvis/jarvis_utils/methodology.py,sha256=6vf__ahwJZ2I62mWGAvh2C-G6pq930Dh_EkrY1VpduQ,8485
 jarvis/jarvis_utils/output.py,sha256=QboL42GtG_dnvd1O64sl8o72mEBhXNRADPXQMXgDE7Q,9661
 jarvis/jarvis_utils/tag.py,sha256=YJHmuedLb7_AiqvKQetHr4R1FxyzIh7HN0RRkWMmYbU,429
-jarvis/jarvis_utils/utils.py,sha256=j9L5kPT3jOYP0PxiAywJtbfbMM4Fu7MyKgjfPKKACkE,11649
-jarvis_ai_assistant-0.1.191.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.191.dist-info/METADATA,sha256=GL95Op-eQIglzKxOYSL4AyfFsTifEbtxoRoPBkbtHNc,17829
-jarvis_ai_assistant-0.1.191.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.191.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.191.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.191.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=r9Xnf84jR2E1CfHBtYVF_sPZ74-S4W63aPleBQZtdYo,11597
+jarvis_ai_assistant-0.1.192.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.192.dist-info/METADATA,sha256=L-16MCi-TdoxaluwVvuq1KVUKJazX05Ell2ZqMToJq0,17829
+jarvis_ai_assistant-0.1.192.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.192.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.192.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.192.dist-info/RECORD,,