Revert "feat: implement postgres database connection pooling"

This reverts commit 7cf67cd.

Author: matthiasschaub

ohsome_quality_api/api/api.py

@@ -1,10 +1,8 @@
 import json
 import os
-from collections.abc import AsyncIterator
 from typing import Any, Union
 
 from fastapi import Depends, FastAPI, HTTPException, Request, status
-from fastapi.concurrency import asynccontextmanager
 from fastapi.encoders import jsonable_encoder
 from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
@@ -48,7 +46,6 @@
 )
 from ohsome_quality_api.attributes.definitions import get_attributes, load_attributes
 from ohsome_quality_api.definitions import ATTRIBUTION_URL
-from ohsome_quality_api.geodatabase.client import create_pool
 from ohsome_quality_api.indicators.definitions import (
     IndicatorEnum,
     IndicatorEnumRequest,
@@ -106,12 +103,6 @@
     )
 
 
-@asynccontextmanager
-async def lifespan(_: FastAPI) -> AsyncIterator[None]:
-    async with create_pool():
-        yield
-
-
 app = FastAPI(
     title=__title__,
     description=description,
@@ -123,7 +114,6 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
     openapi_tags=TAGS_METADATA,
     docs_url=None,
     redoc_url=None,
-    lifespan=lifespan,
     dependencies=[
         Depends(set_request_context),
         Depends(i18n),
@@ -370,7 +360,6 @@ async def _post_indicator(
     if topic.key == "custom-topic":
         topic.filter = topic_filter
         topic.name = topic_name
-        # TODO: Run topic validator again
 
     indicators = await main.create_indicator(key=key, topic=topic, **parameters_)
 

ohsome_quality_api/geodatabase/client.py

@@ -17,12 +17,11 @@
 import logging
 import os
 from contextlib import asynccontextmanager
-from contextvars import ContextVar
 from typing import Literal
 
 import asyncpg
 import geojson
-from asyncpg import Pool, Record
+from asyncpg import Record
 from geojson import Feature, FeatureCollection, MultiPolygon
 
 from ohsome_quality_api.config import get_config_value
@@ -32,61 +31,40 @@
 WORKING_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
-OQAPIDB_POOL: ContextVar[Pool] = ContextVar("OQAPIDB_POOL")
-OHSOMEDB_POOL: ContextVar[Pool] = ContextVar("OHSOMEDB_POOL")
-
-
 def log_query(record):
     logger.debug("Query:\n" + record.query)
     logger.debug("Args:\n" + str(record.args))
 
 
-@asynccontextmanager
-async def create_pool():
-    # DSN in libpq connection URI format
-    oqapidb_dsn = "postgres://{user}:{password}@{host}:{port}/{database}".format(
-        host=get_config_value("postgres_host"),
-        port=get_config_value("postgres_port"),
-        database=get_config_value("postgres_db"),
-        user=get_config_value("postgres_user"),
-        password=get_config_value("postgres_password"),
-    )
-    ohsomedb_dsn = "postgres://{user}:{password}@{host}:{port}/{database}".format(
-        host=get_config_value("ohsomedb_host"),
-        port=get_config_value("ohsomedb_port"),
-        database=get_config_value("ohsomedb_db"),
-        user=get_config_value("ohsomedb_user"),
-        password=get_config_value("ohsomedb_password"),
-    )
-    async with (
-        asyncpg.create_pool(oqapidb_dsn) as oqapidb_pool,
-        asyncpg.create_pool(ohsomedb_dsn) as ohsomedb_pool,
-    ):
-        sql = 'set search_path to "global_2026-04-13",public'
-        await oqapidb_pool.execute(sql)
-        await ohsomedb_pool.execute(sql)
-        oqapidb_pool_token = OQAPIDB_POOL.set(oqapidb_pool)
-        ohsomedb_pool_token = OHSOMEDB_POOL.set(ohsomedb_pool)
-        try:
-            yield
-        finally:
-            OQAPIDB_POOL.reset(oqapidb_pool_token)
-            OHSOMEDB_POOL.reset(ohsomedb_pool_token)
-
-
 @asynccontextmanager
 async def get_connection(database: Literal["oqapidb", "ohsomedb"] = "oqapidb"):
+    # DNS in libpq connection URI format
     match database:
         case "oqapidb":
-            pool = OQAPIDB_POOL.get()
+            dns = "postgres://{user}:{password}@{host}:{port}/{database}".format(
+                host=get_config_value("postgres_host"),
+                port=get_config_value("postgres_port"),
+                database=get_config_value("postgres_db"),
+                user=get_config_value("postgres_user"),
+                password=get_config_value("postgres_password"),
+            )
         case "ohsomedb":
-            pool = OHSOMEDB_POOL.get()
-    async with pool.acquire() as conn:
-        try:
-            with conn.query_logger(log_query):
-                yield conn
-        finally:
-            await conn.close()
+            dns = "postgres://{user}:{password}@{host}:{port}/{database}".format(
+                host=get_config_value("ohsomedb_host"),
+                port=get_config_value("ohsomedb_port"),
+                database=get_config_value("ohsomedb_db"),
+                user=get_config_value("ohsomedb_user"),
+                password=get_config_value("ohsomedb_password"),
+            )
+        case _:
+            raise ValueError()
+    conn = await asyncpg.connect(dns)
+    await conn.execute('set search_path to "global_2026-04-13",public')
+    try:
+        with conn.query_logger(log_query):
+            yield conn
+    finally:
+        await conn.close()
 
 
 async def fetch(

tests/conftest.py

@@ -1,18 +1,15 @@
 import json
 import logging
 import os
-from contextlib import asynccontextmanager
 from pathlib import Path
 
-import asyncpg
 import geojson
 import pytest
 from _pytest.monkeypatch import MonkeyPatch
 from fastapi_i18n.main import Translator, translator
 from geojson import Feature, FeatureCollection, Polygon
 
 from ohsome_quality_api.attributes.models import Attribute
-from ohsome_quality_api.config import get_config_value
 from ohsome_quality_api.indicators.currentness.indicator import Bin
 from ohsome_quality_api.indicators.definitions import (
     get_indicator,
@@ -39,43 +36,6 @@
 # https://github.com/pytest-dev/pytest/issues/5502
 logger = logging.getLogger("rpy2")
 logger.propagate = False
-vcr_logger = logging.getLogger("vcr")
-vcr_logger.setLevel(logging.DEBUG)
-vcr_logger.propagate = False
-
-
-# TODO: remove once ohsomedb has been replaced by ohsome-api
-@pytest.fixture(autouse=True)
-def get_connection(monkeypatch):
-    @asynccontextmanager
-    async def get_connection_(database="oqapidb"):
-        match database:
-            case "oqapidb":
-                dsn = "postgres://{user}:{password}@{host}:{port}/{database}".format(
-                    host=get_config_value("postgres_host"),
-                    port=get_config_value("postgres_port"),
-                    database=get_config_value("postgres_db"),
-                    user=get_config_value("postgres_user"),
-                    password=get_config_value("postgres_password"),
-                )
-            case "ohsomedb":
-                dsn = "postgres://{user}:{password}@{host}:{port}/{database}".format(
-                    host=get_config_value("ohsomedb_host"),
-                    port=get_config_value("ohsomedb_port"),
-                    database=get_config_value("ohsomedb_db"),
-                    user=get_config_value("ohsomedb_user"),
-                    password=get_config_value("ohsomedb_password"),
-                )
-        connection = await asyncpg.connect(dsn)
-        try:
-            yield connection
-        finally:
-            await connection.close()
-
-    monkeypatch.setattr(
-        "ohsome_quality_api.geodatabase.client.get_connection",
-        get_connection_,
-    )
 
 
 @pytest.fixture(scope="class")

tests/integrationtests/api/conftest.py

@@ -5,7 +5,7 @@
 from ohsome_quality_api.api.api import app
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def client():
     return TestClient(app)