jarvis-ai-assistant 0.2.7__tar.gz → 0.2.8__tar.gz

{jarvis_ai_assistant-0.2.7/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.2.7
+Version: 0.2.8
 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.2.7 → jarvis_ai_assistant-0.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.2.7"
+version = "0.2.8"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.2.7 → jarvis_ai_assistant-0.2.8}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.2.7",
+    version="0.2.8",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.2.7 → jarvis_ai_assistant-0.2.8}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.2.7 → jarvis_ai_assistant-0.2.8}/src/jarvis/jarvis_agent/jarvis.py

@@ -221,6 +221,188 @@ def _parse_selection(selection_str: str, max_value: int) -> List[int]:
     return sorted(list(selected))
 
 
+def _handle_share_tool(config_file: Optional[str] = None) -> None:
+    """处理工具分享功能"""
+    from jarvis.jarvis_utils.config import (
+        get_central_tool_repo,
+        get_data_dir,
+    )
+    import glob
+    import shutil
+
+    # 获取中心工具仓库配置
+    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)
+
+    # 克隆或更新中心工具仓库
+    central_repo_path = os.path.join(get_data_dir(), "central_tool_repo")
+    if not os.path.exists(central_repo_path):
+        PrettyOutput.print(f"正在克隆中心工具仓库...", OutputType.INFO)
+        subprocess.run(["git", "clone", central_repo, central_repo_path], check=True)
+    else:
+        PrettyOutput.print(f"正在更新中心工具仓库...", OutputType.INFO)
+        # 检查是否是空仓库
+        try:
+            # 先尝试获取远程分支信息
+            result = subprocess.run(
+                ["git", "ls-remote", "--heads", "origin"],
+                cwd=central_repo_path,
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+            # 如果有远程分支，执行pull
+            if result.stdout.strip():
+                subprocess.run(["git", "pull"], cwd=central_repo_path, check=True)
+            else:
+                PrettyOutput.print(
+                    "中心工具仓库是空的，将初始化为新仓库", OutputType.INFO
+                )
+        except subprocess.CalledProcessError:
+            # 如果命令失败，可能是网络问题或其他错误
+            PrettyOutput.print("无法连接到远程仓库，将跳过更新", OutputType.WARNING)
+
+    # 获取中心仓库中已有的工具文件名
+    existing_tools = set()
+    for filepath in glob.glob(os.path.join(central_repo_path, "*.py")):
+        existing_tools.add(os.path.basename(filepath))
+
+    # 只从数据目录的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,
+        )
+        raise typer.Exit(code=0)
+
+    # 收集本地工具文件（排除已存在的）
+    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,
+            }
+        )
+
+    if not tool_files:
+        PrettyOutput.print(
+            "没有找到新的工具文件（所有工具可能已存在于中心仓库）",
+            OutputType.WARNING,
+        )
+        raise typer.Exit(code=0)
+
+    # 显示可选的工具
+    tool_list = ["\n可分享的工具（已排除中心仓库中已有的）："]
+    for i, tool in enumerate(tool_files, 1):
+        tool_list.append(f"[{i}] {tool['tool_name']} ({tool['filename']})")
+
+    # 一次性打印所有工具
+    PrettyOutput.print("\n".join(tool_list), OutputType.INFO)
+
+    # 让用户选择要分享的工具
+    while True:
+        try:
+            choice_str = prompt(
+                "\n请选择要分享的工具编号（支持格式: 1,2,3,4-9,20 或 all）："
+            ).strip()
+            if choice_str == "0":
+                raise typer.Exit(code=0)
+
+            selected_tools = []
+            if choice_str.lower() == "all":
+                selected_tools = tool_files
+            else:
+                selected_indices = _parse_selection(choice_str, len(tool_files))
+                if not selected_indices:
+                    PrettyOutput.print("无效的选择", OutputType.WARNING)
+                    continue
+                selected_tools = [tool_files[i - 1] for i in selected_indices]
+
+            # 确认操作
+            share_list = [
+                "\n将要分享以下工具到中心仓库（注意：文件将被移动而非复制）："
+            ]
+            for tool in selected_tools:
+                share_list.append(f"- {tool['tool_name']} ({tool['filename']})")
+            PrettyOutput.print("\n".join(share_list), OutputType.WARNING)
+
+            if not user_confirm("确认移动这些工具到中心仓库吗？（原文件将被删除）"):
+                continue
+
+            # 移动选中的工具到中心仓库
+            moved_list = []
+            for tool in selected_tools:
+                src_file = tool["path"]
+                dst_file = os.path.join(central_repo_path, tool["filename"])
+                shutil.move(src_file, dst_file)  # 使用move而不是copy
+                moved_list.append(f"已移动: {tool['tool_name']}")
+
+            # 一次性显示所有移动结果
+            if moved_list:
+                PrettyOutput.print("\n".join(moved_list), OutputType.SUCCESS)
+
+            # 提交并推送更改
+            PrettyOutput.print("\n正在提交更改...", OutputType.INFO)
+            subprocess.run(["git", "add", "."], cwd=central_repo_path, check=True)
+
+            commit_msg = f"Add {len(selected_tools)} tool(s) from local collection"
+            subprocess.run(
+                ["git", "commit", "-m", commit_msg], cwd=central_repo_path, check=True
+            )
+
+            PrettyOutput.print("正在推送到远程仓库...", OutputType.INFO)
+            # 检查是否需要设置上游分支（空仓库的情况）
+            try:
+                # 先尝试普通推送
+                subprocess.run(["git", "push"], cwd=central_repo_path, check=True)
+            except subprocess.CalledProcessError:
+                # 如果失败，可能是空仓库，尝试设置上游分支
+                try:
+                    subprocess.run(
+                        ["git", "push", "-u", "origin", "main"],
+                        cwd=central_repo_path,
+                        check=True,
+                    )
+                except subprocess.CalledProcessError:
+                    # 如果main分支不存在，尝试master分支
+                    subprocess.run(
+                        ["git", "push", "-u", "origin", "master"],
+                        cwd=central_repo_path,
+                        check=True,
+                    )
+
+            PrettyOutput.print("\n工具已成功分享到中心仓库！", OutputType.SUCCESS)
+            PrettyOutput.print(
+                f"原文件已从 {local_tools_dir} 移动到中心仓库", OutputType.INFO
+            )
+            break
+
+        except ValueError:
+            PrettyOutput.print("请输入有效的数字", OutputType.WARNING)
+        except subprocess.CalledProcessError as e:
+            PrettyOutput.print(f"Git操作失败: {str(e)}", OutputType.ERROR)
+            raise typer.Exit(code=1)
+        except Exception as e:
+            PrettyOutput.print(f"分享工具时出错: {str(e)}", OutputType.ERROR)
+            raise typer.Exit(code=1)
+
+
 def _handle_share_methodology(config_file: Optional[str] = None) -> None:
     """处理方法论分享功能"""
     from jarvis.jarvis_utils.config import (
@@ -249,7 +431,26 @@ def _handle_share_methodology(config_file: Optional[str] = None) -> None:
         subprocess.run(["git", "clone", central_repo, central_repo_path], check=True)
     else:
         PrettyOutput.print(f"正在更新中心方法论仓库...", OutputType.INFO)
-        subprocess.run(["git", "pull"], cwd=central_repo_path, check=True)
+        # 检查是否是空仓库
+        try:
+            # 先尝试获取远程分支信息
+            result = subprocess.run(
+                ["git", "ls-remote", "--heads", "origin"],
+                cwd=central_repo_path,
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+            # 如果有远程分支，执行pull
+            if result.stdout.strip():
+                subprocess.run(["git", "pull"], cwd=central_repo_path, check=True)
+            else:
+                PrettyOutput.print(
+                    "中心方法论仓库是空的，将初始化为新仓库", OutputType.INFO
+                )
+        except subprocess.CalledProcessError:
+            # 如果命令失败，可能是网络问题或其他错误
+            PrettyOutput.print("无法连接到远程仓库，将跳过更新", OutputType.WARNING)
 
     # 获取中心仓库中已有的方法论
     existing_methodologies = {}  # 改为字典，存储 problem_type -> content 的映射
@@ -385,7 +586,25 @@ def _handle_share_methodology(config_file: Optional[str] = None) -> None:
             )
 
             PrettyOutput.print("正在推送到远程仓库...", OutputType.INFO)
-            subprocess.run(["git", "push"], cwd=central_repo_path, check=True)
+            # 检查是否需要设置上游分支（空仓库的情况）
+            try:
+                # 先尝试普通推送
+                subprocess.run(["git", "push"], cwd=central_repo_path, check=True)
+            except subprocess.CalledProcessError:
+                # 如果失败，可能是空仓库，尝试设置上游分支
+                try:
+                    subprocess.run(
+                        ["git", "push", "-u", "origin", "main"],
+                        cwd=central_repo_path,
+                        check=True,
+                    )
+                except subprocess.CalledProcessError:
+                    # 如果main分支不存在，尝试master分支
+                    subprocess.run(
+                        ["git", "push", "-u", "origin", "master"],
+                        cwd=central_repo_path,
+                        check=True,
+                    )
 
             PrettyOutput.print("\n方法论已成功分享到中心仓库！", OutputType.SUCCESS)
             break
@@ -426,6 +645,9 @@ def run_cli(
     share_methodology: bool = typer.Option(
         False, "--share-methodology", help="分享本地方法论到中心方法论仓库"
     ),
+    share_tool: bool = typer.Option(
+        False, "--share-tool", help="分享本地工具到中心工具仓库"
+    ),
 ) -> None:
     """Jarvis AI assistant command-line interface."""
     if ctx.invoked_subcommand is not None:
@@ -439,6 +661,12 @@ def run_cli(
         _handle_share_methodology(config_file)
         raise typer.Exit(code=0)
 
+    # 处理工具分享
+    if share_tool:
+        init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
+        _handle_share_tool(config_file)
+        raise typer.Exit(code=0)
+
     init_env(
         "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file
     )

{jarvis_ai_assistant-0.2.7 → jarvis_ai_assistant-0.2.8}/src/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": "是否打印提示",

{jarvis_ai_assistant-0.2.7 → jarvis_ai_assistant-0.2.8}/src/jarvis/jarvis_tools/registry.py

@@ -107,17 +107,13 @@ arguments:
 
 
 class OutputHandlerProtocol(Protocol):
-    def name(self) -> str:
-        ...
+    def name(self) -> str: ...
 
-    def can_handle(self, response: str) -> bool:
-        ...
+    def can_handle(self, response: str) -> bool: ...
 
-    def prompt(self) -> str:
-        ...
+    def prompt(self) -> str: ...
 
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
-        ...
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
 
 
 class ToolRegistry(OutputHandlerProtocol):
@@ -138,9 +134,7 @@ class ToolRegistry(OutputHandlerProtocol):
                 try:
                     tools_prompt += "    <tool>\n"
                     tools_prompt += f"      <name>名称: {tool['name']}</name>\n"
-                    tools_prompt += (
-                        f"      <description>描述: {tool['description']}</description>\n"
-                    )
+                    tools_prompt += f"      <description>描述: {tool['description']}</description>\n"
                     tools_prompt += "      <parameters>\n"
                     tools_prompt += "        <yaml>|\n"
 
@@ -202,15 +196,15 @@ class ToolRegistry(OutputHandlerProtocol):
         """从数据目录获取工具调用统计"""
         from jarvis.jarvis_stats.stats import StatsManager
         from datetime import datetime, timedelta
-        
+
         # 获取所有工具的统计数据
         tool_stats = {}
         tools = self.get_all_tools()
-        
+
         # 获取所有历史数据（从很早的时间开始）
         end_time = datetime.now()
         start_time = datetime(2000, 1, 1)  # 使用一个足够早的时间
-        
+
         for tool in tools:
             tool_name = tool["name"]
             # 获取该工具的统计数据
@@ -218,22 +212,22 @@ class ToolRegistry(OutputHandlerProtocol):
                 metric_name=tool_name,
                 start_time=start_time,
                 end_time=end_time,
-                tags={"group": "tool"}
+                tags={"group": "tool"},
             )
-            
+
             # 计算总调用次数
             if stats_data and "records" in stats_data:
                 total_count = sum(record["value"] for record in stats_data["records"])
                 tool_stats[tool_name] = int(total_count)
             else:
                 tool_stats[tool_name] = 0
-                
+
         return tool_stats
 
     def _update_tool_stats(self, name: str) -> None:
         """更新工具调用统计"""
         from jarvis.jarvis_stats.stats import StatsManager
-        
+
         StatsManager.increment(name, group="tool")
 
     def use_tools(self, name: List[str]) -> None:
@@ -292,7 +286,9 @@ class ToolRegistry(OutputHandlerProtocol):
                 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)
