jarvis-ai-assistant 0.1.179__py3-none-any.whl → 0.1.180__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_data/config_schema.json

@@ -0,0 +1,260 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Jarvis环境变量配置模式",
+  "description": "Jarvis系统配置模式",
+  "type": "object",
+  "properties": {
+    "JARVIS_MCP": {
+      "type": "array",
+      "description": "MCP工具配置列表",
+      "items": {
+        "type": "object",
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "type",
+              "base_url"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "sse",
+                  "streamable"
+                ],
+                "description": "MCP客户端类型"
+              },
+              "base_url": {
+                "type": "string",
+                "format": "uri",
+                "description": "MCP服务器基础URL"
+              },
+              "auth_token": {
+                "type": "string",
+                "description": "认证令牌(可选)"
+              },
+              "headers": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "额外的HTTP头(可选)"
+              },
+              "name": {
+                "type": "string",
+                "description": "工具名称(可选)"
+              },
+              "enable": {
+                "type": "boolean",
+                "default": true,
+                "description": "是否启用该工具(可选)"
+              }
+            }
+          },
+          {
+            "type": "object",
+            "required": [
+              "type",
+              "command"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "stdio"
+                ],
+                "description": "MCP客户端类型"
+              },
+              "command": {
+                "type": "string",
+                "description": "要执行的命令"
+              },
+              "args": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "命令参数列表(可选)"
+              },
+              "env": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "环境变量(可选)"
+              },
+              "name": {
+                "type": "string",
+                "description": "工具名称(可选)"
+              },
+              "enable": {
+                "type": "boolean",
+                "default": true,
+                "description": "是否启用该工具(可选)"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "ENV": {
+      "type": "object",
+      "description": "需要设置的额外环境变量",
+      "additionalProperties": {
+        "type": "string"
+      },
+      "default": {}
+    },
+    "JARVIS_GIT_COMMIT_PROMPT": {
+      "type": "string",
+      "description": "Git提交信息生成提示模板",
+      "default": ""
+    },
+    "JARVIS_MAX_TOKEN_COUNT": {
+      "type": "string",
+      "description": "模型能处理的最大token数量",
+      "default": "960000"
+    },
+    "JARVIS_MAX_INPUT_TOKEN_COUNT": {
+      "type": "string",
+      "description": "模型能处理的最大输入token数量",
+      "default": "32000"
+    },
+    "JARVIS_AUTO_COMPLETE": {
+      "type": "string",
+      "description": "是否启用自动补全功能",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "SHELL": {
+      "type": "string",
+      "description": "系统shell名称(如: bash, zsh)",
+      "default": "/bin/bash"
+    },
+    "JARVIS_PLATFORM": {
+      "type": "string",
+      "description": "常规操作平台名称",
+      "default": "yuanbao"
+    },
+    "JARVIS_MODEL": {
+      "type": "string",
+      "description": "常规操作模型名称",
+      "default": "deep_seek_v3"
+    },
+    "JARVIS_THINKING_PLATFORM": {
+      "type": "string",
+      "description": "思考操作平台名称",
+      "default": "yuanbao"
+    },
+    "JARVIS_THINKING_MODEL": {
+      "type": "string",
+      "description": "思考操作模型名称",
+      "default": "deep_seek"
+    },
+    "JARVIS_EXECUTE_TOOL_CONFIRM": {
+      "type": "string",
+      "description": "执行工具前是否需要确认",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_CONFIRM_BEFORE_APPLY_PATCH": {
+      "type": "string",
+      "description": "应用补丁前是否需要确认",
+      "default": "true",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_MAX_TOOL_CALL_COUNT": {
+      "type": "string",
+      "description": "最大连续工具调用次数",
+      "default": "20"
+    },
+    "JARVIS_DATA_PATH": {
+      "type": "string",
+      "description": "Jarvis数据存储目录路径",
+      "default": "~/.jarvis"
+    },
+    "JARVIS_AUTO_UPDATE": {
+      "type": "string",
+      "description": "是否自动更新git仓库",
+      "default": "true",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_MAX_BIG_CONTENT_SIZE": {
+      "type": "string",
+      "description": "最大大内容尺寸",
+      "default": "1024000"
+    },
+    "JARVIS_PRETTY_OUTPUT": {
+      "type": "string",
+      "description": "是否启用美化输出",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_USE_METHODOLOGY": {
+      "type": "string",
+      "description": "是否启用方法论",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_USE_ANALYSIS": {
+      "type": "string",
+      "description": "是否启用任务分析",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_PRINT_PROMPT": {
+      "type": "string",
+      "description": "是否打印提示",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_REPLACE_MAP": {
+      "type": "object",
+      "description": "自定义替换映射表配置",
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "append": {
+            "type": "boolean",
+            "description": "Whether to append to existing template"
+          },
+          "template": {
+            "type": "string",
+            "description": "Replacement template content"
+          },
+          "description": {
+            "type": "string",
+            "description": "Description of the replacement"
+          }
+        },
+        "required": ["template"]
+      }
+    }
+  },
+  "additionalProperties": false
+}

