feat: accept hyphens in factory names (#116)

Author: b8raoult

src/anemoi/utils/registry.py

@@ -88,14 +88,17 @@ class Registry:
         The package name.
     key : str, optional
         The key to use for the registry, by default "_type".
+    api_version : str, optional
+        The API version, by default '1.0.0'.
     """
 
-    def __init__(self, package: str, key: str = "_type"):
+    def __init__(self, package: str, key: str = "_type", api_version: str = "1.0.0"):
         self.package = package
         self.__registered = {}
         self._sources = {}
         self.kind = package.split(".")[-1]
         self.key = key
+        self.api_version = api_version
         _BY_KIND[self.kind] = self
 
     @classmethod
@@ -133,6 +136,9 @@ def register(
         Wrapper, optional
             A wrapper if the factory is None, otherwise None.
         """
+
+        name = name.replace("_", "-")
+
         if factory is None:
             # This happens when the @register decorator is used
             return Wrapper(name, self)
@@ -177,6 +183,9 @@ def is_registered(self, name: str) -> bool:
         bool
             Whether the factory is registered.
         """
+
+        name = name.replace("_", "-")
+
         ok = name in self.factories
         if not ok:
             LOG.error(f"Cannot find '{name}' in {self.package}")
@@ -199,6 +208,9 @@ def lookup(self, name: str, *, return_none: bool = False) -> Optional[Callable]:
         Callable, optional
             The factory if found, otherwise None.
         """
+
+        name = name.replace("_", "-")
+
         if return_none:
             return self.factories.get(name)
 
@@ -288,6 +300,9 @@ def create(self, name: str, *args: Any, **kwargs: Any) -> Any:
         Any
             The created instance.
         """
+
+        name = name.replace("_", "-")
+
         factory = self.lookup(name)
         return factory(*args, **kwargs)
 

tests/test_remote.py

@@ -7,12 +7,14 @@
 
 import os
 import shutil
+import sys
 
 import pytest
 
 from anemoi.utils.remote import TransferMethodNotImplementedError
 from anemoi.utils.remote import _find_transfer_class
 from anemoi.utils.remote import transfer
+from anemoi.utils.testing import packages_installed
 
 IN_CI = (os.environ.get("GITHUB_WORKFLOW") is not None) or (os.environ.get("IN_CI_HPC") is not None)
 
@@ -112,6 +114,7 @@ def test_transfer_find_none(source: str, target: str) -> None:
 
 
 @pytest.mark.skipif(IN_CI, reason="Test requires access to S3")
+@pytest.mark.skipif(not packages_installed("boto3"), reason="boto3 is not installed")
 def test_transfer_zarr_s3_to_local(tmpdir: pytest.TempPathFactory) -> None:
     """Test transferring a Zarr file from S3 to local.
 
@@ -132,6 +135,7 @@ def test_transfer_zarr_s3_to_local(tmpdir: pytest.TempPathFactory) -> None:
 
 
 @pytest.mark.skipif(IN_CI, reason="Test requires access to S3")
+@pytest.mark.skipif(not packages_installed("boto3"), reason="boto3 is not installed")
 def test_transfer_zarr_local_to_s3(tmpdir: pytest.TempPathFactory) -> None:
     """Test transferring a Zarr file from local to S3.
 
@@ -193,6 +197,7 @@ def compare(local1: str, local2: str) -> None:
 
 
 @pytest.mark.skipif(IN_CI, reason="Test requires access to S3")
+@pytest.mark.skipif(not packages_installed("boto3"), reason="boto3 is not installed")
 @pytest.mark.parametrize("path", ["directory/", "file"])
 def test_transfer_local_to_s3_to_local(path: str) -> None:
     """Test transferring a file or directory from local to S3 and back to local.
@@ -224,6 +229,7 @@ def test_transfer_local_to_s3_to_local(path: str) -> None:
 
 
 @pytest.mark.skipif(IN_CI, reason="Test requires ssh access to localhost")
+@pytest.mark.skipif(sys.platform == "darwin", reason="Does not work on MacOS")
 @pytest.mark.parametrize("path", ["directory", "file"])
 @pytest.mark.parametrize("temporary_target", [True, False])
 def test_transfer_local_to_ssh(path: str, temporary_target: bool) -> None: