Merge pull request #20 from abundant-ai/claude/fix-modal-preview-webhook-collision

Namespace Modal preview webhook subdomains per PR

Author: huangkicn

backend/endpoints.py

@@ -29,6 +29,7 @@
     API_CONCURRENCY_TARGET,
     API_MAX_CONTAINERS,
     API_MIN_CONTAINERS,
+    API_WEBHOOK_LABEL,
     api_volumes,
     app,
     image,
@@ -52,7 +53,7 @@
     target_inputs=API_CONCURRENCY_TARGET,
     max_inputs=API_CONCURRENCY_MAX,
 )
-@modal.asgi_app(label="api")
+@modal.asgi_app(label=API_WEBHOOK_LABEL)
 def api_app():
     """Single ASGI endpoint for all API routes."""
     return api

backend/modal_app.py

@@ -22,6 +22,10 @@ def _env_int(name: str, default: int) -> int:
 MODAL_APP_NAME = os.environ.get("MODAL_APP_NAME", "oddish")
 MODAL_SECRET_ENVIRONMENT = os.environ.get("MODAL_SECRET_ENVIRONMENT", "main")
 RUNTIME_SECRET_NAME = "oddish-prod"
+# Per-app webhook label so PR previews don't collide on the shared
+# `{workspace}-{environment}--{label}.modal.run` subdomain. Production keeps
+# the historical "api" label; previews derive a unique one from the app name.
+API_WEBHOOK_LABEL = "api" if MODAL_APP_NAME == "oddish" else f"{MODAL_APP_NAME}-api"
 ENABLE_BACKGROUND_WORKERS = _env_flag("ODDISH_ENABLE_MODAL_WORKERS", True)
 API_MIN_CONTAINERS = _env_int("ODDISH_MODAL_API_MIN_CONTAINERS", 1)
 API_BUFFER_CONTAINERS = _env_int("ODDISH_MODAL_API_BUFFER_CONTAINERS", 16)