The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
feat: allow --comfy-api-base target ephemeral testenvs (#14569)
Alexander Piskunb35819712e9e
diff --git a/comfy/comfy_api_env.py b/comfy/comfy_api_env.pynew file mode 100644index 000000000..17b47933f--- /dev/null+++ b/comfy/comfy_api_env.py@@ -0,0 +1,46 @@+"""Runtime config the frontend reads from /features to follow --comfy-api-base.++For a non-prod comfy.org backend (staging or an ephemeral preview env), "/features" exposes the api and+platform base so the frontend talks to it without a rebuild, plus the Firebase environment it should use.+Prod bases are left alone and keep their build-time defaults.+"""++from typing import Any+from urllib.parse import urlparse++from comfy.cli_args import args++_STAGING_API_HOST = "stagingapi.comfy.org"+_TESTENV_HOST_SUFFIX = ".testenvs.comfy.org"+_STAGING_PLATFORM_BASE_URL = "https://stagingplatform.comfy.org"+++def _is_staging_tier(host: str) -> bool:+ return host == _STAGING_API_HOST or host.endswith(_TESTENV_HOST_SUFFIX)+++def normalize_comfy_api_base(url: str) -> str:+ """Rewrite a testenv's friendly main host to its comfy-api '-registry' sibling."""+ parsed = urlparse(url)+ host = parsed.hostname or ""+ if not host.endswith(_TESTENV_HOST_SUFFIX):+ return url+ label = host[: -len(_TESTENV_HOST_SUFFIX)]+ if label.endswith("-registry"):+ return url+ return f"{parsed.scheme or 'https'}://{label}-registry{_TESTENV_HOST_SUFFIX}"+++def environment_overrides_for_base(base_url: str) -> dict[str, Any] | None:+ """The /features overrides for a staging-tier base, or None for prod."""+ if not _is_staging_tier(urlparse(base_url).hostname or ""):+ return None+ return {+ "comfy_api_base_url": normalize_comfy_api_base(base_url).rstrip("/"),+ "comfy_platform_base_url": _STAGING_PLATFORM_BASE_URL,+ "firebase_env": "dev",+ }+++def get_environment_overrides() -> dict[str, Any] | None:+ return environment_overrides_for_base(getattr(args, "comfy_api_base", "") or "")diff --git a/comfy_api_nodes/util/_helpers.py b/comfy_api_nodes/util/_helpers.pyindex 6b8121cab..7eb1ec664 100644--- a/comfy_api_nodes/util/_helpers.py+++ b/comfy_api_nodes/util/_helpers.py@@ -11,6 +11,7 @@ from io import BytesIOfrom yarl import URLfrom comfy.cli_args import args+from comfy.comfy_api_env import normalize_comfy_api_basefrom comfy.deploy_environment import get_deploy_environmentfrom comfy.model_management import processing_interruptedfrom comfy_api.latest import IO@@ -63,7 +64,7 @@ def get_comfy_api_headers(node_cls: type[IO.ComfyNode]) -> dict[str, str]:def default_base_url() -> str:- return getattr(args, "comfy_api_base", "https://api.comfy.org")+ return normalize_comfy_api_base(getattr(args, "comfy_api_base", "https://api.comfy.org"))async def sleep_with_interrupt(diff --git a/server.py b/server.pyindex 5ab93ddc2..e28fe2d22 100644--- a/server.py+++ b/server.py@@ -39,6 +39,7 @@ from comfy.deploy_environment import get_deploy_environmentimport comfy.utilsimport comfy.model_managementfrom comfy_api import feature_flags+from comfy.comfy_api_env import get_environment_overridesimport node_helpersfrom comfyui_version import __version__from app.frontend_management import FrontendManager, parse_version@@ -727,7 +728,11 @@ class PromptServer():@routes.get("/features")async def get_features(request):- return web.json_response(feature_flags.get_server_features())+ features = feature_flags.get_server_features()+ overrides = get_environment_overrides()+ if overrides:+ features.update(overrides)+ return web.json_response(features)@routes.get("/prompt")async def get_prompt(request):diff --git a/tests-unit/feature_flags_test.py b/tests-unit/feature_flags_test.pyindex a436ab1ec..df16df6ab 100644--- a/tests-unit/feature_flags_test.py+++ b/tests-unit/feature_flags_test.py@@ -11,6 +11,11 @@ from comfy_api.feature_flags import (_coerce_flag_value,_parse_cli_feature_flags,)+from comfy.comfy_api_env import (+ environment_overrides_for_base,+ get_environment_overrides,+ normalize_comfy_api_base,+)class TestFeatureFlags:@@ -183,3 +188,65 @@ class TestCliFeatureFlagRegistry:assert "type" in info, f"{key} missing 'type'"assert "default" in info, f"{key} missing 'default'"assert "description" in info, f"{key} missing 'description'"+++class TestComfyApiEnv:+ """--comfy-api-base staging-tier detection + testenv main-host -> -registry rewrite."""++ @pytest.mark.parametrize(+ "url, expected",+ [+ # testenv friendly main host -> comfy-api -registry sibling (slash trimmed)+ ("https://pr-4398.testenvs.comfy.org", "https://pr-4398-registry.testenvs.comfy.org"),+ ("https://pr-4398.testenvs.comfy.org/", "https://pr-4398-registry.testenvs.comfy.org"),+ ("https://pr-4398-registry.testenvs.comfy.org", "https://pr-4398-registry.testenvs.comfy.org"),+ # staging + everything else -> unchanged (no -registry split)+ ("https://stagingapi.comfy.org", "https://stagingapi.comfy.org"),+ ("https://api.comfy.org", "https://api.comfy.org"),+ ("https://pr-1.testenvs.comfy.org.evil.com", "https://pr-1.testenvs.comfy.org.evil.com"),+ ("", ""),+ ],+ )+ def test_normalize_comfy_api_base(self, url, expected):+ assert normalize_comfy_api_base(url) == expected++ def test_config_for_staging_tier_else_none(self):+ # ephemeral testenv: friendly main host -> -registry, staging platform, dev Firebase env+ eph = environment_overrides_for_base("https://pr-1234.testenvs.comfy.org/")+ assert eph["comfy_api_base_url"] == "https://pr-1234-registry.testenvs.comfy.org"+ assert eph["comfy_platform_base_url"] == "https://stagingplatform.comfy.org"+ assert eph["firebase_env"] == "dev"+ # staging api host: emitted as-is+ stg = environment_overrides_for_base("https://stagingapi.comfy.org")+ assert stg["comfy_api_base_url"] == "https://stagingapi.comfy.org"+ assert stg["comfy_platform_base_url"] == "https://stagingplatform.comfy.org"+ assert stg["firebase_env"] == "dev"+ # prod / unknown: nothing+ assert environment_overrides_for_base("https://api.comfy.org") is None++ def test_environment_overrides_only_for_staging_tier(self, monkeypatch):+ def set_base(url):+ monkeypatch.setattr(+ "comfy.comfy_api_env.args",+ type("Args", (), {"comfy_api_base": url})(),+ )++ # The overrides merged into the HTTP /features response are present for staging-tier bases...+ set_base("https://stagingapi.comfy.org")+ assert "comfy_api_base_url" in get_environment_overrides()+ set_base("https://pr-7.testenvs.comfy.org")+ assert "comfy_api_base_url" in get_environment_overrides()+ # ...but never for prod.+ set_base("https://api.comfy.org")+ assert get_environment_overrides() is None++ def test_server_features_never_carry_env_overrides(self, monkeypatch):+ """The WebSocket capability handshake must stay free of routing keys."""+ monkeypatch.setattr(+ "comfy.comfy_api_env.args",+ type("Args", (), {"comfy_api_base": "https://pr-7.testenvs.comfy.org"})(),+ )+ features = get_server_features()+ assert "comfy_api_base_url" not in features+ assert "comfy_platform_base_url" not in features+ assert "firebase_env" not in features