Move app creation out of init module

Author: kvklink

lso/__init__.py

@@ -14,34 +14,3 @@
 """LSO, an API for remotely running Ansible playbooks."""
 
 __version__ = "3.0.0"
-
-import logging
-
-from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-
-from lso import environment
-from lso.routes.default import router as default_router
-from lso.routes.execute import router as executable_router
-from lso.routes.playbook import router as playbook_router
-
-logger = logging.getLogger(__name__)
-
-
-def create_app() -> FastAPI:
-    """Initialise the LSO app."""
-    app = FastAPI(docs_url="/api/doc", redoc_url="/api/redoc", openapi_url="/api/openapi.json")
-
-    app.add_middleware(
-        CORSMiddleware, allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"]
-    )
-
-    app.include_router(default_router, prefix="/api")
-    app.include_router(playbook_router, prefix="/api/playbook")
-    app.include_router(executable_router, prefix="/api/execute")
-
-    environment.setup_logging()
-
-    logger.info("FastAPI app initialized")
-
-    return app

lso/app.py

@@ -13,9 +13,39 @@
 
 """Default app creation."""
 
-import lso
+import logging
 
-app = lso.create_app()
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
+from lso import environment
+from lso.routes.default import router as default_router
+from lso.routes.execute import router as executable_router
+from lso.routes.playbook import router as playbook_router
+
+logger = logging.getLogger(__name__)
+
+
+def create_app() -> FastAPI:
+    """Initialise the LSO app."""
+    app = FastAPI(docs_url="/api/doc", redoc_url="/api/redoc", openapi_url="/api/openapi.json")
+
+    app.add_middleware(
+        CORSMiddleware, allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"]
+    )
+
+    app.include_router(default_router, prefix="/api")
+    app.include_router(playbook_router, prefix="/api/playbook")
+    app.include_router(executable_router, prefix="/api/execute")
+
+    environment.setup_logging()
+
+    logger.info("FastAPI app initialized")
+
+    return app
+
+
+app = create_app()
 
 if __name__ == "__main__":
     import uvicorn

test/conftest.py

@@ -59,7 +59,7 @@ def run(*args: Any, **kwargs: Any) -> Runner:  # noqa: ARG001
 @pytest.fixture(scope="session")
 def client() -> TestClient:
     """Return a client that can be used to test the server."""
-    from lso import create_app  # noqa: PLC0415
+    from lso.app import create_app  # noqa: PLC0415
 
     app = create_app()
     return TestClient(app)  # wait here until calling context ends

test/routes/test_playbook.py

@@ -95,8 +95,10 @@ def test_playbook_endpoint_invalid_host_vars(client: TestClient, mocked_ansible_
 
     assert isinstance(response, dict)
     assert response["detail"] == [
-        '[WARNING]: Skipping unexpected key (host_vars) in group (_meta), only "vars", '
-        '"children" and "hosts" are valid\n',
+        (
+            '[WARNING]: Skipping unexpected key (host_vars) in group (_meta), only "vars", '
+            '"children" and "hosts" are valid\n'
+        ),
     ]
     responses.assert_call_count(TEST_CALLBACK_URL, 0)