Fix Modal gateway routing metadata imports

changelog.d/1543.fixed.md

@@ -0,0 +1 @@
+Fixed Modal gateway imports so routing metadata does not pull worker-only dependencies into the lightweight gateway image.

policyengine_household_api/decorators/analytics.py

@@ -25,7 +25,7 @@
     ModalResolvedChannel,
     VariableUsageSummary,
 )
-from policyengine_household_api.utils.modal_routing_metadata import (
+from policyengine_household_api.modal_release.routing_metadata import (
     REQUESTED_VERSION_ENVIRON_KEY,
     RESOLVED_CHANNEL_ENVIRON_KEY,
 )

policyengine_household_api/modal_release/gateway.py

@@ -13,7 +13,7 @@
     empty_manifest,
     validate_manifest,
 )
-from policyengine_household_api.utils.modal_routing_metadata import (
+from policyengine_household_api.modal_release.routing_metadata import (
     MODAL_ROUTING_PAYLOAD_KEY,
     modal_routing_payload,
 )

policyengine_household_api/utils/modal_routing_metadata.py → policyengine_household_api/modal_release/routing_metadata.py

@@ -2,12 +2,14 @@
 
 from typing import Any
 
-from policyengine_household_api.models.analytics import ModalResolvedChannel
-
 
 MODAL_ROUTING_PAYLOAD_KEY = "modal_routing"
 REQUESTED_VERSION_ENVIRON_KEY = "policyengine.requested_version"
 RESOLVED_CHANNEL_ENVIRON_KEY = "policyengine.resolved_channel"
+# Keep this literal in sync with the app's channel values manually. Importing
+# the shared enum here pulls heavy, unnecessary dependencies into the Modal
+# gateway image and has broken production gateway startup.
+RESOLVED_CHANNEL_VALUES = {"current", "frontier"}
 
 
 def modal_routing_payload(
@@ -30,9 +32,7 @@ def routing_environ_overrides(payload: dict[str, Any]) -> dict[str, str]:
     resolved_channel = routing.get("resolved_channel")
     if not isinstance(requested_version, str) or not requested_version:
         return {}
-    if resolved_channel not in {
-        channel.value for channel in ModalResolvedChannel
-    }:
+    if resolved_channel not in RESOLVED_CHANNEL_VALUES:
         return {}
 
     return {

policyengine_household_api/modal_release/worker_dispatch.py

@@ -2,7 +2,7 @@
 
 from typing import Any
 
-from policyengine_household_api.utils.modal_routing_metadata import (
+from policyengine_household_api.modal_release.routing_metadata import (
     routing_environ_overrides,
 )
 

tests/unit/endpoints/test_household.py

@@ -3,7 +3,7 @@
 import pytest
 from policyengine_household_api.constants import COUNTRY_PACKAGE_VERSIONS
 from policyengine_household_api.endpoints.household import _validate_axes
-from policyengine_household_api.utils.modal_routing_metadata import (
+from policyengine_household_api.modal_release.routing_metadata import (
     REQUESTED_VERSION_ENVIRON_KEY,
     RESOLVED_CHANNEL_ENVIRON_KEY,
 )

tests/unit/modal_release/test_gateway.py

@@ -11,7 +11,7 @@
 from policyengine_household_api.modal_release.manifest import (
     MANIFEST_SCHEMA_VERSION,
 )
-from policyengine_household_api.utils.modal_routing_metadata import (
+from policyengine_household_api.modal_release.routing_metadata import (
     MODAL_ROUTING_PAYLOAD_KEY,
 )
 

tests/unit/modal_release/test_worker_dispatch.py

@@ -3,7 +3,7 @@
 from policyengine_household_api.modal_release.worker_dispatch import (
     dispatch_to_flask_app,
 )
-from policyengine_household_api.utils.modal_routing_metadata import (
+from policyengine_household_api.modal_release.routing_metadata import (
     MODAL_ROUTING_PAYLOAD_KEY,
     REQUESTED_VERSION_ENVIRON_KEY,
     RESOLVED_CHANNEL_ENVIRON_KEY,