jarvis-ai-assistant 0.2.7__py3-none-any.whl → 0.3.0__py3-none-any.whl

jarvis/jarvis_agent/tool_share_manager.py

@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+"""工具分享管理模块"""
+import os
+import glob
+import shutil
+from typing import List, Dict, Any, Set
+
+import typer
+
+from jarvis.jarvis_agent import OutputType, PrettyOutput, user_confirm
+from jarvis.jarvis_agent.share_manager import ShareManager
+from jarvis.jarvis_utils.config import get_central_tool_repo, get_data_dir
+
+
+class ToolShareManager(ShareManager):
+    """工具分享管理器"""
+
+    def __init__(self):
+        central_repo = get_central_tool_repo()
+        if not central_repo:
+            PrettyOutput.print(
+                "错误：未配置中心工具仓库（JARVIS_CENTRAL_TOOL_REPO）",
+                OutputType.ERROR,
+            )
+            PrettyOutput.print(
+                "请在配置文件中设置中心工具仓库的Git地址", OutputType.INFO
+            )
+            raise typer.Exit(code=1)
+
+        super().__init__(central_repo, "central_tool_repo")
+
+    def get_resource_type(self) -> str:
+        """获取资源类型名称"""
+        return "工具"
+
+    def format_resource_display(self, resource: Dict[str, Any]) -> str:
+        """格式化资源显示"""
+        return f"{resource['tool_name']} ({resource['filename']})"
+
+    def get_existing_resources(self) -> Set[str]:
+        """获取中心仓库中已有的工具文件名"""
+        existing_tools = set()
+        for filepath in glob.glob(os.path.join(self.repo_path, "*.py")):
+            existing_tools.add(os.path.basename(filepath))
+        return existing_tools
+
+    def get_local_resources(self) -> List[Dict[str, Any]]:
+        """获取本地工具"""
+        # 获取中心仓库中已有的工具文件名
+        existing_tools = self.get_existing_resources()
+
+        # 只从数据目录的tools目录获取工具
+        local_tools_dir = os.path.join(get_data_dir(), "tools")
+        if not os.path.exists(local_tools_dir):
+            PrettyOutput.print(
+                f"本地工具目录不存在: {local_tools_dir}",
+                OutputType.WARNING,
+            )
+            return []
+
+        # 收集本地工具文件（排除已存在的）
+        tool_files = []
+        for filepath in glob.glob(os.path.join(local_tools_dir, "*.py")):
+            filename = os.path.basename(filepath)
+            # 跳过__init__.py和已存在的文件
+            if filename == "__init__.py" or filename in existing_tools:
+                continue
+
+            # 尝试获取工具名称（通过简单解析）
+            tool_name = filename[:-3]  # 移除.py后缀
+            tool_files.append(
+                {
+                    "path": filepath,
+                    "filename": filename,
+                    "tool_name": tool_name,
+                }
+            )
+
+        return tool_files
+
+    def share_resources(self, resources: List[Dict[str, Any]]) -> List[str]:
+        """分享工具到中心仓库"""
+        # 确认操作
+        share_list = ["\n将要分享以下工具到中心仓库（注意：文件将被移动而非复制）："]
+        for tool in resources:
+            share_list.append(f"- {tool['tool_name']} ({tool['filename']})")
+        PrettyOutput.print("\n".join(share_list), OutputType.WARNING)
+
+        if not user_confirm("确认移动这些工具到中心仓库吗？（原文件将被删除）"):
+            return []
+
+        # 移动选中的工具到中心仓库
+        moved_list = []
+        for tool in resources:
+            src_file = tool["path"]
+            dst_file = os.path.join(self.repo_path, tool["filename"])
+            shutil.move(src_file, dst_file)  # 使用move而不是copy
+            moved_list.append(f"已移动: {tool['tool_name']}")
+
+        return moved_list
+
+    def run(self) -> None:
+        """执行工具分享流程"""
+        try:
+            # 更新中心仓库
+            self.update_central_repo()
+
+            # 获取本地资源
+            local_resources = self.get_local_resources()
+            if not local_resources:
+                PrettyOutput.print(
+                    "没有找到新的工具文件（所有工具可能已存在于中心仓库）",
+                    OutputType.WARNING,
+                )
+                raise typer.Exit(code=0)
+
+            # 选择要分享的资源
+            selected_resources = self.select_resources(local_resources)
+            if not selected_resources:
+                raise typer.Exit(code=0)
+
+            # 分享资源
+            moved_list = self.share_resources(selected_resources)
+            if moved_list:
+                # 一次性显示所有移动结果
+                PrettyOutput.print("\n".join(moved_list), OutputType.SUCCESS)
+
+                # 提交并推送
+                self.commit_and_push(len(selected_resources))
+
+                PrettyOutput.print("\n工具已成功分享到中心仓库！", OutputType.SUCCESS)
+                PrettyOutput.print(
+                    f"原文件已从 {os.path.join(get_data_dir(), 'tools')} 移动到中心仓库",
+                    OutputType.INFO,
+                )
+
+        except Exception as e:
+            PrettyOutput.print(f"分享工具时出错: {str(e)}", OutputType.ERROR)
+            raise typer.Exit(code=1)

