diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf026e7..e356112 100644 --- a/.github/workflows/build.yml +++ b/.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 }} diff --git a/Dockerfile b/Dockerfile index e24224f..7320d17 100644 --- a/Dockerfile +++ b/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 diff --git a/bento_reference_service/config.py b/bento_reference_service/config.py index af858ef..b47492d 100644 --- a/bento_reference_service/config.py +++ b/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 diff --git a/dev.Dockerfile b/dev.Dockerfile index 893bb7a..95c7568 100644 --- a/dev.Dockerfile +++ b/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 . diff --git a/poetry.lock b/poetry.lock index bcf94a8..019797b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2066,13 +2066,13 @@ files = [ [[package]] name = "tox" -version = "4.17.1" +version = "4.18.0" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.8" files = [ - {file = "tox-4.17.1-py3-none-any.whl", hash = "sha256:2974597c0353577126ab014f52d1a399fb761049e165ff34427f84e8cfe6c990"}, - {file = "tox-4.17.1.tar.gz", hash = "sha256:2c41565a571e34480bd401d668a4899806169a4633e972ac296c54406d2ded8a"}, + {file = "tox-4.18.0-py3-none-any.whl", hash = "sha256:0a457400cf70615dc0627eb70d293e80cd95d8ce174bb40ac011011f0c03a249"}, + {file = "tox-4.18.0.tar.gz", hash = "sha256:5dfa1cab9f146becd6e351333a82f9e0ade374451630ba65ee54584624c27b58"}, ] [package.dependencies] @@ -2225,13 +2225,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "uvicorn" -version = "0.30.5" +version = "0.30.6" description = "The lightning-fast ASGI server." optional = false python-versions = ">=3.8" files = [ - {file = "uvicorn-0.30.5-py3-none-any.whl", hash = "sha256:b2d86de274726e9878188fa07576c9ceeff90a839e2b6e25c917fe05f5a6c835"}, - {file = "uvicorn-0.30.5.tar.gz", hash = "sha256:ac6fdbd4425c5fd17a9fe39daf4d4d075da6fdc80f653e5894cdc2fd98752bee"}, + {file = "uvicorn-0.30.6-py3-none-any.whl", hash = "sha256:65fd46fe3fda5bdc1b03b94eb634923ff18cd35b2f084813ea79d1f103f711b5"}, + {file = "uvicorn-0.30.6.tar.gz", hash = "sha256:4b15decdda1e72be08209e860a1e10e92439ad5b97cf44cc945fcbee66fc5788"}, ] [package.dependencies]