aws-cost-calculator-cli 1.4.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

cost_calculator/cli.py

@@ -19,49 +19,143 @@ from cost_calculator.drill import format_drill_down_markdown
 from cost_calculator.executor import execute_trends, execute_monthly, execute_drill
 
 
+def apply_auth_options(config, sso=None, access_key_id=None, secret_access_key=None, session_token=None):
+    """Apply authentication options to profile config
+    
+    Args:
+        config: Profile configuration dict
+        sso: AWS SSO profile name
+        access_key_id: AWS Access Key ID
+        secret_access_key: AWS Secret Access Key
+        session_token: AWS Session Token
+    
+    Returns:
+        Updated config dict
+    """
+    import subprocess
+    
+    if sso:
+        # SSO authentication - trigger login if needed
+        try:
+            # Test if SSO session is valid
+            result = subprocess.run(
+                ['aws', 'sts', 'get-caller-identity', '--profile', sso],
+                capture_output=True,
+                text=True,
+                timeout=5
+            )
+            if result.returncode != 0:
+                if 'expired' in result.stderr.lower() or 'token' in result.stderr.lower():
+                    click.echo(f"SSO session expired or not initialized. Logging in...")
+                    subprocess.run(['aws', 'sso', 'login', '--profile', sso], check=True)
+        except Exception as e:
+            click.echo(f"Warning: Could not verify SSO session: {e}")
+        
+        config['aws_profile'] = sso
+    elif access_key_id and secret_access_key:
+        # Static credentials provided via CLI
+        config['credentials'] = {
+            'aws_access_key_id': access_key_id,
+            'aws_secret_access_key': secret_access_key,
+            'region': 'us-east-1'
+        }
+        if session_token:
+            config['credentials']['aws_session_token'] = session_token
+    
+    return config
+
+
 def load_profile(profile_name):
-    """Load profile configuration from ~/.config/cost-calculator/profiles.json"""
+    """Load profile configuration from local file or DynamoDB API"""
+    import os
+    import requests
+    
     config_dir = Path.home() / '.config' / 'cost-calculator'
     config_file = config_dir / 'profiles.json'
     creds_file = config_dir / 'credentials.json'
     
