tidy up

Author: peterdudfield

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

@@ -123,13 +123,40 @@
 
 log = logging.getLogger("nwp-consumer")
 
-# List of available model names
-available_models_names = [
-    "default",
-    "um-global-10km-india",
-    "um-global-10km-uk",
-    "um-ukv-2km",
-]
+class AvailableModel:
+    """Class to hold information about an available model."""
+    name: str
+    delay_minute: int
+    model: entities.ModelMetadata
+
+    def __init__(self, name: str, delay_minute: int, model: entities.ModelMetadata) -> None:
+        """Create a new instance."""
+        self.name = name
+        self.delay_minute = delay_minute
+        self.model = model
+
+# set up the available models
+available_models = []
+available_models.append(AvailableModel(name="default",
+                         delay_minute=300,
+                         model=entities.Models.MO_UM_GLOBAL_10KM.with_region("india")))
+available_models.append(AvailableModel(name="um-global-10km-india",
+                         delay_minute=300,
+                         model=entities.Models.MO_UM_GLOBAL_10KM.with_region("india")))
+available_models.append(AvailableModel(name="um-global-10km-uk",
+                         delay_minute=300,
+                         model=entities.Models.MO_UM_GLOBAL_10KM.with_region("uk")))
+available_models.append(AvailableModel(name="um-ukv-2km",
+                         delay_minute=120,
+                         model=entities.Models.MO_UM_UKV_2KM_LAEA))
+
+# get all model names
+available_models_names = [m.name for m in available_models]
+# get dict of delay minutes by model name
+delay_minutes_dict = {m.name: m.delay_minute for m in available_models}
+# get dict of model metadata by model name
+models_dict = {m.name: m.model for m in available_models}
+
 
 
 class MetOfficeDatahubRawRepository(ports.RawRepository):
@@ -161,27 +188,18 @@ def __init__(self, order_id: str, api_key: str) -> None:
     @override
     def repository() -> entities.RawRepositoryMetadata:
 
-        delay_minutes_all = {"default": 300,
-                             "um-global-10km-india": 300,
-                             "um-global-10km-uk":300,
-                             "um-ukv-2km": 120}
         requested_model: str = get_requested_model_name()
 
         return entities.RawRepositoryMetadata(
             name="MetOffice-Weather-Datahub",
             is_archive=False,
             is_order_based=True,
-            delay_minutes=delay_minutes_all[requested_model],
+            delay_minutes=delay_minutes_dict[requested_model],
             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"),
-                "um-ukv-2km": entities.Models.MO_UM_UKV_2KM_LAEA,
-            },
+            available_models=models_dict,
         )
 
     @staticmethod