+                PrettyOutput.print(
+                    f"文件 {file_path} 加载失败: {str(e)}", OutputType.WARNING
+                )
 
     def _load_builtin_tools(self) -> None:
         """从内置工具目录加载工具"""
@@ -308,8 +304,33 @@ class ToolRegistry(OutputHandlerProtocol):
 
     def _load_external_tools(self) -> None:
         """从jarvis_data/tools和配置的目录加载外部工具"""
+        from jarvis.jarvis_utils.config import get_central_tool_repo
+
         tool_dirs = [str(Path(get_data_dir()) / "tools")] + get_tool_load_dirs()
 
+        # 如果配置了中心工具仓库，将其添加到加载路径
+        central_repo = get_central_tool_repo()
+        if central_repo:
+            # 中心工具仓库存储在数据目录下的特定位置
+            central_repo_path = os.path.join(get_data_dir(), "central_tool_repo")
+            tool_dirs.append(central_repo_path)
+
+            # 确保中心工具仓库被克隆/更新
+            if not os.path.exists(central_repo_path):
+                try:
+                    import subprocess
+
+                    PrettyOutput.print(
+                        f"正在克隆中心工具仓库: {central_repo}", OutputType.INFO
+                    )
+                    subprocess.run(
+                        ["git", "clone", central_repo, central_repo_path], check=True
+                    )
+                except Exception as e:
+                    PrettyOutput.print(
+                        f"克隆中心工具仓库失败: {str(e)}", OutputType.ERROR
+                    )
+
         # --- 全局每日更新检查 ---
         daily_check_git_updates(tool_dirs, "tools")
 
