anemoi-utils 0.4.5__py3-none-any.whl → 0.4.7__py3-none-any.whl

anemoi/utils/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4.5'
-__version_tuple__ = version_tuple = (0, 4, 5)
+__version__ = version = '0.4.7'
+__version_tuple__ = version_tuple = (0, 4, 7)

anemoi/utils/config.py

@@ -207,7 +207,7 @@ def load_any_dict_format(path) -> dict:
                 return tomllib.load(f)
     except (json.JSONDecodeError, yaml.YAMLError, tomllib.TOMLDecodeError) as e:
         LOG.warning(f"Failed to parse config file {path}", exc_info=e)
-        return ValueError(f"Failed to parse config file {path} [{e}]")
+        raise ValueError(f"Failed to parse config file {path} [{e}]")
 
     return open(path).read()
 

anemoi/utils/hindcasts.py

@@ -27,16 +27,16 @@ class HindcastDatesTimes:
 
         self.reference_dates = reference_dates
 
-        if isinstance(years, list):
-            self.years = years
-        else:
-            self.years = range(1, years + 1)
+        assert isinstance(years, int), f"years must be an integer, got {years}"
+        assert years > 0, f"years must be greater than 0, got {years}"
+        self.years = years
 
     def __iter__(self):
         for reference_date in self.reference_dates:
-            for year in self.years:
-                if reference_date.month == 2 and reference_date.day == 29:
-                    date = datetime.datetime(reference_date.year - year, 2, 28)
-                else:
-                    date = datetime.datetime(reference_date.year - year, reference_date.month, reference_date.day)
+            year, month, day = reference_date.year, reference_date.month, reference_date.day
+            if (month, day) == (2, 29):
+                day = 28
+
+            for i in range(1, self.years + 1):
+                date = datetime.datetime(year - i, month, day)
                 yield (date, reference_date)

anemoi/utils/registry.py

@@ -30,6 +30,9 @@ class Wrapper:
         return factory
 
 
+_BY_KIND = {}
+
+
 class Registry:
     """A registry of factories"""
 
@@ -39,6 +42,11 @@ class Registry:
         self.registered = {}
         self.kind = package.split(".")[-1]
         self.key = key
+        _BY_KIND[self.kind] = self
+
+    @classmethod
+    def lookup_kind(cls, kind: str):
+        return _BY_KIND.get(kind)
 
     def register(self, name: str, factory: callable = None):
 
@@ -47,6 +55,9 @@ class Registry:
 
         self.registered[name] = factory
 
+    # def registered(self, name: str):
+    #     return name in self.registered
+
     def _load(self, file):
         name, _ = os.path.splitext(file)
         try:
@@ -54,7 +65,9 @@ class Registry:
         except Exception:
             LOG.warning(f"Error loading filter '{self.package}.{name}'", exc_info=True)
 
-    def lookup(self, name: str) -> callable:
+    def lookup(self, name: str, *, return_none=False) -> callable:
+
+        # print('✅✅✅✅✅✅✅✅✅✅✅✅✅', name, self.registered)
         if name in self.registered:
             return self.registered[name]
 
@@ -87,8 +100,12 @@ class Registry:
                 self.registered[name] = entry_point.load()
 
         if name not in self.registered:
+            if return_none:
+                return None
+
             for e in self.registered:
                 LOG.info(f"Registered: {e}")
+
             raise ValueError(f"Cannot load '{name}' from {self.package}")
 
         return self.registered[name]
@@ -97,8 +114,8 @@ class Registry:
         factory = self.lookup(name)
         return factory(*args, **kwargs)
 
-    def __call__(self, name: str, *args, **kwargs):
-        return self.create(name, *args, **kwargs)
+    # def __call__(self, name: str, *args, **kwargs):
+    #     return self.create(name, *args, **kwargs)
 
     def from_config(self, config, *args, **kwargs):
         if isinstance(config, str):
@@ -125,5 +142,5 @@ class Registry:
             return self.create(key, *args, value, **kwargs)
 
         raise ValueError(
-            f"Entry '{config}' must either be a string, a dictionray with a single entry, or a dictionary with a '{self.key}' key"
+            f"Entry '{config}' must either be a string, a dictionary with a single entry, or a dictionary with a '{self.key}' key"
         )

anemoi/utils/remote/ssh.py

@@ -44,6 +44,9 @@ class SshBaseUpload(BaseUpload):
             hostnames = hostname.split("+")
             hostname = hostnames[random.randint(0, len(hostnames) - 1)]
 
+        if ".." in path.split("/"):
+            raise Exception("Path contains suspicious '..' : {target}")
+
         return hostname, path
 
     def get_temporary_target(self, target, pattern):

{anemoi_utils-0.4.5.dist-info → anemoi_utils-0.4.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anemoi-utils
-Version: 0.4.5
+Version: 0.4.7
 Summary: A package to hold various functions to support training of ML models on ECMWF data.
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 License: Apache License

{anemoi_utils-0.4.5.dist-info → anemoi_utils-0.4.7.dist-info}/RECORD

@@ -1,17 +1,17 @@
 anemoi/utils/__init__.py,sha256=0u0eIdu5-H1frf6V4KHpNmlh_SS-bJnxjzIejlsLqdw,702
 anemoi/utils/__main__.py,sha256=5NW2A3OgTimB4ptwYThivIRSeCrvabMuvnr8mmnVx0E,715
-anemoi/utils/_version.py,sha256=XyejXnBNtqNdR37CiSnJ022K8vUHKAlzN9lbcpmmftA,411
+anemoi/utils/_version.py,sha256=aiv6B46XdwSU0l915ePx2JQG3yol6FO4m6wTlI4ZKN0,411
 anemoi/utils/caching.py,sha256=0cznpvaaox14NSVi-Q3PqumfuGtXo0YNcEFwDPxvMZw,1948
 anemoi/utils/checkpoints.py,sha256=q8QqKlZ6qChjzEfq7KM1gVXuyqgsVRGIb4dJFtkGk58,7774
 anemoi/utils/cli.py,sha256=rmMP60VY3em99rQP6TCrKibMngWwVe5h_0GDcf16c5U,4117
 anemoi/utils/compatibility.py,sha256=0_nIcbdQbNMrS6AkqrBgJGJlSJXW8R23ncaZaDwdJ4c,2190
-anemoi/utils/config.py,sha256=Fpy4wzj3dahTwwO75Iet6zmQQFGmTvhXml6-EsTEvgk,9873
+anemoi/utils/config.py,sha256=At0k_NtbJ74S72sEZIYgdEaLf5KCEvxIJi9FGLcUwrE,9872
 anemoi/utils/dates.py,sha256=wwYD5_QI7EWY_jhpENNYtL5O7fjwYkzmqHkNoayvmrY,12452
 anemoi/utils/grib.py,sha256=zBICyOsYtR_9px1C5UDT6wL_D6kiIhUi_00kjFmas5c,3047
-anemoi/utils/hindcasts.py,sha256=OUOY2nDa3LBnzJ3ncgANzJDapouh82KgVyofDAu7K_Q,1426
+anemoi/utils/hindcasts.py,sha256=TEYDmrZUajuhp_dfWeg6z5c6XfntE-mwugUQJyAgUco,1419
 anemoi/utils/humanize.py,sha256=tSQkiUHiDj3VYk-DeruHp9P79sJO1b0whsPBphqy9qA,16627
 anemoi/utils/provenance.py,sha256=SqOiNoY1y36Zec83Pjt7OhihbwxMyknscfmogHCuriA,10894
-anemoi/utils/registry.py,sha256=I1r7grsIEsqAoJ9LPxfWMj10EoMazxRb4d8FPWdHsqk,3903
+anemoi/utils/registry.py,sha256=Iit_CfTGuoVffXkZA2A5mUXb4AdGIUX9TpnUqWT4HJ0,4291
 anemoi/utils/s3.py,sha256=UOEETko08hnIXeFy8u10eQbqpcape9d-L6IgsjFMe18,2473
 anemoi/utils/sanitise.py,sha256=MqEMLwVZ1jSemLDBoQXuJyXKIfyR0gzYi7DoITBcir8,2866
 anemoi/utils/sanitize.py,sha256=43ZKDcfVpeXSsJ9TFEc9aZnD6oe2cUh151XnDspM98M,462
@@ -23,10 +23,10 @@ anemoi/utils/mars/__init__.py,sha256=kvbu-gSaYI9jSNEzfQltrtHPVIameYGoLjOJKwI7x_U
 anemoi/utils/mars/mars.yaml,sha256=R0dujp75lLA4wCWhPeOQnzJ45WZAYLT8gpx509cBFlc,66
 anemoi/utils/remote/__init__.py,sha256=nLoXHj0Jp3YrGSwb0xkGyeuquDolWiiSBtGPJJX8gbM,11481
 anemoi/utils/remote/s3.py,sha256=CNEYq8P7o7lSB1acUp_GPU8c-WrEa7Cduv3rGw4Kba0,11924
-anemoi/utils/remote/ssh.py,sha256=0Kj-W6U5pSK60pIiAiDUzqNPH7_dVnebrajWrew-Ye0,4546
-anemoi_utils-0.4.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-anemoi_utils-0.4.5.dist-info/METADATA,sha256=aXZNFOuPiRupLvAWEINzyR16otaX3ycg69xqBh1ikuI,15222
-anemoi_utils-0.4.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-anemoi_utils-0.4.5.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
-anemoi_utils-0.4.5.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
-anemoi_utils-0.4.5.dist-info/RECORD,,
+anemoi/utils/remote/ssh.py,sha256=zKya93KOMXTXgiVodb31BUuSapjY_I4yrzULO4NDOZ4,4655
+anemoi_utils-0.4.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+anemoi_utils-0.4.7.dist-info/METADATA,sha256=lIwSwWWpOJ14abGtqR4emsi5cjgIcZDLUzT5UHr5Ong,15222
+anemoi_utils-0.4.7.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+anemoi_utils-0.4.7.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
+anemoi_utils-0.4.7.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
+anemoi_utils-0.4.7.dist-info/RECORD,,

{anemoi_utils-0.4.5.dist-info → anemoi_utils-0.4.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any