-    if not config_file.exists():
+    # Try local file first
+    if config_file.exists():
+        with open(config_file) as f:
+            profiles = json.load(f)
+        
+        if profile_name in profiles:
+            profile = profiles[profile_name]
+            
+            # Load credentials if using static credentials (not SSO)
+            if 'aws_profile' not in profile:
+                if not creds_file.exists():
+                    # Try environment variables
+                    if os.environ.get('AWS_ACCESS_KEY_ID'):
+                        profile['credentials'] = {
+                            'aws_access_key_id': os.environ['AWS_ACCESS_KEY_ID'],
+                            'aws_secret_access_key': os.environ['AWS_SECRET_ACCESS_KEY'],
+                            'aws_session_token': os.environ.get('AWS_SESSION_TOKEN')
+                        }
+                        return profile
+                    
+                    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
+    
+    # Profile not found locally - try DynamoDB API
+    api_secret = os.environ.get('COST_API_SECRET')
+    if not api_secret:
         raise click.ClickException(
-            f"Profile configuration not found at {config_file}\n"
+            f"Profile '{profile_name}' not found locally and COST_API_SECRET not set.\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())}"
+    try:
+        response = requests.post(
+            'https://64g7jq7sjygec2zmll5lsghrpi0txrzo.lambda-url.us-east-1.on.aws/',
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={'operation': 'get', 'profile_name': profile_name},
+            timeout=10
         )
-    
-    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:
+        if response.status_code == 200:
+            response_data = response.json()
+            # API returns {"profile": {...}} wrapper
+            profile_data = response_data.get('profile', response_data)
+            profile = {'accounts': profile_data['accounts']}
+            
+            # Check for AWS_PROFILE environment variable (SSO support)
+            if os.environ.get('AWS_PROFILE'):
+                profile['aws_profile'] = os.environ['AWS_PROFILE']
+            # Use environment credentials
+            elif os.environ.get('AWS_ACCESS_KEY_ID'):
+                profile['credentials'] = {
+                    'aws_access_key_id': os.environ['AWS_ACCESS_KEY_ID'],
+                    'aws_secret_access_key': os.environ['AWS_SECRET_ACCESS_KEY'],
+                    'aws_session_token': os.environ.get('AWS_SESSION_TOKEN')
+                }
+            
+            return profile
+        else:
             raise click.ClickException(
-                f"No credentials found for profile '{profile_name}'.\n"
-                f"Run: cc configure --profile {profile_name}"
+                f"Profile '{profile_name}' not found in DynamoDB.\n"
+                f"Run: cc profile create --name {profile_name} --accounts \"...\""
             )
-        
-        profile['credentials'] = creds[profile_name]
-    
-    return profile
+    except requests.exceptions.RequestException as e:
+        raise click.ClickException(
+            f"Failed to fetch profile from API: {e}\n"
+            f"Run: cc init --profile {profile_name}"
+        )
 
 
 def calculate_costs(profile_config, accounts, start_date, offset, window):
@@ -231,7 +325,7 @@ def calculate_costs(profile_config, accounts, start_date, offset, window):
     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 allocation: divide by 2 (50% allocation), then by days in month
     support_per_day = (support_cost / 2) / days_in_support_month
     
     # Calculate daily rate
@@ -296,12 +390,31 @@ def cli():
 @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"""
+@click.option('--sso', help='AWS SSO profile name (e.g., my_sso_profile)')
+@click.option('--access-key-id', help='AWS Access Key ID (for static credentials)')
+@click.option('--secret-access-key', help='AWS Secret Access Key (for static credentials)')
+@click.option('--session-token', help='AWS Session Token (for static credentials)')
+def calculate(profile, start_date, offset, window, json_output, sso, access_key_id, secret_access_key, session_token):
+    """
+    Calculate AWS costs for the specified period
+    
+    \b
+    Authentication Options:
+      1. SSO: --sso <profile_name>
+         Example: cc calculate --profile myprofile --sso my_sso_profile
+      
+      2. Static Credentials: --access-key-id, --secret-access-key, --session-token
+         Example: cc calculate --profile myprofile --access-key-id ASIA... --secret-access-key ... --session-token ...
+      
+      3. Environment Variables: AWS_PROFILE or AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY
+    """
     
     # Load profile configuration
     config = load_profile(profile)
     
+    # Apply authentication options
+    config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
+    
     # Calculate costs
     result = calculate_costs(
         profile_config=config,
@@ -547,12 +660,17 @@ def configure(profile, access_key_id, secret_access_key, session_token, region):
 @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):
+@click.option('--json-output', is_flag=True, help='Output as JSON')
+@click.option('--sso', help='AWS SSO profile name')
+@click.option('--access-key-id', help='AWS Access Key ID')
+@click.option('--secret-access-key', help='AWS Secret Access Key')
+@click.option('--session-token', help='AWS Session Token')
+def trends(profile, weeks, output, json_output, sso, access_key_id, secret_access_key, session_token):
     """Analyze cost trends with Week-over-Week and Trailing 30-Day comparisons"""
     
     # Load profile configuration
     config = load_profile(profile)
+    config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
     
     click.echo(f"Analyzing last {weeks} weeks...")
     click.echo("")
@@ -613,12 +731,17 @@ def trends(profile, weeks, output, json_output):
 @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):
+@click.option('--json-output', is_flag=True, help='Output as JSON')
+@click.option('--sso', help='AWS SSO profile name')
+@click.option('--access-key-id', help='AWS Access Key ID')
+@click.option('--secret-access-key', help='AWS Secret Access Key')
+@click.option('--session-token', help='AWS Session Token')
+def monthly(profile, months, output, json_output, sso, access_key_id, secret_access_key, session_token):
     """Analyze month-over-month cost trends at service level"""
     
-    # Load profile configuration
+    # Load profile
     config = load_profile(profile)
+    config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
     
     click.echo(f"Analyzing last {months} months...")
     click.echo("")
@@ -680,12 +803,17 @@ def monthly(profile, months, output, json_output):
 @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):
+@click.option('--json-output', is_flag=True, help='Output as JSON')
+@click.option('--sso', help='AWS SSO profile name')
+@click.option('--access-key-id', help='AWS Access Key ID')
+@click.option('--secret-access-key', help='AWS Secret Access Key')
+@click.option('--session-token', help='AWS Session Token')
+def drill(profile, weeks, service, account, usage_type, output, json_output, sso, access_key_id, secret_access_key, session_token):
     """Drill down into cost changes by service, account, or usage type"""
     
-    # Load profile configuration
+    # Load profile
     config = load_profile(profile)
+    config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
     
     # Show filters
     click.echo(f"Analyzing last {weeks} weeks...")
@@ -757,5 +885,119 @@ def drill(profile, weeks, service, account, usage_type, output, json_output):
             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()

cost_calculator/executor.py

@@ -11,22 +11,33 @@ def get_credentials_dict(config):
     Extract credentials from config in format needed for API.
     
     Returns:
-        dict with access_key, secret_key, session_token
+        dict with access_key, secret_key, session_token, or None if profile is 'dummy'
     """
     if 'aws_profile' in config:
-        # Get temporary credentials from SSO session
-        session = boto3.Session(profile_name=config['aws_profile'])
-        credentials = session.get_credentials()
-        frozen_creds = credentials.get_frozen_credentials()
+        # Skip credential loading for dummy profile (API-only mode)
+        if config['aws_profile'] == 'dummy':
+            return None
         
-        return {
-            'access_key': frozen_creds.access_key,
-            'secret_key': frozen_creds.secret_key,
-            'session_token': frozen_creds.token
-        }
+        # Get temporary credentials from SSO session
+        try:
+            session = boto3.Session(profile_name=config['aws_profile'])
+            credentials = session.get_credentials()
+            frozen_creds = credentials.get_frozen_credentials()
+            
+            return {
+                'access_key': frozen_creds.access_key,
+                'secret_key': frozen_creds.secret_key,
+                'session_token': frozen_creds.token
+            }
+        except Exception:
+            # If profile not found, return None (API will handle)
+            return None
     else:
         # Use static credentials
-        creds = config['credentials']
+        creds = config.get('credentials', {})
+        if not creds:
+            return None
+        
         result = {
             'access_key': creds['aws_access_key_id'],
             'secret_key': creds['aws_secret_access_key']
@@ -157,3 +168,74 @@ def execute_drill(config, weeks, service_filter=None, account_filter=None, usage
             account_filter=account_filter,
             usage_type_filter=usage_type_filter
         )
+
+
+def execute_analyze(config, weeks, analysis_type, pattern=None, min_cost=None):
+    """
+    Execute pandas-based analysis via API.
+    Note: This only works via API (requires pandas layer).
+    
+    Returns:
+        dict: analysis results
+    """
+    accounts = config['accounts']
+    
+    if not is_api_configured():
+        raise click.ClickException(
+            "Analyze command requires API configuration.\n"
+            "Set COST_API_SECRET environment variable."
+        )
+    
+    credentials = get_credentials_dict(config)
+    kwargs = {'weeks': weeks, 'type': analysis_type}
+    
+    if pattern:
+        kwargs['pattern'] = pattern
+    if min_cost:
+        kwargs['min_cost'] = min_cost
+    
+    return call_lambda_api('analyze', credentials, accounts, **kwargs)
+
+
+def execute_profile_operation(operation, profile_name=None, accounts=None, description=None):
+    """
+    Execute profile CRUD operations via API.
+    
+    Returns:
+        dict: operation result
+    """
+    if not is_api_configured():
+        raise click.ClickException(
+            "Profile commands require API configuration.\n"
+            "Set COST_API_SECRET environment variable."
+        )
+    
+    # Profile operations don't need AWS credentials, just API secret
+    import os
+    import requests
+    import json
+    
+    api_secret = os.environ.get('COST_API_SECRET', '')
+    
+    # Use profiles endpoint (hardcoded URL)
+    url = 'https://64g7jq7sjygec2zmll5lsghrpi0txrzo.lambda-url.us-east-1.on.aws/'
+    
+    payload = {'operation': operation}
+    if profile_name:
+        payload['profile_name'] = profile_name
+    if accounts:
+        payload['accounts'] = accounts
+    if description:
+        payload['description'] = description
+    
+    headers = {
+        'X-API-Secret': api_secret,
+        'Content-Type': 'application/json'
+    }
+    
+    response = requests.post(url, headers=headers, json=payload, timeout=60)
+    
+    if response.status_code != 200:
+        raise Exception(f"API call failed: {response.status_code} - {response.text}")
+    
+    return response.json()

aws_cost_calculator_cli-1.4.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-aws_cost_calculator_cli-1.4.0.dist-info/licenses/LICENSE,sha256=cYtmQZHNGGTXOtg3T7LHDRneleaH0dHXHfxFV3WR50Y,1079
-cost_calculator/__init__.py,sha256=PJeIqvWh5AYJVrJxPPkI4pJnAt37rIjasrNS0I87kaM,52
-cost_calculator/api_client.py,sha256=pSH2U0tOghDd3fisPcKqEJG3TghQYZi18HZmianHd6Y,2932
-cost_calculator/cli.py,sha256=qK6WQcAM5W15NciGOUtPpqcEvgyua5n5GRRysB4NPWw,27631
-cost_calculator/drill.py,sha256=hGi-prLgZDvNMMICQc4fl3LenM7YaZ3To_Ei4LKwrdc,10543
-cost_calculator/executor.py,sha256=RZ45GuA8tzKqj_pJaZ-BVSc8xbxxWTi4yCGcKqvNsUg,5601
-cost_calculator/monthly.py,sha256=6k9F8S7djhX1wGV3-T1MZP7CvWbbfhSTEaddwCfVu5M,7932
-cost_calculator/trends.py,sha256=k_s4ylBX50sqoiM_fwepi58HW01zz767FMJhQUPDznk,12246
-aws_cost_calculator_cli-1.4.0.dist-info/METADATA,sha256=LJkphxt8op0vOE_UJv-rGYRI4obstONupdOS8tYHGKg,7793
-aws_cost_calculator_cli-1.4.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-aws_cost_calculator_cli-1.4.0.dist-info/entry_points.txt,sha256=_5Qy4EcHbYVYrdgOu1E48faMHb9fLUl5VJ3djDHuJBo,47
-aws_cost_calculator_cli-1.4.0.dist-info/top_level.txt,sha256=PRwGPPlNqASfyhGHDjSfyl4SXeE7GF3OVTu1tY1Uqyc,16
-aws_cost_calculator_cli-1.4.0.dist-info/RECORD,,