Merge pull request #18 from bento-platform/refact/fastapi-config

refact: correctly use FastAPI base config class + update uvicorn

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run Bento build action
-        uses: bento-platform/bento_build_action@v0.11.1
+        uses: bento-platform/bento_build_action@v1.0.0
         with:
           registry: ghcr.io
           registry-username: ${{ github.actor }}

Dockerfile

@@ -2,7 +2,7 @@ FROM ghcr.io/bento-platform/bento_base_image:python-debian-2024.08.12
 
 # Use uvicorn (instead of hypercorn) in production since I've found
 # multiple benchmarks showing it to be faster - David L
-RUN pip install --no-cache-dir "uvicorn[standard]==0.30.5"
+RUN pip install --no-cache-dir "uvicorn[standard]==0.30.6"
 
 WORKDIR /reference
 

bento_reference_service/config.py

@@ -1,4 +1,4 @@
-from bento_lib.config.pydantic import BentoBaseConfig
+from bento_lib.config.pydantic import BentoFastAPIBaseConfig
 from fastapi import Depends
 from functools import lru_cache
 from pathlib import Path
@@ -13,14 +13,10 @@
 ]
 
 
-class Config(BentoBaseConfig):
+class Config(BentoFastAPIBaseConfig):
     service_id: str = f"{SERVICE_GROUP}:{SERVICE_ARTIFACT}"
     service_name: str = "Bento Reference Service"
     service_description: str = "Reference data (genomes & annotations) service for the Bento platform."
-    service_url_base_path: str = "http://127.0.0.1:5000"  # Base path to construct URIs from
-
-    service_docs_path: str = "/docs"
-    service_openapi_path: str = "/openapi.json"
 
     database_uri: str = "postgres://localhost:5432"
     file_ingest_tmp_dir: Path = Path(__file__).parent.parent / "tmp"  # Default to repository `tmp` folder

dev.Dockerfile

@@ -12,7 +12,7 @@ LABEL devcontainer.metadata='[{ \
 }]'
 
 # FastAPI uses uvicorn for a development server as well
-RUN pip install --upgrade pip && pip install --no-cache-dir "uvicorn[standard]==0.30.5"
+RUN pip install --upgrade pip && pip install --no-cache-dir "uvicorn[standard]==0.30.6"
 WORKDIR /reference
 
 COPY pyproject.toml .