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

jarvis/jarvis_stats/stats.py

@@ -14,18 +14,37 @@ from jarvis.jarvis_stats.visualizer import StatsVisualizer
 class StatsManager:
     """统计管理器"""
 
+    # 类级别的存储和可视化器实例
+    _storage: Optional[StatsStorage] = None
+    _visualizer: Optional[StatsVisualizer] = None
+
+    @classmethod
+    def _get_storage(cls) -> StatsStorage:
+        """获取存储实例"""
+        if cls._storage is None:
+            cls._storage = StatsStorage()
+        return cls._storage
+
+    @classmethod
+    def _get_visualizer(cls) -> StatsVisualizer:
+        """获取可视化器实例"""
+        if cls._visualizer is None:
+            cls._visualizer = StatsVisualizer()
+        return cls._visualizer
+
     def __init__(self, storage_dir: Optional[str] = None):
         """
-        初始化统计管理器
+        初始化统计管理器（保留以兼容旧代码）
 
         Args:
             storage_dir: 存储目录路径
         """
-        self.storage = StatsStorage(storage_dir)
-        self.visualizer = StatsVisualizer()
+        # 如果提供了特定的存储目录，则重新初始化存储
+        if storage_dir is not None:
+            StatsManager._storage = StatsStorage(storage_dir)
 
