aws-cost-calculator-cli 1.3.0__py3-none-any.whl

cost_calculator/cli.py

@@ -0,0 +1,848 @@
+#!/usr/bin/env python3
+"""
+AWS Cost Calculator CLI
+
+Usage:
+    cc --profile myprofile
+    cc --profile myprofile --start-date 2025-11-04
+    cc --profile myprofile --offset 2 --window 30
+"""
+
+import click
+import boto3
+import json
+from datetime import datetime, timedelta
+from pathlib import Path
+from cost_calculator.trends import analyze_trends, format_trends_markdown
+from cost_calculator.monthly import analyze_monthly_trends, format_monthly_markdown
+from cost_calculator.drill import analyze_drill_down, format_drill_down_markdown
+
+
+def load_profile(profile_name):
+    """Load profile configuration from ~/.config/cost-calculator/profiles.json"""
+    config_dir = Path.home() / '.config' / 'cost-calculator'
+    config_file = config_dir / 'profiles.json'
+    creds_file = config_dir / 'credentials.json'
+    
+    if not config_file.exists():
+        raise click.ClickException(
+            f"Profile configuration not found at {config_file}\n"
+            f"Run: cc init --profile {profile_name}"
+        )
+    
+    with open(config_file) as f:
+        profiles = json.load(f)
+    
+    if profile_name not in profiles:
+        raise click.ClickException(
+            f"Profile '{profile_name}' not found in {config_file}\n"
+            f"Available profiles: {', '.join(profiles.keys())}"
+        )
+    
+    profile = profiles[profile_name]
+    
+    # Load credentials if using static credentials (not SSO)
+    if 'aws_profile' not in profile:
+        if not creds_file.exists():
+            raise click.ClickException(
+                f"No credentials found for profile '{profile_name}'.\n"
+                f"Run: cc configure --profile {profile_name}"
+            )
+        
+        with open(creds_file) as f:
+            creds = json.load(f)
+        
+        if profile_name not in creds:
+            raise click.ClickException(
+                f"No credentials found for profile '{profile_name}'.\n"
+                f"Run: cc configure --profile {profile_name}"
+            )
+        
+        profile['credentials'] = creds[profile_name]
+    
+    return profile
+
+
+def calculate_costs(profile_config, accounts, start_date, offset, window):
+    """
+    Calculate AWS costs for the specified period.
+    
+    Args:
+        profile_config: Profile configuration (with aws_profile or credentials)
+        accounts: List of AWS account IDs
+        start_date: Start date (defaults to today)
+        offset: Days to go back from start_date (default: 2)
+        window: Number of days to analyze (default: 30)
+    
+    Returns:
+        dict with cost breakdown
+    """
+    # Calculate date range
+    if start_date:
+        end_date = datetime.strptime(start_date, '%Y-%m-%d')
+    else:
+        end_date = datetime.now()
+    
+    # Go back by offset days
+    end_date = end_date - timedelta(days=offset)
+    
+    # Start date is window days before end_date
+    start_date_calc = end_date - timedelta(days=window)
+    
+    # Format for API (end date is exclusive, so add 1 day)
+    api_start = start_date_calc.strftime('%Y-%m-%d')
+    api_end = (end_date + timedelta(days=1)).strftime('%Y-%m-%d')
+    
+    click.echo(f"Analyzing: {api_start} to {end_date.strftime('%Y-%m-%d')} ({window} days)")
+    
+    # Initialize boto3 client
+    try:
+        if 'aws_profile' in profile_config:
+            # SSO-based authentication
+            aws_profile = profile_config['aws_profile']
+            click.echo(f"AWS Profile: {aws_profile} (SSO)")
+            click.echo(f"Accounts: {len(accounts)}")
+            click.echo("")
+            session = boto3.Session(profile_name=aws_profile)
+            ce_client = session.client('ce', region_name='us-east-1')
+        else:
+            # Static credentials
+            creds = profile_config['credentials']
+            click.echo(f"AWS Credentials: Static")
+            click.echo(f"Accounts: {len(accounts)}")
+            click.echo("")
+            
+            session_kwargs = {
+                'aws_access_key_id': creds['aws_access_key_id'],
+                'aws_secret_access_key': creds['aws_secret_access_key'],
+                'region_name': creds.get('region', 'us-east-1')
+            }
+            
+            if 'aws_session_token' in creds:
+                session_kwargs['aws_session_token'] = creds['aws_session_token']
+            
+            session = boto3.Session(**session_kwargs)
+            ce_client = session.client('ce')
+            
+    except Exception as e:
+        if 'Token has expired' in str(e) or 'sso' in str(e).lower():
+            if 'aws_profile' in profile_config:
+                raise click.ClickException(
+                    f"AWS SSO session expired or not initialized.\n"
+                    f"Run: aws sso login --profile {profile_config['aws_profile']}"
+                )
+            else:
+                raise click.ClickException(
+                    f"AWS credentials expired.\n"
+                    f"Run: cc configure --profile <profile_name>"
+                )
+        raise
+    
+    # Build filter
+    cost_filter = {
+        "And": [
+            {
+                "Dimensions": {
+                    "Key": "LINKED_ACCOUNT",
+                    "Values": accounts
+                }
+            },
+            {
+                "Dimensions": {
+                    "Key": "BILLING_ENTITY",
+                    "Values": ["AWS"]
+                }
+            },
+            {
+                "Not": {
+                    "Dimensions": {
+                        "Key": "RECORD_TYPE",
+                        "Values": ["Tax", "Support"]
+                    }
+                }
+            }
+        ]
+    }
+    
+    # Get daily costs
+    click.echo("Fetching cost data...")
+    try:
+        response = ce_client.get_cost_and_usage(
+            TimePeriod={
+                'Start': api_start,
+                'End': api_end
+            },
+            Granularity='DAILY',
+            Metrics=['NetAmortizedCost'],
+            Filter=cost_filter
+        )
+    except Exception as e:
+        if 'Token has expired' in str(e) or 'expired' in str(e).lower():
+            raise click.ClickException(
+                f"AWS SSO session expired.\n"
+                f"Run: aws sso login --profile {aws_profile}"
+            )
+        raise
+    
+    # Calculate total
+    total_cost = sum(
+        float(day['Total']['NetAmortizedCost']['Amount'])
+        for day in response['ResultsByTime']
+    )
+    
+    # Get support cost from the 1st of the month containing the end date
+    # Support is charged on the 1st of each month for the previous month's usage
+    # For Oct 3-Nov 2 analysis, we get support from Nov 1 (which is October's support)
+    support_month_date = end_date.replace(day=1)
+    support_date_str = support_month_date.strftime('%Y-%m-%d')
+    support_date_end = (support_month_date + timedelta(days=1)).strftime('%Y-%m-%d')
+    
+    click.echo("Fetching support costs...")
+    support_response = ce_client.get_cost_and_usage(
+        TimePeriod={
+            'Start': support_date_str,
+            'End': support_date_end
+        },
+        Granularity='DAILY',
+        Metrics=['NetAmortizedCost'],
+        Filter={
+            "And": [
+                {
+                    "Dimensions": {
+                        "Key": "LINKED_ACCOUNT",
+                        "Values": accounts
+                    }
+                },
+                {
+                    "Dimensions": {
+                        "Key": "RECORD_TYPE",
+                        "Values": ["Support"]
+                    }
+                }
+            ]
+        }
+    )
+    
+    support_cost = float(support_response['ResultsByTime'][0]['Total']['NetAmortizedCost']['Amount'])
+    
+    # Calculate days in the month that the support covers
+    # Support on Nov 1 covers October (31 days)
+    support_month = support_month_date - timedelta(days=1)  # Go back to previous month
+    days_in_support_month = support_month.day  # This gives us the last day of the month
+    
+    # Support allocation: divide by 2 (half to Khoros), then by days in month
+    support_per_day = (support_cost / 2) / days_in_support_month
+    
+    # Calculate daily rate
+    # NOTE: We divide operational by window, but support by days_in_support_month
+    # This matches the console's calculation method
+    daily_operational = total_cost / days_in_support_month  # Use 31 for October, not 30
+    daily_total = daily_operational + support_per_day
+    
+    # Annual projection
+    annual = daily_total * 365
+    
+    return {
+        'period': {
+            'start': api_start,
+            'end': end_date.strftime('%Y-%m-%d'),
+            'days': window
+        },
+        'costs': {
+            'total_operational': total_cost,
+            'daily_operational': daily_operational,
+            'support_month': support_cost,
+            'support_per_day': support_per_day,
+            'daily_total': daily_total,
+            'annual_projection': annual
+        }
+    }
+
+
+@click.group()
+def cli():
+    """
+    AWS Cost Calculator - Calculate daily and annual AWS costs
+    
+    \b
+    Two authentication methods:
+    1. AWS SSO (recommended for interactive use)
+    2. Static credentials (for automation/CI)
+    
+    \b
+    Quick Start:
+      # SSO Method
+      aws sso login --profile my_aws_profile
+      cc init --profile myprofile --aws-profile my_aws_profile --accounts "123,456,789"
+      cc calculate --profile myprofile
+    
+      # Static Credentials Method
+      cc init --profile myprofile --aws-profile dummy --accounts "123,456,789"
+      cc configure --profile myprofile
+      cc calculate --profile myprofile
+    
+    \b
+    For detailed documentation, see:
+      - COST_CALCULATION_METHODOLOGY.md
+      - README.md
+    """
+    pass
+
+
+@cli.command()
+@click.option('--profile', required=True, help='Profile name (e.g., myprofile)')
+@click.option('--start-date', help='Start date (YYYY-MM-DD, default: today)')
+@click.option('--offset', default=2, help='Days to go back from start date (default: 2)')
+@click.option('--window', default=30, help='Number of days to analyze (default: 30)')
+@click.option('--json-output', is_flag=True, help='Output as JSON')
+def calculate(profile, start_date, offset, window, json_output):
+    """Calculate AWS costs for the specified period"""
+    
+    # Load profile configuration
+    config = load_profile(profile)
+    
+    # Calculate costs
+    result = calculate_costs(
+        profile_config=config,
+        accounts=config['accounts'],
+        start_date=start_date,
+        offset=offset,
+        window=window
+    )
+    
+    if json_output:
+        click.echo(json.dumps(result, indent=2))
+    else:
+        # Pretty print results
+        click.echo("=" * 60)
+        click.echo(f"Period: {result['period']['start']} to {result['period']['end']}")
+        click.echo(f"Days analyzed: {result['period']['days']}")
+        click.echo("=" * 60)
+        click.echo(f"Total operational cost: ${result['costs']['total_operational']:,.2f}")
+        click.echo(f"Daily operational: ${result['costs']['daily_operational']:,.2f}")
+        click.echo(f"Support (month): ${result['costs']['support_month']:,.2f}")
+        click.echo(f"Support per day (÷2÷days): ${result['costs']['support_per_day']:,.2f}")
+        click.echo("=" * 60)
+        click.echo(f"DAILY RATE: ${result['costs']['daily_total']:,.2f}")
+        click.echo(f"ANNUAL PROJECTION: ${result['costs']['annual_projection']:,.0f}")
+        click.echo("=" * 60)
+
+
+@cli.command()
+@click.option('--profile', required=True, help='Profile name to create')
+@click.option('--aws-profile', required=True, help='AWS CLI profile name')
+@click.option('--accounts', required=True, help='Comma-separated list of account IDs')
+def init(profile, aws_profile, accounts):
+    """Initialize a new profile configuration"""
+    
+    config_dir = Path.home() / '.config' / 'cost-calculator'
+    config_file = config_dir / 'profiles.json'
+    
+    # Create config directory if it doesn't exist
+    config_dir.mkdir(parents=True, exist_ok=True)
+    
+    # Load existing profiles or create new
+    if config_file.exists() and config_file.stat().st_size > 0:
+        try:
+            with open(config_file) as f:
+                profiles = json.load(f)
+        except json.JSONDecodeError:
+            profiles = {}
+    else:
+        profiles = {}
+    
+    # Parse accounts
+    account_list = [acc.strip() for acc in accounts.split(',')]
+    
+    # Add new profile
+    profiles[profile] = {
+        'aws_profile': aws_profile,
+        'accounts': account_list
+    }
+    
+    # Save
+    with open(config_file, 'w') as f:
+        json.dump(profiles, f, indent=2)
+    
+    click.echo(f"✓ Profile '{profile}' created with {len(account_list)} accounts")
+    click.echo(f"✓ Configuration saved to {config_file}")
+    click.echo(f"\nUsage: cc calculate --profile {profile}")
+
+
+@cli.command()
+def list_profiles():
+    """List all configured profiles"""
+    
+    config_file = Path.home() / '.config' / 'cost-calculator' / 'profiles.json'
+    
+    if not config_file.exists():
+        click.echo("No profiles configured. Run: cc init --profile <name>")
+        return
+    
+    with open(config_file) as f:
+        profiles = json.load(f)
+    
+    if not profiles:
+        click.echo("No profiles configured.")
+        return
+    
+    click.echo("Configured profiles:")
+    click.echo("")
+    for name, config in profiles.items():
+        click.echo(f"  {name}")
+        if 'aws_profile' in config:
+            click.echo(f"    AWS Profile: {config['aws_profile']} (SSO)")
+        else:
+            click.echo(f"    AWS Credentials: Configured (Static)")
+        click.echo(f"    Accounts: {len(config['accounts'])}")
+        click.echo("")
+
+
+@cli.command()
+def setup():
+    """Show setup instructions for manual profile configuration"""
+    import platform
+    
+    system = platform.system()
+    
+    if system == "Windows":
+        config_path = "%USERPROFILE%\\.config\\cost-calculator\\profiles.json"
+        config_path_example = "C:\\Users\\YourName\\.config\\cost-calculator\\profiles.json"
+        mkdir_cmd = "mkdir %USERPROFILE%\\.config\\cost-calculator"
+        edit_cmd = "notepad %USERPROFILE%\\.config\\cost-calculator\\profiles.json"
+    else:  # macOS/Linux
+        config_path = "~/.config/cost-calculator/profiles.json"
+        config_path_example = "/Users/yourname/.config/cost-calculator/profiles.json"
+        mkdir_cmd = "mkdir -p ~/.config/cost-calculator"
+        edit_cmd = "nano ~/.config/cost-calculator/profiles.json"
+    
+    click.echo("=" * 70)
+    click.echo("AWS Cost Calculator - Manual Profile Setup")
+    click.echo("=" * 70)
+    click.echo("")
+    click.echo(f"Platform: {system}")
+    click.echo(f"Config location: {config_path}")
+    click.echo("")
+    click.echo("Step 1: Create the config directory")
+    click.echo(f"  {mkdir_cmd}")
+    click.echo("")
+    click.echo("Step 2: Create the profiles.json file")
+    click.echo(f"  {edit_cmd}")
+    click.echo("")
+    click.echo("Step 3: Add your profile configuration (JSON format):")
+    click.echo("")
+    click.echo('  {')
+    click.echo('    "myprofile": {')
+    click.echo('      "aws_profile": "my_aws_profile",')
+    click.echo('      "accounts": [')
+    click.echo('        "123456789012",')
+    click.echo('        "234567890123",')
+    click.echo('        "345678901234"')
+    click.echo('      ]')
+    click.echo('    }')
+    click.echo('  }')
+    click.echo("")
+    click.echo("Step 4: Save the file")
+    click.echo("")
+    click.echo("Step 5: Verify it works")
+    click.echo("  cc list-profiles")
+    click.echo("")
+    click.echo("Step 6: Configure AWS credentials")
+    click.echo("  Option A (SSO):")
+    click.echo("    aws sso login --profile my_aws_profile")
+    click.echo("    cc calculate --profile myprofile")
+    click.echo("")
+    click.echo("  Option B (Static credentials):")
+    click.echo("    cc configure --profile myprofile")
+    click.echo("    cc calculate --profile myprofile")
+    click.echo("")
+    click.echo("=" * 70)
+    click.echo("")
+    click.echo("For multiple profiles, add more entries to the JSON:")
+    click.echo("")
+    click.echo('  {')
+    click.echo('    "profile1": { ... },')
+    click.echo('    "profile2": { ... }')
+    click.echo('  }')
+    click.echo("")
+    click.echo(f"Full path example: {config_path_example}")
+    click.echo("=" * 70)
+
+
+@cli.command()
+@click.option('--profile', required=True, help='Profile name to configure')
+@click.option('--access-key-id', prompt=True, hide_input=False, help='AWS Access Key ID')
+@click.option('--secret-access-key', prompt=True, hide_input=True, help='AWS Secret Access Key')
+@click.option('--session-token', default='', help='AWS Session Token (optional, for temporary credentials)')
+@click.option('--region', default='us-east-1', help='AWS Region (default: us-east-1)')
+def configure(profile, access_key_id, secret_access_key, session_token, region):
+    """Configure AWS credentials for a profile (alternative to SSO)"""
+    
+    config_dir = Path.home() / '.config' / 'cost-calculator'
+    config_file = config_dir / 'profiles.json'
+    creds_file = config_dir / 'credentials.json'
+    
+    # Create config directory if it doesn't exist
+    config_dir.mkdir(parents=True, exist_ok=True)
+    
+    # Load existing profiles
+    if config_file.exists() and config_file.stat().st_size > 0:
+        try:
+            with open(config_file) as f:
+                profiles = json.load(f)
+        except json.JSONDecodeError:
+            profiles = {}
+    else:
+        profiles = {}
+    
+    # Check if profile exists
+    if profile not in profiles:
+        click.echo(f"Error: Profile '{profile}' not found. Create it first with: cc init --profile {profile}")
+        return
+    
+    # Remove aws_profile if it exists (switching from SSO to static creds)
+    if 'aws_profile' in profiles[profile]:
+        del profiles[profile]['aws_profile']
+    
+    # Save updated profile
+    with open(config_file, 'w') as f:
+        json.dump(profiles, f, indent=2)
+    
+    # Load or create credentials file
+    if creds_file.exists() and creds_file.stat().st_size > 0:
+        try:
+            with open(creds_file) as f:
+                creds = json.load(f)
+        except json.JSONDecodeError:
+            creds = {}
+    else:
+        creds = {}
+    
+    # Store credentials (encrypted would be better, but for now just file permissions)
+    creds[profile] = {
+        'aws_access_key_id': access_key_id,
+        'aws_secret_access_key': secret_access_key,
+        'region': region
+    }
+    
+    if session_token:
+        creds[profile]['aws_session_token'] = session_token
+    
+    # Save credentials with restricted permissions
+    with open(creds_file, 'w') as f:
+        json.dump(creds, f, indent=2)
+    
+    # Set file permissions to 600 (owner read/write only)
+    creds_file.chmod(0o600)
+    
+    click.echo(f"✓ AWS credentials configured for profile '{profile}'")
+    click.echo(f"✓ Credentials saved to {creds_file} (permissions: 600)")
+    click.echo(f"\nUsage: cc calculate --profile {profile}")
+    click.echo("\nNote: Credentials are stored locally. For temporary credentials,")
+    click.echo("      you'll need to reconfigure when they expire.")
+
+
+@cli.command()
+@click.option('--profile', required=True, help='Profile name')
+@click.option('--weeks', default=3, help='Number of weeks to analyze (default: 3)')
+@click.option('--output', default='cost_trends.md', help='Output markdown file (default: cost_trends.md)')
+@click.option('--json-output', is_flag=True, help='Output as JSON instead of markdown')
+def trends(profile, weeks, output, json_output):
+    """Analyze cost trends with Week-over-Week and Trailing 30-Day comparisons"""
+    
+    # Load profile configuration
+    config = load_profile(profile)
+    
+    # Initialize boto3 client
+    try:
+        if 'aws_profile' in config:
+            aws_profile = config['aws_profile']
+            click.echo(f"AWS Profile: {aws_profile} (SSO)")
+            session = boto3.Session(profile_name=aws_profile)
+            ce_client = session.client('ce', region_name='us-east-1')
+        else:
+            creds = config['credentials']
+            click.echo(f"AWS Credentials: Static")
+            
+            session_kwargs = {
+                'aws_access_key_id': creds['aws_access_key_id'],
+                'aws_secret_access_key': creds['aws_secret_access_key'],
+                'region_name': creds.get('region', 'us-east-1')
+            }
+            
+            if 'aws_session_token' in creds:
+                session_kwargs['aws_session_token'] = creds['aws_session_token']
+            
+            session = boto3.Session(**session_kwargs)
+            ce_client = session.client('ce')
+            
+    except Exception as e:
+        if 'Token has expired' in str(e) or 'sso' in str(e).lower():
+            if 'aws_profile' in config:
+                raise click.ClickException(
+                    f"AWS SSO session expired or not initialized.\n"
+                    f"Run: aws sso login --profile {config['aws_profile']}"
+                )
+            else:
+                raise click.ClickException(
+                    f"AWS credentials expired.\n"
+                    f"Run: cc configure --profile {profile}"
+                )
+        raise
+    
+    click.echo(f"Analyzing last {weeks} weeks...")
+    click.echo("")
+    
+    # Analyze trends
+    trends_data = analyze_trends(ce_client, config['accounts'], num_weeks=weeks)
+    
+    if json_output:
+        # Output as JSON
+        import json
+        click.echo(json.dumps(trends_data, indent=2, default=str))
+    else:
+        # Generate markdown report
+        markdown = format_trends_markdown(trends_data)
+        
+        # Save to file
+        with open(output, 'w') as f:
+            f.write(markdown)
+        
+        click.echo(f"✓ Trends report saved to {output}")
+        click.echo("")
+        
+        # Show summary
+        click.echo("WEEK-OVER-WEEK:")
+        for comparison in trends_data['wow_comparisons']:
+            prev_week = comparison['prev_week']['label']
+            curr_week = comparison['curr_week']['label']
+            num_increases = len(comparison['increases'])
+            num_decreases = len(comparison['decreases'])
+            
+            click.echo(f"  {prev_week} → {curr_week}")
+            click.echo(f"    Increases: {num_increases}, Decreases: {num_decreases}")
+            
+            if comparison['increases']:
+                top = comparison['increases'][0]
+                click.echo(f"    Top: {top['service']} (+${top['change']:,.2f})")
+            
+            click.echo("")
+        
+        click.echo("TRAILING 30-DAY (T-30):")
+        for comparison in trends_data['t30_comparisons']:
+            baseline_week = comparison['baseline_week']['label']
+            curr_week = comparison['curr_week']['label']
+            num_increases = len(comparison['increases'])
+            num_decreases = len(comparison['decreases'])
+            
+            click.echo(f"  {curr_week} vs {baseline_week}")
+            click.echo(f"    Increases: {num_increases}, Decreases: {num_decreases}")
+            
+            if comparison['increases']:
+                top = comparison['increases'][0]
+                click.echo(f"    Top: {top['service']} (+${top['change']:,.2f})")
+            
+            click.echo("")
+
+
+@cli.command()
+@click.option('--profile', required=True, help='Profile name')
+@click.option('--months', default=6, help='Number of months to analyze (default: 6)')
+@click.option('--output', default='monthly_trends.md', help='Output markdown file (default: monthly_trends.md)')
+@click.option('--json-output', is_flag=True, help='Output as JSON instead of markdown')
+def monthly(profile, months, output, json_output):
+    """Analyze month-over-month cost trends at service level"""
+    
+    # Load profile configuration
+    config = load_profile(profile)
+    
+    # Initialize boto3 client
+    try:
+        if 'aws_profile' in config:
+            aws_profile = config['aws_profile']
+            click.echo(f"AWS Profile: {aws_profile} (SSO)")
+            session = boto3.Session(profile_name=aws_profile)
+        else:
+            # Use static credentials
+            creds = config['credentials']
+            click.echo("AWS Credentials: Static")
+            session = boto3.Session(
+                aws_access_key_id=creds['aws_access_key_id'],
+                aws_secret_access_key=creds['aws_secret_access_key'],
+                aws_session_token=creds.get('aws_session_token')
+            )
+        
+        ce_client = session.client('ce', region_name='us-east-1')
+    except Exception as e:
+        raise click.ClickException(f"Failed to initialize AWS session: {str(e)}")
+    
+    # Get account list
+    accounts = config['accounts']
+    
+    click.echo(f"Analyzing last {months} months...")
+    click.echo("")
+    
+    # Analyze monthly trends
+    monthly_data = analyze_monthly_trends(ce_client, accounts, months)
+    
+    if json_output:
+        # Output as JSON
+        output_data = {
+            'generated': datetime.now().isoformat(),
+            'months': months,
+            'comparisons': []
+        }
+        
+        for comparison in monthly_data['comparisons']:
+            output_data['comparisons'].append({
+                'prev_month': comparison['prev_month']['label'],
+                'curr_month': comparison['curr_month']['label'],
+                'increases': comparison['increases'],
+                'decreases': comparison['decreases'],
+                'total_increase': comparison['total_increase'],
+                'total_decrease': comparison['total_decrease']
+            })
+        
+        click.echo(json.dumps(output_data, indent=2))
+    else:
+        # Generate markdown report
+        markdown = format_monthly_markdown(monthly_data)
+        
+        # Save to file
+        with open(output, 'w') as f:
+            f.write(markdown)
+        
+        click.echo(f"✓ Monthly trends report saved to {output}")
+        click.echo("")
+        
+        # Show summary
+        for comparison in monthly_data['comparisons']:
+            prev_month = comparison['prev_month']['label']
+            curr_month = comparison['curr_month']['label']
+            num_increases = len(comparison['increases'])
+            num_decreases = len(comparison['decreases'])
+            
+            click.echo(f"{prev_month} → {curr_month}")
+            click.echo(f"  Increases: {num_increases}, Decreases: {num_decreases}")
+            
+            if comparison['increases']:
+                top = comparison['increases'][0]
+                click.echo(f"  Top: {top['service']} (+${top['change']:,.2f})")
+            
+            click.echo("")
+
+
+@cli.command()
+@click.option('--profile', required=True, help='Profile name')
+@click.option('--weeks', default=4, help='Number of weeks to analyze (default: 4)')
+@click.option('--service', help='Filter by service name (e.g., "EC2 - Other")')
+@click.option('--account', help='Filter by account ID')
+@click.option('--usage-type', help='Filter by usage type')
+@click.option('--output', default='drill_down.md', help='Output markdown file (default: drill_down.md)')
+@click.option('--json-output', is_flag=True, help='Output as JSON instead of markdown')
+def drill(profile, weeks, service, account, usage_type, output, json_output):
+    """Drill down into cost changes by service, account, or usage type"""
+    
+    # Load profile configuration
+    config = load_profile(profile)
+    
+    # Initialize boto3 client
+    try:
+        if 'aws_profile' in config:
+            aws_profile = config['aws_profile']
+            click.echo(f"AWS Profile: {aws_profile} (SSO)")
+            session = boto3.Session(profile_name=aws_profile)
+        else:
+            # Use static credentials
+            creds = config['credentials']
+            click.echo("AWS Credentials: Static")
+            session = boto3.Session(
+                aws_access_key_id=creds['aws_access_key_id'],
+                aws_secret_access_key=creds['aws_secret_access_key'],
+                aws_session_token=creds.get('aws_session_token')
+            )
+        
+        ce_client = session.client('ce', region_name='us-east-1')
+    except Exception as e:
+        raise click.ClickException(f"Failed to initialize AWS session: {str(e)}")
+    
+    # Get account list
+    accounts = config['accounts']
+    
+    # Show filters
+    click.echo(f"Analyzing last {weeks} weeks...")
+    if service:
+        click.echo(f"  Service filter: {service}")
+    if account:
+        click.echo(f"  Account filter: {account}")
+    if usage_type:
+        click.echo(f"  Usage type filter: {usage_type}")
+    click.echo("")
+    
+    # Analyze with drill-down
+    drill_data = analyze_drill_down(
+        ce_client, accounts, weeks,
+        service_filter=service,
+        account_filter=account,
+        usage_type_filter=usage_type
+    )
+    
+    if json_output:
+        # Output as JSON
+        output_data = {
+            'generated': datetime.now().isoformat(),
+            'weeks': weeks,
+            'filters': drill_data['filters'],
+            'group_by': drill_data['group_by'],
+            'comparisons': []
+        }
+        
+        for comparison in drill_data['comparisons']:
+            output_data['comparisons'].append({
+                'prev_week': comparison['prev_week']['label'],
+                'curr_week': comparison['curr_week']['label'],
+                'increases': comparison['increases'],
+                'decreases': comparison['decreases'],
+                'total_increase': comparison['total_increase'],
+                'total_decrease': comparison['total_decrease']
+            })
+        
+        click.echo(json.dumps(output_data, indent=2))
+    else:
+        # Generate markdown report
+        markdown = format_drill_down_markdown(drill_data)
+        
+        # Save to file
+        with open(output, 'w') as f:
+            f.write(markdown)
+        
+        click.echo(f"✓ Drill-down report saved to {output}")
+        click.echo("")
+        
+        # Show summary
+        group_by_label = {
+            'SERVICE': 'services',
+            'LINKED_ACCOUNT': 'accounts',
+            'USAGE_TYPE': 'usage types',
+            'REGION': 'regions'
+        }.get(drill_data['group_by'], 'items')
+        
+        click.echo(f"Showing top {group_by_label}:")
+        for comparison in drill_data['comparisons']:
+            prev_week = comparison['prev_week']['label']
+            curr_week = comparison['curr_week']['label']
+            num_increases = len(comparison['increases'])
+            num_decreases = len(comparison['decreases'])
+            
+            click.echo(f"{prev_week} → {curr_week}")
+            click.echo(f"  Increases: {num_increases}, Decreases: {num_decreases}")
+            
+            if comparison['increases']:
+                top = comparison['increases'][0]
+                click.echo(f"  Top: {top['dimension'][:50]} (+${top['change']:,.2f})")
+            
+            click.echo("")
+
+
+if __name__ == '__main__':
+    cli()