feat(backends): Swap to std python grpc lib

pyproject.toml

@@ -19,7 +19,7 @@ authors = [
 classifiers = ["Programming Language :: Python :: 3"]
 dependencies = [
     "cryptography >= 41.0.0",
-    "dp-sdk",
+    "dp-sdk >= 0.25.0",
     "fastapi>=0.105.0",
     "pvsite-datamodel == 1.2.3",
     "pyjwt >= 2.8.0",
@@ -62,8 +62,7 @@ dev = [
 ]
 
 [tool.uv.sources]
-dp-sdk = { url = "https://github.com/openclimatefix/data-platform/releases/download/v0.24.5/dp_sdk-0.24.5-py3-none-any.whl" }
-
+dp-sdk = { url = "https://github.com/openclimatefix/data-platform/releases/download/v0.25.0/dp_sdk-0.25.0-py3-none-any.whl" }
 
 [project.urls]
 repository = "https://github.com/openclimatefix/quartz-api"

src/quartz_api/cmd/main.py

@@ -9,18 +9,17 @@
 import pathlib
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from typing import TYPE_CHECKING, Any
+from typing import Any
 from zoneinfo import ZoneInfo
 
+import grpc
 import sentry_sdk
 from apitally.fastapi import ApitallyMiddleware
-from dp_sdk.ocf import dp
 from fastapi import FastAPI, status
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.openapi.utils import get_openapi
 from fastapi_cache import FastAPICache
 from fastapi_cache.backends.inmemory import InMemoryBackend
-from grpclib.client import Channel
 from pydantic import BaseModel
 from pyhocon import ConfigFactory, ConfigTree
 from slowapi import _rate_limit_exceeded_handler
@@ -33,17 +32,13 @@
 from quartz_api.internal.backends import (
     DataPlatformStorage,
     DummyStorage,
-    EnrichedChannel,
     QuartzStorage,
 )
 from quartz_api.internal.middleware import audit, auth, ratelimit, sentry, trace
 from quartz_api.internal.service.uk_national.endpoint_types import gsp_id_map
 
 from ._logging import setup_json_logging
 
-if TYPE_CHECKING:
-    from grpclib.client import Channel
-
 log = logging.getLogger(__name__)
 logging.getLogger("hpack").setLevel(logging.WARNING)
 
@@ -88,7 +83,6 @@ def _custom_openapi(server: FastAPI) -> dict[str, Any]:
 async def _lifespan(server: FastAPI, conf: ConfigTree) -> AsyncGenerator[None]:
     """Configure FastAPI app instance with startup and shutdown events."""
     storage: models.StorageInterface | None = None
-    grpc_channel: Channel | None = None
 
     match conf.get_string("backend.source"):
         case "quartzdb":
@@ -99,16 +93,15 @@ async def _lifespan(server: FastAPI, conf: ConfigTree) -> AsyncGenerator[None]:
             storage = DummyStorage()
             log.warning("disabled backend. NOT recommended for production")
         case "dataplatform":
-            grpc_channel = EnrichedChannel(
-                host=conf.get_string("backend.dataplatform.host"),
-                port=conf.get_int("backend.dataplatform.port"),
+            from ocf.dp.dp_data import service_pb2_grpc
+            trace_interceptor = trace.TraceInterceptor()
+            grpc_channel = grpc.aio.insecure_channel(
+                target=conf.get_string("backend.dataplatform.host") \
+                    + ":" + conf.get_string("backend.dataplatform.port"),
+                    interceptors=[trace_interceptor],
             )
-            client = dp.DataPlatformDataServiceStub(channel=grpc_channel)
+            client = service_pb2_grpc.DataPlatformDataServiceStub(grpc_channel)
             storage = DataPlatformStorage.from_dp(dp_client=client)
-            storage.set_sync_client(
-                host=conf.get_string("backend.dataplatform.host"),
-                port=conf.get_int("backend.dataplatform.port"),
-            )
 
             if "uk_national" in conf.get_string("api.routers").split(","):
                 # Populate the GSP ID to UUID mapping
@@ -132,7 +125,6 @@ async def _lifespan(server: FastAPI, conf: ConfigTree) -> AsyncGenerator[None]:
 
     server.dependency_overrides[models.get_storage_client] = lambda: storage
 
-    warm_task = None
     if "uk_national" in conf.get_string("api.routers"):
         from quartz_api.internal.service.uk_national.gsp_router import _warm_forecast_all_cache
         warm_task = asyncio.create_task(_warm_forecast_all_cache(server))
@@ -144,14 +136,15 @@ async def _lifespan(server: FastAPI, conf: ConfigTree) -> AsyncGenerator[None]:
 
     gsp_id_map.clear()
     if grpc_channel:
-        grpc_channel.close()
+        await grpc_channel.close()
 
 
 def _create_server(conf: ConfigTree) -> FastAPI:
     """Configure FastAPI app instance with routes, dependencies, and middleware."""
     setup_json_logging(level=logging.getLevelName(conf.get_string("api.loglevel").upper()))
     description = "API providing access to OCF's Quartz Forecasts."
     server = FastAPI(
+        debug=True,
         version=importlib.metadata.version("quartz_api"),
         lifespan=functools.partial(_lifespan, conf=conf),
         title="Quartz API",