jarvis/jarvis_git_utils/git_commiter.py

@@ -252,7 +252,7 @@ class GitCommitTool:
                     "stdout": yaml.safe_dump({
                         "commit_hash": commit_hash,
                         "commit_message": commit_message
-                    }),
+                    }, allow_unicode=True),
                     "stderr": ""
                 }
             finally:

jarvis/jarvis_platform/kimi.py

@@ -6,10 +6,6 @@ import time
 from typing import Dict, Generator, List, Tuple
 
 import requests  # type: ignore
-from rich import box
-from rich.live import Live
-from rich.panel import Panel
-from rich.text import Text
 
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.config import get_data_dir
@@ -37,24 +33,6 @@ class KimiModel(BasePlatform):
         self.chat_id = ""
         self.api_key = os.getenv("KIMI_API_KEY")
         if not self.api_key:
-            message = (
-                "需要设置 KIMI_API_KEY 才能使用 Jarvis。请按照以下步骤操作：\n"
-                "1. 获取 Kimi API Key:\n"
-                "   • 访问 Kimi AI 平台: https://kimi.moonshot.cn\n"
-                "   • 登录您的账户\n"
-                "   • 打开浏览器开发者工具 (F12 或右键 -> 检查)\n"
-                "   • 切换到网络标签\n"
-                "   • 发送任意消息\n"
-                "   • 在请求中找到 Authorization 头\n"
-                "   • 复制 token 值（去掉 'Bearer ' 前缀）\n"
-                "2. 设置环境变量:\n"
-                "   • 方法 1: 创建或编辑配置文件:\n"
-                f"   echo 'KIMI_API_KEY=your_key_here' > {get_data_dir()}/env\n"
-                "   • 方法 2: 直接设置环境变量:\n"
-                "   export KIMI_API_KEY=your_key_here\n"
-                "设置后，重新运行 Jarvis。"
-            )
-            PrettyOutput.print(message, OutputType.INFO)
             PrettyOutput.print("KIMI_API_KEY 未设置", OutputType.WARNING)
         self.auth_header = f"Bearer {self.api_key}"
         self.uploaded_files = []  # 存储已上传文件的信息

jarvis/jarvis_platform/openai.py

@@ -19,21 +19,6 @@ class OpenAIModel(BasePlatform):
         self.system_message = ""
         self.api_key = os.getenv("OPENAI_API_KEY")
         if not self.api_key:
