Separate orchestrator ASGI launcher into wsgi.py (#60)

Author: kvklink

README.md

@@ -349,32 +349,37 @@ to define the helper functions as locally as possible.
 
 ### Main application
 
-The `main.py` can be as simple as shown below, and can be deployed by a
+The `wsgi.py` can be as simple as shown below, and can be deployed by a
 ASGI server like Uvicorn[^5].
 
 ```python
 from orchestrator import OrchestratorCore
-from orchestrator.cli.main import app as core_cli
 from orchestrator.settings import AppSettings
 
 import products
 import workflows
 
 app = OrchestratorCore(base_settings=AppSettings())
 app.register_graphql()
-
-if __name__ == "__main__":
-    core_cli()
 ```
 
 All other orchestrator code is referenced by importing the `products`
 and `workflows` modules. The application is started with:
 
 ```shell
-uvicorn --host localhost --port 8080 main:app
+uvicorn --host localhost --port 8080 wsgi:app
+```
+
+To use the orchestrator command line interface create a `main.py` like below:
+
+```python
+from orchestrator.cli.main import app as core_cli
+
+if __name__ == "__main__":
+    core_cli()
 ```
 
-To use the orchestrator command line interface use:
+Run the CLI using:
 
 ```shell
 python main.py --help

docker-compose.yml

@@ -183,6 +183,7 @@ services:
       - ./migrations:/home/orchestrator/migrations
       - ./docker:/home/orchestrator/etc
       - ./main.py:/home/orchestrator/main.py
+      - ./wsgi.py:/home/orchestrator/wsgi.py
       - ./settings.py:/home/orchestrator/settings.py
       - ./graphql_federation.py:/home/orchestrator/graphql_federation.py
       - ./utils:/home/orchestrator/utils

docker/orchestrator/entrypoint.sh

@@ -27,7 +27,7 @@ if [ -f ${CORE_OVERRIDE}/pyproject.toml ]; then
     # Run any missing migrations on the database
     python main.py db upgrade heads
 
-    uvicorn --host 0.0.0.0 --port 8080 $UVICORN_ARGS main:app --reload --proxy-headers \
+    uvicorn --host 0.0.0.0 --port 8080 $UVICORN_ARGS wsgi:app --reload --proxy-headers \
         --reload-dir $CORE_OVERRIDE \
         --reload-dir products \
         --reload-dir services \
@@ -39,5 +39,5 @@ else
     python main.py db upgrade heads
 
     echo "⏭️ Use orchestrator-core as specified in pyproject.toml $(uv pip freeze | grep orchestrator-core)"
-    uvicorn --host 0.0.0.0 --port 8080 $UVICORN_ARGS main:app --reload --proxy-headers
-fi
+    uvicorn --host 0.0.0.0 --port 8080 $UVICORN_ARGS wsgi:app --reload --proxy-headers
+fi

main.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 SURF.
+# Copyright 2019-2025 SURF, ESnet, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,16 +12,8 @@
 # limitations under the License.
 
 
-from orchestrator import OrchestratorCore
 from orchestrator.cli.main import app as core_cli
-from orchestrator.settings import AppSettings
 
-from graphql_federation import CUSTOM_GRAPHQL_MODELS
-import products  # noqa: F401  Side-effects
-import workflows  # noqa: F401  Side-effects
-
-app = OrchestratorCore(base_settings=AppSettings())
-app.register_graphql(graphql_models=CUSTOM_GRAPHQL_MODELS)
 
 if __name__ == "__main__":
     core_cli()

wsgi.py

@@ -0,0 +1,23 @@
+# Copyright 2019-2025 SURF, ESnet, GÉANT.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from orchestrator import OrchestratorCore
+from orchestrator.settings import AppSettings
+
+from graphql_federation import CUSTOM_GRAPHQL_MODELS
+import products  # noqa: F401  Side-effects
+import workflows  # noqa: F401  Side-effects
+
+app = OrchestratorCore(base_settings=AppSettings())
+app.register_graphql(graphql_models=CUSTOM_GRAPHQL_MODELS)