Refactor import order and improve database connection error handling

Author: emmanuelmathot

stac_fastapi/pgstac/app.py

@@ -9,8 +9,8 @@
 from contextlib import asynccontextmanager
 
 from brotli_asgi import BrotliMiddleware
-from fastapi import FastAPI, Request, APIRouter
-from fastapi.responses import ORJSONResponse, JSONResponse
+from fastapi import APIRouter, FastAPI, Request
+from fastapi.responses import JSONResponse, ORJSONResponse
 from stac_fastapi.api.app import StacApi
 from stac_fastapi.api.middleware import CORSMiddleware, ProxyHeaderMiddleware
 from stac_fastapi.api.models import (
@@ -175,18 +175,26 @@ async def ping(request: Request):
                 async with request.app.state.get_connection(request, "r") as conn:
                     # Execute a simple query to verify pgstac is ready
                     # Check if we can query the migrations table which should exist in pgstac
-                    result = await conn.fetchval("SELECT 1 FROM pgstac.migrations LIMIT 1")
+                    result = await conn.fetchval(
+                        "SELECT 1 FROM pgstac.migrations LIMIT 1"
+                    )
                     if result is not None:
                         return {"message": "PONG", "database": "OK"}
                     else:
                         return JSONResponse(
                             status_code=503,
-                            content={"message": "Database tables not found", "database": "ERROR"}
+                            content={
+                                "message": "Database tables not found",
+                                "database": "ERROR",
+                            },
                         )
             except Exception as e:
                 return JSONResponse(
                     status_code=503,
-                    content={"message": f"Database connection failed: {str(e)}", "database": "ERROR"}
+                    content={
+                        "message": f"Database connection failed: {str(e)}",
+                        "database": "ERROR",
+                    },
                 )
 
         self.app.include_router(mgmt_router, tags=["Liveliness/Readiness"])

tests/api/test_api.py

@@ -10,7 +10,6 @@
 from pypgstac.db import PgstacDB
 from pypgstac.load import Loader
 from pystac import Collection, Extent, Item, SpatialExtent, TemporalExtent
-from stac_fastapi.pgstac.app import PgStacApi
 from stac_fastapi.api.models import create_get_request_model, create_post_request_model
 from stac_fastapi.extensions.core import (
     CollectionSearchExtension,
@@ -20,6 +19,7 @@
 from stac_fastapi.extensions.core.fields import FieldsConformanceClasses
 from stac_fastapi.types import stac as stac_types
 
+from stac_fastapi.pgstac.app import PgStacApi
 from stac_fastapi.pgstac.config import PostgresSettings
 from stac_fastapi.pgstac.core import CoreCrudClient, Settings
 from stac_fastapi.pgstac.db import close_db_connection, connect_to_db

tests/conftest.py

@@ -15,7 +15,6 @@
 from pypgstac.db import PgstacDB
 from pypgstac.migrate import Migrate
 from pytest_postgresql.janitor import DatabaseJanitor
-from stac_fastapi.pgstac.app import PgStacApi
 from stac_fastapi.api.models import (
     ItemCollectionUri,
     create_get_request_model,
@@ -41,6 +40,7 @@
 from stac_fastapi.extensions.third_party import BulkTransactionExtension
 from stac_pydantic import Collection, Item
 
+from stac_fastapi.pgstac.app import PgStacApi
 from stac_fastapi.pgstac.config import PostgresSettings, Settings
 from stac_fastapi.pgstac.core import CoreCrudClient
 from stac_fastapi.pgstac.db import close_db_connection, connect_to_db