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

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)
 
@@ -197,15 +199,17 @@ class Transfer:
     ):
         if target == ".":
             target = os.path.basename(source)
+            if not target:
+                target = os.path.basename(os.path.dirname(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

@@ -51,8 +51,9 @@ class SshBaseUpload(BaseUpload):
 
     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.7.dist-info → anemoi_utils-0.4.9.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 anemoi/utils/__init__.py,sha256=0u0eIdu5-H1frf6V4KHpNmlh_SS-bJnxjzIejlsLqdw,702
 anemoi/utils/__main__.py,sha256=5NW2A3OgTimB4ptwYThivIRSeCrvabMuvnr8mmnVx0E,715
-anemoi/utils/_version.py,sha256=aiv6B46XdwSU0l915ePx2JQG3yol6FO4m6wTlI4ZKN0,411
+anemoi/utils/_version.py,sha256=9cAnB-pA-T5W59CKIhPY3Faikq0QoZykRx3JmbTzzjE,411
 anemoi/utils/caching.py,sha256=0cznpvaaox14NSVi-Q3PqumfuGtXo0YNcEFwDPxvMZw,1948
 anemoi/utils/checkpoints.py,sha256=q8QqKlZ6qChjzEfq7KM1gVXuyqgsVRGIb4dJFtkGk58,7774
 anemoi/utils/cli.py,sha256=rmMP60VY3em99rQP6TCrKibMngWwVe5h_0GDcf16c5U,4117
@@ -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=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/remote/__init__.py,sha256=-_AA1xm9GpagW5zP0PGpz-3SRKEUjw_AGSNd_bhuh7g,11639
+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.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+anemoi_utils-0.4.9.dist-info/METADATA,sha256=ArYQ4wg6khfNZpeSfzAbPKyRxcGAK5gnnYiiiewoVIU,15222
+anemoi_utils-0.4.9.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+anemoi_utils-0.4.9.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
+anemoi_utils-0.4.9.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
+anemoi_utils-0.4.9.dist-info/RECORD,,