aws-cost-calculator-cli 2.0.1__py3-none-any.whl → 2.3.1__py3-none-any.whl

{aws_cost_calculator_cli-2.0.1.dist-info → aws_cost_calculator_cli-2.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-cost-calculator-cli
-Version: 2.0.1
+Version: 2.3.1
 Summary: AWS Cost Calculator CLI - Calculate daily and annual AWS costs across multiple accounts
 Home-page: https://github.com/trilogy-group/aws-cost-calculator
 Author: Cost Optimization Team

aws_cost_calculator_cli-2.3.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+aws_cost_calculator_cli-2.3.1.dist-info/licenses/LICENSE,sha256=cYtmQZHNGGTXOtg3T7LHDRneleaH0dHXHfxFV3WR50Y,1079
+cost_calculator/__init__.py,sha256=PJeIqvWh5AYJVrJxPPkI4pJnAt37rIjasrNS0I87kaM,52
+cost_calculator/api_client.py,sha256=UN_dKo8OYWVN905xZAn8pLlHMBSFR_EJWCUq21K8IKg,2204
+cost_calculator/cli.py,sha256=z8_eKrBrg2JsLn7oA8DkEI1vKkMVNvPiIDn8HEHINsw,87635
+cost_calculator/cur.py,sha256=QaZ_nyDSw5_cti-h5Ho6eYLbqzY5TWoub24DpyzIiSs,9502
+cost_calculator/dimensions.py,sha256=cTpdYm-w88IgqlcB4ObhUsvGREBMrMSZx0d2PyehI6M,4478
+cost_calculator/drill.py,sha256=hGi-prLgZDvNMMICQc4fl3LenM7YaZ3To_Ei4LKwrdc,10543
+cost_calculator/executor.py,sha256=vwp4SoZfTobUeTKPujRzZzkO7tjOG8_LEGxgtraOZAQ,9348
+cost_calculator/forensics.py,sha256=uhRo3I_zOeMEaBENHfgq65URga31W0Z4vzS2UN6VmTY,12819
+cost_calculator/monthly.py,sha256=6k9F8S7djhX1wGV3-T1MZP7CvWbbfhSTEaddwCfVu5M,7932
+cost_calculator/trends.py,sha256=k_s4ylBX50sqoiM_fwepi58HW01zz767FMJhQUPDznk,12246
+aws_cost_calculator_cli-2.3.1.dist-info/METADATA,sha256=AxN6JVPuY3KljBGk1uBzxOHCgKkd8dT1fCnXmtTPwoc,11978
+aws_cost_calculator_cli-2.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aws_cost_calculator_cli-2.3.1.dist-info/entry_points.txt,sha256=_5Qy4EcHbYVYrdgOu1E48faMHb9fLUl5VJ3djDHuJBo,47
+aws_cost_calculator_cli-2.3.1.dist-info/top_level.txt,sha256=PRwGPPlNqASfyhGHDjSfyl4SXeE7GF3OVTu1tY1Uqyc,16
+aws_cost_calculator_cli-2.3.1.dist-info/RECORD,,

{aws_cost_calculator_cli-2.0.1.dist-info → aws_cost_calculator_cli-2.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

cost_calculator/api_client.py

@@ -23,14 +23,15 @@ def get_api_config():
     return None
 
 
-def call_lambda_api(endpoint, credentials, accounts, **kwargs):
+def call_lambda_api(endpoint, credentials, accounts=None, profile=None, **kwargs):
     """
-    Call Lambda API endpoint.
+    Call unified API Gateway endpoint.
     
     Args:
-        endpoint: API endpoint name ('trends', 'monthly', 'drill')
+        endpoint: API endpoint name ('calculate', 'trends', 'monthly', 'drill', 'query', etc.)
         credentials: dict with AWS credentials
-        accounts: list of account IDs
+        accounts: list of account IDs (deprecated - use profile instead)
+        profile: profile name (preferred over accounts)
         **kwargs: additional parameters for the specific endpoint
     
     Returns:
@@ -44,26 +45,22 @@ def call_lambda_api(endpoint, credentials, accounts, **kwargs):
     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/',
-        'forensics': 'https://gaekfzz7sc2hwn4mjyk64sieke0vadfo.lambda-url.us-east-1.on.aws/'  # Will be populated after deployment
-    }
-    
-    url = endpoint_urls.get(endpoint)
-    
-    if not url:
-        raise Exception(f"Unknown endpoint: {endpoint}")
+    # Get base URL from environment or use default
+    base_url = os.environ.get('COST_CALCULATOR_API_URL', 'https://api.costcop.cloudfix.dev')
+    url = f"{base_url}/{endpoint}"
     
     # Build request payload
     payload = {
-        'credentials': credentials,
-        'accounts': accounts
+        'credentials': credentials
     }
+    
+    # Add profile or accounts
+    if profile:
+        payload['profile'] = profile
+    elif accounts:
+        payload['accounts'] = accounts
+    
+    # Add additional parameters
     payload.update(kwargs)
     
     # Make API call
@@ -72,7 +69,7 @@ def call_lambda_api(endpoint, credentials, accounts, **kwargs):
         'Content-Type': 'application/json'
     }
     
-    response = requests.post(url, headers=headers, json=payload, timeout=300)
+    response = requests.post(url, headers=headers, json=payload, timeout=900)  # 15 min timeout
     
     if response.status_code != 200:
         raise Exception(f"API call failed: {response.status_code} - {response.text}")

cost_calculator/cli.py

@@ -18,6 +18,17 @@ 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
+
+# API Configuration - can be overridden via environment variable
+API_BASE_URL = os.environ.get(
+    'COST_CALCULATOR_API_URL',
+    'https://api.costcop.cloudfix.dev'
+)
+# Legacy profiles URL for backward compatibility
+PROFILES_API_URL = os.environ.get(
+    'COST_CALCULATOR_PROFILES_URL',
+    f'{API_BASE_URL}/profiles'
+)
 from cost_calculator.executor import execute_trends, execute_monthly, execute_drill
 
 
@@ -88,6 +99,96 @@ def get_api_secret():
     return None
 
 
+def get_exclusions(profile_name=None):
+    """Get exclusions configuration from DynamoDB API"""
+    import requests
+    
+    api_secret = get_api_secret()
+    if not api_secret:
+        raise click.ClickException(
+            "No API secret configured.\n"
+            "Run: cc configure --api-secret YOUR_SECRET"
+        )
+    
+    try:
+        response = requests.post(
+            PROFILES_API_URL,
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={'operation': 'get_exclusions', 'profile_name': profile_name},
+            timeout=10
+        )
+        
+        if response.status_code == 200:
+            return response.json().get('exclusions', {})
+        else:
+            # Return defaults if API fails
+            return {
+                'record_types': ['Tax', 'Support'],
+                'services': [],
+                'usage_types': [],
+                'line_item_types': []
+            }
+    except:
+        # Return defaults if request fails
+        return {
+            'record_types': ['Tax', 'Support'],
+            'services': [],
+            'usage_types': [],
+            'line_item_types': []
+        }
+
+
+def build_exclusion_filter(exclusions):
+    """Build AWS Cost Explorer filter from exclusions config"""
+    filter_parts = []
+    
+    # Exclude record types (Tax, Support, etc.)
+    if exclusions.get('record_types'):
+        filter_parts.append({
+            "Not": {
+                "Dimensions": {
+                    "Key": "RECORD_TYPE",
+                    "Values": exclusions['record_types']
+                }
+            }
+        })
+    
+    # Exclude specific services (OCBLateFee, etc.)
+    if exclusions.get('services'):
+        filter_parts.append({
+            "Not": {
+                "Dimensions": {
+                    "Key": "SERVICE",
+                    "Values": exclusions['services']
+                }
+            }
+        })
+    
+    # Exclude usage types
+    if exclusions.get('usage_types'):
+        filter_parts.append({
+            "Not": {
+                "Dimensions": {
+                    "Key": "USAGE_TYPE",
+                    "Values": exclusions['usage_types']
+                }
+            }
+        })
+    
+    # Exclude line item types (Refund, Credit, etc.)
+    if exclusions.get('line_item_types'):
+        filter_parts.append({
+            "Not": {
+                "Dimensions": {
+                    "Key": "LINE_ITEM_TYPE",
+                    "Values": exclusions['line_item_types']
+                }
+            }
+        })
+    
+    return filter_parts
+
+
 def load_profile(profile_name):
     """Load profile configuration from DynamoDB API (API-only, no local files)"""
     import requests
@@ -104,7 +205,7 @@ def load_profile(profile_name):
     
     try:
         response = requests.post(
-            'https://64g7jq7sjygec2zmll5lsghrpi0txrzo.lambda-url.us-east-1.on.aws/',
+            PROFILES_API_URL,
             headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
             json={'operation': 'get', 'profile_name': profile_name},
             timeout=10
@@ -245,7 +346,10 @@ def calculate_costs(profile_config, accounts, start_date, offset, window):
                 )
         raise
     
-    # Build filter
+    # Build filter with dynamic exclusions
+    exclusions = get_exclusions()  # Get from DynamoDB
+    exclusion_filters = build_exclusion_filter(exclusions)
+    
     cost_filter = {
         "And": [
             {
@@ -259,18 +363,13 @@ def calculate_costs(profile_config, accounts, start_date, offset, window):
                     "Key": "BILLING_ENTITY",
                     "Values": ["AWS"]
                 }
-            },
-            {
-                "Not": {
-                    "Dimensions": {
-                        "Key": "RECORD_TYPE",
-                        "Values": ["Tax", "Support"]
-                    }
-                }
             }
         ]
     }
     
+    # Add dynamic exclusion filters
+    cost_filter["And"].extend(exclusion_filters)
+    
     # Get daily costs
     click.echo("Fetching cost data...")
     try:
@@ -575,145 +674,61 @@ def calculate(profile, start_date, offset, window, json_output, sso, access_key_
         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}")
+# init command removed - use backend API via 'cc profile create' instead
 
 
 @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)
+    """List all profiles from backend API (no local caching)"""
+    import requests
     
-    if not profiles:
-        click.echo("No profiles configured.")
+    api_secret = get_api_secret()
+    if not api_secret:
+        click.echo("No API secret configured.")
+        click.echo("Run: cc configure --api-secret YOUR_SECRET")
         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'])}")
+    try:
+        response = requests.post(
+            f"{API_BASE_URL}/profiles",
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={'operation': 'list'},
+            timeout=10
+        )
+        
+        if response.status_code != 200:
+            click.echo(f"Error: {response.status_code} - {response.text}")
+            return
+        
+        result = response.json()
+        profiles = result.get('profiles', [])
+        
+        if not profiles:
+            click.echo("No profiles found in backend.")
+            click.echo("Contact admin to create profiles in DynamoDB.")
+            return
+        
+        click.echo("Profiles (from backend API):")
         click.echo("")
+        for profile in profiles:
+            # Each profile is a dict, extract the profile_name
+            if isinstance(profile, dict):
+                name = profile.get('profile_name', 'unknown')
+                # Skip exclusions entries
+                if not name.startswith('exclusions:'):
+                    accounts = profile.get('accounts', [])
+                    click.echo(f"  {name}")
+                    click.echo(f"    Accounts: {len(accounts)}")
+                    click.echo("")
+            else:
+                click.echo(f"  {profile}")
+        click.echo(f"Total: {len([p for p in profiles if isinstance(p, dict) and not p.get('profile_name', '').startswith('exclusions:')])} profile(s)")
+        
+    except Exception as e:
+        click.echo(f"Error loading profiles: {e}")
 
 
-@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)
+# setup command removed - profiles are managed in DynamoDB backend only
 
 
 @cli.command()
@@ -939,6 +954,10 @@ def monthly(profile, months, output, json_output, sso, access_key_id, secret_acc
 @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('--dimension', type=click.Choice(['service', 'account', 'region', 'usage_type', 'resource', 'instance_type', 'operation', 'availability_zone']),
+              help='Dimension to analyze by (overrides --service/--account filters)')
+@click.option('--backend', type=click.Choice(['auto', 'ce', 'athena']), default='auto',
+              help='Data source: auto (smart selection), ce (Cost Explorer), athena (CUR). Default: auto')
 @click.option('--resources', is_flag=True, help='Show individual resource IDs (requires CUR, uses Athena)')
 @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')
@@ -946,19 +965,49 @@ def monthly(profile, months, output, json_output, sso, access_key_id, secret_acc
 @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, resources, output, json_output, sso, access_key_id, secret_access_key, session_token):
+def drill(profile, weeks, service, account, usage_type, dimension, backend, resources, output, json_output, sso, access_key_id, secret_access_key, session_token):
     """
     Drill down into cost changes by service, account, or usage type
     
     Add --resources flag to see individual resource IDs and costs (requires CUR data via Athena)
+    
+    Examples:
+        # Analyze by service (auto-selects Cost Explorer for speed)
+        cc drill --profile khoros --dimension service
+        
+        # Analyze by region with specific service filter
+        cc drill --profile khoros --dimension region --service AWSELB
+        
+        # Analyze by resource (auto-selects Athena - only source with resource IDs)
+        cc drill --profile khoros --dimension resource --service AWSELB --account 820054669588
+        
+        # Force Athena backend for detailed analysis
+        cc drill --profile khoros --dimension service --backend athena
     """
     
     # Load profile
     config = load_profile(profile)
     config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
     
+    # Smart backend selection
+    def select_backend(dimension, resources_flag, backend_choice):
+        """Auto-select backend based on query requirements"""
+        if backend_choice != 'auto':
+            return backend_choice
+        
+        # Must use Athena if:
+        if dimension == 'resource' or resources_flag:
+            return 'athena'
+        
+        # Prefer CE for speed (unless explicitly requesting Athena)
+        return 'ce'
+    
+    selected_backend = select_backend(dimension, resources, backend)
+    
     # Show filters
     click.echo(f"Analyzing last {weeks} weeks...")
+    if dimension:
+        click.echo(f"  Dimension: {dimension}")
     if service:
         click.echo(f"  Service filter: {service}")
     if account:
@@ -967,10 +1016,11 @@ def drill(profile, weeks, service, account, usage_type, resources, output, json_
         click.echo(f"  Usage type filter: {usage_type}")
     if resources:
         click.echo(f"  Mode: Resource-level (CUR via Athena)")
+    click.echo(f"  Backend: {selected_backend.upper()}")
     click.echo("")
     
     # Execute via API or locally
-    drill_data = execute_drill(config, weeks, service, account, usage_type, resources)
+    drill_data = execute_drill(config, weeks, service, account, usage_type, resources, dimension, selected_backend)
     
     # Handle resource-level output differently
     if resources:
@@ -1997,5 +2047,238 @@ def query(profile, query, database, output_bucket, sso):
         raise click.ClickException(f"Query failed: {e}")
 
 
+@cli.group()
+def exclusions():
+    """
+    Manage cost exclusions (services/types to exclude from calculations).
+    
+    Exclusions are stored in DynamoDB and apply globally or per-profile.
+    Common exclusions: Tax, Support, OCBLateFee, Refunds, Credits
+    """
+    pass
+
+
+@exclusions.command('show')
+@click.option('--profile', help='Show profile-specific exclusions (default: global)')
+@click.option('--json', 'output_json', is_flag=True, help='Output as JSON')
+def show_exclusions(profile, output_json):
+    """Show current exclusions configuration"""
+    import requests
+    
+    api_secret = get_api_secret()
+    if not api_secret:
+        raise click.ClickException(
+            "No API secret configured.\n"
+            "Run: cc configure --api-secret YOUR_SECRET"
+        )
+    
+    try:
+        response = requests.post(
+            PROFILES_API_URL,
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={'operation': 'get_exclusions', 'profile_name': profile},
+            timeout=10
+        )
+        
+        if response.status_code == 200:
+            exclusions_data = response.json().get('exclusions', {})
+            
+            if output_json:
+                click.echo(json.dumps(exclusions_data, indent=2))
+            else:
+                scope = profile if profile else "global"
+                click.echo(f"Exclusions ({scope}):")
+                click.echo("")
+                
+                if exclusions_data.get('record_types'):
+                    click.echo("Record Types:")
+                    for rt in exclusions_data['record_types']:
+                        click.echo(f"  - {rt}")
+                    click.echo("")
+                
+                if exclusions_data.get('services'):
+                    click.echo("Services:")
+                    for svc in exclusions_data['services']:
+                        click.echo(f"  - {svc}")
+                    click.echo("")
+                
+                if exclusions_data.get('line_item_types'):
+                    click.echo("Line Item Types:")
+                    for lit in exclusions_data['line_item_types']:
+                        click.echo(f"  - {lit}")
+                    click.echo("")
+                
+                if exclusions_data.get('usage_types'):
+                    click.echo("Usage Types:")
+                    for ut in exclusions_data['usage_types']:
+                        click.echo(f"  - {ut}")
+        else:
+            raise click.ClickException(f"Failed to fetch exclusions: {response.status_code}")
+    
+    except requests.exceptions.RequestException as e:
+        raise click.ClickException(f"API request failed: {e}")
+
+
+@exclusions.command('add')
+@click.option('--record-type', help='Add record type exclusion (e.g., Tax, Support)')
+@click.option('--service', help='Add service exclusion (e.g., OCBLateFee)')
+@click.option('--line-item-type', help='Add line item type exclusion (e.g., Refund, Credit)')
+@click.option('--usage-type', help='Add usage type exclusion')
+@click.option('--profile', help='Add to profile-specific exclusions (default: global)')
+def add_exclusion(record_type, service, line_item_type, usage_type, profile):
+    """Add an exclusion"""
+    import requests
+    
+    if not any([record_type, service, line_item_type, usage_type]):
+        raise click.ClickException(
+            "Must specify at least one of: --record-type, --service, --line-item-type, --usage-type"
+        )
+    
+    api_secret = get_api_secret()
+    if not api_secret:
+        raise click.ClickException(
+            "No API secret configured.\n"
+            "Run: cc configure --api-secret YOUR_SECRET"
+        )
+    
+    # Get current exclusions
+    try:
+        response = requests.post(
+            PROFILES_API_URL,
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={'operation': 'get_exclusions', 'profile_name': profile},
+            timeout=10
+        )
+        
+        if response.status_code == 200:
+            exclusions_data = response.json().get('exclusions', {})
+        else:
+            exclusions_data = {
+                'record_types': [],
+                'services': [],
+                'line_item_types': [],
+                'usage_types': []
+            }
+        
+        # Add new exclusions
+        if record_type and record_type not in exclusions_data.get('record_types', []):
+            exclusions_data.setdefault('record_types', []).append(record_type)
+        
+        if service and service not in exclusions_data.get('services', []):
+            exclusions_data.setdefault('services', []).append(service)
+        
+        if line_item_type and line_item_type not in exclusions_data.get('line_item_types', []):
+            exclusions_data.setdefault('line_item_types', []).append(line_item_type)
+        
+        if usage_type and usage_type not in exclusions_data.get('usage_types', []):
+            exclusions_data.setdefault('usage_types', []).append(usage_type)
+        
+        # Update exclusions
+        update_response = requests.post(
+            PROFILES_API_URL,
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={
+                'operation': 'update_exclusions',
+                'profile_name': profile,
+                'record_types': exclusions_data.get('record_types', []),
+                'services': exclusions_data.get('services', []),
+                'line_item_types': exclusions_data.get('line_item_types', []),
+                'usage_types': exclusions_data.get('usage_types', [])
+            },
+            timeout=10
+        )
+        
+        if update_response.status_code == 200:
+            scope = profile if profile else "global"
+            click.echo(f"✓ Exclusion added to {scope} config")
+            if record_type:
+                click.echo(f"  Record Type: {record_type}")
+            if service:
+                click.echo(f"  Service: {service}")
+            if line_item_type:
+                click.echo(f"  Line Item Type: {line_item_type}")
+            if usage_type:
+                click.echo(f"  Usage Type: {usage_type}")
+        else:
+            raise click.ClickException(f"Failed to update exclusions: {update_response.status_code}")
+    
+    except requests.exceptions.RequestException as e:
+        raise click.ClickException(f"API request failed: {e}")
+
+
+@exclusions.command('remove')
+@click.option('--record-type', help='Remove record type exclusion')
+@click.option('--service', help='Remove service exclusion')
+@click.option('--line-item-type', help='Remove line item type exclusion')
+@click.option('--usage-type', help='Remove usage type exclusion')
+@click.option('--profile', help='Remove from profile-specific exclusions (default: global)')
+def remove_exclusion(record_type, service, line_item_type, usage_type, profile):
+    """Remove an exclusion"""
+    import requests
+    
+    if not any([record_type, service, line_item_type, usage_type]):
+        raise click.ClickException(
+            "Must specify at least one of: --record-type, --service, --line-item-type, --usage-type"
+        )
+    
+    api_secret = get_api_secret()
+    if not api_secret:
+        raise click.ClickException(
+            "No API secret configured.\n"
+            "Run: cc configure --api-secret YOUR_SECRET"
+        )
+    
+    # Get current exclusions
+    try:
+        response = requests.post(
+            PROFILES_API_URL,
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={'operation': 'get_exclusions', 'profile_name': profile},
+            timeout=10
+        )
+        
+        if response.status_code == 200:
+            exclusions_data = response.json().get('exclusions', {})
+        else:
+            raise click.ClickException("No exclusions found")
+        
+        # Remove exclusions
+        if record_type and record_type in exclusions_data.get('record_types', []):
+            exclusions_data['record_types'].remove(record_type)
+        
+        if service and service in exclusions_data.get('services', []):
+            exclusions_data['services'].remove(service)
+        
+        if line_item_type and line_item_type in exclusions_data.get('line_item_types', []):
+            exclusions_data['line_item_types'].remove(line_item_type)
+        
+        if usage_type and usage_type in exclusions_data.get('usage_types', []):
+            exclusions_data['usage_types'].remove(usage_type)
+        
+        # Update exclusions
+        update_response = requests.post(
+            PROFILES_API_URL,
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={
+                'operation': 'update_exclusions',
+                'profile_name': profile,
+                'record_types': exclusions_data.get('record_types', []),
+                'services': exclusions_data.get('services', []),
+                'line_item_types': exclusions_data.get('line_item_types', []),
+                'usage_types': exclusions_data.get('usage_types', [])
+            },
+            timeout=10
+        )
+        
+        if update_response.status_code == 200:
+            scope = profile if profile else "global"
+            click.echo(f"✓ Exclusion removed from {scope} config")
+        else:
+            raise click.ClickException(f"Failed to update exclusions: {update_response.status_code}")
+    
+    except requests.exceptions.RequestException as e:
+        raise click.ClickException(f"API request failed: {e}")
+
+
 if __name__ == '__main__':
     cli()

cost_calculator/dimensions.py

@@ -0,0 +1,141 @@
+"""
+Dimension mapping between CLI, Cost Explorer, and Athena CUR.
+
+This module provides utilities for translating dimension names across different backends.
+"""
+
+# Dimension mapping: CLI dimension -> (CE dimension, Athena column)
+DIMENSION_MAP = {
+    'service': ('SERVICE', 'line_item_product_code'),
+    'account': ('LINKED_ACCOUNT', 'line_item_usage_account_id'),
+    'region': ('REGION', 'product_region'),
+    'usage_type': ('USAGE_TYPE', 'line_item_usage_type'),
+    'resource': (None, 'line_item_resource_id'),  # Athena only
+    'instance_type': ('INSTANCE_TYPE', 'product_instance_type'),
+    'operation': ('OPERATION', 'line_item_operation'),
+    'availability_zone': ('AVAILABILITY_ZONE', 'product_availability_zone'),
+}
+
+
+def get_ce_dimension(cli_dimension):
+    """
+    Get Cost Explorer dimension key for a CLI dimension.
+    
+    Args:
+        cli_dimension: CLI dimension name (e.g., 'service', 'account')
+    
+    Returns:
+        str: Cost Explorer dimension key (e.g., 'SERVICE', 'LINKED_ACCOUNT')
+        None: If dimension is not available in Cost Explorer
+    
+    Raises:
+        ValueError: If dimension is unknown
+    """
+    if cli_dimension not in DIMENSION_MAP:
+        raise ValueError(f"Unknown dimension: {cli_dimension}")
+    
+    ce_dim, _ = DIMENSION_MAP[cli_dimension]
+    return ce_dim
+
+
+def get_athena_column(cli_dimension):
+    """
+    Get Athena CUR column name for a CLI dimension.
+    
+    Args:
+        cli_dimension: CLI dimension name (e.g., 'service', 'account')
+    
+    Returns:
+        str: Athena column name (e.g., 'line_item_product_code', 'line_item_usage_account_id')
+    
+    Raises:
+        ValueError: If dimension is unknown
+    """
+    if cli_dimension not in DIMENSION_MAP:
+        raise ValueError(f"Unknown dimension: {cli_dimension}")
+    
+    _, athena_col = DIMENSION_MAP[cli_dimension]
+    return athena_col
+
+
+def is_athena_only(cli_dimension):
+    """
+    Check if a dimension is only available in Athena (not in Cost Explorer).
+    
+    Args:
+        cli_dimension: CLI dimension name
+    
+    Returns:
+        bool: True if dimension requires Athena, False otherwise
+    """
+    if cli_dimension not in DIMENSION_MAP:
+        raise ValueError(f"Unknown dimension: {cli_dimension}")
+    
+    ce_dim, _ = DIMENSION_MAP[cli_dimension]
+    return ce_dim is None
+
+
+def get_available_dimensions(backend='auto'):
+    """
+    Get list of available dimensions for a given backend.
+    
+    Args:
+        backend: 'auto', 'ce', or 'athena'
+    
+    Returns:
+        list: List of available dimension names
+    """
+    if backend == 'athena':
+        # All dimensions available in Athena
+        return list(DIMENSION_MAP.keys())
+    elif backend == 'ce':
+        # Only dimensions with CE mapping
+        return [dim for dim, (ce_dim, _) in DIMENSION_MAP.items() if ce_dim is not None]
+    else:  # auto
+        # All dimensions (backend will be auto-selected)
+        return list(DIMENSION_MAP.keys())
+
+
+def validate_dimension_backend(dimension, backend):
+    """
+    Validate that a dimension is available for the specified backend.
+    
+    Args:
+        dimension: CLI dimension name
+        backend: 'auto', 'ce', or 'athena'
+    
+    Returns:
+        tuple: (is_valid, error_message)
+    
+    Examples:
+        >>> validate_dimension_backend('resource', 'ce')
+        (False, "Dimension 'resource' requires Athena backend (not available in Cost Explorer)")
+        
+        >>> validate_dimension_backend('service', 'ce')
+        (True, None)
+    """
+    if dimension not in DIMENSION_MAP:
+        return False, f"Unknown dimension: {dimension}"
+    
+    if backend == 'ce' and is_athena_only(dimension):
+        return False, f"Dimension '{dimension}' requires Athena backend (not available in Cost Explorer)"
+    
+    return True, None
+
+
+# Human-readable dimension descriptions
+DIMENSION_DESCRIPTIONS = {
+    'service': 'AWS Service (e.g., EC2, S3, RDS)',
+    'account': 'AWS Account ID',
+    'region': 'AWS Region (e.g., us-east-1, eu-west-1)',
+    'usage_type': 'Usage Type (e.g., BoxUsage:t3.micro)',
+    'resource': 'Resource ID/ARN (Athena only)',
+    'instance_type': 'Instance Type (e.g., t3.micro, m5.large)',
+    'operation': 'Operation (e.g., RunInstances, CreateBucket)',
+    'availability_zone': 'Availability Zone (e.g., us-east-1a)',
+}
+
+
+def get_dimension_description(dimension):
+    """Get human-readable description for a dimension."""
+    return DIMENSION_DESCRIPTIONS.get(dimension, dimension)

cost_calculator/executor.py

@@ -92,12 +92,16 @@ def get_credentials_dict(config):
 
 def execute_trends(config, weeks):
     """
-    Execute trends analysis via API or locally.
+    Execute trends analysis via API.
+    
+    Args:
+        config: Profile configuration
+        weeks: Number of weeks to analyze
     
     Returns:
         dict: trends data
     """
-    accounts = config['accounts']
+    profile_name = config.get('profile_name', config.get('name'))
     
     if not is_api_configured():
         raise Exception(
@@ -110,7 +114,7 @@ def execute_trends(config, weeks):
     credentials = get_credentials_dict(config)
     if not credentials:
         raise Exception("Failed to get AWS credentials. Check your AWS SSO session.")
-    return call_lambda_api('trends', credentials, accounts, weeks=weeks)
+    return call_lambda_api('trends', credentials, profile=profile_name, weeks=weeks)
 
 
 def execute_monthly(config, months):
@@ -120,7 +124,7 @@ def execute_monthly(config, months):
     Returns:
         dict: monthly data
     """
-    accounts = config['accounts']
+    profile_name = config.get('profile_name', config.get('name'))
     
     if not is_api_configured():
         raise Exception(
@@ -133,10 +137,10 @@ def execute_monthly(config, months):
     credentials = get_credentials_dict(config)
     if not credentials:
         raise Exception("Failed to get AWS credentials. Check your AWS SSO session.")
-    return call_lambda_api('monthly', credentials, accounts, months=months)
+    return call_lambda_api('monthly', credentials, profile=profile_name, months=months)
 
 
-def execute_drill(config, weeks, service_filter=None, account_filter=None, usage_type_filter=None, resources=False):
+def execute_drill(config, weeks, service_filter=None, account_filter=None, usage_type_filter=None, resources=False, dimension=None, backend='auto'):
     """
     Execute drill-down analysis via API.
     
@@ -147,11 +151,13 @@ def execute_drill(config, weeks, service_filter=None, account_filter=None, usage
         account_filter: Optional account ID filter
         usage_type_filter: Optional usage type filter
         resources: If True, query CUR for resource-level details
+        dimension: Dimension to analyze by (service, account, region, usage_type, resource, etc.)
+        backend: Backend to use ('auto', 'ce', 'athena')
     
     Returns:
         dict: drill data or resource data
     """
-    accounts = config['accounts']
+    profile_name = config.get('profile_name', config.get('name'))
     
     if not is_api_configured():
         raise Exception(
@@ -172,12 +178,16 @@ def execute_drill(config, weeks, service_filter=None, account_filter=None, usage
         kwargs['account'] = account_filter
     if usage_type_filter:
         kwargs['usage_type'] = usage_type_filter
+    if dimension:
+        kwargs['dimension'] = dimension
+    if backend and backend != 'auto':
+        kwargs['backend'] = backend
     if resources:
-        if not service_filter:
-            raise click.ClickException("--service is required when using --resources flag")
+        if not service_filter and not dimension:
+            raise click.ClickException("--service or --dimension is required when using --resources flag")
         kwargs['resources'] = True
     
-    return call_lambda_api('drill', credentials, accounts, **kwargs)
+    return call_lambda_api('drill', credentials, profile=profile_name, **kwargs)
 
 
 def execute_analyze(config, weeks, analysis_type, pattern=None, min_cost=None):
@@ -227,8 +237,11 @@ def execute_profile_operation(operation, profile_name=None, accounts=None, descr
     
     api_secret = os.environ.get('COST_API_SECRET', '')
     
-    # Use profiles endpoint (hardcoded URL)
-    url = 'https://64g7jq7sjygec2zmll5lsghrpi0txrzo.lambda-url.us-east-1.on.aws/'
+    # Use profiles endpoint (can be overridden via environment variable)
+    url = os.environ.get(
+        'COST_CALCULATOR_PROFILES_URL',
+        'https://64g7jq7sjygec2zmll5lsghrpi0txrzo.lambda-url.us-east-1.on.aws/'
+    )
     
     payload = {'operation': operation}
     if profile_name:

aws_cost_calculator_cli-2.0.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-aws_cost_calculator_cli-2.0.1.dist-info/licenses/LICENSE,sha256=cYtmQZHNGGTXOtg3T7LHDRneleaH0dHXHfxFV3WR50Y,1079
-cost_calculator/__init__.py,sha256=PJeIqvWh5AYJVrJxPPkI4pJnAt37rIjasrNS0I87kaM,52
-cost_calculator/api_client.py,sha256=4ZI2XcGIN3FBeQqb7xOxQ91kCoeM43-rExiOELXoKBQ,2485
-cost_calculator/cli.py,sha256=7j_jK2PKOchF9oereH6GtDtTjDnlhiTaVuS5FFdeL6U,76371
-cost_calculator/cur.py,sha256=QaZ_nyDSw5_cti-h5Ho6eYLbqzY5TWoub24DpyzIiSs,9502
-cost_calculator/drill.py,sha256=hGi-prLgZDvNMMICQc4fl3LenM7YaZ3To_Ei4LKwrdc,10543
-cost_calculator/executor.py,sha256=yZTCUgJc1OpB892O3mq9ZA0Yekc7N-HvaW8xLFyrXjo,8681
-cost_calculator/forensics.py,sha256=uhRo3I_zOeMEaBENHfgq65URga31W0Z4vzS2UN6VmTY,12819
-cost_calculator/monthly.py,sha256=6k9F8S7djhX1wGV3-T1MZP7CvWbbfhSTEaddwCfVu5M,7932
-cost_calculator/trends.py,sha256=k_s4ylBX50sqoiM_fwepi58HW01zz767FMJhQUPDznk,12246
-aws_cost_calculator_cli-2.0.1.dist-info/METADATA,sha256=vC_DLqKCR82e1D9uideemfOE6AihjB57fR4wS1F-WWc,11978
-aws_cost_calculator_cli-2.0.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-aws_cost_calculator_cli-2.0.1.dist-info/entry_points.txt,sha256=_5Qy4EcHbYVYrdgOu1E48faMHb9fLUl5VJ3djDHuJBo,47
-aws_cost_calculator_cli-2.0.1.dist-info/top_level.txt,sha256=PRwGPPlNqASfyhGHDjSfyl4SXeE7GF3OVTu1tY1Uqyc,16
-aws_cost_calculator_cli-2.0.1.dist-info/RECORD,,