aws-cost-calculator-cli 1.11.1__tar.gz → 2.3.2__tar.gz

{aws_cost_calculator_cli-1.11.1/aws_cost_calculator_cli.egg-info → aws_cost_calculator_cli-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-cost-calculator-cli
-Version: 1.11.1
+Version: 2.3.2
 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-1.11.1 → aws_cost_calculator_cli-2.3.2/aws_cost_calculator_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-cost-calculator-cli
-Version: 1.11.1
+Version: 2.3.2
 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-1.11.1 → aws_cost_calculator_cli-2.3.2}/aws_cost_calculator_cli.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ cost_calculator/__init__.py
 cost_calculator/api_client.py
 cost_calculator/cli.py
 cost_calculator/cur.py
+cost_calculator/dimensions.py
 cost_calculator/drill.py
 cost_calculator/executor.py
 cost_calculator/forensics.py

{aws_cost_calculator_cli-1.11.1 → aws_cost_calculator_cli-2.3.2}/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}")