jarvis/jarvis_code_agent/code_agent.py

@@ -17,7 +17,6 @@ from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_code_agent.lint import get_lint_tools
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
-from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.config import (
     is_confirm_before_apply_patch,
@@ -70,7 +69,25 @@ class CodeAgent:
                 "clear_memory",
             ]
         )
-        code_system_prompt = """
+        code_system_prompt = self._get_system_prompt()
+        self.agent = Agent(
+            system_prompt=code_system_prompt,
+            name="CodeAgent",
+            auto_complete=False,
+            output_handler=[tool_registry, EditFileHandler()],  # type: ignore
+            llm_type=llm_type,
+            model_group=model_group,
+            input_handler=[shell_input_handler, builtin_input_handler],
+            need_summary=need_summary,
+            use_methodology=False,  # 禁用方法论
+            use_analysis=False,  # 禁用分析
+        )
+
+        self.agent.set_after_tool_call_cb(self.after_tool_call_cb)
+
+    def _get_system_prompt(self) -> str:
+        """获取代码工程师的系统提示词"""
+        return """
 <code_engineer_guide>
 ## 角色定位
 你是Jarvis系统的代码工程师，一个专业的代码分析和修改助手。你的职责是：
@@ -124,20 +141,6 @@ class CodeAgent:
 10. 我不订阅闲 AI
 </say_to_llm>
 """
-        self.agent = Agent(
-            system_prompt=code_system_prompt,
-            name="CodeAgent",
-            auto_complete=False,
-            output_handler=[tool_registry, EditFileHandler()],  # type: ignore
-            llm_type=llm_type,
-            model_group=model_group,
-            input_handler=[shell_input_handler, builtin_input_handler],
-            need_summary=need_summary,
-            use_methodology=False,  # 禁用方法论
-            use_analysis=False,  # 禁用分析
-        )
-
-        self.agent.set_after_tool_call_cb(self.after_tool_call_cb)
 
     def _check_git_config(self) -> None:
         """检查 git username 和 email 是否已设置，如果没有则提示并退出"""
@@ -209,11 +212,11 @@ class CodeAgent:
         jarvis_ignore = ".jarvis"
 
         if not os.path.exists(gitignore_path):
-            with open(gitignore_path, "w") as f:
+            with open(gitignore_path, "w", encoding="utf-8") as f:
                 f.write(f"{jarvis_ignore}\n")
             print(f"✅ 已创建.gitignore文件并添加'{jarvis_ignore}'")
         else:
-            with open(gitignore_path, "r+") as f:
+            with open(gitignore_path, "r+", encoding="utf-8") as f:
                 content = f.read()
                 if jarvis_ignore not in content.splitlines():
                     f.write(f"\n{jarvis_ignore}\n")
@@ -260,7 +263,10 @@ class CodeAgent:
         current_settings = {}
         for key, target_value in target_settings.items():
             result = subprocess.run(
-                ["git", "config", "--get", key], capture_output=True, text=True
+                ["git", "config", "--get", key],
+                capture_output=True,
+                text=True,
+                check=False,
             )
             current_value = result.stdout.strip()
             current_settings[key] = current_value
@@ -522,7 +528,7 @@ class CodeAgent:
 
             if project_info:
                 enhanced_input = (
-                    f"项目概况:\n"
+                    "项目概况:\n"
                     + "\n\n".join(project_info)
                     + "\n\n"
                     + first_tip

jarvis/jarvis_data/config_schema.json

@@ -230,6 +230,11 @@
       "description": "中心方法论Git仓库地址，该仓库会自动添加到方法论加载路径中",
       "default": ""
     },
+    "JARVIS_CENTRAL_TOOL_REPO": {
+      "type": "string",
+      "description": "中心工具库Git仓库地址，该仓库会自动克隆到数据目录并加载其中的工具",
+      "default": ""
+    },
     "JARVIS_PRINT_PROMPT": {
       "type": "boolean",
       "description": "是否打印提示",
@@ -240,6 +245,38 @@
       "description": "是否启用静态代码分析",
       "default": true
     },
+    "JARVIS_TOOL_GROUP": {
+      "type": "string",
+      "description": "选择一个预定义的工具配置组",
+      "default": ""
+    },
+    "JARVIS_TOOL_GROUPS": {
+      "type": "array",
+      "description": "预定义的工具配置组",
+      "default": [],
+      "items": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object",
+          "properties": {
+            "use": {
+              "type": "array",
+              "description": "要使用的工具名称列表",
+              "items": {
+                "type": "string"
+              }
+            },
+            "dont_use": {
+              "type": "array",
+              "description": "不使用的工具名称列表",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    },
     "JARVIS_RAG_GROUP": {
       "type": "string",
       "description": "选择一个预定义的RAG配置组",

jarvis/jarvis_platform/ai8.py

@@ -250,7 +250,9 @@ class AI8Model(BasePlatform):
             PrettyOutput.print(f"会话文件未找到: {file_path}", OutputType.ERROR)
             return False
         except KeyError as e:
-            PrettyOutput.print(f"恢复失败: 会话文件格式不正确，缺少键 {e}", OutputType.ERROR)
+            PrettyOutput.print(
+                f"恢复失败: 会话文件格式不正确，缺少键 {e}", OutputType.ERROR
+            )
             return False
         except Exception as e:
             PrettyOutput.print(f"恢复会话失败: {str(e)}", OutputType.ERROR)
@@ -322,3 +324,13 @@ class AI8Model(BasePlatform):
 
     def upload_files(self, file_list: List[str]) -> bool:
         return False
+
+    @classmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """
+        获取AI8平台所需的环境变量键列表
+
+        返回:
+            List[str]: 环境变量键的列表
+        """
+        return ["AI8_API_KEY"]

jarvis/jarvis_platform/base.py

@@ -2,7 +2,7 @@
 import re
 from abc import ABC, abstractmethod
 from types import TracebackType
-from typing import Generator, List, Optional, Tuple, Type
+from typing import Dict, Generator, List, Optional, Tuple, Type
 
 from typing_extensions import Self
 
@@ -87,7 +87,7 @@ class BasePlatform(ABC):
             prefix_prompt = f"""
             我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
             """
-            while_true(lambda: while_success(lambda: self.chat(prefix_prompt), 5), 5)
+            while_true(lambda: while_success(lambda: self._chat(prefix_prompt), 5), 5)
             submit_count = 0
             length = 0
             response = ""
@@ -101,7 +101,7 @@ class BasePlatform(ABC):
                 response += "\n"
                 for trunk in while_true(
                     lambda: while_success(
-                        lambda: self.chat(
+                        lambda: self._chat(
                             f"<part_content>{input}</part_content>\n\n请返回<已收到>，不需要返回其他任何内容"
                         ),
                         5,
@@ -110,10 +110,14 @@ class BasePlatform(ABC):
                 ):
                     response += trunk
 
-                print(f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}")
+                print(
+                    f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
+                )
             print("✅ 提交完成")
             response += "\n" + while_true(
-                lambda: while_success(lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5),
+                lambda: while_success(
+                    lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5
+                ),
                 5,
             )
         else:
@@ -240,6 +244,17 @@ class BasePlatform(ABC):
         """Get model list"""
         raise NotImplementedError("get_model_list is not implemented")
 
+    @classmethod
+    @abstractmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """Get required env keys"""
+        raise NotImplementedError("get_required_env_keys is not implemented")
+
+    @classmethod
+    def get_env_defaults(cls) -> Dict[str, str]:
+        """Get env default values"""
+        return {}
+
     def set_suppress_output(self, suppress: bool):
         """Set whether to suppress output"""
         self.suppress_output = suppress

jarvis/jarvis_platform/human.py

@@ -10,9 +10,9 @@ import string
 from typing import Generator, List, Tuple
 
 from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils.clipboard import copy_to_clipboard
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import copy_to_clipboard
 
 
 class HumanPlatform(BasePlatform):
@@ -131,3 +131,13 @@ class HumanPlatform(BasePlatform):
     def support_upload_files(self) -> bool:
         """是否支持文件上传功能"""
         return False
+
+    @classmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """
+        获取Human平台所需的环境变量键列表
+
+        返回:
+            List[str]: 环境变量键的列表
+        """
+        return []

jarvis/jarvis_platform/kimi.py

@@ -395,3 +395,13 @@ class KimiModel(BasePlatform):
     def support_web(self) -> bool:
         """Kimi平台支持web功能"""
         return True
+
+    @classmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """
+        获取Kimi平台所需的环境变量键列表
+
+        返回:
+            List[str]: 环境变量键的列表
+        """
+        return ["KIMI_API_KEY"]

jarvis/jarvis_platform/openai.py

@@ -211,3 +211,23 @@ class OpenAIModel(BasePlatform):
             bool: 当前是否支持上传文件 (OpenAI平台始终返回False)
         """
         return False
