compose-runner 0.6.4rc2__tar.gz → 0.6.6__tar.gz

{compose_runner-0.6.4rc2 → compose_runner-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compose-runner
-Version: 0.6.4rc2
+Version: 0.6.6
 Summary: A package for running neurosynth-compose analyses
 Project-URL: Repository, https://github.com/neurostuff/compose-runner
 Author-email: James Kent <jamesdkent21@gmail.com>

{compose_runner-0.6.4rc2 → compose_runner-0.6.6}/compose_runner/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.6.4rc2'
-__version_tuple__ = version_tuple = (0, 6, 4, 'rc2')
+__version__ = version = '0.6.6'
+__version_tuple__ = version_tuple = (0, 6, 6)
 
 __commit_id__ = commit_id = None

compose_runner-0.6.6/compose_runner/aws_lambda/cost_check_handler.py

@@ -0,0 +1,71 @@
+from __future__ import annotations
+
+import datetime as _dt
+import logging
+import os
+from decimal import Decimal
+from typing import Any, Dict
+
+import boto3
+from botocore.exceptions import BotoCoreError, ClientError
+
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+
+_CE_CLIENT = boto3.client("ce", region_name=os.environ.get("AWS_REGION", "us-east-1"))
+
+COST_LIMIT_ENV = "COST_LIMIT_USD"
+
+
+def _month_range(today: _dt.date) -> Dict[str, str]:
+    start = today.replace(day=1)
+    # Cost Explorer end date is exclusive; add a day to include today.
+    end = today + _dt.timedelta(days=1)
+    return {"Start": start.isoformat(), "End": end.isoformat()}
+
+
+def _current_month_cost() -> Dict[str, Any]:
+    period = _month_range(_dt.date.today())
+    response = _CE_CLIENT.get_cost_and_usage(
+        TimePeriod=period,
+        Granularity="MONTHLY",
+        Metrics=["UnblendedCost"],
+    )
+    results = response.get("ResultsByTime", [])
+    total = results[0]["Total"]["UnblendedCost"] if results else {"Amount": "0", "Unit": "USD"}
+    amount = float(Decimal(total.get("Amount", "0")))
+    currency = total.get("Unit", "USD")
+    return {"amount": amount, "currency": currency, "time_period": period}
+
+
+def handler(event: Dict[str, Any], context: Any) -> Dict[str, Any]:
+    limit_raw = os.environ.get(COST_LIMIT_ENV)
+    if not limit_raw:
+        raise RuntimeError(f"{COST_LIMIT_ENV} environment variable must be set.")
+
+    try:
+        limit = float(limit_raw)
+    except ValueError as exc:  # noqa: PERF203
+        raise RuntimeError(f"Invalid {COST_LIMIT_ENV}: {limit_raw}") from exc
+
+    try:
+        cost = _current_month_cost()
+    except (ClientError, BotoCoreError) as exc:
+        logger.error("Failed to query Cost Explorer: %s", exc)
+        return {
+            "status": "ERROR",
+            "allowed": False,
+            "error": "cost_explorer_unavailable",
+            "limit": limit,
+        }
+
+    amount = cost["amount"]
+    allowed = amount < limit
+    return {
+        "status": "OK",
+        "allowed": allowed,
+        "current_spend": amount,
+        "limit": limit,
+        "currency": cost.get("currency", "USD"),
+        "time_period": cost.get("time_period"),
+    }

{compose_runner-0.6.4rc2 → compose_runner-0.6.6}/compose_runner/run.py

@@ -198,6 +198,10 @@ class Runner:
         weights = self.cached_specification.get("weights", [])
         weight_conditions = {w: c for c, w in zip(conditions, weights)}
 
+        # since we added "order" to annotations
+        if isinstance(column_type, dict):
+            column_type = column_type.get("type")
+
         if not (conditions or weights) and column_type != "boolean":
             raise ValueError(
                 f"Column type {column_type} requires a conditions and weights."

{compose_runner-0.6.4rc2 → compose_runner-0.6.6}/infra/cdk/stacks/compose_runner_stack.py

@@ -36,6 +36,7 @@ class ComposeRunnerStack(Stack):
         poll_memory_size = int(self.node.try_get_context("pollMemorySize") or 512)
         poll_timeout_seconds = int(self.node.try_get_context("pollTimeoutSeconds") or 30)
         poll_lookback_ms = int(self.node.try_get_context("pollLookbackMs") or 3600000)
+        monthly_spend_limit_usd = float(self.node.try_get_context("monthlySpendLimit") or 100)
 
         task_cpu = int(self.node.try_get_context("taskCpu") or 4096)
         task_memory_mib = int(self.node.try_get_context("taskMemoryMiB") or 30720)
@@ -243,6 +244,31 @@ class ComposeRunnerStack(Stack):
             max_attempts=2,
         )
 
+        cost_check_code = lambda_.DockerImageCode.from_image_asset(
+            str(project_root),
+            file="aws_lambda/Dockerfile",
+            cmd=["compose_runner.aws_lambda.cost_check_handler.handler"],
+            build_args=build_args,
+        )
+
+        cost_check_function = lambda_.DockerImageFunction(
+            self,
+            "ComposeRunnerCostCheck",
+            code=cost_check_code,
+            memory_size=256,
+            timeout=Duration.seconds(15),
+            environment={
+                "COST_LIMIT_USD": str(monthly_spend_limit_usd),
+            },
+            description="Blocks executions when monthly spend exceeds the configured limit.",
+        )
+        cost_check_function.add_to_role_policy(
+            iam.PolicyStatement(
+                actions=["ce:GetCostAndUsage"],
+                resources=["*"],
+            )
+        )
+
         run_output = sfn.Pass(
             self,
             "ComposeRunnerOutput",
@@ -256,7 +282,7 @@ class ComposeRunnerStack(Stack):
             },
         )
 
-        definition_chain = sfn.Choice(
+        task_selection = sfn.Choice(
             self,
             "SelectFargateTask",
         ).when(
@@ -266,6 +292,28 @@ class ComposeRunnerStack(Stack):
             run_task_standard.next(run_output)
         )
 
+        cost_limit_exceeded = sfn.Fail(
+            self,
+            "CostLimitExceeded",
+            cause="Monthly spend limit exceeded.",
+            error="CostLimitExceeded",
+        )
+
+        enforce_cost_limit = sfn.Choice(self, "EnforceMonthlyCostLimit").when(
+            sfn.Condition.boolean_equals("$.cost_check.Payload.allowed", False),
+            cost_limit_exceeded,
+        ).otherwise(task_selection)
+
+        cost_check_step = tasks.LambdaInvoke(
+            self,
+            "CheckMonthlyCost",
+            lambda_function=cost_check_function,
+            payload=sfn.TaskInput.from_object({"stateInput.$": "$"}),
+            result_path="$.cost_check",
+        )
+
+        definition_chain = cost_check_step.next(enforce_cost_limit)
+
         state_machine = sfn.StateMachine(
             self,
             "ComposeRunnerStateMachine",