jarvis-ai-assistant 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

jarvis/jarvis_platform/base.py

@@ -255,6 +255,15 @@ class BasePlatform(ABC):
         """Get env default values"""
         return {}
 
+    @classmethod
+    def get_env_config_guide(cls) -> Dict[str, str]:
+        """Get environment variable configuration guide
+
+        Returns:
+            Dict[str, str]: A dictionary mapping env key names to their configuration instructions
+        """
+        return {}
+
     def set_suppress_output(self, suppress: bool):
         """Set whether to suppress output"""
         self.suppress_output = suppress

jarvis/jarvis_platform/kimi.py

@@ -405,3 +405,23 @@ class KimiModel(BasePlatform):
             List[str]: 环境变量键的列表
         """
         return ["KIMI_API_KEY"]
+
+    @classmethod
+    def get_env_config_guide(cls) -> Dict[str, str]:
+        """
+        获取环境变量配置指导
+
+        返回:
+            Dict[str, str]: 环境变量名到配置指导的映射
+        """
+        return {
+            "KIMI_API_KEY": (
+                "1. 登录 Kimi 网页版: https://kimi.moonshot.cn/\n"
+                "2. 打开浏览器开发者工具 (F12)\n"
+                '3. 切换到"网络"(Network)标签页\n'
+                "4. 在 Kimi 中发送一条消息\n"
+                "5. 找到 stream 请求\n"
+                '6. 在"请求标头"中找到 authorization 字段\n'
+                "7. 复制 Bearer 后面的 API Key 部分"
+            )
+        }

jarvis/jarvis_platform/openai.py

@@ -222,6 +222,33 @@ class OpenAIModel(BasePlatform):
         """
         return ["OPENAI_API_KEY", "OPENAI_API_BASE"]
 
+    @classmethod
+    def get_env_config_guide(cls) -> Dict[str, str]:
+        """
+        获取环境变量配置指导
+
+        返回:
+            Dict[str, str]: 环境变量名到配置指导的映射
+        """
+        return {
+            "OPENAI_API_KEY": (
+                "请输入您的 OpenAI API Key:\n"
+                "获取方式一（官方）:\n"
+                "1. 登录 OpenAI 平台: https://platform.openai.com/\n"
+                "2. 进入 API Keys 页面\n"
+                "3. 创建新的 API Key 或使用现有的\n"
+                "4. 复制 API Key (以 sk- 开头)\n"
+                "\n获取方式二（第三方代理）:\n"
+                "如果使用第三方代理服务，请从代理服务商处获取 API Key"
+            ),
+            "OPENAI_API_BASE": (
+                "请输入 API Base URL:\n"
+                "- 官方 API: https://api.openai.com/v1\n"
+                "- 如使用代理或第三方服务，请输入对应的 Base URL\n"
+                "- 例如: https://your-proxy.com/v1"
+            ),
+        }
+
     @classmethod
     def get_env_defaults(cls) -> Dict[str, str]:
         """

jarvis/jarvis_platform/tongyi.py

@@ -567,3 +567,22 @@ class TongyiPlatform(BasePlatform):
             List[str]: 环境变量键的列表
         """
         return ["TONGYI_COOKIES"]
+
+    @classmethod
+    def get_env_config_guide(cls) -> Dict[str, str]:
+        """
+        获取环境变量配置指导
+
+        返回:
+            Dict[str, str]: 环境变量名到配置指导的映射
+        """
+        return {
+            "TONGYI_COOKIES": (
+                "1. 登录通义千问网页版: https://tongyi.aliyun.com/\n"
+                "2. 打开浏览器开发者工具 (F12)\n"
+                '3. 切换到"网络"(Network)标签页\n'
+                "4. 刷新页面或发送一条消息\n"
+                "5. 找到 conversation 请求或任意发往 api.tongyi.com 的请求\n"
+                '6. 在"请求标头"中复制完整的 Cookie 值'
+            )
+        }

jarvis/jarvis_platform/yuanbao.py

