cloud-files 5.1.3__py3-none-any.whl → 5.3.0__py3-none-any.whl

{cloud_files-5.1.3.dist-info → cloud_files-5.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 5.1.3
+Version: 5.3.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.3.dist-info → cloud_files-5.3.0.dist-info}/RECORD

@@ -4,9 +4,9 @@ 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=8Gez-1q1Ulb6p_qSfydwAKXvJybVi-QS0yfkvSnm44I,43862
-cloudfiles/lib.py,sha256=9YFGMCy0mi23baqtsr-f5Gd1ewAGvD7x3UVNt772Z9E,5317
-cloudfiles/paths.py,sha256=4B3qWjR2TP8wAYK4NLw-iy2KUn3VNspKp6_Vy4j3I8A,11592
+cloudfiles/interfaces.py,sha256=f_7doKCiI_8--ghsQJvh8f5HhAn5u3haSlPHlxi_jbw,43949
+cloudfiles/lib.py,sha256=HHjCvjmOjA0nZWSvHGoSeYpxqd6FAG8xk8LM212LAUA,5382
+cloudfiles/paths.py,sha256=ZfdFvbQoFiGgICPM4cjT2TzfP6vf3WEcj31aKON6IwE,12120
 cloudfiles/resumable_tools.py,sha256=NyuSoGh1SaP5akrHCpd9kgy2-JruEWrHW9lvJxV7jpE,6711
 cloudfiles/scheduler.py,sha256=DqDANmOpB3NdzFgJDNMMibRIkCrXQqIh2XGL8GWoc9c,3668
 cloudfiles/secrets.py,sha256=791b5a8nWSBYtlleGzKeoYIR5jl-FI1bw6INRM4Wy-0,5295
@@ -16,11 +16,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.1.3.dist-info/AUTHORS,sha256=BFVmobgAhaVFI5fqbuqAY5XmBQxe09ZZAsAOTy87hKQ,318
-cloud_files-5.1.3.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
-cloud_files-5.1.3.dist-info/METADATA,sha256=A_TQG-p83SU5RibMDyRfKcM4BoC3pcf6IbgEn_inzVw,27047
-cloud_files-5.1.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cloud_files-5.1.3.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
-cloud_files-5.1.3.dist-info/pbr.json,sha256=r_OnVuWLj4u5oFTro4Tjb60qKNAK2AAaXCkaI-MB24w,46
-cloud_files-5.1.3.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
-cloud_files-5.1.3.dist-info/RECORD,,
+cloud_files-5.3.0.dist-info/AUTHORS,sha256=BFVmobgAhaVFI5fqbuqAY5XmBQxe09ZZAsAOTy87hKQ,318
+cloud_files-5.3.0.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
+cloud_files-5.3.0.dist-info/METADATA,sha256=1HXttAwASLRFMS8iNv1QRINsogpXsl9Rjyxk64sP9Wo,27047
+cloud_files-5.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloud_files-5.3.0.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
+cloud_files-5.3.0.dist-info/pbr.json,sha256=r9Ai82ya_B5fCQC8kg4ALYvsm03ts0oj1LsLzlNP_C0,46
+cloud_files-5.3.0.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
+cloud_files-5.3.0.dist-info/RECORD,,

cloud_files-5.3.0.dist-info/pbr.json

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

cloudfiles/interfaces.py

@@ -1189,10 +1189,13 @@ class S3Interface(StorageInterface):
         **attrs
       )
     else:
+      if isinstance(content, str):
+        content = content.encode('utf8')
+
       attrs['Bucket'] = self._path.bucket
       attrs['Body'] = content
       attrs['Key'] = key
-      attrs["ChecksumCRC32C"] = str(encode_crc32c_b64(content))
+      attrs["ChecksumCRC32C"] = encode_crc32c_b64(content).decode('utf8')
       self._conn.put_object(**attrs)
 
   @retry

cloudfiles/lib.py

@@ -163,6 +163,8 @@ def crc32c(binary):
   Computes the crc32c of a binary string 
   and returns it as an integer.
   """
+  if isinstance(binary, str):
+    binary = binary.encode('utf8')
   return crc32clib.crc32c(binary) # an integer
 
 def md5(binary, base=64):

cloudfiles/paths.py

@@ -58,11 +58,14 @@ def update_aliases_from_file():
 
 def cloudpath_error(cloudpath):
   return yellow(f"""
-    Cloud Path must conform to [FORMAT://]PROTOCOL://PATH
+    Cloud Path must conform to one of:
+      (a) [FORMAT://]PROTOCOL://PATH
+      (b) PROTOCOL://PATH|FORMAT:
     Examples: 
       precomputed://gs://test_bucket/em
       gs://test_bucket/em
       graphene://https://example.com/image/em
+      gs://text_bucket/em/|zarr2:
 
     Supported Formats: None (precomputed), {", ".join(ALLOWED_FORMATS)}
     Supported Protocols: {", ".join(ALLOWED_PROTOCOLS)}
@@ -87,6 +90,9 @@ def mkregexp():
 CLOUDPATH_REGEXP = re.compile(mkregexp())
 BUCKET_RE = re.compile(r'^(/?[~\d\w_\.\-]+(?::\d+)?)(?:/|$)') # posix /what/a/great/path  
 
+# |neuroglancer-precomputed: or |zarr2: suffixes etc
+TAIL_FORMAT_REGEXP = re.compile('\\|(?P<fmt>[\\w\\d-]+):$') 
+
 def add_alias(alias:str, host:str):
   global ALIASES
   global ALLOWED_PROTOCOLS
@@ -165,6 +171,10 @@ for alias, host in OFFICIAL_ALIASES.items():
 def normalize(path):
 
   path = path.removesuffix(PRECOMPUTED_SUFFIX)
+  m = re.search(TAIL_FORMAT_REGEXP, path)
+  if m is not None:
+    path = re.sub(TAIL_FORMAT_REGEXP, "", path)
+    path = f"{m.group('fmt')}://{path}"
 
   fmt, proto, endpoint, cloudpath, alias = extract_format_protocol(
     path, allow_defaults=False
@@ -291,6 +301,13 @@ def pop_protocol(cloudpath):
 def extract_format_protocol(cloudpath:str, allow_defaults=True) -> tuple:
   error = UnsupportedProtocolError(cloudpath_error(cloudpath))
 
+  cloudpath = cloudpath.removesuffix(PRECOMPUTED_SUFFIX)
+
+  m = re.search(TAIL_FORMAT_REGEXP, cloudpath)
+  if m is not None:
+    cloudpath = re.sub(TAIL_FORMAT_REGEXP, "", cloudpath)
+    cloudpath = f"{m.group('fmt')}://{cloudpath}"
+
   alias, cloudpath = resolve_alias(cloudpath)
 
   m = re.match(CLOUDPATH_REGEXP, cloudpath)
@@ -299,7 +316,6 @@ 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.1.3.dist-info/pbr.json

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