compose-runner 0.6.4rc2__py2.py3-none-any.whl → 0.6.6__py2.py3-none-any.whl

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/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/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.dist-info → compose_runner-0.6.6.dist-info}/METADATA

@@ -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.dist-info → compose_runner-0.6.6.dist-info}/RECORD

@@ -1,11 +1,12 @@
 compose_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-compose_runner/_version.py,sha256=cybk8XYVdWK2Je29E0k4lwZfcW6ZxTZItOHcu6hpJqk,714
+compose_runner/_version.py,sha256=36Xr9Xxe1YvCx4D9dhOO3FJ9uBAofY81kJm_SZPwDIQ,704
 compose_runner/cli.py,sha256=1tkxFgEe8Yk7VkzE8qxGmCGqLU7UbGin2VaP0AiZkVg,1101
 compose_runner/ecs_task.py,sha256=15CyLsaf2xrvWM-gGPDOXj_Hq8eJJPiH7xyRas93zn0,5352
-compose_runner/run.py,sha256=yIh8Fj8dfVKvahRl483qGOsDUoAS1FdsYrKZp_HknGo,18525
+compose_runner/run.py,sha256=wNAm8_fKoBJElMVlY7GTODqjZJG8S6y8K-QCUljL6Ko,18666
 compose_runner/sentry.py,sha256=pjqwsZrXrKB0cCy-TL-_2eYJIqUU0aV-8e0SWUk-9Xw,320
 compose_runner/aws_lambda/__init__.py,sha256=yZNXXv7gCPSrtLCEX5Qf4cnzSTS3fHPV6k-SyZwiZIA,48
 compose_runner/aws_lambda/common.py,sha256=cA2G5lO4P8uVBqJaYcU6Y3P3t3syoTmk4SpLKZhAFo8,1688
+compose_runner/aws_lambda/cost_check_handler.py,sha256=TjzlnXLOT7kW6RfYfXuFFpmusIckGjOeUM6y0_NztBw,2213
 compose_runner/aws_lambda/log_poll_handler.py,sha256=eEU-Ra_-17me3e4eqSTd2Nv_qoaOl7zi3kIxD58Tbek,1905
 compose_runner/aws_lambda/results_handler.py,sha256=vSxs4nbWyBmkFFKRGIp5-T4W2hPh9zgj7uNH-e18aW8,2107
 compose_runner/aws_lambda/run_handler.py,sha256=WbaoRp5hsWNqAgDamW9BPihp1tfVVTM94_HKHL4Uawg,6562
@@ -22,8 +23,8 @@ compose_runner/tests/cassettes/test_run/test_run_database_workflow.yaml,sha256=a
 compose_runner/tests/cassettes/test_run/test_run_group_comparison_workflow.yaml,sha256=FaZpMdcaM7TMgyueyZBGftm6ywUh1HhtGmCegXUmRFA,4029712
 compose_runner/tests/cassettes/test_run/test_run_string_group_comparison_workflow.yaml,sha256=pcn6tQwrimhDtP8yJ3jFlsfEOnk8FWybYQr9IQ5A_KA,3233839
 compose_runner/tests/cassettes/test_run/test_run_workflow.yaml,sha256=0Nk7eJWAmgYALG2ODrezbRhpYsc00JiuYVjXt3TUm5c,3857234
-compose_runner-0.6.4rc2.dist-info/METADATA,sha256=Q2Eb4lIUAgE88_wxf5xjxcBeL2r3EEvKqHzP7pC2CWc,3435
-compose_runner-0.6.4rc2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-compose_runner-0.6.4rc2.dist-info/entry_points.txt,sha256=TyPmB9o2tSWw8L3mcach9r2EL7inRVXE9ew3_XReMIY,55
-compose_runner-0.6.4rc2.dist-info/licenses/LICENSE,sha256=PeiWxrrRme2rIpPMV9vjgGe7UHEKCIcTb0KagYhnyqo,1313
-compose_runner-0.6.4rc2.dist-info/RECORD,,
+compose_runner-0.6.6.dist-info/METADATA,sha256=rL0VGkiWKExkNpJhLq4_Kh5ZfbezoVUIeo5d_ein7lc,3432
+compose_runner-0.6.6.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+compose_runner-0.6.6.dist-info/entry_points.txt,sha256=TyPmB9o2tSWw8L3mcach9r2EL7inRVXE9ew3_XReMIY,55
+compose_runner-0.6.6.dist-info/licenses/LICENSE,sha256=PeiWxrrRme2rIpPMV9vjgGe7UHEKCIcTb0KagYhnyqo,1313
+compose_runner-0.6.6.dist-info/RECORD,,

{compose_runner-0.6.4rc2.dist-info → compose_runner-0.6.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any