extract model names

Author: peterdudfield

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

@@ -123,6 +123,14 @@
 
 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 MetOfficeDatahubRawRepository(ports.RawRepository):
     """Repository implementation for data from MetOffice's DataHub service."""
@@ -153,11 +161,11 @@ def __init__(self, order_id: str, api_key: str) -> None:
     @override
     def repository() -> entities.RawRepositoryMetadata:
 
-        requested_model: str = os.getenv("MODEL", default="default")
         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",
@@ -179,15 +187,7 @@ def repository() -> entities.RawRepositoryMetadata:
     @staticmethod
     @override
     def model() -> entities.ModelMetadata:
-        requested_model: str = os.getenv("MODEL", default="default")
-        if requested_model not in MetOfficeDatahubRawRepository.repository().available_models:
-            log.warn(
-                f"Unknown model '{requested_model}' requested, falling back to default. "
-                "MetOffice Datahub repository only supports "
-                f"'{list(MetOfficeDatahubRawRepository.repository().available_models.keys())}'. "
-                "Ensure MODEL environment variable is set to a valid model name.",
-            )
-            requested_model = "default"
+        requested_model: str = get_requested_model_name()
         return MetOfficeDatahubRawRepository.repository().available_models[requested_model]
 
     @classmethod
@@ -524,3 +524,16 @@ def _convert_ukv(path: pathlib.Path) -> ResultE[list[xr.DataArray]]:
             )
 
         return Success([da])
+
+
+def get_requested_model_name() -> str:
+    """Get the requested model name from the environment variable."""
+    requested_model: str = os.getenv("MODEL", default="default")
+    if requested_model not in available_models_names:
+        log.warn(
+            f"Unknown model '{requested_model}' requested, falling back to default. "
+            f"MetOffice Datahub repository only supports '{available_models_names}'. "
+            "Ensure MODEL environment variable is set to a valid model name.",
+            )
+        requested_model = "default"
+    return requested_model