cloud-files 6.0.0__tar.gz → 6.1.1__tar.gz

{cloud_files-6.0.0 → cloud_files-6.1.1}/ChangeLog

@@ -1,6 +1,18 @@
 CHANGES
 =======
 
+6.1.1
+-----
+
+* fix(gcs): prefixes added back into listing files
+* fix: don't print a progress bar when uploading zero elements
+
+6.1.0
+-----
+
+* test: check that raw objects work for mem
+* feat: allow for storing python objects in mem to avoid serialization cost
+
 6.0.0
 -----
 

{cloud_files-6.0.0 → cloud_files-6.1.1}/PKG-INFO

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

@@ -128,6 +128,24 @@ def test_read_write(s3, protocol, num_threads, green):
   if protocol == 'file':
     rmtree(url)
 
+def test_read_write_py_objects_mem():
+  from cloudfiles import CloudFiles, CloudFile, exceptions
+  url = compute_url("mem", "rw")
+
+  cf = CloudFiles(url)
+  
+  content = set([1,2,3])
+  cf.put('my_set', content, compress=None, raw=True, cache_control='no-cache')
+  cf['my_set2'] = content
+
+  f = CloudFile(cf.join(url, "my_set"))
+  assert cf.get('my_set') == content
+  assert cf['my_set2'] == content
+  assert f.get() == content
+  assert cf.get('nonexistentfile') is None
+
+  cf.delete(["my_set", "my_set2"])
+
 @pytest.mark.parametrize("protocol", ('mem', 'file', 's3'))#'gs'))
 def test_get_json_order(s3, protocol):
   from cloudfiles import CloudFiles

{cloud_files-6.0.0 → cloud_files-6.1.1}/cloud_files.egg-info/PKG-INFO

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

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

{cloud_files-6.0.0 → cloud_files-6.1.1}/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("")        

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

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