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

jarvis/jarvis_smart_shell/main.py

@@ -98,7 +98,7 @@ def process_request(request: str) -> Optional[str]:
 输入: "查找Python文件"
 输出: find . -name "*.py"
 """
-        model.set_system_message(system_message)
+        model.set_system_prompt(system_message)
 
         prefix = f"Current path: {current_path}\n"
         prefix += f"Current shell: {shell}\n"

jarvis/jarvis_tools/file_analyzer.py

@@ -79,7 +79,7 @@ class FileAnalyzerTool:
             system_message = """你是一个文件分析助手。你的任务是分析提供的文件内容，并根据用户的提示提取关键信息。
 请保持客观，只关注文件中实际存在的内容。如果无法确定某些信息，请明确指出。
 请以结构化的方式组织你的回答，使用标题、列表和代码块等格式来提高可读性。"""
-            platform.set_system_message(system_message)
+            platform.set_system_prompt(system_message)
             
             # 上传文件
             with yaspin(Spinners.dots, text="正在上传文件...") as spinner:

jarvis/jarvis_tools/registry.py

@@ -622,11 +622,11 @@ class ToolRegistry(OutputHandlerProtocol):
         """
         output_parts = []
         if stdout:
-            output_parts.append(f"输出:\n{stdout}")
+            output_parts.append(f"<output>\n{stdout}\n</output>")
         if stderr:
-            output_parts.append(f"错误:\n{stderr}")
+            output_parts.append(f"<error>\n{stderr}\n</error>")
         output = "\n\n".join(output_parts)
-        return "无输出和错误" if not output else output
+        return "<无输出和错误>" if not output else output
 
     def _truncate_output(self, output: str) -> str:
         """截断过长的输出内容

jarvis/jarvis_utils/globals.py

@@ -21,22 +21,30 @@ os.environ["TOKENIZERS_PARALLELISM"] = "false"
 # 全局代理管理
 global_agents: Set[str] = set()
 current_agent_name: str = ""
+# 表示与大模型交互的深度(>0表示正在交互)
+g_in_chat: int = 0
+# 表示是否接收到中断信号
+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:
     """
     通过附加后缀生成唯一的代理名称（如果必要）。
@@ -53,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:
     """
     设置当前代理并将其添加到全局代理集合中。
@@ -64,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:
     """
     获取表示当前代理状态的格式化字符串。
@@ -71,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:
     """
     从全局代理集合中删除一个代理。
@@ -83,3 +101,51 @@ def delete_agent(agent_name: str) -> None:
         global_agents.remove(agent_name)
         global current_agent_name
         current_agent_name = ""
+
+
+def set_in_chat(status: bool) -> None:
+    """
+    设置与大模型交互的状态。
+
+    参数:
+        status: True表示增加交互深度，False表示减少
+    """
+    global g_in_chat
+    if status:
+        g_in_chat += 1
+    else:
+        g_in_chat = max(0, g_in_chat - 1)
+
+
+def get_in_chat() -> bool:
+    """
+    获取当前是否正在与大模型交互的状态。
+
+    返回:
+        bool: 当前交互状态(>0表示正在交互)
+    """
+    return g_in_chat > 0
+
+
+def set_interrupt(status: bool) -> None:
+    """
+    设置中断信号状态。
+
+    参数:
+        status: 中断状态
+    """
+    global g_interrupt
+    if status:
+        g_interrupt += 1
+    else:
+        g_interrupt = 0
+
+
+def get_interrupt() -> int:
+    """
+    获取当前中断信号状态。
+
+    返回:
+        int: 当前中断计数
+    """
+    return g_interrupt

jarvis/jarvis_utils/utils.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import hashlib
 import os
+import signal
 import subprocess
 import tarfile
 import time
@@ -14,6 +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, get_interrupt, set_interrupt
 
 
 
@@ -25,11 +27,25 @@ def init_env(welcome_str: str, config_file: Optional[str] = None) -> None:
     3. 处理文件读取异常
     4. 检查git仓库状态并在落后时更新
     5. 统计当前命令使用次数
+    6. 注册SIGINT信号处理函数
 
     参数:
         welcome_str: 欢迎信息字符串
         config_file: 配置文件路径，默认为None(使用~/.jarvis/config.yaml)
     """
