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

{aws_cost_calculator_cli-1.11.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: 1.11.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-1.11.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}")