Grab new ghga event schemas version

Author: TheByronHimes

.pyproject_generation/pyproject_custom.toml

@@ -5,7 +5,7 @@ description = "Upload Orchestration Service - A service providing a web-accessib
 dependencies = [
     "typer >= 0.15",
     "ghga-service-commons[api,auth,crypt] >= 4.2",
-    "ghga-event-schemas ~= 10.0",
+    "ghga-event-schemas ~= 10.1",
     "hexkit[akafka,mongodb,opentelemetry] >= 7.0",
 ]
 

lock/requirements-dev.txt

@@ -581,9 +581,9 @@ filelock==3.18.0 \
     --hash=sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2 \
     --hash=sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de
     # via virtualenv
-ghga-event-schemas==10.0.0 \
-    --hash=sha256:997feaa5ed672b3eb85d82eb3fe4d37b31cd6f810d26efa65a6db53b33d6ce26 \
-    --hash=sha256:deb5260a902701cf53074e77d0ee78046d47b2f14fe8d4dae43c917ec5c6182f
+ghga-event-schemas==10.1.0 \
+    --hash=sha256:2b2ca89897b8edd85d949d02cf9615cc450441018891197b9fbf719c6c9628c1 \
+    --hash=sha256:6cf50c7228a4b960a9fa9e9c8f53da75f96062876e06f364aa8d18547920564d
     # via uos (pyproject.toml)
 ghga-service-commons==5.0.0 \
     --hash=sha256:9c772d7b7fb47d95e0a8c4522f2c79fc11bc3b8125090fe6b7cee86b1685f226 \

lock/requirements.txt

@@ -527,9 +527,9 @@ fastapi==0.115.12 \
     # via
     #   -c lock/requirements-dev.txt
     #   ghga-service-commons
-ghga-event-schemas==10.0.0 \
-    --hash=sha256:997feaa5ed672b3eb85d82eb3fe4d37b31cd6f810d26efa65a6db53b33d6ce26 \
-    --hash=sha256:deb5260a902701cf53074e77d0ee78046d47b2f14fe8d4dae43c917ec5c6182f
+ghga-event-schemas==10.1.0 \
+    --hash=sha256:2b2ca89897b8edd85d949d02cf9615cc450441018891197b9fbf719c6c9628c1 \
+    --hash=sha256:6cf50c7228a4b960a9fa9e9c8f53da75f96062876e06f364aa8d18547920564d
     # via
     #   -c lock/requirements-dev.txt
     #   uos (pyproject.toml)

pyproject.toml

@@ -26,7 +26,7 @@ description = "Upload Orchestration Service - A service providing a web-accessib
 dependencies = [
     "typer >= 0.15",
     "ghga-service-commons[api,auth,crypt] >= 4.2",
-    "ghga-event-schemas ~= 10.0",
+    "ghga-event-schemas ~= 10.1",
     "hexkit[akafka,mongodb,opentelemetry] >= 7.0",
 ]
 

src/uos/adapters/inbound/event_sub.py

@@ -17,31 +17,16 @@
 
 import logging
 
+from ghga_event_schemas.configs import FileUploadBoxEventsConfig
 from hexkit.protocols.daosub import DaoSubscriberProtocol
-from pydantic import Field
-from pydantic_settings import BaseSettings
 
 from uos.core.models import FileUploadBox
 from uos.ports.inbound.orchestrator import UploadOrchestratorPort
 
 log = logging.getLogger(__name__)
 
 
-# TODO: Move this config to ghga-event-schemas
-class FileUploadBoxConfig(BaseSettings):
-    """Config for events communicating changes in FileUploadBoxes
-
-    The event types are hardcoded by `hexkit`.
-    """
-
-    file_upload_box_topic: str = Field(
-        ...,
-        description="Topic containing published FileUploadBox outbox events",
-        examples=["file-upload-boxes", "file-upload-box-topic"],
-    )
-
-
-class OutboxSubConfig(FileUploadBoxConfig):
+class OutboxSubConfig(FileUploadBoxEventsConfig):
     """Configuration for subscribing to outbox events"""
 
 

src/uos/adapters/inbound/fastapi_/routes.py

@@ -47,7 +47,6 @@
 router = APIRouter()
 
 TAGS: list[str | Enum] = ["ResearchDataUploadBoxes"]
-# TODO: fill in possible response codes
 
 
 @router.get(

src/uos/adapters/outbound/dao.py

@@ -14,9 +14,8 @@
 # limitations under the License.
 """DAO implementation"""
 
+from ghga_event_schemas.configs import ResearchDataUploadBoxEventsConfig
 from hexkit.protocols.daopub import DaoPublisherFactoryProtocol
-from pydantic import Field
-from pydantic_settings import BaseSettings
 
 from uos.constants import BOX_COLLECTION
 from uos.core.models import ResearchDataUploadBox
@@ -25,19 +24,6 @@
 __all__ = ["OutboxPubConfig", "get_box_dao"]
 
 
-# TODO: Replace this config with the centrally defined one when ready
-class ResearchDataUploadBoxEventsConfig(BaseSettings):
-    """Config for events communicating changes in ResearchDataUploadBoxes.
-    The event types are hardcoded by `hexkit`.
-    """
-
-    research_data_upload_box_topic: str = Field(
-        ...,
-        description="Name of the event topic containing research data upload box events",
-        examples=["research-data-upload-boxes"],
-    )
-
-
 class OutboxPubConfig(ResearchDataUploadBoxEventsConfig):
     """Config needed to publish outbox events"""
 

src/uos/adapters/outbound/event_pub.py

@@ -15,31 +15,13 @@
 
 """Event publisher code"""
 
+from ghga_event_schemas.configs import AuditEventsConfig
 from hexkit.protocols.eventpub import EventPublisherProtocol
-from pydantic import Field
-from pydantic_settings import BaseSettings
 
 from uos.core.models import AuditRecord
 from uos.ports.outbound.event_pub import EventPublisherPort
 
 
-# TODO: Move this class into ghga-event-schemas
-class AuditEventsConfig(BaseSettings):
-    """For events conveying audit record information"""
-
-    audit_record_topic: str = Field(
-        default=...,
-        description="Name of the topic used for events conveying audit record information.",
-        examples=["audit-records"],
-    )
-
-    audit_record_type: str = Field(
-        default=...,
-        description="The type used for events conveying audit record information.",
-        examples=["audit_record_logged"],
-    )
-
-
 class EventPubConfig(AuditEventsConfig):
     """Config for publishing events"""