aws-cost-calculator-cli 1.0.3__py3-none-any.whl → 1.5.2__py3-none-any.whl

{aws_cost_calculator_cli-1.0.3.dist-info → aws_cost_calculator_cli-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-cost-calculator-cli
-Version: 1.0.3
+Version: 1.5.2
 Summary: AWS Cost Calculator CLI - Calculate daily and annual AWS costs across multiple accounts
 Home-page: https://github.com/yourusername/cost-calculator
 Author: Cost Optimization Team
@@ -23,6 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click>=8.0.0
 Requires-Dist: boto3>=1.26.0
+Requires-Dist: requests>=2.28.0
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
@@ -80,7 +81,23 @@ cc calculate --profile myprofile --offset 2 --window 30
 cc calculate --profile myprofile --json-output
 ```
 
-### 4. List profiles
+### 4. Analyze cost trends
+
+```bash
+# Analyze last 3 weeks (default)
+cc trends --profile myprofile
+
+# Analyze more weeks
+cc trends --profile myprofile --weeks 5
+
+# Custom output file
+cc trends --profile myprofile --output weekly_trends.md
+
+# JSON output
+cc trends --profile myprofile --json-output
+```
+
+### 5. List profiles
 
 ```bash
 cc list-profiles
@@ -138,8 +155,118 @@ cc calculate --profile myprofile --json-output > costs.json
 
 # Different window size
 cc calculate --profile myprofile --window 60
+
+# Weekly cost trends analysis
+cc trends --profile myprofile
+
+# Analyze last 8 weeks
+cc trends --profile myprofile --weeks 8
+
+# Monthly cost trends analysis
+cc monthly --profile myprofile
+
+# Analyze last 12 months
+cc monthly --profile myprofile --months 12
+
+# Drill down into specific service
+cc drill --profile myprofile --service "EC2 - Other"
+
+# Drill down into specific account
+cc drill --profile myprofile --account 123456789012
+
+# Drill down into service within account
+cc drill --profile myprofile --service "EC2 - Other" --account 123456789012
 ```
 
+## Trends Report
+
+The `trends` command generates a markdown report with **two types of analysis**:
+
+### 1. Week-over-Week (WoW)
+Compares each week to the previous week - good for catching immediate spikes and changes.
+
+### 2. Trailing 30-Day (T-30)
+Compares each week to the same week 4 weeks ago - filters out noise and shows sustained trends.
+
+**Features:**
+- **Service-level aggregation**: Shows total cost per service (not individual usage types)
+- **Top 10 Increases/Decreases**: For each comparison period
+- **Total rows**: Sum of top 10 changes for quick assessment
+- **Filters**: Only shows changes >$10 and >5%
+
+Example output:
+```
+Week of Oct 19 → Week of Oct 26 (WoW)
+  Increases: 4, Decreases: 10
+  Top: EC2 - Other (+$949.12)
+
+Week of Oct 26 vs Week of Sep 28 (T-30)
+  Increases: 10, Decreases: 10
+  Top: EC2 - Other (+$886.39)
+```
+
+The report is saved to `cost_trends.md` by default and includes:
+- Service name
+- Previous/baseline cost
+- Current cost
+- Change amount and percentage
+- Total of top 10 changes
+
+## Monthly Report
+
+The `monthly` command generates month-over-month cost comparisons:
+
+**Features:**
+- **Service-level aggregation**: Shows total cost per service
+- **Calendar month comparisons**: October vs September, September vs August, etc.
+- **Top 10 Increases/Decreases**: For each month comparison
+- **Total rows**: Sum of top 10 changes
+- **Filters**: Only shows changes >$50 and >5%
+
+Example output:
+```
+October 2025 → November 2025
+  Increases: 1, Decreases: 10
+  Top: Savings Plans for AWS Compute usage (+$231,161.46)
+```
+
+The report is saved to `monthly_trends.md` by default.
+
+## Drill-Down Analysis
+
+The `drill` command allows you to investigate cost changes at different levels of detail:
+
+**Funnel Approach:**
+1. **Start broad:** `cc trends` → See EC2 costs up $1000
+2. **Drill by service:** `cc drill --service "EC2 - Other"` → See which accounts
+3. **Drill deeper:** `cc drill --service "EC2 - Other" --account 123` → See usage types
+
+**Features:**
+- **Week-over-week cost analysis**: Compare costs between consecutive weeks
+- **Month-over-month cost analysis**: Compare costs between consecutive months
+- **Drill-down analysis**: Analyze costs by service, account, or usage type
+- **Pandas aggregations**: Time series analysis with sum, avg, std across all weeks
+- **Volatility detection**: Identify services with high cost variability and outliers
+- **Trend detection**: Auto-detect increasing/decreasing cost patterns
+- **Search & filter**: Find services by pattern or cost threshold
+- **Profile management**: CRUD operations for account profiles in DynamoDB
+- **Markdown reports**: Generate formatted reports
+- **JSON output**: Machine-readable output for automation
+- **Lambda API backend**: Serverless backend with pandas/numpy support
+
+Example output:
+```
+# Drill by service
+cc drill --profile myprofile --service "EC2 - Other"
+
+Showing top accounts:
+Week of Oct 19 → Week of Oct 26
+  Increases: 3, Decreases: 2
+  Top: 887649220066 (+$450.23)
+```
+
+The report is saved to `drill_down.md` by default.
+
 ## Output
 
 ```

aws_cost_calculator_cli-1.5.2.dist-info/RECORD

@@ -0,0 +1,13 @@
+aws_cost_calculator_cli-1.5.2.dist-info/licenses/LICENSE,sha256=cYtmQZHNGGTXOtg3T7LHDRneleaH0dHXHfxFV3WR50Y,1079
+cost_calculator/__init__.py,sha256=PJeIqvWh5AYJVrJxPPkI4pJnAt37rIjasrNS0I87kaM,52
+cost_calculator/api_client.py,sha256=LUzQmveDF0X9MqAyThp9mbSzJzkOO73Pk4F7IEJjASU,2353
+cost_calculator/cli.py,sha256=ufK28divdvrceEryWd8cCWjvG5pT2owaqprskX2epeQ,32589
+cost_calculator/drill.py,sha256=hGi-prLgZDvNMMICQc4fl3LenM7YaZ3To_Ei4LKwrdc,10543
+cost_calculator/executor.py,sha256=tVyyBtXIj9OPyG-xQj8CUmyFjDhb9IVK639360dUZDc,8076
+cost_calculator/monthly.py,sha256=6k9F8S7djhX1wGV3-T1MZP7CvWbbfhSTEaddwCfVu5M,7932
+cost_calculator/trends.py,sha256=k_s4ylBX50sqoiM_fwepi58HW01zz767FMJhQUPDznk,12246
+aws_cost_calculator_cli-1.5.2.dist-info/METADATA,sha256=0wxy-jgVC-paubGHN87mDObETGr_u9qU4ZIP3xV49hM,8176
+aws_cost_calculator_cli-1.5.2.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+aws_cost_calculator_cli-1.5.2.dist-info/entry_points.txt,sha256=_5Qy4EcHbYVYrdgOu1E48faMHb9fLUl5VJ3djDHuJBo,47
+aws_cost_calculator_cli-1.5.2.dist-info/top_level.txt,sha256=PRwGPPlNqASfyhGHDjSfyl4SXeE7GF3OVTu1tY1Uqyc,16
+aws_cost_calculator_cli-1.5.2.dist-info/RECORD,,

cost_calculator/api_client.py

@@ -0,0 +1,84 @@
+"""
+API client for calling Lambda backend.
+Falls back to local execution if API is not configured.
+"""
+import os
+import json
+import requests
+from pathlib import Path
+
+
+def get_api_config():
+    """
+    Get API configuration.
+    
+    Returns:
+        dict: API configuration with api_secret, or None if not configured
+    """
+    api_secret = os.environ.get('COST_API_SECRET', '')
+    
+    if api_secret:
+        return {'api_secret': api_secret}
+    
+    return None
+
+
+def call_lambda_api(endpoint, credentials, accounts, **kwargs):
+    """
+    Call Lambda API endpoint.
+    
+    Args:
+        endpoint: API endpoint name ('trends', 'monthly', 'drill')
+        credentials: dict with AWS credentials
+        accounts: list of account IDs
+        **kwargs: additional parameters for the specific endpoint
+    
+    Returns:
+        dict: API response data
+    
+    Raises:
+        Exception: if API call fails
+    """
+    api_config = get_api_config()
+    
+    if not api_config:
+        raise Exception("API not configured. Set COST_API_SECRET environment variable.")
+    
+    # Map endpoint names to Lambda URLs
+    endpoint_urls = {
+        'trends': 'https://pq3mqntc6vuwi4zw5flulsoleq0yiqtl.lambda-url.us-east-1.on.aws/',
+        'monthly': 'https://6aueebodw6q4zdeu3aaexb6tle0fqhhr.lambda-url.us-east-1.on.aws/',
+        'drill': 'https://3ncm2gzxrsyptrhud3ua3x5lju0akvsr.lambda-url.us-east-1.on.aws/',
+        'analyze': 'https://y6npmidtxwzg62nrqzkbacfs5q0edwgs.lambda-url.us-east-1.on.aws/',
+        'profiles': 'https://64g7jq7sjygec2zmll5lsghrpi0txrzo.lambda-url.us-east-1.on.aws/'
+    }
+    
+    url = endpoint_urls.get(endpoint)
+    
+    if not url:
+        raise Exception(f"Unknown endpoint: {endpoint}")
+    
+    # Build request payload
+    payload = {
+        'credentials': credentials,
+        'accounts': accounts
+    }
+    payload.update(kwargs)
+    
+    # Make API call
+    headers = {
+        'X-API-Secret': api_config['api_secret'],
+        'Content-Type': 'application/json'
+    }
+    
+    response = requests.post(url, headers=headers, json=payload, timeout=300)
+    
+    if response.status_code != 200:
+        raise Exception(f"API call failed: {response.status_code} - {response.text}")
+    
+    return response.json()
+
+
+def is_api_configured():
+    """Check if API is configured."""
+    return get_api_config() is not None

cost_calculator/cli.py

@@ -13,6 +13,10 @@ import boto3
 import json
 from datetime import datetime, timedelta
 from pathlib import Path
+from cost_calculator.trends import format_trends_markdown
+from cost_calculator.monthly import format_monthly_markdown
+from cost_calculator.drill import format_drill_down_markdown
+from cost_calculator.executor import execute_trends, execute_monthly, execute_drill
 
 
 def load_profile(profile_name):
@@ -539,5 +543,333 @@ def configure(profile, access_key_id, secret_access_key, session_token, region):
     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)