@@ -662,6 +683,10 @@ class ToolRegistry(OutputHandlerProtocol):
             parameters: 工具参数定义
             func: 工具执行函数
         """
+        if name in self.tools:
+            PrettyOutput.print(
+                f"警告: 工具 '{name}' 已存在，将被覆盖", OutputType.WARNING
+            )
         self.tools[name] = Tool(name, description, parameters, func)
 
     def get_tool(self, name: str) -> Optional[Tool]:
@@ -735,7 +760,9 @@ class ToolRegistry(OutputHandlerProtocol):
         """
         if len(output.splitlines()) > 60:
             lines = output.splitlines()
-            return "\n".join(lines[:30] + ["\n...内容太长，已截取前后30行...\n"] + lines[-30:])
+            return "\n".join(
+                lines[:30] + ["\n...内容太长，已截取前后30行...\n"] + lines[-30:]
+            )
         return output
 
     def handle_tool_calls(self, tool_call: Dict[str, Any], agent: Any) -> str:

{jarvis_ai_assistant-0.2.7 → jarvis_ai_assistant-0.2.8}/src/jarvis/jarvis_utils/config.py

@@ -319,6 +319,16 @@ def get_central_methodology_repo() -> str:
     return GLOBAL_CONFIG_DATA.get("JARVIS_CENTRAL_METHODOLOGY_REPO", "")
 
 
