anemoi-utils 0.4.6__py3-none-any.whl → 0.4.8__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.6'
-__version_tuple__ = version_tuple = (0, 4, 6)
+__version__ = version = '0.4.8'
+__version_tuple__ = version_tuple = (0, 4, 8)

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/remote/__init__.py

@@ -138,6 +138,8 @@ class BaseDownload(Loader):
         raise NotImplementedError
 
     def get_temporary_target(self, target, pattern):
+        if pattern is None:
+            return target
         dirname, basename = os.path.split(target)
         return pattern.format(dirname=dirname, basename=basename)
 
@@ -199,13 +201,13 @@ class Transfer:
             target = os.path.basename(source)
 
         temporary_target = {
-            False: "{dirname}/{basename}",
+            False: None,
             True: "{dirname}-downloading/{basename}",
             "-tmp/*": "{dirname}-tmp/{basename}",
             "*-tmp": "{dirname}/{basename}-tmp",
             "tmp-*": "{dirname}/tmp-{basename}",
         }.get(temporary_target, temporary_target)
-        assert isinstance(temporary_target, str), (type(temporary_target), temporary_target)
+        assert temporary_target is None or isinstance(temporary_target, str), (type(temporary_target), temporary_target)
 
         self.source = source
         self.target = target

anemoi/utils/remote/s3.py

@@ -192,6 +192,9 @@ class S3Download(BaseDownload):
         _, _, bucket, key = source.split("/", 3)
         s3 = s3_client(bucket)
 
+        if key.endswith("/"):
+            return 0
+
         try:
             response = s3.head_object(Bucket=bucket, Key=key)
         except s3.exceptions.ClientError as e:

anemoi/utils/remote/ssh.py

@@ -44,12 +44,16 @@ 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):
         hostname, path = self._parse_target(target)
-        dirname, basename = os.path.split(path)
-        path = pattern.format(dirname=dirname, basename=basename)
+        if pattern is not None:
+            dirname, basename = os.path.split(path)
+            path = pattern.format(dirname=dirname, basename=basename)
         return f"ssh://{hostname}:{path}"
 
     def rename_target(self, target, new_target):

{anemoi_utils-0.4.6.dist-info → anemoi_utils-0.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anemoi-utils
-Version: 0.4.6
+Version: 0.4.8
 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.6.dist-info → anemoi_utils-0.4.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
 anemoi/utils/__init__.py,sha256=0u0eIdu5-H1frf6V4KHpNmlh_SS-bJnxjzIejlsLqdw,702
 anemoi/utils/__main__.py,sha256=5NW2A3OgTimB4ptwYThivIRSeCrvabMuvnr8mmnVx0E,715
-anemoi/utils/_version.py,sha256=zpZoWJd6Ckmo0bRYgkjKcEXS2EIwkKGRgif5PN8gs6Y,411
+anemoi/utils/_version.py,sha256=WKH2DAU2byiQfZy9XW8vTna5aTSXgkj8aA__Cy4DLwQ,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=TEYDmrZUajuhp_dfWeg6z5c6XfntE-mwugUQJyAgUco,1419
@@ -21,12 +21,12 @@ anemoi/utils/commands/__init__.py,sha256=O5W3yHZywRoAqmRUioAr3zMCh0hGVV18wZYGvc0
 anemoi/utils/commands/config.py,sha256=zt4PFATYJ-zs0C5mpUlrQ4Fj5m1kM3CcsszUP1VBbzA,816
 anemoi/utils/mars/__init__.py,sha256=kvbu-gSaYI9jSNEzfQltrtHPVIameYGoLjOJKwI7x_U,1723
 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.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-anemoi_utils-0.4.6.dist-info/METADATA,sha256=VkNVI8JM7Sqbllhp3afhI6CWZ6MD-X1YcMgDf7A6L40,15222
-anemoi_utils-0.4.6.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-anemoi_utils-0.4.6.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
-anemoi_utils-0.4.6.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
-anemoi_utils-0.4.6.dist-info/RECORD,,
+anemoi/utils/remote/__init__.py,sha256=f6pfM0PiCabyRmqDFOsXegnXbOvkaUiHGeC9ThU9Ero,11545
+anemoi/utils/remote/s3.py,sha256=hykbVlh1_aFI00FWjgm_FWIMfVCTFiQf_cq8_gAo31s,11976
+anemoi/utils/remote/ssh.py,sha256=3lqFpY9CEor_DvIK9ZxSmj3rND-366Sm9R3Vw61sWSs,4695
+anemoi_utils-0.4.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+anemoi_utils-0.4.8.dist-info/METADATA,sha256=mfdZdTOTRN6Ata0zc4V7UkIKgKImSXI3IO1JumHWwss,15222
+anemoi_utils-0.4.8.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+anemoi_utils-0.4.8.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
+anemoi_utils-0.4.8.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
+anemoi_utils-0.4.8.dist-info/RECORD,,