Merge pull request #59 from bento-platform/chore/update

chore: update dependencies (+ small new bento lib usage tweaks)

Dockerfile

@@ -1,11 +1,11 @@
-FROM ghcr.io/bento-platform/bento_base_image:python-debian-2024.02.01
+FROM ghcr.io/bento-platform/bento_base_image:python-debian-2024.05.01
 
 # Run as root in the Dockerfile until we drop down to the service user in the entrypoint
 USER root
 
 # 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.27.1"
+RUN pip install --no-cache-dir "uvicorn[standard]==0.29.0"
 
 WORKDIR /aggregation
 

bento_aggregation_service/config.py

@@ -3,7 +3,7 @@
 from functools import lru_cache
 from typing import Annotated
 
-from .constants import SERVICE_NAME, SERVICE_TYPE
+from .constants import SERVICE_TYPE
 
 __all__ = [
     "Config",
@@ -14,7 +14,7 @@
 
 class Config(BentoBaseConfig):
     service_id: str = str(":".join(list(SERVICE_TYPE.values())[:2]))
-    service_name: str = SERVICE_NAME
+    service_name: str = "Bento Aggregation Service"
 
     request_timeout: int = 180  # seconds
 

bento_aggregation_service/constants.py

@@ -1,22 +1,13 @@
 from __future__ import annotations
 
+from bento_lib.service_info.helpers import build_bento_service_type
 from . import __version__
 
 
 __all__ = [
     "BENTO_SERVICE_KIND",
-    "SERVICE_ORGANIZATION",
-    "SERVICE_ARTIFACT",
     "SERVICE_TYPE",
-    "SERVICE_NAME",
 ]
 
 BENTO_SERVICE_KIND = "aggregation"
-SERVICE_ORGANIZATION = "ca.c3g.bento"
-SERVICE_ARTIFACT = BENTO_SERVICE_KIND
-SERVICE_TYPE = {
-    "group": "ca.c3g.bento",
-    "artifact": SERVICE_ARTIFACT,
-    "version": __version__,
-}
-SERVICE_NAME = "Bento Aggregation Service"
+SERVICE_TYPE = build_bento_service_type(BENTO_SERVICE_KIND, __version__)

dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/bento-platform/bento_base_image:python-debian-2024.02.01
+FROM ghcr.io/bento-platform/bento_base_image:python-debian-2024.05.01
 
 LABEL org.opencontainers.image.description="Local development image the Bento aggregation service."
 LABEL devcontainer.metadata='[{ \
@@ -14,7 +14,7 @@ LABEL devcontainer.metadata='[{ \
 # Run as root in the Dockerfile until we drop down to the service user in the entrypoint
 USER root
 
-RUN pip install --no-cache-dir "uvicorn[standard]==0.27.1"
+RUN pip install --no-cache-dir "uvicorn[standard]==0.29.0"
 
 WORKDIR /aggregation