-            message = (
-                "需要设置以下环境变量才能使用 OpenAI 模型:\n"
-                "  • OPENAI_API_KEY: API 密钥\n"
-                "  • OPENAI_API_BASE: (可选) API 基础地址, 默认使用 https://api.openai.com/v1\n"
-                "您可以通过以下方式设置它们:\n"
-                "1. 创建或编辑 ~/.jarvis/env 文件:\n"
-                "   OPENAI_API_KEY=your_api_key\n"
-                "   OPENAI_API_BASE=your_api_base\n"
-                "   OPENAI_MODEL_NAME=your_model_name\n"
-                "2. 直接设置环境变量:\n"
-                "   export OPENAI_API_KEY=your_api_key\n"
-                "   export OPENAI_API_BASE=your_api_base\n"
-                "   export OPENAI_MODEL_NAME=your_model_name"
-            )
-            PrettyOutput.print(message, OutputType.INFO)
             PrettyOutput.print("OPENAI_API_KEY 未设置", OutputType.WARNING)
 
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.openai.com/v1")

jarvis/jarvis_platform/yuanbao.py

@@ -9,10 +9,6 @@ from typing import Dict, Generator, List, Tuple
 
 import requests
 from PIL import Image
-from rich import box
-from rich.live import Live
-from rich.panel import Panel
-from rich.text import Text
 from yaspin import yaspin
 from yaspin.api import Yaspin
 from yaspin.spinners import Spinners
@@ -43,25 +39,6 @@ class YuanbaoPlatform(BasePlatform):
         self.agent_id = os.getenv("YUANBAO_AGENT_ID")  # 代理ID
 
         if not self.cookies:
-            message = (
-                "需要设置 YUANBAO_COOKIES 和 YUANBAO_AGENT_ID 才能使用 Jarvis 的元宝功能。请按照以下步骤操作：\n"
-                "1. 获取元宝 API 参数:\n"
-                "   • 访问元宝平台: https://yuanbao.tencent.com\n"
-                "   • 登录您的账户\n"
-                "   • 打开浏览器开发者工具 (F12 或右键 -> 检查)\n"
-                "   • 切换到网络标签\n"
-                "   • 发送任意消息\n"
-                "   • 查看请求中的 Cookie 和 AgentID 值（具体位置见README.md中截图）\n"
-                "2. 设置环境变量:\n"
-                "   • 方法 1: 创建或编辑配置文件:\n"
-                f"   echo 'YUANBAO_COOKIES=your_cookies_here' >> {get_data_dir()}/env\n"
-                f"   echo 'YUANBAO_AGENT_ID=your_agent_id_here' >> {get_data_dir()}/env\n"
-                "   • 方法 2: 直接设置环境变量:\n"
-                "   export YUANBAO_COOKIES=your_cookies_here\n"
-                "   export YUANBAO_AGENT_ID=your_agent_id_here\n"
-                "设置后，重新运行 Jarvis。"
-            )
-            PrettyOutput.print(message, OutputType.INFO)
             PrettyOutput.print("YUANBAO_COOKIES 未设置", OutputType.WARNING)
 
         self.system_message = ""  # 系统消息，用于初始化对话

jarvis/jarvis_smart_shell/main.py

@@ -8,7 +8,7 @@ from typing import Optional
 from sympy import false
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.config import get_shell_name
+from jarvis.jarvis_utils.config import get_shell_name, set_config
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.utils import init_env
 
@@ -90,7 +90,7 @@ def process_request(request: str) -> Optional[str]:
 
 # 规则
 1. 只输出命令
-2. 不要解释或标记
+2. 不要输出任何命令之外的内容
 3. 单行输出
 4. 多个命令用&&连接
 
@@ -116,8 +116,11 @@ def process_request(request: str) -> Optional[str]:
         return None
 
 def main() -> int:
-    # 创建参数解析器s
+    # 创建参数解析器
     init_env("")
