jarvis-ai-assistant 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

jarvis/jarvis_utils/utils.py

@@ -2,6 +2,7 @@
 import hashlib
 import json
 import os
+import platform
 import signal
 import subprocess
 import sys
@@ -11,6 +12,11 @@ from typing import Any, Callable, Dict, List, Optional
 from datetime import datetime
 
 import yaml  # type: ignore
+from rich.align import Align
+from rich.console import Group, RenderableType
+from rich.panel import Panel
+from rich.table import Table
+from rich.text import Text
 
 from jarvis import __version__
 from jarvis.jarvis_utils.config import (
@@ -79,15 +85,20 @@ def _check_git_updates() -> bool:
 
 def _show_usage_stats() -> None:
     """显示Jarvis使用统计信息"""
+    from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
     try:
-        from jarvis.jarvis_stats.stats import StatsManager
-        from jarvis.jarvis_utils.output import OutputType, PrettyOutput
         from datetime import datetime
 
-        stats_manager = StatsManager()
+        from rich.console import Console, Group
+        from rich.panel import Panel
+        from rich.table import Table
+        from rich.text import Text
+
+        from jarvis.jarvis_stats.stats import StatsManager
 
         # 获取所有可用的指标
-        all_metrics = stats_manager.list_metrics()
+        all_metrics = StatsManager.list_metrics()
 
         # 根据指标名称和标签自动分类
         categorized_stats: Dict[str, Dict[str, Any]] = {
@@ -96,12 +107,13 @@ def _show_usage_stats() -> None:
             "lines": {"title": "📊 代码行数", "metrics": {}, "suffix": "行"},
             "commit": {"title": "💾 提交统计", "metrics": {}, "suffix": "个"},
             "command": {"title": "📱 命令使用", "metrics": {}, "suffix": "次"},
+            "adoption": {"title": "🎯 采纳情况", "metrics": {}, "suffix": ""},
         }
 
         # 遍历所有指标，获取统计数据
         for metric in all_metrics:
             # 获取该指标的所有数据
-            stats_data = stats_manager.get_stats(
+            stats_data = StatsManager.get_stats(
                 metric_name=metric,
                 start_time=datetime(2000, 1, 1),
                 end_time=datetime.now(),
@@ -137,6 +149,41 @@ def _show_usage_stats() -> None:
                         elif group == "command":
                             categorized_stats["command"]["metrics"][metric] = int(total)
 
+        # 计算采纳率并添加到统计中
+        commit_stats = categorized_stats["commit"]["metrics"]
+        # 尝试多种可能的指标名称
+        generated_commits = commit_stats.get(
+            "commits_generated", commit_stats.get("commit_generated", 0)
+        )
+        accepted_commits = commit_stats.get(
+            "commits_accepted",
+            commit_stats.get("commit_accepted", commit_stats.get("commit_adopted", 0)),
+        )
+        rejected_commits = commit_stats.get(
+            "commits_rejected", commit_stats.get("commit_rejected", 0)
+        )
+
+        # 如果有 generated 和 accepted，则使用这两个计算采纳率
+        if generated_commits > 0 and accepted_commits > 0:
+            adoption_rate = (accepted_commits / generated_commits) * 100
+            categorized_stats["adoption"]["metrics"][
+                "adoption_rate"
+            ] = f"{adoption_rate:.1f}%"
+            categorized_stats["adoption"]["metrics"][
+                "commits_status"
+            ] = f"{accepted_commits}/{generated_commits}"
+        elif accepted_commits > 0 or rejected_commits > 0:
+            # 否则使用 accepted 和 rejected 计算
+            total_commits = accepted_commits + rejected_commits
+            if total_commits > 0:
+                adoption_rate = (accepted_commits / total_commits) * 100
+                categorized_stats["adoption"]["metrics"][
+                    "adoption_rate"
+                ] = f"{adoption_rate:.1f}%"
+                categorized_stats["adoption"]["metrics"][
+                    "commits_status"
+                ] = f"{accepted_commits}/{total_commits}"
+
         # 构建输出
         has_data = False
         stats_output = []
@@ -148,18 +195,73 @@ def _show_usage_stats() -> None:
 
         # 显示统计信息
         if has_data:
-            # 构建统计信息字符串
-            stats_lines = ["📊 Jarvis 使用统计"]
-
+            # 1. 创建统计表格
+            from rich import box
+
+            table = Table(
+                show_header=True,
+                header_style="bold magenta",
+                title="📊 Jarvis 使用统计",
+                title_justify="center",
+                box=box.ROUNDED,
+                padding=(0, 1),
+            )
+            table.add_column("分类", style="cyan", no_wrap=True, width=12)
+            table.add_column("指标", style="white", width=20)
+            table.add_column("数量", style="green", justify="right", width=10)
+            table.add_column("分类", style="cyan", no_wrap=True, width=12)
+            table.add_column("指标", style="white", width=20)
+            table.add_column("数量", style="green", justify="right", width=10)
+
+            # 收集所有要显示的数据
+            all_rows = []
             for title, stats, suffix in stats_output:
                 if stats:
-                    stats_lines.append(f"\n{title}:")
-                    for metric, count in sorted(
-                        stats.items(), key=lambda x: x[1], reverse=True
-                    ):
-                        # 美化指标名称
+                    sorted_stats = sorted(
+                        stats.items(), key=lambda item: item[1], reverse=True
+                    )
+                    for i, (metric, count) in enumerate(sorted_stats):
                         display_name = metric.replace("_", " ").title()
-                        stats_lines.append(f"  • {display_name}: {count:,} {suffix}")
+                        category_title = title if i == 0 else ""
+                        # 处理不同类型的count值
+                        if isinstance(count, (int, float)):
+                            count_str = f"{count:,} {suffix}"
+                        else:
+                            # 对于字符串类型的count（如百分比或比率），直接使用
+                            count_str = str(count)
+                        all_rows.append((category_title, display_name, count_str))
+
+            # 以3行2列的方式添加数据
+            has_content = len(all_rows) > 0
+            # 计算需要多少行来显示所有数据
+            total_rows = len(all_rows)
+            rows_needed = (total_rows + 1) // 2  # 向上取整，因为是2列布局
+
+            for i in range(rows_needed):
+                left_idx = i
+                right_idx = i + rows_needed
+
+                if left_idx < len(all_rows):
+                    left_row = all_rows[left_idx]
+                else:
+                    left_row = ("", "", "")
+
+                if right_idx < len(all_rows):
+                    right_row = all_rows[right_idx]
+                else:
+                    right_row = ("", "", "")
+
+                table.add_row(
+                    left_row[0],
+                    left_row[1],
+                    left_row[2],
+                    right_row[0],
+                    right_row[1],
+                    right_row[2],
+                )
+
+            # 2. 创建总结面板
+            summary_content = []
 
             # 总结统计
             total_tools = sum(
@@ -175,80 +277,127 @@ def _show_usage_stats() -> None:
                 for metric, count in stats.items()
             )
 
-            if total_tools > 0 or total_changes > 0:
-                stats_lines.append(
-                    f"\n📈 总计: 工具调用 {total_tools:,} 次, 代码修改 {total_changes:,} 次"
-                )
-
-            # 计算节省的时间
-            # 基于经验估算：
-            # - 每次工具调用平均节省5分钟（相比手动操作）
-            # - 每行代码修改平均节省60秒（考虑思考、编写、测试时间）
-            # - 每次提交平均节省15分钟（考虑整理、描述、检查时间）
-            # - 每个命令调用平均节省5分钟（相比手动执行）
-
-            time_saved_minutes = 0
-
-            # 工具调用节省的时间
-            time_saved_minutes += total_tools * 5
-
-            # 代码行数节省的时间（每行修改节省60秒）
-            total_lines = sum(
-                count
-                for title, stats, _ in stats_output
-                if "代码行数" in title
-                for metric, count in stats.items()
+            # 统计代码行数
+            lines_stats = categorized_stats["lines"]["metrics"]
+            total_lines_added = lines_stats.get(
+                "code_lines_inserted", lines_stats.get("code_lines_added", 0)
             )
-            time_saved_minutes += total_lines * 1  # 60秒 = 1分钟
+            total_lines_deleted = lines_stats.get("code_lines_deleted", 0)
+            total_lines_modified = total_lines_added + total_lines_deleted
 
-            # 提交节省的时间
-            total_commits = sum(
-                count
-                for title, stats, _ in stats_output
-                if "提交统计" in title
-                for metric, count in stats.items()
-            )
-            time_saved_minutes += total_commits * 15
+            if total_tools > 0 or total_changes > 0 or total_lines_modified > 0:
+                parts = []
+                if total_tools > 0:
+                    parts.append(f"工具调用 {total_tools:,} 次")
+                if total_changes > 0:
+                    parts.append(f"代码修改 {total_changes:,} 次")
+                if total_lines_modified > 0:
+                    parts.append(f"代码行数 {total_lines_modified:,} 行")
 
-            # 命令调用节省的时间
-            total_commands = sum(
-                count
-                for title, stats, _ in stats_output
-                if "命令使用" in title
-                for metric, count in stats.items()
-            )
-            time_saved_minutes += total_commands * 5
-
-            # 转换为更友好的格式
-            if time_saved_minutes > 0:
-                hours = int(time_saved_minutes // 60)
-                minutes = int(time_saved_minutes % 60)
-
-                if hours > 24:
-                    days = hours // 24
-                    remaining_hours = hours % 24
-                    time_str = f"{days} 天 {remaining_hours} 小时 {minutes} 分钟"
-                elif hours > 0:
+                if parts:
+                    summary_content.append(f"📈 总计: {', '.join(parts)}")
+
+            # 计算节省的时间
+            time_saved_seconds = 0
+            tool_stats = categorized_stats["tool"]["metrics"]
+            code_agent_changes = categorized_stats["code"]["metrics"]
+            lines_stats = categorized_stats["lines"]["metrics"]
+            # commit_stats is already defined above
+            command_stats = categorized_stats["command"]["metrics"]
+
+            # 统一的工具使用时间估算（每次调用节省2分钟）
+            DEFAULT_TOOL_TIME_SAVINGS = 2 * 60  # 秒
+
+            # 计算所有工具的时间节省
+            for tool_name, count in tool_stats.items():
+                time_saved_seconds += count * DEFAULT_TOOL_TIME_SAVINGS
+
+            # 其他类型的时间计算
+            total_code_agent_calls = sum(code_agent_changes.values())
+            time_saved_seconds += total_code_agent_calls * 10 * 60
+            time_saved_seconds += lines_stats.get("code_lines_added", 0) * 0.8 * 60
+            time_saved_seconds += lines_stats.get("code_lines_deleted", 0) * 0.2 * 60
+            time_saved_seconds += sum(commit_stats.values()) * 10 * 60
+            time_saved_seconds += sum(command_stats.values()) * 1 * 60
+
+            time_str = ""
+            hours = 0
+            if time_saved_seconds > 0:
+                total_minutes = int(time_saved_seconds / 60)
+                seconds = int(time_saved_seconds % 60)
+                hours = total_minutes // 60
+                minutes = total_minutes % 60
+                # 只显示小时和分钟
+                if hours > 0:
                     time_str = f"{hours} 小时 {minutes} 分钟"
+                elif total_minutes > 0:
+                    time_str = f"{minutes} 分钟 {seconds} 秒"
                 else:
-                    time_str = f"{minutes} 分钟"
-
-                stats_lines.append(f"\n⏱️  节省时间: 约 {time_str}")
-
-                # 根据节省的时间给出鼓励信息
-                if hours >= 100:
-                    stats_lines.append(
-                        "🎉 您已经通过 Jarvis 节省了超过100小时的开发时间！"
-                    )
-                elif hours >= 40:
-                    stats_lines.append("🚀 相当于节省了一整周的工作时间！")
-                elif hours >= 8:
-                    stats_lines.append("💪 相当于节省了一个工作日的时间！")
+                    time_str = f"{seconds} 秒"
+
+                if summary_content:
+                    summary_content.append("")  # Add a separator line
+                summary_content.append(f"⏱️  节省时间: 约 {time_str}")
+
+                encouragement = ""
+                # 计算各级时间单位
+                total_work_days = hours // 8  # 总工作日数
+                work_years = total_work_days // 240  # 每年约240个工作日
+                remaining_days_after_years = total_work_days % 240
+                work_months = remaining_days_after_years // 20  # 每月约20个工作日
+                remaining_days_after_months = remaining_days_after_years % 20
+                work_days = remaining_days_after_months
+                remaining_hours = int(hours % 8)  # 剩余不足一个工作日的小时数
+                
+                # 构建时间描述
+                time_parts = []
+                if work_years > 0:
+                    time_parts.append(f"{work_years} 年")
+                if work_months > 0:
+                    time_parts.append(f"{work_months} 个月")
+                if work_days > 0:
+                    time_parts.append(f"{work_days} 个工作日")
+                if remaining_hours > 0:
+                    time_parts.append(f"{remaining_hours} 小时")
+                
+                if time_parts:
+                    time_description = "、".join(time_parts)
+                    if work_years >= 1:
+                        encouragement = f"🎉 相当于节省了 {time_description} 的工作时间！"
+                    elif work_months >= 1:
+                        encouragement = f"🚀 相当于节省了 {time_description} 的工作时间！"
+                    elif work_days >= 1:
+                        encouragement = f"💪 相当于节省了 {time_description} 的工作时间！"
+                    else:
+                        encouragement = f"✨ 相当于节省了 {time_description} 的工作时间！"
                 elif hours >= 1:
-                    stats_lines.append("✨ 积少成多，继续保持！")
-
-            # 一次性输出所有统计信息
-            PrettyOutput.print("\n".join(stats_lines), OutputType.INFO)
+                    encouragement = f"⭐ 相当于节省了 {int(hours)} 小时的工作时间，积少成多，继续保持！"
+                if encouragement:
+                    summary_content.append(encouragement)
+
+            # 3. 组合并打印
+            render_items: List[RenderableType] = []
+            if has_content:
+                # 居中显示表格
+                centered_table = Align.center(table)
+                render_items.append(centered_table)
+
+            if summary_content:
+                summary_panel = Panel(
+                    Text("\n".join(summary_content), justify="left"),
+                    title="✨ 总体表现 ✨",
+                    title_align="center",
+                    border_style="green",
+                    expand=False,
+                )
+                # 居中显示面板
+                centered_panel = Align.center(summary_panel)
+                render_items.append(centered_panel)
+
+            if render_items:
+                console = Console()
+                render_group = Group(*render_items)
+                console.print(render_group)
     except Exception as e:
         # 输出错误信息以便调试
         import traceback
@@ -569,13 +718,48 @@ def count_cmd_usage() -> None:
     import os
     from jarvis.jarvis_stats.stats import StatsManager
 
+    # 命令映射关系：将短命令映射到长命令
+    command_mapping = {
+        # jarvis主命令
+        "jvs": "jarvis",
+        # 代码代理
+        "jca": "jarvis-code-agent",
+        # 智能shell
+        "jss": "jarvis-smart-shell",
+        # 平台管理
+        "jpm": "jarvis-platform-manager",
+        # Git提交
+        "jgc": "jarvis-git-commit",
+        # 代码审查
+        "jcr": "jarvis-code-review",
+        # Git压缩
+        "jgs": "jarvis-git-squash",
+        # 多代理
+        "jma": "jarvis-multi-agent",
+        # 代理
+        "ja": "jarvis-agent",
+        # 工具
+        "jt": "jarvis-tool",
+        # 方法论
+        "jm": "jarvis-methodology",
+        # RAG
+        "jrg": "jarvis-rag",
+        # 统计
+        "jst": "jarvis-stats",
+    }
+
     # 从完整路径中提取命令名称
     cmd_path = sys.argv[0]
     cmd_name = os.path.basename(cmd_path)
+    
+    # 如果是短命令，映射到长命令
+    if cmd_name in command_mapping:
+        metric_name = command_mapping[cmd_name]
+    else:
+        metric_name = cmd_name
 
     # 使用 StatsManager 记录命令使用统计
-    stats_manager = StatsManager()
-    stats_manager.increment(cmd_name, group="command")
+    StatsManager.increment(metric_name, group="command")
 
 
 def is_context_overflow(
@@ -603,7 +787,7 @@ def get_loc_stats() -> str:
 
 
 def copy_to_clipboard(text: str) -> None:
-    """将文本复制到剪贴板，依次尝试xsel和xclip (非阻塞)
+    """将文本复制到剪贴板，支持Windows、macOS和Linux
 
     参数:
         text: 要复制的文本
@@ -611,41 +795,80 @@ def copy_to_clipboard(text: str) -> None:
     print("--- 剪贴板内容开始 ---")
     print(text)
     print("--- 剪贴板内容结束 ---")
-    # 尝试使用 xsel
-    try:
-        process = subprocess.Popen(
-            ["xsel", "-b", "-i"],
-            stdin=subprocess.PIPE,
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-        )
-        if process.stdin:
-            process.stdin.write(text.encode("utf-8"))
-            process.stdin.close()
-        return
-    except FileNotFoundError:
-        pass  # xsel 未安装，继续尝试下一个
-    except Exception as e:
-        PrettyOutput.print(f"使用xsel时出错: {e}", OutputType.WARNING)
 
-    # 尝试使用 xclip
-    try:
-        process = subprocess.Popen(
-            ["xclip", "-selection", "clipboard"],
-            stdin=subprocess.PIPE,
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-        )
-        if process.stdin:
-            process.stdin.write(text.encode("utf-8"))
-            process.stdin.close()
-        return
-    except FileNotFoundError:
-        PrettyOutput.print(
-            "xsel 和 xclip 均未安装, 无法复制到剪贴板", OutputType.WARNING
-        )
-    except Exception as e:
-        PrettyOutput.print(f"使用xclip时出错: {e}", OutputType.WARNING)
+    system = platform.system()
+
+    # Windows系统
+    if system == "Windows":
+        try:
+            # 使用Windows的clip命令
+            process = subprocess.Popen(
+                ["clip"],
+                stdin=subprocess.PIPE,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                shell=True,
+            )
+            if process.stdin:
+                process.stdin.write(text.encode("utf-8"))
+                process.stdin.close()
+            return
+        except Exception as e:
+            PrettyOutput.print(f"使用Windows clip命令时出错: {e}", OutputType.WARNING)
+
+    # macOS系统
+    elif system == "Darwin":
+        try:
+            process = subprocess.Popen(
+                ["pbcopy"],
+                stdin=subprocess.PIPE,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+            if process.stdin:
+                process.stdin.write(text.encode("utf-8"))
+                process.stdin.close()
+            return
+        except Exception as e:
+            PrettyOutput.print(f"使用macOS pbcopy命令时出错: {e}", OutputType.WARNING)
+
+    # Linux系统
+    else:
+        # 尝试使用 xsel
+        try:
+            process = subprocess.Popen(
+                ["xsel", "-b", "-i"],
+                stdin=subprocess.PIPE,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+            if process.stdin:
+                process.stdin.write(text.encode("utf-8"))
+                process.stdin.close()
+            return
+        except FileNotFoundError:
+            pass  # xsel 未安装，继续尝试下一个
+        except Exception as e:
+            PrettyOutput.print(f"使用xsel时出错: {e}", OutputType.WARNING)
+
+        # 尝试使用 xclip
+        try:
+            process = subprocess.Popen(
+                ["xclip", "-selection", "clipboard"],
+                stdin=subprocess.PIPE,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+            if process.stdin:
+                process.stdin.write(text.encode("utf-8"))
+                process.stdin.close()
+            return
+        except FileNotFoundError:
+            PrettyOutput.print(
+                "xsel 和 xclip 均未安装, 无法复制到剪贴板", OutputType.WARNING
+            )
+        except Exception as e:
+            PrettyOutput.print(f"使用xclip时出错: {e}", OutputType.WARNING)
 
 
 def _pull_git_repo(repo_path: Path, repo_type: str):

{jarvis_ai_assistant-0.2.4.dist-info → jarvis_ai_assistant-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.2.4
+Version: 0.2.5
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -60,6 +60,7 @@ Requires-Dist: lxml==6.0.0
 Requires-Dist: markdownify>=1.1.0
 Requires-Dist: typer
 Requires-Dist: pathspec
+Requires-Dist: plotext==5.2.8
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -180,15 +181,23 @@ Jarvis 正是为这种工作流而设计的工具。它通过无缝的命令行
 
 ### 系统要求
 - **Linux**: 完全支持。
-- **Windows**: 未经充分测试，建议在 [WSL](https://docs.microsoft.com/en-us/windows/wsl/install) 中使用。
+- **Windows**: 完全支持（需要 PowerShell）。
 
 ### 安装
 
 #### 一键安装 (推荐)
 只需一行命令即可完成所有安装和配置：
+
+**Linux/macOS:**
 ```bash
 bash -c "$(curl -fsSL https://raw.githubusercontent.com/skyfireitdiy/Jarvis/main/scripts/install.sh)"
 ```
+
+**Windows (PowerShell):**
+```powershell
+iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/skyfireitdiy/Jarvis/main/scripts/install.ps1'))
+```
+
 > 该脚本会自动检测Python环境、克隆项目、安装依赖并设置好路径。
 
 #### 手动安装