use app factory

sanderegg · sanderegg · commit 37285a9c76f1 · 2025-07-10T12:47:35.000+02:00
diff --git a/services/api-server/Makefile b/services/api-server/Makefile
@@ -30,7 +30,7 @@ define _create_and_validate_openapi
 	# generating openapi specs file under $< (NOTE: Skips DEV FEATURES since this OAS is the 'offically released'!)
 	@source .env; \
 	export API_SERVER_DEV_FEATURES_ENABLED=$1; \
-	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
+	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app_factory().openapi(), indent=2) )" > $@
 
 	# validates OAS file: $@
 	docker run --rm \
diff --git a/services/api-server/src/simcore_service_api_server/cli.py b/services/api-server/src/simcore_service_api_server/cli.py
@@ -18,6 +18,6 @@ def run():
     """Runs application"""
     typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")
     typer.secho(
-        "$ uvicorn simcore_service_api_server.main:the_app",
+        "$ uvicorn --factory simcore_service_api_server.main:app_factory",
         fg=typer.colors.BLUE,
     )
diff --git a/services/api-server/src/simcore_service_api_server/main.py b/services/api-server/src/simcore_service_api_server/main.py
@@ -9,9 +9,6 @@
 from simcore_service_api_server.core.application import init_app
 from simcore_service_api_server.core.settings import ApplicationSettings
 
-# SINGLETON FastAPI app
-the_app: FastAPI = init_app()
-
 _logger = logging.getLogger(__name__)
 
 _NOISY_LOGGERS: Final[tuple[str, ...]] = (
diff --git a/services/api-server/tests/unit/test_cli.py b/services/api-server/tests/unit/test_cli.py
@@ -34,7 +34,7 @@ def test_cli_list_settings(cli_runner: CliRunner, app_environment: EnvVarsDict):
 
 
 def test_main(app_environment: EnvVarsDict):
-    from simcore_service_api_server.main import the_app
+    from simcore_service_api_server.main import app_factory
 
-    assert the_app
+    the_app = app_factory()
     assert isinstance(the_app, FastAPI)
diff --git a/services/autoscaling/src/simcore_service_autoscaling/cli.py b/services/autoscaling/src/simcore_service_autoscaling/cli.py
@@ -19,6 +19,6 @@ def run():
     """Runs application"""
     typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")
     typer.secho(
-        "$ uvicorn simcore_service_autoscaling.main:the_app",
+        "$ uvicorn --factory simcore_service_autoscaling.main:app_factory",
         fg=typer.colors.BLUE,
     )
diff --git a/services/autoscaling/tests/unit/test_main.py b/services/autoscaling/tests/unit/test_main.py
@@ -7,6 +7,6 @@
 
 
 def test_main_app(app_environment: EnvVarsDict):
-    from simcore_service_autoscaling.main import the_app, the_settings
+    from simcore_service_autoscaling.main import app_factory
 
-    assert the_app.state.settings == the_settings
+    app_factory()
diff --git a/services/catalog/Makefile b/services/catalog/Makefile
@@ -17,7 +17,7 @@ openapi.json: .env-ignore
 	@set -o allexport; \
 	source $<; \
 	set +o allexport; \
-	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
+	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app_factory().openapi(), indent=2) )" > $@
 
 	# validates OAS file: $@
 	$(call validate_openapi_specs,$@)
diff --git a/services/catalog/src/simcore_service_catalog/cli.py b/services/catalog/src/simcore_service_catalog/cli.py
@@ -30,7 +30,7 @@ def run():
     """Runs application"""
     typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")
     typer.secho(
-        "$ uvicorn simcore_service_catalog.main:the_app",
+        "$ uvicorn --factory simcore_service_catalog.main:app_factory",
         fg=typer.colors.BLUE,
     )
 
diff --git a/services/clusters-keeper/src/simcore_service_clusters_keeper/cli.py b/services/clusters-keeper/src/simcore_service_clusters_keeper/cli.py
@@ -19,6 +19,6 @@ def run():
     """Runs application"""
     typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")
     typer.secho(
-        "$ uvicorn simcore_service_clusters_keeper.main:the_app",
+        "$ uvicorn --factory simcore_service_clusters_keeper.main:app_factory",
         fg=typer.colors.BLUE,
     )