+
+    @classmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """
+        获取OpenAI平台所需的环境变量键列表
+
+        返回:
+            List[str]: 环境变量键的列表
+        """
+        return ["OPENAI_API_KEY", "OPENAI_API_BASE"]
+
+    @classmethod
+    def get_env_defaults(cls) -> Dict[str, str]:
+        """
+        获取OpenAI平台环境变量的默认值
+
+        返回:
+            Dict[str, str]: 环境变量默认值的字典
+        """
+        return {"OPENAI_API_BASE": "https://api.openai.com/v1"}

jarvis/jarvis_platform/tongyi.py

@@ -11,6 +11,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ot, ct
 from jarvis.jarvis_utils.utils import while_success
 
+
 class TongyiPlatform(BasePlatform):
     """Tongyi platform implementation"""
 
@@ -200,12 +201,8 @@ class TongyiPlatform(BasePlatform):
                                         tmp_content = json.loads(
                                             content.get("content")
                                         )["content"]
-                                        if len(thinking_content) < len(
-                                            tmp_content
-                                        ):
-                                            yield tmp_content[
-                                                len(thinking_content) :
-                                            ]
+                                        if len(thinking_content) < len(tmp_content):
+                                            yield tmp_content[len(thinking_content) :]
                                             thinking_content = tmp_content
                                         else:
                                             yield f"\r\n{ct('think')}\n"[
@@ -224,9 +221,7 @@ class TongyiPlatform(BasePlatform):
                                     else:
                                         tmp_content = content.get("content")
                                         if len(text_content) < len(tmp_content):
-                                            yield tmp_content[
-                                                len(text_content) :
-                                            ]
+                                            yield tmp_content[len(text_content) :]
                                             text_content = tmp_content
 
                     except json.JSONDecodeError:
@@ -562,3 +557,13 @@ class TongyiPlatform(BasePlatform):
             bool: True if web is supported, False otherwise
         """
         return True
+
+    @classmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """
+        获取通义平台所需的环境变量键列表
+
+        返回:
+            List[str]: 环境变量键的列表
+        """
+        return ["TONGYI_COOKIES"]

jarvis/jarvis_platform/yuanbao.py

@@ -623,3 +623,13 @@ class YuanbaoPlatform(BasePlatform):
     def support_web(self) -> bool:
         """Yuanbao平台支持web功能"""
         return True
+
+    @classmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """
+        获取元宝平台所需的环境变量键列表
+
+        返回:
+            List[str]: 环境变量键的列表
+        """
+        return ["YUANBAO_COOKIES"]

jarvis/jarvis_platform_manager/main.py

@@ -27,13 +27,13 @@ def list_platforms() -> None:
     PrettyOutput.section("Supported platforms and models", OutputType.SUCCESS)
 
     for platform_name in platforms:
-        # Create platform instance
-        platform = registry.create_platform(platform_name)
-        if not platform:
-            continue
-
-        # Get the list of models supported by the platform
         try:
+            # Create platform instance
+            platform = registry.create_platform(platform_name)
+            if not platform:
+                continue
+
+            # Get the list of models supported by the platform
             models = platform.get_model_list()
 
             # Print platform name
@@ -51,10 +51,8 @@ def list_platforms() -> None:
             else:
                 PrettyOutput.print("  • 没有可用的模型信息", OutputType.WARNING)
 
-        except Exception as exc:
-            PrettyOutput.print(
-                f"获取 {platform_name} 的模型列表失败: {str(exc)}", OutputType.WARNING
-            )
+        except Exception:
+            PrettyOutput.print(f"创建 {platform_name} 平台失败", OutputType.WARNING)
 
 
 def chat_with_model(platform_name: str, model_name: str, system_prompt: str) -> None:
@@ -330,13 +328,15 @@ def validate_platform_model(platform: Optional[str], model: Optional[str]) -> bo
 
 @app.command("chat")
 def chat_command(
-    platform: Optional[str] = typer.Option(None, "--platform", "-p", help="指定要使用的平台"),
+    platform: Optional[str] = typer.Option(
+        None, "--platform", "-p", help="指定要使用的平台"
+    ),
     model: Optional[str] = typer.Option(None, "--model", "-m", help="指定要使用的模型"),
 ) -> None:
     """与指定平台和模型聊天。"""
     if not validate_platform_model(platform, model):
         return
-    chat_with_model(platform, model, "") # type: ignore
+    chat_with_model(platform, model, "")  # type: ignore
 
 
 @app.command("service")