Require explicit simulation API URL per environment

Author: anth-volk

.github/scripts/validate_app_engine_deploy_env.sh

@@ -3,6 +3,7 @@
 set -euo pipefail
 
 required=(
+  SIMULATION_API_URL
   GATEWAY_AUTH_ISSUER
   GATEWAY_AUTH_AUDIENCE
   GATEWAY_AUTH_CLIENT_ID

gcp/export.py

@@ -1,10 +1,6 @@
 import os
 from pathlib import Path
 
-DEFAULT_SIMULATION_API_URL = (
-    "https://policyengine--policyengine-simulation-gateway-web-app.modal.run"
-)
-
 GAE = os.environ["GOOGLE_APPLICATION_CREDENTIALS"]
 # If it's a filepath, read the file. Otherwise, it'll be JSON
 try:
@@ -18,9 +14,7 @@
 ANTHROPIC_API_KEY = os.environ["ANTHROPIC_API_KEY"]
 OPENAI_API_KEY = os.environ["OPENAI_API_KEY"]
 HUGGING_FACE_TOKEN = os.environ["HUGGING_FACE_TOKEN"]
-SIMULATION_API_URL = (
-    os.environ.get("SIMULATION_API_URL") or DEFAULT_SIMULATION_API_URL
-)
+SIMULATION_API_URL = os.environ["SIMULATION_API_URL"]
 GATEWAY_AUTH_ISSUER = os.environ["GATEWAY_AUTH_ISSUER"]
 GATEWAY_AUTH_AUDIENCE = os.environ["GATEWAY_AUTH_AUDIENCE"]
 GATEWAY_AUTH_CLIENT_ID = os.environ["GATEWAY_AUTH_CLIENT_ID"]

policyengine_api/libs/simulation_api_modal.py

@@ -22,11 +22,6 @@
 )
 
 
-DEFAULT_SIMULATION_API_URL = (
-    "https://policyengine--policyengine-simulation-gateway-web-app.modal.run"
-)
-
-
 @dataclass
 class ModalSimulationExecution:
     """
@@ -56,7 +51,10 @@ class SimulationAPIModal:
     """
 
     def __init__(self):
-        self.base_url = os.environ.get("SIMULATION_API_URL") or DEFAULT_SIMULATION_API_URL
+        self.base_url = os.environ.get(
+            "SIMULATION_API_URL",
+            "https://policyengine--policyengine-simulation-gateway-web-app.modal.run",
+        )
         self._token_provider = GatewayAuthTokenProvider()
         _require_all_or_none_gateway_auth_env()
         auth = (

tests/unit/libs/test_simulation_api_modal.py

@@ -131,16 +131,6 @@ def test__given_env_var_not_set__then_uses_default_url(self, mock_httpx_client):
                 assert "policyengine-simulation-gateway" in api.base_url
                 assert "modal.run" in api.base_url
 
-        def test__given_env_var_blank__then_uses_default_url(self, mock_httpx_client):
-            # Given
-            with patch.dict("os.environ", {"SIMULATION_API_URL": ""}, clear=False):
-                # When
-                api = SimulationAPIModal()
-
-                # Then
-                assert "policyengine-simulation-gateway" in api.base_url
-                assert "modal.run" in api.base_url
-
         def test__given_gateway_auth_env_vars__then_attaches_bearer_auth(
             self, mock_httpx_client, monkeypatch
         ):