try out with both delay minutes

Author: peterdudfield

src/nwp_consumer/cmd/main.py

@@ -30,9 +30,6 @@ def parse_env() -> Adaptors:
             model_repository_adaptor = repositories.raw_repositories.ECMWFRealTimeS3RawRepository
         case "metoffice-datahub":
             model_repository_adaptor = repositories.raw_repositories.MetOfficeDatahubRawRepository
-        case "metoffice-datahub-global":
-            model_repository_adaptor \
-                = repositories.raw_repositories.MetOfficeDatahubGlobalRawRepository
         case "ecmwf-mars":
             model_repository_adaptor = repositories.raw_repositories.ECMWFMARSRawRepository
         case _ as mr:

src/nwp_consumer/internal/entities/modelmetadata.py

@@ -74,6 +74,10 @@ class ModelMetadata:
         - `entities.coordinates.NWPDimensionCoordinateMap.chunking`
     """
 
+    delay_minutes: int | None = None
+    """The model delay in minutes. This can be taken from the repository metadata.
+    """
+
     def __str__(self) -> str:
         """Return a pretty-printed string representation of the metadata."""
         pretty: str = "".join(
@@ -404,7 +408,8 @@ class Models:
                 for lon in np.arange(-179.929687, 179.929688 + 0.140625, 0.140625)
             ],
         ),
-        running_hours=[0, 6, 12, 18],
+        running_hours=[0, 12],
+        delay_minutes=300,
     )
     """MetOffice's Unified Model, in the Global configuration, at a resolution of 10km."""
 
@@ -438,6 +443,7 @@ class Models:
             x_osgb=[int(x) for x in np.arange(start=-239000, stop=857000, step=2000)],
         ),
         running_hours=list(range(0, 24, 6)),
+        delay_minutes=120,
     )
     """MetOffice's Unified Model in the UKV configuration, at a resolution of 2km"""
 

src/nwp_consumer/internal/entities/repometadata.py

@@ -13,11 +13,14 @@
 
 import dataclasses
 import datetime as dt
+import logging
 import os
 
 from .modelmetadata import ModelMetadata
 from .postprocess import PostProcessOptions
 
+log = logging.getLogger("nwp-consumer")
+
 
 @dataclasses.dataclass(slots=True)
 class RawRepositoryMetadata:
@@ -40,11 +43,13 @@ class RawRepositoryMetadata:
     but rather are defined by pre-selected agreements with the provider.
     """
 
-    delay_minutes: int
+    delay_minutes: int  | None
     """The approximate model delay in minutes.
 
     This delay is the time between the running of the model and the time
-    at which the data is actually available."""
+    at which the data is actually available.
+    This can be None, and then the delay minutes is take from the sepecific model.
+    """
 
     required_env: list[str]
     """Environment variables required for usage."""
@@ -65,6 +70,24 @@ class RawRepositoryMetadata:
     available_models: dict[str, ModelMetadata]
     """A dictionary of available models and their metadata."""
 
+    def __post_init__(self) -> None:
+        """Post-initialization to set delay_minutes if not set."""
+        self.set_delay_minutes()
+
+
+    def set_delay_minutes(self) -> None:
+        """Set the delay_minutes from the model if not already set."""
+        if self.delay_minutes is None:
+            # get the delay minutes from the models
+            log.info(f"Setting delay_minutes from model metadata for {self.model().name}")
+            delay_minutes = self.model().delay_minutes
+            if delay_minutes is None:
+                message = f"Repository {self.name} and \
+                Model {self.model().name} has no delay_minutes set. Set one of these."
+                raise Exception(message)
+
+            self.delay_minutes = delay_minutes
+
     def determine_latest_it_from(self, t: dt.datetime, running_hours: list[int]) -> dt.datetime:
         """Determine the latest available initialization time from a given time.
 

src/nwp_consumer/internal/repositories/raw_repositories/__init__.py

@@ -7,14 +7,13 @@
 from .ecmwf_realtime import ECMWFRealTimeS3RawRepository
 from .ecmwf_mars import ECMWFMARSRawRepository
 from .noaa_s3 import NOAAS3RawRepository
-from .mo_datahub import MetOfficeDatahubRawRepository, MetOfficeDatahubGlobalRawRepository
+from .mo_datahub import MetOfficeDatahubRawRepository
 
 __all__ = [
     "CEDARawRepository",
     "ECMWFRealTimeS3RawRepository",
     "NOAAS3RawRepository",
     "MetOfficeDatahubRawRepository",
     "ECMWFMARSRawRepository",
-    "MetOfficeDatahubGlobalRawRepository",
 ]
 

src/nwp_consumer/internal/repositories/raw_repositories/mo_datahub.py

@@ -156,13 +156,15 @@ def repository() -> entities.RawRepositoryMetadata:
             name="MetOffice-Weather-Datahub",
             is_archive=False,
             is_order_based=True,
-            delay_minutes=int(os.getenv("METOFFICE_DELAY_MINUTES", 120)),
+            delay_minutes=None,
             max_connections=10,
             required_env=["METOFFICE_API_KEY", "METOFFICE_ORDER_ID"],
             optional_env={"METOFFICE_DATASPEC": "1.1.0"},
             postprocess_options=entities.PostProcessOptions(),
             available_models={
-                "default": entities.Models.MO_UM_UKV_2KM_LAEA,
+                "default": entities.Models.MO_UM_GLOBAL_10KM.with_region("india"),
+                "um-global-10km-india": entities.Models.MO_UM_GLOBAL_10KM.with_region("india"),
+                "um-global-10km-uk": entities.Models.MO_UM_GLOBAL_10KM.with_region("uk"),
                 "um-ukv-2km": entities.Models.MO_UM_UKV_2KM_LAEA,
             },
         )
@@ -515,29 +517,3 @@ def _convert_ukv(path: pathlib.Path) -> ResultE[list[xr.DataArray]]:
             )
 
         return Success([da])
-
-
-class MetOfficeDatahubGlobalRawRepository(MetOfficeDatahubRawRepository):
-    """Repository implementation for data from MetOffice's Global DataHub service.
-
-    See above for more information.
-    """
-    @staticmethod
-    @override
-    def repository() -> entities.RawRepositoryMetadata:
-        return entities.RawRepositoryMetadata(
-            name="MetOffice-Weather-Datahub",
-            is_archive=False,
-            is_order_based=True,
-            delay_minutes=60*5,
-            max_connections=10,
-            required_env=["METOFFICE_API_KEY", "METOFFICE_ORDER_ID"],
-            optional_env={"METOFFICE_DATASPEC": "1.1.0"},
-            postprocess_options=entities.PostProcessOptions(),
-            available_models={
-                "default": entities.Models.MO_UM_GLOBAL_10KM.with_region("india"),
-                "um-global-10km-india": entities.Models.MO_UM_GLOBAL_10KM.with_region("india"),
-                "um-global-10km-uk": entities.Models.MO_UM_GLOBAL_10KM.with_region("uk"),
-            },
-        )
-