diff --git a/services/clusters-keeper/tests/unit/test_main.py b/services/clusters-keeper/tests/unit/test_main.py
@@ -7,6 +7,6 @@
 
 
 def test_main_app(app_environment: EnvVarsDict):
-    from simcore_service_clusters_keeper.main import the_app, the_settings
+    from simcore_service_clusters_keeper.main import app_factory
 
-    assert the_app.state.settings == the_settings
+    app_factory()
diff --git a/services/datcore-adapter/src/simcore_service_datcore_adapter/cli.py b/services/datcore-adapter/src/simcore_service_datcore_adapter/cli.py
@@ -20,6 +20,6 @@ def run() -> None:
     """Runs application"""
     typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")
     typer.secho(
-        f"$ uvicorn {PROJECT_NAME}.main:the_app",
+        f"$ uvicorn --factory {PROJECT_NAME}.main:app_factory",
         fg=typer.colors.BLUE,
     )
diff --git a/services/director-v2/Makefile b/services/director-v2/Makefile
@@ -18,7 +18,7 @@ openapi.json: .env
 	@set -o allexport; \
 	source .env; \
 	set +o allexport; \
-	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
+	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app_factory().openapi(), indent=2) )" > $@
 
 
 DOCKER_API_VERSION ?= 1.41
@@ -65,7 +65,7 @@ down down-extra:  ## stops extra stack
 
 run-devel: .env up-extra  ## starts app with extra stack
 	# start app (within $<) in devel mode
-	uvicorn $(APP_PACKAGE_NAME).__main__:the_app \
+	uvicorn --factory $(APP_PACKAGE_NAME).__main__:app_factory \
 		--reload --reload-dir $(SRC_DIR) \
 		--port=8000 --host=0.0.0.0
 
diff --git a/services/director/src/simcore_service_director/cli.py b/services/director/src/simcore_service_director/cli.py
@@ -21,6 +21,6 @@ def run():
     """Runs application"""
     typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")
     typer.secho(
-        "$ uvicorn simcore_service_director.main:the_app",
+        "$ uvicorn --factory simcore_service_director.main:app_factory",
         fg=typer.colors.BLUE,
     )
diff --git a/services/dynamic-scheduler/Makefile b/services/dynamic-scheduler/Makefile
@@ -15,4 +15,4 @@ openapi.json: .env-ignore ## produces openapi.json
 	@set -o allexport; \
 	source $<; \
 	set +o allexport; \
-	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
+	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app_factory().openapi(), indent=2) )" > $@
diff --git a/services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/cli.py b/services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/cli.py
@@ -95,5 +95,5 @@ async def _async_outputs_push() -> None:
 
 #
 # NOTE: We intentionally did NOT create a command to run the application
-# Use instead $ uvicorn simcore_service_dynamic_sidecar.main:the_app
+# Use instead $ uvicorn --factory simcore_service_dynamic_sidecar.main:app_factory
 #
diff --git a/services/efs-guardian/src/simcore_service_efs_guardian/cli.py b/services/efs-guardian/src/simcore_service_efs_guardian/cli.py
@@ -19,6 +19,6 @@ def run():
     """Runs application"""
     typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")
     typer.secho(
-        "$ uvicorn simcore_service_efs_guardian.main:the_app",
+        "$ uvicorn --factory simcore_service_efs_guardian.main:app_factory",
         fg=typer.colors.BLUE,
     )
diff --git a/services/efs-guardian/tests/unit/test_main.py b/services/efs-guardian/tests/unit/test_main.py
@@ -7,6 +7,6 @@
 
 
 def test_main_app(app_environment: EnvVarsDict):
-    from simcore_service_efs_guardian.main import the_app, the_settings
+    from simcore_service_efs_guardian.main import app_factory
 
-    assert the_app.state.settings == the_settings
+    app_factory()
diff --git a/services/invitations/Makefile b/services/invitations/Makefile
@@ -17,7 +17,7 @@ openapi.json: .env-ignore ## produces openapi.json
 	@set -o allexport; \
 	source $<; \
 	set +o allexport; \