@@ -633,3 +633,21 @@ class YuanbaoPlatform(BasePlatform):
             List[str]: 环境变量键的列表
         """
         return ["YUANBAO_COOKIES"]
+
+    @classmethod
+    def get_env_config_guide(cls) -> Dict[str, str]:
+        """
+        获取环境变量配置指导
+
+        返回:
+            Dict[str, str]: 环境变量名到配置指导的映射
+        """
+        return {
+            "YUANBAO_COOKIES": (
+                "1. 登录腾讯元宝网页版: https://yuanbao.tencent.com/\n"
+                "2. 打开浏览器开发者工具 (F12)\n"
+                '3. 切换到"网络"(Network)标签页\n'
+                "4. 刷新页面，找到任意一个发往 yuanbao.tencent.com 的请求\n"
+                '5. 在"请求标头"中复制完整的 Cookie 值'
+            )
+        }

jarvis/jarvis_platform_manager/main.py

@@ -119,8 +119,14 @@ def chat_with_model(
                 PrettyOutput.print("检测到空输入，退出聊天", OutputType.INFO)
                 break
 
+            # Parse command and arguments
+            stripped_input = user_input.strip()
+            parts = stripped_input.split(None, 1)
+            command = parts[0] if parts else ""
+            args = parts[1] if len(parts) > 1 else ""
+
             # Check if it is a clear session command
-            if user_input.strip() == "/clear":
+            if command == "/clear":
                 try:
                     platform.reset()  # type: ignore[no-untyped-call]  # type: ignore[no-untyped-call]  # type: ignore[no-untyped-call]
                     platform.set_model_name(model_name)  # Reinitialize session
@@ -131,9 +137,9 @@ def chat_with_model(
                 continue
 
             # Check if it is an upload command
-            if user_input.strip().startswith("/upload"):
+            if command == "/upload":
                 try:
-                    file_path = user_input.strip()[8:].strip()
+                    file_path = args
                     if not file_path:
                         PrettyOutput.print(
                             '请指定要上传的文件路径，例如: /upload /path/to/file 或 /upload "/path/with spaces/file"',
@@ -161,9 +167,9 @@ def chat_with_model(
                 continue
 
             # Check if it is a save command
-            if user_input.strip().startswith("/save"):
+            if command == "/save":
                 try:
-                    file_path = user_input.strip()[5:].strip()
+                    file_path = args
                     if not file_path:
                         PrettyOutput.print(
                             "请指定保存文件名，例如: /save last_message.txt",
@@ -192,9 +198,9 @@ def chat_with_model(
                 continue
 
             # Check if it is a saveall command
-            if user_input.strip().startswith("/saveall"):
+            if command == "/saveall":
                 try:
-                    file_path = user_input.strip()[8:].strip()
+                    file_path = args
                     if not file_path:
                         PrettyOutput.print(
                             "请指定保存文件名，例如: /saveall all_conversations.txt",
@@ -223,9 +229,9 @@ def chat_with_model(
                 continue
 
             # Check if it is a save_session command
-            if user_input.strip().startswith("/save_session"):
+            if command == "/save_session":
                 try:
-                    file_path = user_input.strip()[14:].strip()
+                    file_path = args
                     if not file_path:
                         PrettyOutput.print(
                             "请指定保存会话的文件名，例如: /save_session session.json",
@@ -250,9 +256,9 @@ def chat_with_model(
                 continue
 
             # Check if it is a load_session command
-            if user_input.strip().startswith("/load_session"):
+            if command == "/load_session":
                 try:
-                    file_path = user_input.strip()[14:].strip()
+                    file_path = args
                     if not file_path:
                         PrettyOutput.print(
                             "请指定加载会话的文件名，例如: /load_session session.json",
@@ -278,18 +284,18 @@ def chat_with_model(
                 continue
 
             # Check if it is a shell command
-            if user_input.strip().startswith("/shell"):
+            if command == "/shell":
                 try:
-                    command = user_input.strip()[6:].strip()
-                    if not command:
+                    shell_command = args
+                    if not shell_command:
                         PrettyOutput.print(
                             "请指定要执行的shell命令，例如: /shell ls -l",
                             OutputType.WARNING,
                         )
                         continue
 
-                    PrettyOutput.print(f"执行命令: {command}", OutputType.INFO)
-                    return_code = os.system(command)
+                    PrettyOutput.print(f"执行命令: {shell_command}", OutputType.INFO)
+                    return_code = os.system(shell_command)
                     if return_code == 0:
                         PrettyOutput.print("命令执行完成", OutputType.SUCCESS)
                     else:

jarvis/jarvis_tools/base.py

@@ -39,4 +39,11 @@ class Tool:
         返回:
             Dict[str, Any]: 工具执行结果
         """
-        return self.func(arguments)
+        try:
+            return self.func(arguments)
+        except Exception as e:
+            return {
+                "success": False,
+                "stderr": f"工具 {self.name} 执行失败: {str(e)}",
+                "stdout": "",
+            }