+    
+    click.echo(f"Analyzing last {weeks} weeks...")
+    click.echo("")
+    
+    # Execute via API or locally
+    trends_data = execute_trends(config, 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)
+    
+    click.echo(f"Analyzing last {months} months...")
+    click.echo("")
+    
+    # Execute via API or locally
+    monthly_data = execute_monthly(config, 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)
+    
+    # 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("")
+    
+    # Execute via API or locally
+    drill_data = execute_drill(config, weeks, service, account, 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("")
+
+
+@cli.command()
+@click.option('--profile', required=True, help='Profile name')
+@click.option('--type', 'analysis_type', default='summary',
+              type=click.Choice(['summary', 'volatility', 'trends', 'search']),
+              help='Analysis type')
+@click.option('--weeks', default=12, help='Number of weeks (default: 12)')
+@click.option('--pattern', help='Service search pattern (for search type)')
+@click.option('--min-cost', type=float, help='Minimum cost filter (for search type)')
+@click.option('--json-output', is_flag=True, help='Output as JSON')
+def analyze(profile, analysis_type, weeks, pattern, min_cost, json_output):
+    """Perform pandas-based analysis (aggregations, volatility, trends, search)"""
+    
+    config = load_profile(profile)
+    
+    if not json_output:
+        click.echo(f"Running {analysis_type} analysis for {weeks} weeks...")
+    
+    from cost_calculator.executor import execute_analyze
+    result = execute_analyze(config, weeks, analysis_type, pattern, min_cost)
+    
+    if json_output:
+        import json
+        click.echo(json.dumps(result, indent=2, default=str))
+    else:
+        # Format output based on type
+        if analysis_type == 'summary':
+            click.echo(f"\n📊 Summary ({result.get('total_services', 0)} services)")
+            click.echo(f"Weeks analyzed: {result.get('weeks_analyzed', 0)}")
+            click.echo(f"\nTop 10 Services (by total change):")
+            for svc in result.get('services', [])[:10]:
+                click.echo(f"  {svc['service']}")
+                click.echo(f"    Total: ${svc['change_sum']:,.2f}")
+                click.echo(f"    Average: ${svc['change_mean']:,.2f}")
+                click.echo(f"    Volatility: {svc['volatility']:.3f}")
+        
+        elif analysis_type == 'volatility':
+            click.echo(f"\n📈 High Volatility Services:")
+            for svc in result.get('high_volatility_services', [])[:10]:
+                click.echo(f"  {svc['service']}: CV={svc['coefficient_of_variation']:.3f}")
+            
+            outliers = result.get('outliers', [])
+            if outliers:
+                click.echo(f"\n⚠️  Outliers ({len(outliers)}):")
+                for o in outliers[:5]:
+                    click.echo(f"  {o['service']} ({o['week']}): ${o['change']:,.2f} (z={o['z_score']:.2f})")
+        
+        elif analysis_type == 'trends':
+            inc = result.get('increasing_trends', [])
+            dec = result.get('decreasing_trends', [])
+            
+            click.echo(f"\n📈 Increasing Trends ({len(inc)}):")
+            for t in inc[:5]:
+                click.echo(f"  {t['service']}: ${t['avg_change']:,.2f}/week")
+            
+            click.echo(f"\n📉 Decreasing Trends ({len(dec)}):")
+            for t in dec[:5]:
+                click.echo(f"  {t['service']}: ${t['avg_change']:,.2f}/week")
+        
+        elif analysis_type == 'search':
+            matches = result.get('matches', [])
+            click.echo(f"\n🔍 Search Results ({len(matches)} matches)")
+            if pattern:
+                click.echo(f"Pattern: {pattern}")
+            if min_cost:
+                click.echo(f"Min cost: ${min_cost:,.2f}")
+            
+            for m in matches[:20]:
+                click.echo(f"  {m['service']}: ${m['curr_cost']:,.2f}")
+
+
+@cli.command()
+@click.argument('operation', type=click.Choice(['list', 'get', 'create', 'update', 'delete']))
+@click.option('--name', help='Profile name')
+@click.option('--accounts', help='Comma-separated account IDs')
+@click.option('--description', help='Profile description')
+def profile(operation, name, accounts, description):
+    """Manage profiles (CRUD operations)"""
+    
+    from cost_calculator.executor import execute_profile_operation
+    
+    # Parse accounts if provided
+    account_list = None
+    if accounts:
+        account_list = [a.strip() for a in accounts.split(',')]
+    
+    result = execute_profile_operation(
+        operation=operation,
+        profile_name=name,
+        accounts=account_list,
+        description=description
+    )
+    
+    if operation == 'list':
+        profiles = result.get('profiles', [])
+        click.echo(f"\n📋 Profiles ({len(profiles)}):")
+        for p in profiles:
+            click.echo(f"  {p['profile_name']}: {len(p.get('accounts', []))} accounts")
+            if p.get('description'):
+                click.echo(f"    {p['description']}")
+    
+    elif operation == 'get':
+        profile_data = result.get('profile', {})
+        click.echo(f"\n📋 Profile: {profile_data.get('profile_name')}")
+        click.echo(f"Accounts: {len(profile_data.get('accounts', []))}")
+        if profile_data.get('description'):
+            click.echo(f"Description: {profile_data['description']}")
+        click.echo(f"\nAccounts:")
+        for acc in profile_data.get('accounts', []):
+            click.echo(f"  {acc}")
+    
+    else:
+        click.echo(result.get('message', 'Operation completed'))
+
+
 if __name__ == '__main__':
     cli()