-	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
+	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app_factory().openapi(), indent=2) )" > $@
 
 
 #
diff --git a/services/invitations/src/simcore_service_invitations/web_server.py b/services/invitations/src/simcore_service_invitations/web_server.py
@@ -7,9 +7,10 @@ def start(
     log_level: Literal["info", "debug", "warning", "error"], *, reload: bool = False
 ):
     uvicorn.run(
-        "simcore_service_invitations.web_main:the_app",
+        "simcore_service_invitations.web_main:app_factory",
         host="0.0.0.0",  # nosec
         port=8000,
         log_level=log_level,
         reload=reload,
+        factory=True,
     )
diff --git a/services/notifications/Makefile b/services/notifications/Makefile
@@ -15,4 +15,4 @@ openapi.json: .env-ignore ## produces openapi.json
 	@set -o allexport; \
 	source $<; \
 	set +o allexport; \
-	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
+	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app_factory().openapi(), indent=2) )" > $@
diff --git a/services/payments/Makefile b/services/payments/Makefile
@@ -15,7 +15,7 @@ openapi.json: .env-ignore ## produces openapi.json
 	@set -o allexport; \
 	source $<; \
 	set +o allexport; \
-	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
+	python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app_factory().openapi(), indent=2) )" > $@
 
 
 # NOTE: Create using `ln -s path/to/osparc-config/repo.config .env-secret`
diff --git a/services/payments/tests/unit/test_cli.py b/services/payments/tests/unit/test_cli.py
@@ -55,6 +55,6 @@ def test_list_settings(cli_runner: CliRunner, app_environment: EnvVarsDict):
 
 
 def test_main(app_environment: EnvVarsDict):
-    from simcore_service_payments.main import the_app
+    from simcore_service_payments.main import app_factory
 
-    assert the_app
+    app_factory()
diff --git a/services/resource-usage-tracker/Makefile b/services/resource-usage-tracker/Makefile
@@ -10,4 +10,4 @@ include ../../scripts/common-service.Makefile
 openapi-specs: openapi.json
 openapi.json:  ## produces openapi.json
 	# generating openapi specs file (need to have the environment set for this)
-	@python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(the_app.openapi(), indent=2) )" > $@
+	@python3 -c "import json; from $(APP_PACKAGE_NAME).main import *; print( json.dumps(app_factory().openapi(), indent=2) )" > $@
diff --git a/services/storage/src/simcore_service_storage/cli.py b/services/storage/src/simcore_service_storage/cli.py
@@ -31,7 +31,7 @@ def run():
     """Runs application"""
     typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")
     typer.secho(
-        f"$ uvicorn {PROJECT_NAME}.main:the_app",
+        f"$ uvicorn --factory {PROJECT_NAME}.main:app_factory",
         fg=typer.colors.BLUE,
     )
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ def run():`
`18`	`18`	`"""Runs application"""`
`19`	`19`	`typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")`
`20`	`20`	`typer.secho(`
`21`		`- "$ uvicorn simcore_service_api_server.main:the_app",`
	`21`	`+ "$ uvicorn --factory simcore_service_api_server.main:app_factory",`
`22`	`22`	`fg=typer.colors.BLUE,`
`23`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ def run():`
`19`	`19`	`"""Runs application"""`
`20`	`20`	`typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")`
`21`	`21`	`typer.secho(`
`22`		`- "$ uvicorn simcore_service_autoscaling.main:the_app",`
	`22`	`+ "$ uvicorn --factory simcore_service_autoscaling.main:app_factory",`
`23`	`23`	`fg=typer.colors.BLUE,`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ def run():`
`30`	`30`	`"""Runs application"""`
`31`	`31`	`typer.secho("Sorry, this entrypoint is intentionally disabled. Use instead")`
`32`	`32`	`typer.secho(`
`33`		`- "$ uvicorn simcore_service_catalog.main:the_app",`
	`33`	`+ "$ uvicorn --factory simcore_service_catalog.main:app_factory",`
`34`	`34`	`fg=typer.colors.BLUE,`
`35`	`35`	`)`
`36`	`36`