cloud-files 4.25.0__py3-none-any.whl → 4.26.0__py3-none-any.whl

{cloud_files-4.25.0.dist-info → cloud_files-4.26.0.dist-info}/METADATA

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

{cloud_files-4.25.0.dist-info → cloud_files-4.26.0.dist-info}/RECORD

@@ -7,7 +7,7 @@ cloudfiles/exceptions.py,sha256=H2IcMlZoy2Bsn-6wCPwyLDjg66LZCyxtcf3s_p21FDw,770
 cloudfiles/gcs.py,sha256=_njJ7TpqwrHCjPHRGkBN5alCrCWKM2m9qdy5DhxMZ7U,3718
 cloudfiles/interfaces.py,sha256=Qqhjv2GIVw3ibaTgPpiGK97i7aBDgU9O0bBuOiLI2KM,36117
 cloudfiles/lib.py,sha256=fEqL5APu_WQhl2yxqQbwE7msHdu7U8pstAJw6LgoKO0,5142
-cloudfiles/paths.py,sha256=tqR9XnRdAKopTJqSM6V5xrMo1xfmBdl9b5DpBLZnoB0,9998
+cloudfiles/paths.py,sha256=WHuMbVtKk9nm9akfNF9dgH94awnrWXVIo5mbCvtc0LQ,10302
 cloudfiles/resumable_tools.py,sha256=pK-VcoPjQ2BjGjvlvH4dDCBf6lNsqHG-weiBgxVFbzA,5838
 cloudfiles/scheduler.py,sha256=DqDANmOpB3NdzFgJDNMMibRIkCrXQqIh2XGL8GWoc9c,3668
 cloudfiles/secrets.py,sha256=3BSV2Hn8FGGn4QCs5FP3eGs4WEs5cIXRBsXuF0eIgIY,4918
@@ -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=eETIOK4QyztQcpA4ZRny21SobLtcrPDlzZ_JaKBmmmA,28449
-cloud_files-4.25.0.dist-info/AUTHORS,sha256=7E2vC894bbLPO_kvUuEB2LFZZbIxZn23HabxH7x0Hgo,266
-cloud_files-4.25.0.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
-cloud_files-4.25.0.dist-info/METADATA,sha256=wXrUnPFfMt3vMXfcxvqMpOB6fVsHRV1cEhDgFr4LdqQ,26804
-cloud_files-4.25.0.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-cloud_files-4.25.0.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
-cloud_files-4.25.0.dist-info/pbr.json,sha256=v8YZnfyUynJ66Bxxf0b3fjSVxyAmHqmTI4XJ4BP25pg,46
-cloud_files-4.25.0.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
-cloud_files-4.25.0.dist-info/RECORD,,
+cloud_files-4.26.0.dist-info/AUTHORS,sha256=7E2vC894bbLPO_kvUuEB2LFZZbIxZn23HabxH7x0Hgo,266
+cloud_files-4.26.0.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
+cloud_files-4.26.0.dist-info/METADATA,sha256=-Rsfl3gNmmS8zSMTI7FHTYZ8TEuhzWgF0UKhxoBCdRk,26804
+cloud_files-4.26.0.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+cloud_files-4.26.0.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
+cloud_files-4.26.0.dist-info/pbr.json,sha256=Q1hsyLUlpIPjOyXcpmmGewWq1Difl_oiqt8EjJXRGOE,46
+cloud_files-4.26.0.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
+cloud_files-4.26.0.dist-info/RECORD,,

cloud_files-4.26.0.dist-info/pbr.json

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

cloudfiles/paths.py

@@ -29,7 +29,12 @@ BASE_ALLOWED_PROTOCOLS = [
   'http', 'https', 'mem' 
 ]
 ALLOWED_PROTOCOLS = list(BASE_ALLOWED_PROTOCOLS)
-ALLOWED_FORMATS = [ 'graphene', 'precomputed', 'boss', 'n5' ] 
+ALLOWED_FORMATS = [ 
+  'graphene', 'precomputed', 'boss', 
+  'n5', 'zarr', 'zarr2', 'zarr3',
+  'brainmaps', 'deepzoom', 'nggraph',
+  'render', 'vtk', 'nifti', 'dvid',
+] 
 
 def update_aliases_from_file():
   global ALIASES_FROM_FILE
@@ -147,11 +152,16 @@ for alias, host in OFFICIAL_ALIASES.items():
 ## Other Path Library Functions
 
 def normalize(path):
-  proto = get_protocol(path)
+  fmt, proto, endpoint, cloudpath, alias = extract_format_protocol(
+    path, allow_defaults=False
+  )
+
   if proto is None:
     proto = "file"
-    path = toabs(path)
-    return f"file://{path}"
+    cloudpath = toabs(cloudpath)
+    fmt = f"{fmt}://" if fmt else ""
+    path = f"{fmt}{proto}://{cloudpath}"
+
   return path
 
 def dirname(path):
@@ -264,7 +274,7 @@ def pop_protocol(cloudpath):
 
   return (protocol, cloudpath)
 
-def extract_format_protocol(cloudpath:str) -> tuple:
+def extract_format_protocol(cloudpath:str, allow_defaults=True) -> tuple:
   error = UnsupportedProtocolError(cloudpath_error(cloudpath))
 
   alias, cloudpath = resolve_alias(cloudpath)
@@ -276,7 +286,9 @@ def extract_format_protocol(cloudpath:str) -> tuple:
   groups = m.groups()
   cloudpath = re.sub(CLOUDPATH_REGEXP, '', cloudpath, count=1)
 
-  fmt = m.group('fmt') or 'precomputed'
+  fmt = m.group('fmt')
+  if not fmt and allow_defaults:
+    fmt = 'precomputed'
   proto = m.group('proto')
   endpoint = None
 

cloud_files-4.25.0.dist-info/pbr.json

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