+def get_central_tool_repo() -> str:
+    """
+    获取中心工具Git仓库地址。
+
+    返回:
+        str: 中心工具Git仓库地址，如果未配置则返回空字符串
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_CENTRAL_TOOL_REPO", "")
+
+
 def is_print_prompt() -> bool:
     """
     获取是否打印提示。

{jarvis_ai_assistant-0.2.7 → jarvis_ai_assistant-0.2.8}/src/jarvis/jarvis_utils/utils.py

@@ -330,11 +330,18 @@ def _show_usage_stats() -> None:
                 if total_changes > 0:
                     parts.append(f"代码修改 {total_changes:,} 次")
                 if total_lines_modified > 0:
-                    parts.append(f"代码行数 {total_lines_modified:,} 行")
+                    parts.append(f"修改代码行数 {total_lines_modified:,} 行")
 
                 if parts:
                     summary_content.append(f"📈 总计: {', '.join(parts)}")
 
+                # 添加代码采纳率显示
+                adoption_metrics = categorized_stats["adoption"]["metrics"]
+                if "adoption_rate" in adoption_metrics:
+                    summary_content.append(
+                        f"✅ 代码采纳率: {adoption_metrics['adoption_rate']}"
+                    )
+
             # 计算节省的时间
             time_saved_seconds = 0
             tool_stats = categorized_stats["tool"]["metrics"]
@@ -946,6 +953,25 @@ def _pull_git_repo(repo_path: Path, repo_type: str):
         )
         before_hash = before_hash_result.stdout.strip()
 
+        # 检查是否是空仓库
+        ls_remote_result = subprocess.run(
+            ["git", "ls-remote", "--heads", "origin"],
+            cwd=repo_path,
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            check=True,
+            timeout=10,
+        )
+
+        if not ls_remote_result.stdout.strip():
+            PrettyOutput.print(
+                f"{repo_type}库 '{repo_path.name}' 的远程仓库是空的，跳过更新。",
+                OutputType.INFO,
+            )
+            return
+
         # 执行 git pull
         pull_result = subprocess.run(
             ["git", "pull"],

{jarvis_ai_assistant-0.2.7 → jarvis_ai_assistant-0.2.8/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.2.7
+Version: 0.2.8
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire