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

jarvis/jarvis_stats/visualizer.py

@@ -0,0 +1,443 @@
+"""
+统计数据可视化模块
+
+提供终端图形化展示功能
+"""
+
+import os
+
+from typing import Dict, List, Optional, Any
+from collections import OrderedDict
+from rich.console import Console
+from rich.table import Table
+from rich.panel import Panel
+from rich import box
+
+
+class StatsVisualizer:
+    """统计数据可视化类"""
+
+    def __init__(self, width: Optional[int] = None, height: Optional[int] = None):
+        """
+        初始化可视化器
+
+        Args:
+            width: 图表宽度，默认为终端宽度-10
+            height: 图表高度，默认为20
+        """
+        self.width = width or self._get_terminal_width() - 10
+        self.height = height or 20
+
+        # 确保最小尺寸
+        self.width = max(self.width, 40)
+        self.height = max(self.height, 10)
+
+        # 初始化Rich Console
+        self.console = Console()
+
+    def _get_terminal_width(self) -> int:
+        """获取终端宽度"""
+        try:
+            columns = os.get_terminal_size().columns
+            return columns
+        except:
+            return 80
+
+    def plot_line_chart(
+        self,
+        data: Dict[str, float],
+        title: str = "",
+        unit: Optional[str] = None,
+        show_values: bool = True,
+    ) -> str:
+        """
+        绘制折线图
+
+        Args:
+            data: 数据字典，键为时间标签，值为数值
+            title: 图表标题
+            unit: 单位
+            show_values: 是否显示数值
+
+        Returns:
+            图表字符串
+        """
+        if not data:
+            return "无数据可显示"
+
+        # 排序数据
+        sorted_data = OrderedDict(sorted(data.items()))
+
+        # 提取值和标签
+        labels = list(sorted_data.keys())
+        values = list(sorted_data.values())
+
+        # 计算数值范围
+        min_val = min(values)
+        max_val = max(values)
+
+        # 如果所有值相同，调整范围
+        if min_val == max_val:
+            if min_val == 0:
+                min_val = -1
+                max_val = 1
+            else:
+                min_val = min_val * 0.9
+                max_val = max_val * 1.1
+
+        # 创建图表画布
+        chart_width = self.width - 10  # 留出y轴标签空间
+        chart_height = self.height - 5  # 留出x轴标签空间
+
+        # 初始化画布
+        canvas = [[" " for _ in range(chart_width)] for _ in range(chart_height)]
+
+        # 计算缩放因子
+        x_scale = (chart_width - 1) / max(len(values) - 1, 1)
+        y_scale = (chart_height - 1) / (max_val - min_val)
+
+        # 绘制坐标轴
+        for i in range(chart_height):
+            canvas[i][0] = "│"
+        for j in range(chart_width):
+            canvas[chart_height - 1][j] = "─"
+        canvas[chart_height - 1][0] = "└"
+
+        # 绘制数据点和连线
+        points = []
+        for i, value in enumerate(values):
+            x = int(i * x_scale) + 1
+            y = chart_height - 1 - int((value - min_val) * y_scale)
+            y = max(0, min(chart_height - 1, y))  # 确保在范围内
+
+            if 0 <= x < chart_width and 0 <= y < chart_height:
+                points.append((x, y, value))
+                canvas[y][x] = "●"
+
+        # 连接数据点
+        for i in range(len(points) - 1):
+            x1, y1, _ = points[i]
+            x2, y2, _ = points[i + 1]
+            self._draw_line(canvas, x1, y1, x2, y2)
+
+        # 构建输出
+        output = []
+
+        # 标题
+        if title:
+            output.append(f"\n{title.center(self.width)}")
+            output.append("=" * self.width)
+
+        # Y轴标签和图表
+        y_labels = self._generate_y_labels(min_val, max_val, chart_height)
+
+        for i, row in enumerate(canvas):
+            label = y_labels.get(i, "")
+            line = f"{label:>8} " + "".join(row)
+            output.append(line)
+
+        # X轴标签
+        x_labels = self._generate_x_labels(labels, chart_width)
+        output.append(" " * 9 + x_labels)
+
+        # 单位
+        if unit:
+            output.append(f"\n单位: {unit}")
+
+        # 统计信息
+        if show_values:
+            output.append(
+                f"\n最小值: {min_val:.2f}, 最大值: {max_val:.2f}, 平均值: {sum(values)/len(values):.2f}"
+            )
+
+        return "\n".join(output)
+
+    def plot_bar_chart(
+        self,
+        data: Dict[str, float],
+        title: str = "",
+        unit: Optional[str] = None,
+        horizontal: bool = False,
+    ) -> str:
+        """
+        绘制柱状图
+
+        Args:
+            data: 数据字典
+            title: 图表标题
+            unit: 单位
+            horizontal: 是否横向
+
+        Returns:
+            图表字符串
+        """
+        if not data:
+            return "无数据可显示"
+
+        output = []
+
+        # 标题
+        if title:
+            output.append(f"\n{title.center(self.width)}")
+            output.append("=" * self.width)
+
+        # 找出最大值用于缩放
+        max_value = max(data.values()) if data.values() else 1
+
+        if horizontal:
+            # 横向柱状图
+            max_label_len = max(len(str(k)) for k in data.keys())
+            bar_width = self.width - max_label_len - 15
+
+            for label, value in data.items():
+                bar_len = int((value / max_value) * bar_width)
+                bar = "█" * bar_len
+                output.append(f"{str(label):>{max_label_len}} │{bar} {value:.2f}")
+        else:
+            # 纵向柱状图
+            bar_height = self.height - 5
+            labels = list(data.keys())
+            values = list(data.values())
+
+            # 创建画布
+            canvas = [[" " for _ in range(len(labels) * 4)] for _ in range(bar_height)]
+
+            # 绘制柱子
+            for i, (label, value) in enumerate(zip(labels, values)):
+                height = int((value / max_value) * bar_height)
+                x = i * 4 + 1
+
+                for y in range(bar_height - height, bar_height):
+                    if y >= 0 and x < len(canvas[0]):
+                        canvas[y][x] = "█"
+                        if x + 1 < len(canvas[0]):
+                            canvas[y][x + 1] = "█"
+
+            # 输出画布
+            for row in canvas:
+                output.append("".join(row))
+
+            # X轴标签
+            label_line = ""
+            for i, label in enumerate(labels):
+                x = i * 4
+                label_line += f"{label[:3]:>4}"
+            output.append(label_line)
+
+        # 单位
+        if unit:
+            output.append(f"\n单位: {unit}")
+
+        return "\n".join(output)
+
+    def show_summary(
+        self,
+        aggregated_data: Dict[str, Dict[str, Any]],
+        metric_name: str,
+        unit: Optional[str] = None,
+        tags_filter: Optional[Dict[str, str]] = None,
+    ) -> str:
+        """
+        显示数据摘要
+
+        Args:
+            aggregated_data: 聚合后的数据
+            metric_name: 指标名称
+            unit: 单位
+            tags_filter: 标签过滤条件
+
+        Returns:
+            摘要字符串（用于兼容性，实际会直接打印）
+        """
+        if not aggregated_data:
+            self.console.print("[yellow]无数据可显示[/yellow]")
+            return "无数据可显示"
+
+        # 创建表格
+        table = Table(title=f"{metric_name} 统计摘要", box=box.ROUNDED)
+
+        # 添加列
+        table.add_column("时间", justify="center", style="cyan")
+        table.add_column("计数", justify="right", style="green")
+        table.add_column("总和", justify="right", style="yellow")
+        table.add_column("平均", justify="right", style="yellow")
+        table.add_column("最小", justify="right", style="blue")
+        table.add_column("最大", justify="right", style="red")
+
+        # 添加数据行
+        for time_key, stats in sorted(aggregated_data.items()):
+            table.add_row(
+                time_key,
+                str(stats["count"]),
+                f"{stats['sum']:.2f}",
+                f"{stats['avg']:.2f}",
+                f"{stats['min']:.2f}",
+                f"{stats['max']:.2f}",
+            )
+
+        # 显示表格
+        self.console.print(table)
+
+        # 显示单位信息
+        if unit:
+            self.console.print(f"\n[dim]单位: {unit}[/dim]")
+
+        # 显示过滤条件
+        if tags_filter:
+            filter_str = ", ".join([f"{k}={v}" for k, v in tags_filter.items()])
+            self.console.print(f"[dim]过滤条件: {filter_str}[/dim]")
+
+        return ""  # 返回空字符串，实际输出已经通过console打印
+
+    def show_table(
+        self,
+        records: List[Dict[str, Any]],
+        metric_name: str,
+        unit: Optional[str] = None,
+        start_time: Optional[str] = None,
+        end_time: Optional[str] = None,
+        tags_filter: Optional[Dict[str, str]] = None,
+    ) -> str:
+        """
+        使用Rich Table显示数据记录
+
+        Args:
+            records: 数据记录列表
+            metric_name: 指标名称
+            unit: 单位
+            start_time: 开始时间
+            end_time: 结束时间
+            tags_filter: 标签过滤条件
+
+        Returns:
+            空字符串（实际通过console打印）
+        """
+        if not records:
+            self.console.print(f"[yellow]没有找到指标 '{metric_name}' 的数据[/yellow]")
+            return ""
+
+        # 创建表格
+        table = Table(title=f"指标: {metric_name}", box=box.ROUNDED)
+
+        # 添加列
+        table.add_column("时间", style="cyan", no_wrap=True)
+        table.add_column("值", justify="right", style="yellow")
+        table.add_column("标签", style="dim")
+
+        # 只显示最近的20条记录
+        display_records = records[-20:] if len(records) > 20 else records
+
+        # 添加数据行
+        from datetime import datetime
+
+        for record in display_records:
+            timestamp = datetime.fromisoformat(record["timestamp"])
+            time_str = timestamp.strftime("%Y-%m-%d %H:%M:%S")
+            value = f"{record['value']:.2f}"
+            tags_str = ", ".join(f"{k}={v}" for k, v in record.get("tags", {}).items())
+
+            table.add_row(time_str, value, tags_str)
+
+        # 显示表格
+        self.console.print(table)
+
+        # 显示元信息
+        info_items = []
+        if unit:
+            info_items.append(f"单位: {unit}")
+        if start_time and end_time:
+            info_items.append(f"时间范围: {start_time} ~ {end_time}")
+        if tags_filter:
+            filter_str = ", ".join([f"{k}={v}" for k, v in tags_filter.items()])
+            info_items.append(f"过滤条件: {filter_str}")
+
+        if info_items:
+            self.console.print(Panel(" | ".join(info_items), style="dim"))
+
+        # 统计信息
+        if len(records) > 0:
+            values = [r["value"] for r in records]
+            stats_info = (
+                f"总记录数: {len(records)} | "
+                f"显示: {len(display_records)} | "
+                f"最小值: {min(values):.2f} | "
+                f"最大值: {max(values):.2f} | "
+                f"平均值: {sum(values)/len(values):.2f}"
+            )
+            self.console.print(f"\n[dim]{stats_info}[/dim]")
+
+        return ""
+
+    def _draw_line(self, canvas: List[List[str]], x1: int, y1: int, x2: int, y2: int):
+        """在画布上绘制线条"""
+        # 使用Bresenham算法绘制线条
+        dx = abs(x2 - x1)
+        dy = abs(y2 - y1)
+        sx = 1 if x1 < x2 else -1
+        sy = 1 if y1 < y2 else -1
+        err = dx - dy
+
+        x, y = x1, y1
+
+        while True:
+            if 0 <= x < len(canvas[0]) and 0 <= y < len(canvas):
+                if canvas[y][x] == " ":
+                    if dx > dy:
+                        canvas[y][x] = "─"
+                    else:
+                        canvas[y][x] = "│"
+
+            if x == x2 and y == y2:
+                break
+
+            e2 = 2 * err
+            if e2 > -dy:
+                err -= dy
+                x += sx
+            if e2 < dx:
+                err += dx
+                y += sy
+
+    def _generate_y_labels(
+        self, min_val: float, max_val: float, height: int
+    ) -> Dict[int, str]:
+        """生成Y轴标签"""
+        labels = {}
+
+        # 在顶部、中部和底部放置标签
+        positions = [0, height // 2, height - 1]
+        values = [max_val, (max_val + min_val) / 2, min_val]
+
+        for pos, val in zip(positions, values):
+            labels[pos] = f"{val:.1f}"
+
+        return labels
+
+    def _generate_x_labels(self, labels: List[str], width: int) -> str:
+        """生成X轴标签"""
+        if not labels:
+            return ""
+
+        # 简化标签（如果是时间格式）
+        simplified_labels = []
+        for label in labels:
+            if len(label) > 10:
+                # 尝试提取时间部分
+                parts = label.split()
+                if len(parts) >= 2:
+                    simplified_labels.append(parts[1][:5])  # 只取时间
+                else:
+                    simplified_labels.append(label[:8])
+            else:
+                simplified_labels.append(label)
+
+        # 根据空间决定显示多少标签
+        max_labels = width // 10
+        step = max(1, len(simplified_labels) // max_labels)
+
+        label_line = ""
+        for i in range(0, len(simplified_labels), step):
+            if i < len(simplified_labels):
+                label_line += f"{simplified_labels[i]:>10}"
+
+        return label_line

jarvis/jarvis_tools/cli/main.py

@@ -40,25 +40,94 @@ def list_tools(
 
 
 @app.command("stat")
-def stat_tools(as_json: bool = typer.Option(False, "--json", help="以JSON格式输出")):
+def stat_tools(
+    as_json: bool = typer.Option(False, "--json", help="以JSON格式输出"),
+    last_days: Optional[int] = typer.Option(None, "--days", help="显示最近N天的统计（默认显示所有历史数据）"),
+    format: str = typer.Option("table", "--format", help="显示格式: table, chart, summary")
+):
     """显示工具调用统计信息"""
-    registry = ToolRegistry()
-    stats = registry._get_tool_stats()
-    tools = registry.get_all_tools()
-
-    table_data = []
-    for tool in tools:
-        name = tool["name"]
-        count = stats.get(name, 0)
-        table_data.append([name, count])
+    from jarvis.jarvis_stats.stats import StatsManager
+    
+    stats_manager = StatsManager()
+    
+    if format == "table":
+        registry = ToolRegistry()
+        stats = registry._get_tool_stats()
+        tools = registry.get_all_tools()
+
+        table_data = []
+        for tool in tools:
+            name = tool["name"]
+            count = stats.get(name, 0)
+            if count > 0:  # 只显示有调用记录的工具
+                table_data.append([name, count])
 
-    table_data.sort(key=lambda x: x[1], reverse=True)
+        table_data.sort(key=lambda x: x[1], reverse=True)
 
-    if as_json:
-        print(json.dumps(dict(table_data), indent=2))
+        if as_json:
+            print(json.dumps(dict(table_data), indent=2))
+        else:
+            time_desc = f"最近{last_days}天" if last_days else "所有历史"
+            PrettyOutput.section(f"工具调用统计 ({time_desc})", OutputType.SYSTEM)
+            if table_data:
+                print(tabulate(table_data, headers=["工具名称", "调用次数"], tablefmt="grid"))
+                print(f"\n总计: {len(table_data)} 个工具被使用，共 {sum(x[1] for x in table_data)} 次调用")
+            else:
+                print("暂无工具调用记录")
     else:
-        PrettyOutput.section("工具调用统计", OutputType.SYSTEM)
-        print(tabulate(table_data, headers=["工具名称", "调用次数"], tablefmt="grid"))
+        # 使用 stats 系统的高级功能
+        PrettyOutput.section("工具组统计", OutputType.SYSTEM)
+        # 显示所有标记为 tool 组的指标
+        metrics = stats_manager.list_metrics()
+        tool_metrics = []
+        
+        for metric in metrics:
+            # 检查是否是工具组的指标
+            if last_days:
+                stats_data = stats_manager.get_stats(
+                    metric_name=metric,
+                    last_days=last_days,
+                    tags={"group": "tool"}
+                )
+            else:
+                # 获取所有历史数据
+                from datetime import datetime
+                stats_data = stats_manager.get_stats(
+                    metric_name=metric,
+                    start_time=datetime(2000, 1, 1),
+                    end_time=datetime.now(),
+                    tags={"group": "tool"}
+                )
+            if stats_data and stats_data.get("records"):
+                tool_metrics.append(metric)
+        
+        if tool_metrics:
+            for metric in tool_metrics:
+                if format == "chart":
+                    if last_days:
+                        stats_manager.plot(metric, last_days=last_days, tags={"group": "tool"})
+                    else:
+                        from datetime import datetime
+                        stats_manager.plot(
+                            metric, 
+                            start_time=datetime(2000, 1, 1), 
+                            end_time=datetime.now(), 
+                            tags={"group": "tool"}
+                        )
+                elif format == "summary":
+                    if last_days:
+                        stats_manager.show(metric, last_days=last_days, format="summary", tags={"group": "tool"})
+                    else:
+                        from datetime import datetime
+                        stats_manager.show(
+                            metric, 
+                            start_time=datetime(2000, 1, 1), 
+                            end_time=datetime.now(), 
+                            format="summary", 
+                            tags={"group": "tool"}
+                        )
+        else:
+            print("暂无工具调用记录")
 
 
 @app.command("call")

jarvis/jarvis_tools/generate_new_tool.py

@@ -12,7 +12,9 @@ class generate_new_tool:
     生成并注册新的Jarvis工具。该工具会在用户数据目录下创建新的工具文件，
     并自动注册到当前的工具注册表中。适用场景：1. 需要创建新的自定义工具；
     2. 扩展Jarvis功能；3. 自动化重复性操作；4. 封装特定领域的功能。
-    重要提示：在编写工具代码时，应尽量将工具执行的过程和结果打印出来，方便追踪工具的执行状态。
+    重要提示：
+    1. `tool_name` 参数必须与 `tool_code` 中定义的 `name` 属性完全一致。
+    2. 在编写工具代码时，应尽量将工具执行的过程和结果打印出来，方便追踪工具的执行状态。
     """
 
     parameters = {
@@ -75,6 +77,25 @@ class generate_new_tool:
                     "stderr": f"工具名称 '{tool_name}' 不是有效的Python标识符",
                 }
 
+            # 验证工具代码中的名称是否与tool_name一致
+            import re
+
+            match = re.search(r"^\s*name\s*=\s*[\"'](.+?)[\"']", tool_code, re.MULTILINE)
+            if not match:
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "无法在工具代码中找到 'name' 属性。请确保工具类中包含 'name = \"your_tool_name\"'。",
+                }
+
+            code_name = match.group(1)
+            if tool_name != code_name:
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"工具名称不一致：参数 'tool_name' ('{tool_name}') 与代码中的 'name' 属性 ('{code_name}') 必须相同。",
+                }
+
             # 准备工具目录
             tools_dir = Path(get_data_dir()) / "tools"
             tools_dir.mkdir(parents=True, exist_ok=True)

jarvis/jarvis_tools/registry.py

@@ -200,25 +200,44 @@ class ToolRegistry(OutputHandlerProtocol):
 
     def _get_tool_stats(self) -> Dict[str, int]:
         """从数据目录获取工具调用统计"""
-        stats_file = Path(get_data_dir()) / "tool_stat.yaml"
-        if stats_file.exists():
-            try:
-                with open(stats_file, "r", encoding="utf-8") as f:
-                    return yaml.safe_load(f) or {}
-            except Exception as e:
-                PrettyOutput.print(f"加载工具调用统计失败: {str(e)}", OutputType.WARNING)
-        return {}
+        from jarvis.jarvis_stats.stats import StatsManager
+        from datetime import datetime, timedelta
+        
+        stats_manager = StatsManager()
+        
+        # 获取所有工具的统计数据
+        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"]
+            # 获取该工具的统计数据
+            stats_data = stats_manager.get_stats(
+                metric_name=tool_name,
+                start_time=start_time,
+                end_time=end_time,
+                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:
         """更新工具调用统计"""
-        stats = self._get_tool_stats()
-        stats[name] = stats.get(name, 0) + 1
-        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, allow_unicode=True)
-        except Exception as e:
-            PrettyOutput.print(f"保存工具调用统计失败: {str(e)}", OutputType.WARNING)
+        from jarvis.jarvis_stats.stats import StatsManager
+        
+        stats_manager = StatsManager()
+        stats_manager.increment(name, group="tool")
 
     def use_tools(self, name: List[str]) -> None:
         """使用指定工具

jarvis/jarvis_tools/search_web.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""A tool for searching the web."""
+"""网络搜索工具。"""
 from typing import Any, Dict
 
 import requests
@@ -17,7 +17,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class SearchWebTool:
-    """A class to handle web searches."""
+    """处理网络搜索的类。"""
 
     name = "search_web"
     description = "搜索互联网上的信息"
@@ -28,7 +28,7 @@ class SearchWebTool:
 
     def _search_with_ddgs(self, query: str, agent: Agent) -> Dict[str, Any]:
         # pylint: disable=too-many-locals, broad-except
-        """Performs a web search, scrapes content, and summarizes the results."""
+        """执行网络搜索、抓取内容并总结结果。"""
         try:
             PrettyOutput.print("▶️ 使用 DuckDuckGo 开始网页搜索...", OutputType.INFO)
             results = list(DDGS().text(query, max_results=50))