+    # 保存原始信号处理函数
+    original_sigint = signal.getsignal(signal.SIGINT)
+    
+    def sigint_handler(signum, frame):
+        if get_in_chat():
+            set_interrupt(True)
+            if get_interrupt() > 5 and original_sigint and callable(original_sigint):
+                original_sigint(signum, frame)
+        else:
+            if original_sigint and callable(original_sigint):
+                original_sigint(signum, frame)
+    
+    signal.signal(signal.SIGINT, sigint_handler)
     count_cmd_usage()
 
     jarvis_ascii_art = f"""

{jarvis_ai_assistant-0.1.190.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.190
+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
@@ -230,6 +230,54 @@ OPENAI_API_BASE: https://api.openai.com/v1  # 可选，默认为官方API地址
 | `jarvis-git-details` | - | 使用git details功能 |
 | `jarvis-methodology` | - | 使用方法论功能 |
 
+## 🏗️ 平台管理功能
+
+`jarvis-platform-manager` 提供以下子命令来管理AI平台和模型：
+
+### 1. 列出支持的平台和模型
+```bash
+jarvis-platform-manager info
+```
+显示所有支持的AI平台及其可用模型列表。
+
+### 2. 与指定平台和模型聊天
+```bash
+jarvis-platform-manager chat -p <平台名称> -m <模型名称>
+```
+启动交互式聊天会话，支持以下命令：
+- `/bye` - 退出聊天
+- `/clear` - 清除当前会话
+- `/upload <文件路径>` - 上传文件到当前会话
+- `/shell <命令>` - 执行shell命令
+- `/save <文件名>` - 保存最后一条消息
+- `/saveall <文件名>` - 保存完整对话历史
+
+### 3. 启动OpenAI兼容的API服务
+```bash
+jarvis-platform-manager service --host <IP地址> --port <端口号> -p <平台名称> -m <模型名称>
+```
+启动一个兼容OpenAI API的服务，可用于其他应用程序集成。
+
+### 4. 加载角色配置文件
+```bash
+jarvis-platform-manager role -c <配置文件路径>
+```
+从YAML配置文件加载预定义角色进行对话。配置文件格式示例：
+```yaml
+roles:
+  - name: "代码助手"
+    description: "专注于代码分析和生成的AI助手"
+    platform: "yuanbao"
+    model: "deep_seek_v3"
+    system_prompt: "你是一个专业的代码助手，专注于分析和生成高质量的代码"
+  - name: "文档撰写"
+    description: "帮助撰写技术文档的AI助手"
+    platform: "kimi"
+    model: "k1"
+    system_prompt: "你是一个技术文档撰写专家，擅长将复杂技术概念转化为清晰易懂的文字"
+```
+
+
 ---
 
 ## ⚙️ 配置说明 <a id="configuration"></a>
@@ -428,7 +476,7 @@ class CustomPlatform(BasePlatform):
         # 设置模型名称
         pass
 
-    def set_system_message(self, message: str):
+    def set_system_prompt(self, message: str):
         # 设置系统消息
         pass
 

{jarvis_ai_assistant-0.1.190.dist-info → jarvis_ai_assistant-0.1.192.dist-info}/RECORD

@@ -1,13 +1,13 @@
-jarvis/__init__.py,sha256=4h6TNgKLF0A6znYlkXoPrVCeP9Pj6DTrNF6NbH9Oroo,74
-jarvis/jarvis_agent/__init__.py,sha256=utqI92rkiqiVR2zk5N-IQe2CeMSl-sNiLU429dLoGVw,30487
+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=gOZfTwVlG-GZxPjgCoSiIcFsl4RwwfPA0CGUjE5J7oU,6249
+jarvis/jarvis_agent/jarvis.py,sha256=zfYlwXaZJYfwvNeU5IUSlURyY0pn7QxsHmXBqSptUo8,6105
 jarvis/jarvis_agent/main.py,sha256=miR8wnWBzmbhOfnscyiKo1oI4wZBRU6FEE-k1lkqtiI,2752
 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
@@ -47,17 +47,17 @@ jarvis/jarvis_methodology/main.py,sha256=HhEArlKI5PCpGnBCwVrXMuDn2z84LgpgK7-aGSQ
 jarvis/jarvis_multi_agent/__init__.py,sha256=Xab5sFltJmX_9MoXqanmZs6FqKfUb2v_pG29Vk8ZXaw,4311
 jarvis/jarvis_multi_agent/main.py,sha256=KeGv8sdpSgTjW6VE4-tQ8BWDC_a0aE_4R3OqzPBd5N4,1646
 jarvis/jarvis_platform/__init__.py,sha256=0YnsUoM4JkIBOtImFdjfuDbrqQZT3dEaAwSJ62DrpCc,104
-jarvis/jarvis_platform/base.py,sha256=C_50l5kc2P1OP8NH4JbaMZdY-aWOfhfuECoUlRCriU8,7029
-jarvis/jarvis_platform/human.py,sha256=xwaTZ1zdrAYZZFXxkbHvUdECwCGsic0kgAFUncUr45g,2567
-jarvis/jarvis_platform/kimi.py,sha256=5-LUcvBoL_1Y8HZom9pkNFHO7ghstNCPEobVrVESOi4,12101
-jarvis/jarvis_platform/openai.py,sha256=VyX3bR1rGxrJdWOtUBf8PgSL9n06KaNbOewL1urzOnk,4741
-jarvis/jarvis_platform/registry.py,sha256=3djxE8AB4gwrdAOvRSL0612Rt_CcsaZhzZ0_oXHu6xk,7820
-jarvis/jarvis_platform/tongyi.py,sha256=1cecb2GofJ_7J3xEj_fBj4Ns7XuGIn5CpCi_DFmiP4s,21063
-jarvis/jarvis_platform/yuanbao.py,sha256=yOj5T3lo45ULrFkwHXdAsiLhfv141V0sPQplHGeLKNg,20751
+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=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
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_platform_manager/main.py,sha256=7XfiP19Gv88sFkS__v83a-JTI-VUuyH3lWLr4_jTq1w,25863
+jarvis/jarvis_platform_manager/main.py,sha256=klN8c0IItE1wg1V2tPkh2RoEJxXXCgO--Hf7mpmY39I,29558
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_smart_shell/main.py,sha256=k59o5UD7merbsPhJQzae95ThTmZY2EcNHB3Ov6kb0PA,5291
+jarvis/jarvis_smart_shell/main.py,sha256=pUoRsAbY2_BNqtVGEOin8UJVb8gmL_-Aj_NITJ9k0eo,5290
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_tools/ask_user.py,sha256=qwxwJIL698rEWdi1txxlPgIr4UFuihfe--NqBEYhIQQ,2168
 jarvis/jarvis_tools/base.py,sha256=OdlvzUjYQBmZIMcAeBxAqIQo2urh126OerArK-wOPzU,1191
@@ -67,13 +67,13 @@ jarvis/jarvis_tools/create_code_agent.py,sha256=-nHfo5O5pDIG5IX3w1ClQafGvGcdI2_w
 jarvis/jarvis_tools/create_sub_agent.py,sha256=lyFrrg4V0yXULmU3vldwGp_euZjwZzJcRU6mJ20zejY,3023
 jarvis/jarvis_tools/edit_file.py,sha256=s8HqG8qHDrYjCwIioeBpGvw7Aw-iEEZoUyRJFqdjcQA,18453
 jarvis/jarvis_tools/execute_script.py,sha256=IA1SkcnwBB9PKG2voBNx5N9GXL303OC7OOtdqRfqWOk,6428
-jarvis/jarvis_tools/file_analyzer.py,sha256=UuQmti-eBocJB6ivMINmOvSuXxBxOqmbQ3RsQlyueWs,4918
+jarvis/jarvis_tools/file_analyzer.py,sha256=jl9phaN6BqMcgrikMeaxY-9VYXbXQOO1Zu61fZocGv0,4917
 jarvis/jarvis_tools/file_operation.py,sha256=WloC1-oPJLwgICu4WBc9f7XA8N_Ggl73QQ5CxM2XTlE,9464
 jarvis/jarvis_tools/generate_new_tool.py,sha256=KZX4wpSpBZ4S5817zAN5j7AAirtgBCrNUmjrpfL9dNI,7706
 jarvis/jarvis_tools/methodology.py,sha256=m7cQmVhhQpUUl_uYTVvcW0JBovQLx5pWTXh_8K77HsU,5237
 jarvis/jarvis_tools/read_code.py,sha256=pL2SwZDsJbJMXo4stW96quFsLgbtPVIAW-h4sDKsLtM,6274
 jarvis/jarvis_tools/read_webpage.py,sha256=PFAYuKjay9j6phWzyuZ99ZfNaHJljmRWAgS0bsvbcvE,2219
-jarvis/jarvis_tools/registry.py,sha256=339NBh4qZHsiBKMHgKV2kgDVhEkeZqiSJnZTedGMK8o,25162
+jarvis/jarvis_tools/registry.py,sha256=6iroEOm75KDhgSM0HHb1p8Sn2lLemZ29nSw7O6IzRPY,25186
 jarvis/jarvis_tools/rewrite_file.py,sha256=3V2l7kG5DG9iRimBce-1qCRuJPL0QM32SBTzOl2zCqM,7004
 jarvis/jarvis_tools/search_web.py,sha256=rzxrCOTEo-MmLQrKI4k-AbfidUfJUeCPK4f5ZJy48G8,952
 jarvis/jarvis_tools/virtual_tty.py,sha256=8E_n-eC-RRPTqYx6BI5Q2RnorY8dbhKFBfAjIiRQROA,16397
@@ -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=6JWtB1XoD-wEFiMzZNA790ixlZ_OsJEYUM_B8EwkOE8,2277
+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=dTFIN6EV48BuC4VOyvcVcj4P0tsWysc9ennbMRhLJjk,10960
-jarvis_ai_assistant-0.1.190.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.190.dist-info/METADATA,sha256=3Dz7yIwWszneilEi9OfdiqzumWW0ruMLLjbzqZKC7RA,16257
-jarvis_ai_assistant-0.1.190.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.190.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.190.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.190.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,,