+
+    set_config("JARVIS_PRINT_PROMPT", "false")
+    
     parser = argparse.ArgumentParser(
         description="将自然语言要求转换为shell命令",
         formatter_class=argparse.RawDescriptionHelpFormatter,

jarvis/jarvis_tools/edit_file.py

@@ -156,7 +156,7 @@ class FileSearchReplaceTool:
                 with yaspin(text=f"正在处理文件 {file_path}...", color="cyan") as spinner:
                     success, temp_content = fast_edit(file_path, changes, spinner)
                     if not success:
-                        success, temp_content = slow_edit(file_path, yaml.safe_dump(changes), spinner)
+                        success, temp_content = slow_edit(file_path, yaml.safe_dump(changes, allow_unicode=True), spinner)
 
                 # 只有当所有替换操作都成功时，才写回文件
                 if success and (temp_content != original_content or not file_exists):

jarvis/jarvis_tools/registry.py

@@ -198,7 +198,7 @@ class ToolRegistry(OutputHandlerProtocol):
         stats_file = Path(get_data_dir()) / "tool_stat.yaml"
         try:
             with open(stats_file, "w", encoding="utf-8") as f:
-                yaml.safe_dump(stats, f)
+                yaml.safe_dump(stats, f, allow_unicode=True)
         except Exception as e:
             PrettyOutput.print(
                 f"保存工具调用统计失败: {str(e)}", OutputType.WARNING
@@ -229,14 +229,36 @@ class ToolRegistry(OutputHandlerProtocol):
         }
 
     def _load_mcp_tools(self) -> None:
-        """从jarvis_data/tools/mcp加载工具"""
+        """加载MCP工具，优先从配置获取，其次从目录扫描"""
+        from jarvis.jarvis_utils.config import get_mcp_config
+        
+        # 优先从配置获取MCP工具配置
+        mcp_configs = get_mcp_config()
+        if mcp_configs:
+            for config in mcp_configs:
+                self.register_mcp_tool_by_config(config)
+            return
+
+        # 如果配置中没有，则扫描目录
         mcp_tools_dir = Path(get_data_dir()) / "mcp"
         if not mcp_tools_dir.exists():
             return
 
+        # 添加警告信息
+        PrettyOutput.print(
+            "警告: 从文件目录加载MCP工具的方式将在未来版本中废弃，请尽快迁移到JARVIS_MCP配置方式",
+            OutputType.WARNING
+        )
+
         # 遍历目录中的所有.yaml文件
         for file_path in mcp_tools_dir.glob("*.yaml"):
-            self.register_mcp_tool_by_file(str(file_path))
+            try:
+                config = yaml.safe_load(open(file_path, "r", encoding="utf-8"))
+                self.register_mcp_tool_by_config(config)
+            except Exception as e:
+                PrettyOutput.print(
+                    f"文件 {file_path} 加载失败: {str(e)}", OutputType.WARNING
+                )
 
     def _load_builtin_tools(self) -> None:
         """从内置工具目录加载工具"""
@@ -264,29 +286,26 @@ class ToolRegistry(OutputHandlerProtocol):
 
             self.register_tool_by_file(str(file_path))
 
-    def register_mcp_tool_by_file(self, file_path: str) -> bool:
-        """从指定文件加载并注册工具
+    def register_mcp_tool_by_config(self, config: Dict[str, Any]) -> bool:
+        """从配置字典加载并注册工具
 
         参数:
-            file_path: 工具文件的路径
+            config: MCP工具配置字典
 
         返回:
             bool: 工具是否加载成功
         """
         try:
-            config = yaml.safe_load(open(file_path, "r", encoding="utf-8"))
             if "type" not in config:
-                PrettyOutput.print(f"文件 {file_path} 缺少type字段", OutputType.WARNING)
+                PrettyOutput.print(f"配置{config.get('name', '')}缺少type字段", OutputType.WARNING)
                 return False
 
             # 检查enable标志
             if not config.get("enable", True):
-                PrettyOutput.print(
-                    f"文件 {file_path} 已禁用(enable=false)，跳过注册", OutputType.INFO
-                )
+                PrettyOutput.print(f"MCP配置{config.get('name', '')}已禁用(enable=false)，跳过注册", OutputType.INFO)
                 return False
 
-            name = config.get("name", Path(file_path).stem)
+            name = config.get("name", "mcp")
 
             # 注册资源工具
             def create_resource_list_func(client: McpClient):
@@ -296,11 +315,11 @@ class ToolRegistry(OutputHandlerProtocol):
                     args.pop("want", None)
                     ret = client.get_resource_list()
                     PrettyOutput.print(
-                        f"MCP {name} 资源列表:\n{yaml.safe_dump(ret)}", OutputType.TOOL
+                        f"MCP {name} 资源列表:\n{yaml.safe_dump(ret, allow_unicode=True)}", OutputType.TOOL
                     )
                     return {
                         "success": True,
-                        "stdout": yaml.safe_dump(ret),
+                        "stdout": yaml.safe_dump(ret, allow_unicode=True),
                         "stderr": "",
                     }
 
@@ -319,7 +338,7 @@ class ToolRegistry(OutputHandlerProtocol):
                         }
                     ret = client.get_resource(args["uri"])
                     PrettyOutput.print(
-                        f"MCP {name} 获取资源:\n{yaml.safe_dump(ret)}", OutputType.TOOL
+                        f"MCP {name} 获取资源:\n{yaml.safe_dump(ret, allow_unicode=True)}", OutputType.TOOL
                     )
                     return ret
 
@@ -332,7 +351,7 @@ class ToolRegistry(OutputHandlerProtocol):
                     args.pop("want", None)
                     ret = client.execute(tool_name, args)
                     PrettyOutput.print(
-                        f"MCP {name} {tool_name} 执行结果:\n{yaml.safe_dump(ret)}",
+                        f"MCP {name} {tool_name} 执行结果:\n{yaml.safe_dump(ret, allow_unicode=True)}",
                         OutputType.TOOL,
                     )
                     return ret
@@ -341,26 +360,18 @@ class ToolRegistry(OutputHandlerProtocol):
 
             if config["type"] == "stdio":
                 if "command" not in config:
-                    PrettyOutput.print(
-                        f"文件 {file_path} 缺少command字段", OutputType.WARNING
-                    )
+                    PrettyOutput.print(f"配置{config.get('name', '')}缺少command字段", OutputType.WARNING)
                     return False
             elif config["type"] == "sse":
                 if "base_url" not in config:
-                    PrettyOutput.print(
-                        f"文件 {file_path} 缺少base_url字段", OutputType.WARNING
-                    )
+                    PrettyOutput.print(f"配置{config.get('name', '')}缺少base_url字段", OutputType.WARNING)
                     return False
             elif config["type"] == "streamable":
                 if "base_url" not in config:
-                    PrettyOutput.print(
-                        f"文件 {file_path} 缺少base_url字段", OutputType.WARNING
-                    )
+                    PrettyOutput.print(f"配置{config.get('name', '')}缺少base_url字段", OutputType.WARNING)
                     return False
             else:
-                PrettyOutput.print(
-                    f"文件 {file_path} 类型错误: {config['type']}", OutputType.WARNING
-                )
+                PrettyOutput.print(f"不支持的MCP客户端类型: {config['type']}", OutputType.WARNING)
                 return False
 
             # 创建MCP客户端
@@ -376,14 +387,11 @@ class ToolRegistry(OutputHandlerProtocol):
             # 获取工具信息
             tools = mcp_client.get_tool_list()
             if not tools:
-                PrettyOutput.print(
-                    f"从 {file_path} 获取工具列表失败", OutputType.WARNING
-                )
+                PrettyOutput.print(f"从配置{config.get('name', '')}获取工具列表失败", OutputType.WARNING)
                 return False
 
             # 注册每个工具
             for tool in tools:
-
                 # 注册工具
                 self.register_tool(
                     name=f"{name}.tool_call.{tool['name']}",
@@ -417,9 +425,7 @@ class ToolRegistry(OutputHandlerProtocol):
             return True
 
         except Exception as e:
-            PrettyOutput.print(
-                f"文件 {file_path} 加载失败: {str(e)}", OutputType.WARNING
-            )
+            PrettyOutput.print(f"MCP配置{config.get('name', '')}加载失败: {str(e)}", OutputType.WARNING)
             return False
 
     def register_tool_by_file(self, file_path: str) -> bool: