Merge pull request #99 from mrlitong/feature/daily-monthly-token-stats

Add: Daily and monthly token usage views

Author: Maciek-roboblog

.gitignore

@@ -212,3 +212,7 @@ logs/
 /src/Functionality_Coverage_Claude-Code-Usage-Monitor_Missing_From_claude_monitor.md
 /TODO.md
 *Zone.Identifier
+
+# Local linting scripts
+lint*.py
+lint*.sh

src/claude_monitor/cli/main.py

@@ -3,11 +3,15 @@
 import argparse
 import contextlib
 import logging
+import signal
 import sys
+import time
 import traceback
 from pathlib import Path
 from typing import Any, Callable, Dict, List, NoReturn, Optional, Union
 
+from rich.console import Console
+
 from claude_monitor import __version__
 from claude_monitor.cli.bootstrap import (
     ensure_directories,
@@ -17,6 +21,7 @@
 )
 from claude_monitor.core.plans import Plans, PlanType, get_token_limit
 from claude_monitor.core.settings import Settings
+from claude_monitor.data.aggregator import UsageAggregator
 from claude_monitor.data.analysis import analyze_usage
 from claude_monitor.error_handling import report_error
 from claude_monitor.monitoring.orchestrator import MonitoringOrchestrator
@@ -29,6 +34,7 @@
 )
 from claude_monitor.terminal.themes import get_themed_console, print_themed
 from claude_monitor.ui.display_controller import DisplayController
+from claude_monitor.ui.table_views import TableViewsController
 
 # Type aliases for CLI callbacks
 DataUpdateCallback = Callable[[Dict[str, Any]], None]
@@ -103,6 +109,8 @@ def main(argv: Optional[List[str]] = None) -> int:
 
 def _run_monitoring(args: argparse.Namespace) -> None:
     """Main monitoring implementation without facade."""
+    view_mode = getattr(args, "view", "realtime")
+
     if hasattr(args, "theme") and args.theme:
         console = get_themed_console(force_theme=args.theme.lower())
     else:
@@ -121,6 +129,11 @@ def _run_monitoring(args: argparse.Namespace) -> None:
         logger = logging.getLogger(__name__)
         logger.info(f"Using data path: {data_path}")
 
+        # Handle different view modes
+        if view_mode in ["daily", "monthly"]:
+            _run_table_view(args, data_path, view_mode, console)
+            return
+
         token_limit: int = _get_initial_token_limit(args, str(data_path))
 
         display_controller = DisplayController()
@@ -151,9 +164,9 @@ def _run_monitoring(args: argparse.Namespace) -> None:
             live_display.update(loading_display)
 
             orchestrator = MonitoringOrchestrator(
-                update_interval=args.refresh_rate
-                if hasattr(args, "refresh_rate")
-                else 10,
+                update_interval=(
+                    args.refresh_rate if hasattr(args, "refresh_rate") else 10
+                ),
                 data_path=str(data_path),
             )
             orchestrator.set_args(args)
@@ -214,10 +227,13 @@ def on_session_change(
                 logger.warning("Timeout waiting for initial data")
 
             # Main loop - live display is already active
-            while True:
-                import time
-
-                time.sleep(1)
+            # Use signal.pause() for more efficient waiting
+            try:
+                signal.pause()
+            except AttributeError:
+                # Fallback for Windows which doesn't support signal.pause()
+                while True:
+                    time.sleep(1)
         finally:
             # Stop monitoring first
             if "orchestrator" in locals():
@@ -362,5 +378,57 @@ def validate_cli_environment() -> Optional[str]:
         return f"Environment validation failed: {e}"
 
 
+def _run_table_view(
+    args: argparse.Namespace, data_path: Path, view_mode: str, console: Console
+) -> None:
+    """Run table view mode (daily/monthly)."""
+    logger = logging.getLogger(__name__)
+
+    try:
+        # Create aggregator with appropriate mode
+        aggregator = UsageAggregator(
+            data_path=str(data_path),
+            aggregation_mode=view_mode,
+            timezone=args.timezone,
+        )
+
+        # Create table controller
+        controller = TableViewsController(console=console)
+
+        # Get aggregated data
+        logger.info(f"Loading {view_mode} usage data...")
+        aggregated_data = aggregator.aggregate()
+
+        if not aggregated_data:
+            print_themed(f"No usage data found for {view_mode} view", style="warning")
+            return
+
+        # Display the table
+        controller.display_aggregated_view(
+            data=aggregated_data,
+            view_mode=view_mode,
+            timezone=args.timezone,
+            plan=args.plan,
+            token_limit=_get_initial_token_limit(args, data_path),
+        )
+
+        # Wait for user to press Ctrl+C
+        print_themed("\nPress Ctrl+C to exit", style="info")
+        try:
+            # Use signal.pause() for more efficient waiting
+            try:
+                signal.pause()
+            except AttributeError:
+                # Fallback for Windows which doesn't support signal.pause()
+                while True:
+                    time.sleep(1)
+        except KeyboardInterrupt:
+            print_themed("\nExiting...", style="info")
+
+    except Exception as e:
+        logger.error(f"Error in table view: {e}", exc_info=True)
+        print_themed(f"Error displaying {view_mode} view: {e}", style="error")
+
+
 if __name__ == "__main__":
     sys.exit(main())

src/claude_monitor/core/settings.py

@@ -33,6 +33,7 @@ def save(self, settings: "Settings") -> None:
                 "time_format": settings.time_format,
                 "refresh_rate": settings.refresh_rate,
                 "reset_hour": settings.reset_hour,
+                "view": settings.view,
                 "timestamp": datetime.now().isoformat(),
             }
 
@@ -103,6 +104,11 @@ class Settings(BaseSettings):
         description="Plan type (pro, max5, max20, custom)",
     )
 
+    view: Literal["realtime", "daily", "monthly", "session"] = Field(
+        default="realtime",
+        description="View mode (realtime, daily, monthly, session)",
+    )
+
     @staticmethod
     def _get_system_timezone() -> str:
         """Lazy import to avoid circular dependencies."""
@@ -178,6 +184,20 @@ def validate_plan(cls, v: Any) -> str:
             )
         return v
 
+    @field_validator("view", mode="before")
+    @classmethod
+    def validate_view(cls, v: Any) -> str:
+        """Validate and normalize view value."""
+        if isinstance(v, str):
+            v_lower = v.lower()
+            valid_views = ["realtime", "daily", "monthly", "session"]
+            if v_lower in valid_views:
+                return v_lower
+            raise ValueError(
+                f"Invalid view: {v}. Must be one of: {', '.join(valid_views)}"
+            )
+        return v
+
     @field_validator("theme", mode="before")
     @classmethod
     def validate_theme(cls, v: Any) -> str:
@@ -319,6 +339,7 @@ def to_namespace(self) -> argparse.Namespace:
         args = argparse.Namespace()
 
         args.plan = self.plan
+        args.view = self.view
         args.timezone = self.timezone
         args.theme = self.theme
         args.refresh_rate = self.refresh_rate