jarvis/jarvis_utils/git_utils.py

@@ -309,7 +309,9 @@ def get_modified_line_ranges() -> Dict[str, List[Tuple[int, int]]]:
             start_line = int(range_match.group(1))  # 保持从1开始
             line_count = int(range_match.group(2)) if range_match.group(2) else 1
             end_line = start_line + line_count - 1
-            result[current_file] = (start_line, end_line)
+            if current_file not in result:
+                result[current_file] = []
+            result[current_file].append((start_line, end_line))
 
     return result
 
@@ -414,8 +416,23 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                     hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
                 )
 
-                # 尝试普通安装
-                install_cmd = [sys.executable, "-m", "pip", "install", "-e", "."]
+                is_uv_env = False
+                if in_venv:
+                    # 检查是否在uv创建的虚拟环境内
+                    if sys.platform == "win32":
+                        uv_path = os.path.join(sys.prefix, "Scripts", "uv.exe")
+                    else:
+                        uv_path = os.path.join(sys.prefix, "bin", "uv")
+                    if os.path.exists(uv_path):
+                        is_uv_env = True
+
+                # 根据环境选择安装命令
+                if is_uv_env:
+                    install_cmd = ["uv", "pip", "install", "-e", "."]
+                else:
+                    install_cmd = [sys.executable, "-m", "pip", "install", "-e", "."]
+
+                # 尝试安装
                 result = subprocess.run(
                     install_cmd, cwd=git_root, capture_output=True, text=True
                 )

jarvis/jarvis_utils/globals.py

@@ -236,20 +236,26 @@ def get_short_term_memories(tags: Optional[List[str]] = None) -> List[Dict[str,
         tags: 用于过滤的标签列表（可选）
 
     返回:
-        List[Dict[str, Any]]: 符合条件的短期记忆列表
+        List[Dict[str, Any]]: 符合条件的短期记忆列表，按创建时间降序排列
     """
     global short_term_memories
-    if not tags:
-        return short_term_memories.copy()
 
-    # 按标签过滤
-    filtered_memories = []
-    for memory in short_term_memories:
-        memory_tags = memory.get("tags", [])
-        if any(tag in memory_tags for tag in tags):
-            filtered_memories.append(memory)
+    # 获取记忆副本
+    memories_copy = short_term_memories.copy()
+
+    # 按标签过滤（如果提供了标签）
+    if tags:
+        filtered_memories = []
+        for memory in memories_copy:
+            memory_tags = memory.get("tags", [])
+            if any(tag in memory_tags for tag in tags):
+                filtered_memories.append(memory)
+        memories_copy = filtered_memories
+
+    # 按创建时间排序（最新的在前）
+    memories_copy.sort(key=lambda x: x.get("created_at", ""), reverse=True)
 
-    return filtered_memories
+    return memories_copy
 
 
 def clear_short_term_memories() -> None:

jarvis/jarvis_utils/methodology.py

@@ -175,13 +175,20 @@ def upload_methodology(platform: BasePlatform, other_files: List[str] = []) -> b
                 pass
 
 
-def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> str:
+def load_methodology(
+    user_input: str,
+    tool_registery: Optional[Any] = None,
+    platform_name: Optional[str] = None,
+    model_name: Optional[str] = None,
+) -> str:
     """
     加载方法论并上传到大模型。
 
     参数：
         user_input: 用户输入文本，用于提示大模型
         tool_registery: 工具注册表，用于获取工具列表
+        platform_name (str, optional): 指定的平台名称. Defaults to None.
+        model_name (str, optional): 指定的模型名称. Defaults to None.
 
     返回：
         str: 相关的方法论提示，如果未找到方法论则返回空字符串
@@ -203,7 +210,17 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
             return ""
         print(f"✅ 加载方法论文件完成 (共 {len(methodologies)} 个)")
 
-        platform = PlatformRegistry().get_normal_platform()
+        if platform_name:
+            platform = PlatformRegistry().create_platform(platform_name)
+            if platform and model_name:
+                platform.set_model_name(model_name)
+        else:
+            platform = PlatformRegistry().get_normal_platform()
+
+        if not platform:
+            PrettyOutput.print("无法创建平台实例", OutputType.ERROR)
+            return ""
+
         platform.set_suppress_output(True)
 
         # 步骤1：获取所有方法论的标题