cloud-files 5.0.2__tar.gz → 5.1.0__tar.gz

{cloud_files-5.0.2 → cloud_files-5.1.0}/ChangeLog

@@ -1,6 +1,18 @@
 CHANGES
 =======
 
+5.1.0
+-----
+
+* fix: remove precomputed suffix from cloudfiles during normalization
+* feat: accept the new |neuroglancer-precomputed: suffix
+
+5.0.3
+-----
+
+* docs: describe why this works
+* fix(gcs): flat listing works
+
 5.0.2
 -----
 

{cloud_files-5.0.2 → cloud_files-5.1.0}/PKG-INFO

@@ -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 → cloud_files-5.1.0}/automated_test.py

@@ -531,6 +531,13 @@ def test_path_extraction():
 
   shoulderror('ou3bouqjsa fkj aojsf oaojf ojsaf')
 
+  assert (
+    paths.extract('gs://bucket/dataset/layer|neuroglancer-precomputed:') 
+      == ExtractedPath(
+        'precomputed', 'gs', 'bucket', 
+        'dataset/layer', None, None
+      ))
+
   okgoogle('gs://bucket/dataset/layer/')
   # shoulderror('gs://bucket/dataset/layer/info')
 

{cloud_files-5.0.2 → cloud_files-5.1.0}/cloud_files.egg-info/PKG-INFO

@@ -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.1.0/cloud_files.egg-info/pbr.json

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

{cloud_files-5.0.2 → cloud_files-5.1.0}/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

{cloud_files-5.0.2 → cloud_files-5.1.0}/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

{cloud_files-5.0.2 → cloud_files-5.1.0}/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/cloud_files.egg-info/pbr.json

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