cloud-files 6.0.0__py3-none-any.whl → 6.1.1__py3-none-any.whl

{cloud_files-6.0.0.dist-info → cloud_files-6.1.1.dist-info}/METADATA

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

{cloud_files-6.0.0.dist-info → cloud_files-6.1.1.dist-info}/RECORD

@@ -4,12 +4,12 @@ cloudfiles/compression.py,sha256=WXJHnoNLJ_NWyoY9ygZmFA2qMou35_9xS5dzF7-2H-M,626
 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=Kg5t2-tWD0EoJ0qK-wid7zdxLgs7q0mDduPxAzyUUL0,47499
+cloudfiles/interfaces.py,sha256=gOmVq-R2zQ0PLnQbfT4DIZVJ2SzV3FPA9eNAtKNZalY,47564
 cloudfiles/lib.py,sha256=HHjCvjmOjA0nZWSvHGoSeYpxqd6FAG8xk8LM212LAUA,5382
 cloudfiles/monitoring.py,sha256=N5Xq0PYZK1OxoYtwBFsnnfaq7dElTgY8Rn2Ez_I3aoo,20897
 cloudfiles/paths.py,sha256=FLdShqkOg1XlkHurU9eiKzLadx2JFYG1EmleCpOFsYQ,12229
 cloudfiles/resumable_tools.py,sha256=NyuSoGh1SaP5akrHCpd9kgy2-JruEWrHW9lvJxV7jpE,6711
-cloudfiles/scheduler.py,sha256=ioqBT5bMPCVHEHlnL-SW_wHulxGgjeThiKHlnaDOydo,3831
+cloudfiles/scheduler.py,sha256=r_yEjUkvUk-mHa8giRnPjcQ-_LiiXaPQNkMYQtVcmgI,3851
 cloudfiles/secrets.py,sha256=IuYKHmmvFmQTyG2Zcmbx7e8U2LIv-woG5d8qyOlyCD8,5431
 cloudfiles/test.py,sha256=jktBhzKLU448QPs5H7QVnTvpYMo4lBBWG1aE7-uzVGQ,678
 cloudfiles/threaded_queue.py,sha256=Nl4vfXhQ6nDLF8PZpSSBpww0M2zWtcd4DLs3W3BArBw,7082
@@ -17,11 +17,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=jHbQasZb5DB_g8nGxS3Y0ekAdIPcSVrHN5mvEedUl0k,38908
-cloud_files-6.0.0.dist-info/AUTHORS,sha256=BFVmobgAhaVFI5fqbuqAY5XmBQxe09ZZAsAOTy87hKQ,318
-cloud_files-6.0.0.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
-cloud_files-6.0.0.dist-info/METADATA,sha256=SJw22OqzxSN3BvyacUjQgJ1trdAWs4mJv9hC0LYKQZk,30530
-cloud_files-6.0.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cloud_files-6.0.0.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
-cloud_files-6.0.0.dist-info/pbr.json,sha256=P1Yg68JWbSeMCxsbPR-QhAUj2p8rzNNuqgMHtcFAveo,46
-cloud_files-6.0.0.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
-cloud_files-6.0.0.dist-info/RECORD,,
+cloud_files-6.1.1.dist-info/AUTHORS,sha256=BFVmobgAhaVFI5fqbuqAY5XmBQxe09ZZAsAOTy87hKQ,318
+cloud_files-6.1.1.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
+cloud_files-6.1.1.dist-info/METADATA,sha256=LrydFpwwF2A2OSPj9tcxxLQXBmybrekBQ4K8GqBoeQg,30530
+cloud_files-6.1.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloud_files-6.1.1.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
+cloud_files-6.1.1.dist-info/pbr.json,sha256=q_xW5z-50iFm9A4TKknrHMHoAEvWIwnEa-7NI2HMutQ,46
+cloud_files-6.1.1.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
+cloud_files-6.1.1.dist-info/RECORD,,

cloud_files-6.1.1.dist-info/pbr.json

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

cloudfiles/interfaces.py

@@ -446,11 +446,12 @@ class MemoryInterface(StorageInterface):
     elif compress:
       raise ValueError("Compression type {} not supported.".format(compress))
 
-    if content \
-      and content_type \
-      and re.search('json|te?xt', content_type) \
-      and type(content) is str:
-
+    if (
+      isinstance(content, str)
+      and len(content) > 0
+      and content_type
+      and re.search('json|te?xt', content_type)
+    ):
       content = content.encode('utf-8')
 
     if hasattr(content, "read") and hasattr(content, "seek"):
@@ -480,7 +481,7 @@ class MemoryInterface(StorageInterface):
       encoding = None
 
     result = self._data.get(path, None)
-    if result:
+    if isinstance(result, (bytes, bytearray, str)):
       result = result[slice(start, end)]
     return (result, encoding, None, None)
 
@@ -850,7 +851,7 @@ class GoogleCloudStorageInterface(StorageInterface):
       prefix=path, 
       delimiter=delimiter,
       page_size=2500,
-      fields="items(name),nextPageToken",
+      fields="items(name),nextPageToken,prefixes",
     )
 
     for page in blobs.pages:
@@ -869,7 +870,6 @@ class GoogleCloudStorageInterface(StorageInterface):
         elif flat and '/' not in blob.name.removeprefix(path):
           yield filename
 
-
   @retry
   def subtree_size(self, prefix:str = "") -> tuple[int,int]:
     layer_path = self.get_path_to_file("")        

cloudfiles/scheduler.py

@@ -98,9 +98,10 @@ def schedule_single_threaded_jobs(
   if isinstance(progress, tqdm):
     pbar = progress
   else:
+    N = totalfn(fns, total)
     pbar = tqdm(
-      total=totalfn(fns, total), 
-      disable=(not progress), 
+      total=N, 
+      disable=(not progress or N == 0), 
       desc=(progress if isinstance(progress, str) else None)
     )
 

cloud_files-6.0.0.dist-info/pbr.json

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