anemoi-utils 0.4.35__py3-none-any.whl → 0.4.37__py3-none-any.whl

anemoi/utils/registry.py

@@ -97,6 +97,8 @@ class Registry(Generic[T]):
         self.package = package
         self.__registered = {}
         self._sources = {}
+        self._aliases = {}
+        self._warnings = set()
         self.kind = package.split(".")[-1]
         self.key = key
         self.api_version = api_version
@@ -118,7 +120,9 @@ class Registry(Generic[T]):
         """
         return _BY_KIND.get(kind)
 
-    def register(self, name: str, factory: Callable | None = None, source: Any | None = None) -> Wrapper | None:
+    def register(
+        self, name: str, factory: Callable | None = None, source: Any | None = None, aliases: list[str] | None = None
+    ) -> Wrapper | None:
         """Register a factory with the registry.
 
         Parameters
@@ -129,6 +133,8 @@ class Registry(Generic[T]):
             The factory to register, by default None.
         source : Any, optional
             The source of the factory, by default None.
+        aliases : list of str, optional
+            Aliases for the factory, by default None.
 
         Returns
         -------
@@ -136,7 +142,13 @@ class Registry(Generic[T]):
             A wrapper if the factory is None, otherwise None.
         """
 
+        aliases = aliases or []
+
         name = name.replace("_", "-")
+        assert (
+            name not in self._aliases
+        ), f"'{name}' is already registered for '{self._aliases[name]}' in {self.package}"
+        assert name not in aliases, f"'{name}' cannot be an alias for itself in {self.package}"
 
         if factory is None:
             # This happens when the @register decorator is used
@@ -150,6 +162,15 @@ class Registry(Generic[T]):
             warnings.warn(f"Existing: {self._sources[name]}")
             warnings.warn(f"New: {source}")
 
+        for alias in aliases:
+            assert (
+                alias not in self.__registered
+            ), f"Alias '{alias}' is already registered as a factory in {self.package}"
+            alias = alias.replace("_", "-")
+            if alias in self._aliases:
+                warnings.warn(f"Alias '{alias}' is already registered for '{self._aliases[alias]}' in {self.package}")
+            self._aliases[alias] = name
+
         self.__registered[name] = factory
         self._sources[name] = source
 
@@ -188,6 +209,7 @@ class Registry(Generic[T]):
         """
 
         name = name.replace("_", "-")
+        name = self._unalias(name)
 
         ok = name in self.factories
         if not ok:
@@ -213,6 +235,7 @@ class Registry(Generic[T]):
         """
 
         name = name.replace("_", "-")
+        name = self._unalias(name)
 
         if return_none:
             return self.factories.get(name)
@@ -305,6 +328,7 @@ class Registry(Generic[T]):
         """
 
         name = name.replace("_", "-")
+        name = self._unalias(name)
 
         factory = self.lookup(name)
         return factory(*args, **kwargs)
@@ -352,3 +376,33 @@ class Registry(Generic[T]):
         raise ValueError(
             f"Entry '{config}' must either be a string, a dictionary with a single entry, or a dictionary with a '{self.key}' key"
         )
+
+    def _unalias(self, name: str) -> str:
+        """Resolve an alias to its canonical name.
+
+        Parameters
+        ----------
+        name : str
+            The name to resolve.
+
+        Returns
+        -------
+        str
+            The canonical name.
+        """
+        canonical = self._aliases.get(name, name)
+        if canonical != name:
+            warnings.warn(
+                f"Alias '{name}' for '{canonical}' in {self.package} is deprecated and will be removed in a future version.",
+                category=DeprecationWarning,
+                # stacklevel=2,
+            )
+
+        return canonical
+
+    def aliases(self):
+        """Get the aliases."""
+        result = {}
+        for alias, name in self._aliases.items():
+            result.setdefault(name, []).append(alias)
+        return result

anemoi/utils/remote/__init__.py

@@ -77,13 +77,11 @@ class Loader:
         progress : callable, optional
             A callable for progress reporting, by default None.
         """
-        assert verbosity == 1, verbosity
+        # assert verbosity == 1, verbosity
 
         if progress is None:
             progress = _ignore
 
-        # from boto3.s3.transfer import TransferConfig
-        # config = TransferConfig(use_threads=False)
         config = None
         with concurrent.futures.ThreadPoolExecutor(max_workers=threads) as executor:
             try: