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

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-1.11.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-aws_cost_calculator_cli-1.11.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=OudMcAitmJfWgZKxjlHtfXnx2SlKrYh6FzPTkHabJlI,77975
-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-1.11.1.dist-info/METADATA,sha256=d-AHFprwq0-lD-D3ilWa7IGBxOszOdMqP7nJl5J0gyA,11979
-aws_cost_calculator_cli-1.11.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-aws_cost_calculator_cli-1.11.1.dist-info/entry_points.txt,sha256=_5Qy4EcHbYVYrdgOu1E48faMHb9fLUl5VJ3djDHuJBo,47
-aws_cost_calculator_cli-1.11.1.dist-info/top_level.txt,sha256=PRwGPPlNqASfyhGHDjSfyl4SXeE7GF3OVTu1tY1Uqyc,16
-aws_cost_calculator_cli-1.11.1.dist-info/RECORD,,