cloud-files 5.0.2__py3-none-any.whl → 5.1.0__py3-none-any.whl

{cloud_files-5.0.2.dist-info → cloud_files-5.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 5.0.2
+Version: 5.1.0
 Summary: Fast access to cloud storage and local FS.
 Home-page: https://github.com/seung-lab/cloud-files/
 Author: William Silversmith

{cloud_files-5.0.2.dist-info → cloud_files-5.1.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 cloudfiles/__init__.py,sha256=pLB4CcV2l3Jgv_ni1520Np1pfzFj8Cpr87vNxFT3rNI,493
-cloudfiles/cloudfiles.py,sha256=SVGAupjBi98brCMomAYOakbeyLJAahd7BUjf8pwZv8E,51066
+cloudfiles/cloudfiles.py,sha256=K8rKzrzDzbi1HjGoPMsXSMFzTbe_KLfDIyk4tRjoGEI,51070
 cloudfiles/compression.py,sha256=pqYdpu5vfFv-094BpfZ2pgRjVu7ESM9pAZC09P6E8bY,6150
 cloudfiles/connectionpools.py,sha256=aL8RiSjRepECfgAFmJcz80aJFKbou7hsbuEgugDKwB8,4814
 cloudfiles/exceptions.py,sha256=N0oGQNG-St6RvnT8e5p_yC_E61q2kgAe2scwAL0F49c,843
 cloudfiles/gcs.py,sha256=unqu5KxGKaPq6N4QeHSpCDdtnK1BzPOAerTZ8FLt2_4,3820
-cloudfiles/interfaces.py,sha256=rc6jblcdxfvsPAyiOrosY_kTn7idHftS026prG84x2M,43389
+cloudfiles/interfaces.py,sha256=jAILgy6v67L0tV4QXe03wm6fzb2nJ3PJQod8IPE_c7k,43601
 cloudfiles/lib.py,sha256=9YFGMCy0mi23baqtsr-f5Gd1ewAGvD7x3UVNt772Z9E,5317
-cloudfiles/paths.py,sha256=VFgqrOqI7lTZ2EE7Ktg6I343TVXYEhn8GHTfJZZ9giE,11435
+cloudfiles/paths.py,sha256=4B3qWjR2TP8wAYK4NLw-iy2KUn3VNspKp6_Vy4j3I8A,11592
 cloudfiles/resumable_tools.py,sha256=NyuSoGh1SaP5akrHCpd9kgy2-JruEWrHW9lvJxV7jpE,6711
 cloudfiles/scheduler.py,sha256=DqDANmOpB3NdzFgJDNMMibRIkCrXQqIh2XGL8GWoc9c,3668
 cloudfiles/secrets.py,sha256=791b5a8nWSBYtlleGzKeoYIR5jl-FI1bw6INRM4Wy-0,5295
@@ -15,11 +15,11 @@ cloudfiles/typing.py,sha256=f3ZYkNfN9poxhGu5j-P0KCxjCCqSn9HAg5KiIPkjnCg,416
 cloudfiles_cli/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
 cloudfiles_cli/__init__.py,sha256=Wftt3R3F21QsHtWqx49ODuqT9zcSr0em7wk48kcH0WM,29
 cloudfiles_cli/cloudfiles_cli.py,sha256=_2Amjp3vsdq7vQgF2utD6BJqjOPKXOTjrJyehnlojpQ,34893
-cloud_files-5.0.2.dist-info/AUTHORS,sha256=BFVmobgAhaVFI5fqbuqAY5XmBQxe09ZZAsAOTy87hKQ,318
-cloud_files-5.0.2.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
-cloud_files-5.0.2.dist-info/METADATA,sha256=ZrdyciuDQruZS6GjOll-FxtWl1sRHE2DwszlHVXVdPA,27047
-cloud_files-5.0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cloud_files-5.0.2.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
-cloud_files-5.0.2.dist-info/pbr.json,sha256=1Ut3ABIh0b-00huoRZVkC1bPqCTSbdQ3syVtVqYnIU4,46
-cloud_files-5.0.2.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
-cloud_files-5.0.2.dist-info/RECORD,,
+cloud_files-5.1.0.dist-info/AUTHORS,sha256=BFVmobgAhaVFI5fqbuqAY5XmBQxe09ZZAsAOTy87hKQ,318
+cloud_files-5.1.0.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
+cloud_files-5.1.0.dist-info/METADATA,sha256=J8ZvZo3w1SJDhpuvyy5Qz8yswZElEsFMzMfzN3iqnvY,27047
+cloud_files-5.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloud_files-5.1.0.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
+cloud_files-5.1.0.dist-info/pbr.json,sha256=xEKcf5cQdkKoIlJkxO7RUsjjZQPsSGYZpQUsAew5Ve8,46
+cloud_files-5.1.0.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
+cloud_files-5.1.0.dist-info/RECORD,,

cloud_files-5.1.0.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "4678ea6", "is_release": true}

cloudfiles/cloudfiles.py

@@ -243,7 +243,7 @@ class CloudFiles:
       cloudpath = paths.to_https_protocol(cloudpath)
 
     cloudpath = paths.normalize(cloudpath)
-
+    
     self.cloudpath = cloudpath
     self.progress = progress
     self.secrets = secrets

cloudfiles/interfaces.py

@@ -808,18 +808,24 @@ class GoogleCloudStorageInterface(StorageInterface):
     path = posixpath.join(layer_path, prefix)
 
     delimiter = '/' if flat else None
+
     blobs = self._bucket.list_blobs(
       prefix=path, 
       delimiter=delimiter,
     )
 
-    if blobs.prefixes:
-      yield from (
-        item.removeprefix(path)
-        for item in blobs.prefixes
-      )
-
+    first = True
     for blob in blobs:
+      # This awkward construction is necessary
+      # because the request that populates prefixes 
+      # isn't made until the iterator is activated.
+      if first and blobs.prefixes:
+        yield from (
+          item.removeprefix(path)
+          for item in blobs.prefixes
+        )
+        first = False
+
       filename = blob.name.removeprefix(layer_path)
       if not filename:
         continue

cloudfiles/paths.py

@@ -18,6 +18,8 @@ ExtractedPath = namedtuple('ExtractedPath',
   ('format', 'protocol', 'bucket', 'path', 'host', 'alias')
 )
 
+PRECOMPUTED_SUFFIX = '|neuroglancer-precomputed:'
+
 ALIAS_FILE = os.path.join(CLOUD_FILES_DIR, "aliases.json")
 OFFICIAL_ALIASES = {
   "matrix": "s3://https://s3-hpcrc.rc.princeton.edu/",
@@ -161,6 +163,9 @@ for alias, host in OFFICIAL_ALIASES.items():
 
 @lru_cache(maxsize=10, typed=False)
 def normalize(path):
+
+  path = path.removesuffix(PRECOMPUTED_SUFFIX)
+
   fmt, proto, endpoint, cloudpath, alias = extract_format_protocol(
     path, allow_defaults=False
   )
@@ -294,6 +299,7 @@ def extract_format_protocol(cloudpath:str, allow_defaults=True) -> tuple:
 
   groups = m.groups()
   cloudpath = re.sub(CLOUDPATH_REGEXP, '', cloudpath, count=1)
+  cloudpath = cloudpath.removesuffix(PRECOMPUTED_SUFFIX)
 
   fmt = m.group('fmt')
   if not fmt and allow_defaults:

cloud_files-5.0.2.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "b480c53", "is_release": true}