+    @staticmethod
     def increment(
-        self,
         metric_name: str,
         amount: Union[int, float] = 1,
         tags: Optional[Dict[str, str]] = None,
@@ -43,11 +62,10 @@ class StatsManager:
             unit: 计量单位，默认为 "count"
 
         Examples:
-            >>> stats = StatsManager()
-            >>> stats.increment("page_views")
-            >>> stats.increment("downloads", 5)
-            >>> stats.increment("response_time", 0.123, unit="seconds")
-            >>> stats.increment("execute_script", 1, group="tool")
+            >>> StatsManager.increment("page_views")
+            >>> StatsManager.increment("downloads", 5)
+            >>> StatsManager.increment("response_time", 0.123, unit="seconds")
+            >>> StatsManager.increment("execute_script", 1, group="tool")
         """
         # 如果指定了分组，自动添加到 tags 中
         if group:
@@ -55,7 +73,8 @@ class StatsManager:
                 tags = {}
             tags["group"] = group
 
-        self.storage.add_metric(
+        storage = StatsManager._get_storage()
+        storage.add_metric(
             metric_name=metric_name,
             value=float(amount),
             unit=unit,
@@ -63,17 +82,19 @@ class StatsManager:
             tags=tags,
         )
 
-    def list_metrics(self) -> List[str]:
+    @staticmethod
+    def list_metrics() -> List[str]:
         """
         列出所有指标
 
         Returns:
             指标名称列表
         """
-        return self.storage.list_metrics()
+        storage = StatsManager._get_storage()
+        return storage.list_metrics()
 
+    @staticmethod
     def show(
-        self,
         metric_name: Optional[str] = None,
         last_hours: Optional[int] = None,
         last_days: Optional[int] = None,
@@ -97,10 +118,9 @@ class StatsManager:
             tags: 过滤标签
 
         Examples:
-            >>> stats = StatsManager()
-            >>> stats.show()  # 显示所有指标摘要
-            >>> stats.show("api_calls", last_hours=24)  # 显示最近24小时
-            >>> stats.show("response_time", last_days=7, format="chart")  # 图表显示
+            >>> StatsManager.show()  # 显示所有指标摘要
+            >>> StatsManager.show("api_calls", last_hours=24)  # 显示最近24小时
+            >>> StatsManager.show("response_time", last_days=7, format="chart")  # 图表显示
         """
         # 处理时间范围
         if end_time is None:
@@ -116,18 +136,22 @@ class StatsManager:
 
         if metric_name is None:
             # 显示所有指标摘要
-            self._show_metrics_summary()
+            StatsManager._show_metrics_summary(start_time, end_time, tags)
         else:
             # 根据格式显示数据
             if format == "chart":
-                self._show_chart(metric_name, start_time, end_time, aggregation, tags)
+                StatsManager._show_chart(
+                    metric_name, start_time, end_time, aggregation, tags
+                )
             elif format == "summary":
-                self._show_summary(metric_name, start_time, end_time, aggregation, tags)
+                StatsManager._show_summary(
+                    metric_name, start_time, end_time, aggregation, tags
+                )
             else:
-                self._show_table(metric_name, start_time, end_time, tags)
+                StatsManager._show_table(metric_name, start_time, end_time, tags)
 
+    @staticmethod
     def plot(
-        self,
         metric_name: Optional[str] = None,
         last_hours: Optional[int] = None,
         last_days: Optional[int] = None,
@@ -153,9 +177,8 @@ class StatsManager:
             height: 图表高度
 
         Examples:
-            >>> stats = StatsManager()
-            >>> stats.plot("response_time", last_hours=24)
-            >>> stats.plot(tags={"service": "api"}, last_days=7)
+            >>> StatsManager.plot("response_time", last_hours=24)
+            >>> StatsManager.plot(tags={"service": "api"}, last_days=7)
         """
         # 处理时间范围
         if end_time is None:
@@ -171,17 +194,17 @@ class StatsManager:
 
         # 如果指定了metric_name，显示单个图表
         if metric_name:
-            self._show_chart(
+            StatsManager._show_chart(
                 metric_name, start_time, end_time, aggregation, tags, width, height
             )
         else:
             # 如果没有指定metric_name，根据标签过滤获取所有匹配的指标
-            self._show_multiple_charts(
+            StatsManager._show_multiple_charts(
                 start_time, end_time, aggregation, tags, width, height
             )
 
+    @staticmethod
     def get_stats(
-        self,
         metric_name: str,
         last_hours: Optional[int] = None,
         last_days: Optional[int] = None,
@@ -217,14 +240,15 @@ class StatsManager:
             else:
                 start_time = end_time - timedelta(days=7)
 
+        storage = StatsManager._get_storage()
         if aggregation:
             # 返回聚合数据
-            return self.storage.aggregate_metrics(
+            return storage.aggregate_metrics(
                 metric_name, start_time, end_time, aggregation, tags
             )
         else:
             # 返回原始数据
-            records = self.storage.get_metrics(metric_name, start_time, end_time, tags)
+            records = storage.get_metrics(metric_name, start_time, end_time, tags)
             return {
                 "metric": metric_name,
                 "records": records,
@@ -233,28 +257,56 @@ class StatsManager:
                 "end_time": end_time.isoformat(),
             }
 
-    def clean_old_data(self, days_to_keep: int = 30):
+    @staticmethod
+    def clean_old_data(days_to_keep: int = 30):
         """
         清理旧数据
 
         Args:
             days_to_keep: 保留最近N天的数据
         """
-        self.storage.delete_old_data(days_to_keep)
+        storage = StatsManager._get_storage()
+        storage.delete_old_data(days_to_keep)
         print(f"已清理 {days_to_keep} 天前的数据")
 
-    def _show_metrics_summary(self):
+    @staticmethod
+    def remove_metric(metric_name: str) -> bool:
+        """
+        删除指定的指标及其所有数据
+        
+        Args:
+            metric_name: 要删除的指标名称
+            
+        Returns:
+            True 如果成功删除，False 如果指标不存在
+        """
+        storage = StatsManager._get_storage()
+        return storage.delete_metric(metric_name)
+
+    @staticmethod
+    def _show_metrics_summary(
+        start_time: Optional[datetime] = None,
+        end_time: Optional[datetime] = None,
+        tags: Optional[Dict[str, str]] = None,
+    ):
         """显示所有指标摘要"""
         from rich.console import Console
         from rich.table import Table
 
         console = Console()
-        metrics = self.storage.list_metrics()
+        storage = StatsManager._get_storage()
+        metrics = storage.list_metrics()
 
         if not metrics:
             console.print("[yellow]没有找到任何统计指标[/yellow]")
             return
 
+        # 如果没有指定时间范围，使用默认值
+        if end_time is None:
+            end_time = datetime.now()
+        if start_time is None:
+            start_time = end_time - timedelta(days=7)
+
         # 创建表格
         table = Table(title="统计指标摘要")
         table.add_column("指标名称", style="cyan")
@@ -262,12 +314,20 @@ class StatsManager:
         table.add_column("最后更新", style="yellow")
         table.add_column("7天数据点", style="magenta")
 
-        # 获取每个指标的信息
-        end_time = datetime.now()
-        start_time = end_time - timedelta(days=7)
-
+        # 过滤满足标签条件的指标
+        displayed_count = 0
         for metric in metrics:
-            info = self.storage.get_metric_info(metric)
+            # 获取该指标的记录
+            records = storage.get_metrics(metric, start_time, end_time, tags)
+            
+            # 如果指定了标签过滤，但没有匹配的记录，跳过该指标
+            if tags and len(records) == 0:
+                continue
+            
+            info = storage.get_metric_info(metric)
+            unit = "-"
+            last_updated = "-"
+            
             if info:
                 unit = info.get("unit", "-")
                 last_updated = info.get("last_updated", "-")
@@ -280,31 +340,38 @@ class StatsManager:
                     except:
                         pass
 
-                # 获取数据点数
-                records = self.storage.get_metrics(metric, start_time, end_time)
-                count = len(records)
+            count = len(records)
+            table.add_row(metric, unit, last_updated, str(count))
+            displayed_count += 1
 
-                table.add_row(metric, unit, last_updated, str(count))
-
-        console.print(table)
-        console.print(f"\n[green]总计: {len(metrics)} 个指标[/green]")
+        if displayed_count == 0:
+            console.print("[yellow]没有找到符合条件的指标[/yellow]")
+            if tags:
+                console.print(f"过滤条件: {tags}")
+        else:
+            console.print(table)
+            console.print(f"\n[green]总计: {displayed_count} 个指标[/green]")
+            if tags:
+                console.print(f"过滤条件: {tags}")
 
+    @staticmethod
     def _show_table(
-        self,
         metric_name: str,
         start_time: datetime,
         end_time: datetime,
         tags: Optional[Dict[str, str]],
     ):
         """以表格形式显示数据"""
-        records = self.storage.get_metrics(metric_name, start_time, end_time, tags)
+        storage = StatsManager._get_storage()
+        visualizer = StatsManager._get_visualizer()
+        records = storage.get_metrics(metric_name, start_time, end_time, tags)
 
         # 获取指标信息
-        info = self.storage.get_metric_info(metric_name)
+        info = storage.get_metric_info(metric_name)
         unit = info.get("unit", "") if info else ""
 
         # 使用visualizer显示表格
-        self.visualizer.show_table(
+        visualizer.show_table(
             records=records,
             metric_name=metric_name,
             unit=unit,
@@ -313,8 +380,8 @@ class StatsManager:
             tags_filter=tags,
         )
 
+    @staticmethod
     def _show_chart(
-        self,
         metric_name: str,
         start_time: datetime,
         end_time: datetime,
@@ -324,8 +391,11 @@ class StatsManager:
         height: Optional[int] = None,
     ):
         """显示图表"""
+        storage = StatsManager._get_storage()
+        visualizer = StatsManager._get_visualizer()
+
         # 获取聚合数据
-        aggregated = self.storage.aggregate_metrics(
+        aggregated = storage.aggregate_metrics(
             metric_name, start_time, end_time, aggregation, tags
         )
 
@@ -334,19 +404,30 @@ class StatsManager:
             return
 
         # 获取指标信息
-        info = self.storage.get_metric_info(metric_name)
+        info = storage.get_metric_info(metric_name)
         unit = info.get("unit", "") if info else ""
 
         # 准备数据
-        data = {k: v["avg"] for k, v in aggregated.items()}
+        first_item = next(iter(aggregated.values()), None)
+        is_simple_count = (
+            first_item
+            and first_item.get("min") == 1
+            and first_item.get("max") == 1
+            and first_item.get("avg") == 1
+        )
 
-        # 设置可视化器尺寸
+        if unit == "count" or is_simple_count:
+            # 对于计数类指标，使用总和更有意义
+            data = {k: v["sum"] for k, v in aggregated.items()}
+        else:
+            # 对于其他指标（如耗时），使用平均值
+            data = {k: v["avg"] for k, v in aggregated.items()}  # 设置可视化器尺寸
         if width or height:
-            self.visualizer.width = width or self.visualizer.width
-            self.visualizer.height = height or self.visualizer.height
+            visualizer.width = width or visualizer.width
+            visualizer.height = height or visualizer.height
 
         # 绘制图表
-        chart = self.visualizer.plot_line_chart(
+        chart = visualizer.plot_line_chart(
             data=data,
             title=f"{metric_name} - {aggregation}聚合",
             unit=unit,
@@ -356,12 +437,22 @@ class StatsManager:
         print(chart)
 
         # 显示时间范围
-        print(
-            f"\n时间范围: {start_time.strftime('%Y-%m-%d %H:%M')} ~ {end_time.strftime('%Y-%m-%d %H:%M')}"
+        from rich.panel import Panel
+        from rich.console import Console
+
+        console = Console()
+        console.print(
+            Panel(
+                f"[cyan]{start_time.strftime('%Y-%m-%d %H:%M')}[/] ~ [cyan]{end_time.strftime('%Y-%m-%d %H:%M')}[/]",
+                title="[bold]时间范围[/bold]",
+                expand=False,
+                style="dim",
+                border_style="green",
+            )
         )
 
+    @staticmethod
     def _show_multiple_charts(
-        self,
         start_time: datetime,
         end_time: datetime,
         aggregation: str,
@@ -373,15 +464,16 @@ class StatsManager:
         from rich.console import Console
 
         console = Console()
+        storage = StatsManager._get_storage()
 
         # 获取所有指标
-        all_metrics = self.list_metrics()
+        all_metrics = StatsManager.list_metrics()
 
         # 根据标签过滤指标
         matched_metrics = []
         for metric in all_metrics:
             # 获取该指标在时间范围内的数据
-            records = self.storage.get_metrics(metric, start_time, end_time, tags)
+            records = storage.get_metrics(metric, start_time, end_time, tags)
             if records:  # 如果有匹配标签的数据
                 matched_metrics.append(metric)
 
@@ -396,12 +488,12 @@ class StatsManager:
             if i > 0:
                 console.print("\n" + "=" * 80 + "\n")  # 分隔符
 
-            self._show_chart(
+            StatsManager._show_chart(
                 metric, start_time, end_time, aggregation, tags, width, height
             )
 
+    @staticmethod
     def _show_summary(
-        self,
         metric_name: str,
         start_time: datetime,
         end_time: datetime,
@@ -409,8 +501,11 @@ class StatsManager:
         tags: Optional[Dict[str, str]],
     ):
         """显示汇总信息"""
+        storage = StatsManager._get_storage()
+        visualizer = StatsManager._get_visualizer()
+
         # 获取聚合数据
-        aggregated = self.storage.aggregate_metrics(
+        aggregated = storage.aggregate_metrics(
             metric_name, start_time, end_time, aggregation, tags
         )
 
@@ -419,15 +514,25 @@ class StatsManager:
             return
 
         # 获取指标信息
-        info = self.storage.get_metric_info(metric_name)
+        info = storage.get_metric_info(metric_name)
         unit = info.get("unit", "") if info else ""
 
         # 显示汇总
-        summary = self.visualizer.show_summary(aggregated, metric_name, unit, tags)
+        summary = visualizer.show_summary(aggregated, metric_name, unit, tags)
         if summary:  # 如果返回了内容才打印（兼容性）
             print(summary)
 
         # 显示时间范围
-        print(
-            f"\n时间范围: {start_time.strftime('%Y-%m-%d %H:%M')} ~ {end_time.strftime('%Y-%m-%d %H:%M')}"
+        from rich.panel import Panel
+        from rich.console import Console
+
+        console = Console()
+        console.print(
+            Panel(
+                f"[cyan]{start_time.strftime('%Y-%m-%d %H:%M')}[/] ~ [cyan]{end_time.strftime('%Y-%m-%d %H:%M')}[/]",
+                title="[bold]时间范围[/bold]",
+                expand=False,
+                style="dim",
+                border_style="green",
+            )
         )

jarvis/jarvis_stats/storage.py

@@ -240,8 +240,23 @@ class StatsStorage:
 
     def list_metrics(self) -> List[str]:
         """列出所有指标"""
+        # 从元数据文件获取指标
         meta = self._load_json(self.meta_file)
-        return list(meta.get("metrics", {}).keys())
+        metrics_from_meta = set(meta.get("metrics", {}).keys())
+        
+        # 扫描所有数据文件获取实际存在的指标
+        metrics_from_data = set()
+        for data_file in self.data_dir.glob("stats_*.json"):
+            try:
+                data = self._load_json(data_file)
+                metrics_from_data.update(data.keys())
+            except (json.JSONDecodeError, OSError):
+                # 忽略无法读取的文件
+                continue
+        
+        # 合并两个来源的指标并返回排序后的列表
+        all_metrics = metrics_from_meta.union(metrics_from_data)
+        return sorted(list(all_metrics))
 
     def aggregate_metrics(
         self,
@@ -310,6 +325,43 @@ class StatsStorage:
 
         return result
 
+    def delete_metric(self, metric_name: str) -> bool:
+        """
+        删除指定的指标及其所有数据
+        
+        Args:
+            metric_name: 要删除的指标名称
+            
+        Returns:
+            True 如果成功删除，False 如果指标不存在
+        """
+        # 检查指标是否存在
+        meta = self._load_json(self.meta_file)
+        if metric_name not in meta.get("metrics", {}):
+            return False
+            
+        # 从元数据中删除指标
+        del meta["metrics"][metric_name]
+        self._save_json(self.meta_file, meta)
+        
+        # 遍历所有数据文件，删除该指标的数据
+        for data_file in self.data_dir.glob("stats_*.json"):
+            try:
+                data = self._load_json(data_file)
+                if metric_name in data:
+                    del data[metric_name]
+                    # 如果文件中还有其他数据，保存更新后的文件
+                    if data:
+                        self._save_json(data_file, data)
+                    # 如果文件变空了，删除文件
+                    else:
+                        data_file.unlink()
+            except Exception:
+                # 忽略单个文件的错误，继续处理其他文件
+                pass
+                
+        return True
+
     def delete_old_data(self, days_to_keep: int = 30):
         """删除旧数据"""
         cutoff_date = (datetime.now() - timedelta(days=days_to_keep)).date()