cloud-files 5.3.2__tar.gz → 5.4.1__tar.gz

{cloud_files-5.3.2 → cloud_files-5.4.1}/ChangeLog

@@ -1,6 +1,23 @@
 CHANGES
 =======
 
+5.4.1
+-----
+
+* fix: enable CAVE to accept secret kw and alternative server credentials
+* fix(cave): ensure CAVE tokens are handled properly
+* fix: isdir was inverted for http
+* chore: update changelog
+* fix(cli): incorrect escaping
+
+5.4.0
+-----
+
+* test: check nokura works in path parsing
+* install: fix license information
+* fix: expand hardcoded references to "matrix"
+* feat(alias): add "nokura" as an official alias
+
 5.3.2
 -----
 

{cloud_files-5.3.2 → cloud_files-5.4.1}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 5.3.2
+Version: 5.4.1
 Summary: Fast access to cloud storage and local FS.
 Home-page: https://github.com/seung-lab/cloud-files/
 Author: William Silversmith
 Author-email: ws9@princeton.edu
-License: License :: OSI Approved :: BSD License
+License: BSD-3-Clause
 Classifier: Intended Audience :: Developers
 Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10

{cloud_files-5.3.2 → cloud_files-5.4.1}/automated_test.py

@@ -749,6 +749,9 @@ def test_to_https_protocol():
   pth = to_https_protocol("matrix://my_bucket/to/heaven")
   assert pth == "https://s3-hpcrc.rc.princeton.edu/my_bucket/to/heaven"
 
+  pth = to_https_protocol("nokura://my_bucket/to/heaven")
+  assert pth == "https://nokura.pni.princeton.edu/my_bucket/to/heaven"
+
   pth = to_https_protocol("tigerdata://my_bucket/to/heaven")
   assert pth == "https://td.princeton.edu/my_bucket/to/heaven"
 

{cloud_files-5.3.2 → cloud_files-5.4.1}/cloud_files.egg-info/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 5.3.2
+Version: 5.4.1
 Summary: Fast access to cloud storage and local FS.
 Home-page: https://github.com/seung-lab/cloud-files/
 Author: William Silversmith
 Author-email: ws9@princeton.edu
-License: License :: OSI Approved :: BSD License
+License: BSD-3-Clause
 Classifier: Intended Audience :: Developers
 Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10

cloud_files-5.4.1/cloud_files.egg-info/pbr.json

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

{cloud_files-5.3.2 → cloud_files-5.4.1}/cloudfiles/cloudfiles.py

@@ -751,8 +751,7 @@ class CloudFiles:
       res = first(self.list(prefix=prefix))
       return res is not None
     except NotImplementedError as err:
-      res = CloudFile(self.cloudpath).size() 
-      return res > 0
+      return not CloudFile(self.cloudpath).exists()
 
   def exists(
     self, paths:GetPathType, 

{cloud_files-5.3.2 → cloud_files-5.4.1}/cloudfiles/interfaces.py

@@ -1497,8 +1497,25 @@ class CaveInterface(HttpInterface):
   is, don't worry about it.
   see: https://github.com/CAVEconnectome
   """
-  def default_headers(self):
-    cred = cave_credentials()
+  def __init__(self, path, secrets=None, **kwargs):
+    super().__init__(path, secrets=secrets, **kwargs)
+
+    secrets = kwargs.get('secrets', None)
+    if secrets is None:
+      secrets = {}
+
+    self._token = secrets.get('token', None)
+    if self._token is None:
+      server = self._path.host.replace("https://", "", 1)
+      server = server.replace("http://", "", 1)
+      self._token = cave_credentials(server)
+      if self._token is not None:
+        self._token = self._token.get('token', None)
+
+  def default_headers(self) -> dict:
+    if self._token is None:
+      return {}
+    
     return {
-      "Authorization": f"Bearer {cred['token']}",
-    }
+      "Authorization": f"Bearer {self._token}",
+    }

{cloud_files-5.3.2 → cloud_files-5.4.1}/cloudfiles/paths.py

@@ -22,6 +22,7 @@ PRECOMPUTED_SUFFIX = '|neuroglancer-precomputed:'
 
 ALIAS_FILE = os.path.join(CLOUD_FILES_DIR, "aliases.json")
 OFFICIAL_ALIASES = {
+  "nokura": "s3://https://nokura.pni.princeton.edu/",
   "matrix": "s3://https://s3-hpcrc.rc.princeton.edu/",
   "tigerdata": "s3://https://td.princeton.edu/",
 }
@@ -40,6 +41,10 @@ ALLOWED_FORMATS = [
   'render', 'vtk', 'nifti', 'dvid',
 ] 
 
+CLOUD_PROTOCOLS = [
+  "gs", "s3"
+] + list(OFFICIAL_ALIASES.keys())
+
 def update_aliases_from_file():
   global ALIASES_FROM_FILE
   global ALIAS_FILE
@@ -374,7 +379,7 @@ def extract(cloudpath:str, windows=None) -> ExtractedPath:
     cloudpath = toabs(cloudpath)
 
   bucket = None
-  if protocol in ('gs', 's3', 'matrix', 'mem'):
+  if protocol in CLOUD_PROTOCOLS + ['mem']:
     match = re.match(BUCKET_RE, cloudpath)
     if not match:
       raise error
@@ -398,7 +403,7 @@ def extract(cloudpath:str, windows=None) -> ExtractedPath:
 
 def to_https_protocol(cloudpath):
   if isinstance(cloudpath, ExtractedPath):
-    if cloudpath.protocol in ('gs', 's3', 'matrix'):
+    if cloudpath.protocol in CLOUD_PROTOCOLS:
       return extract(to_https_protocol(ascloudpath(cloudpath)))
     return cloudpath
 

{cloud_files-5.3.2 → cloud_files-5.4.1}/cloudfiles/secrets.py

@@ -137,23 +137,27 @@ def aws_credentials(bucket = '', service = 'aws', skip_files=False):
   AWS_CREDENTIALS_CACHE[service][bucket] = aws_credentials
   return aws_credentials
 
-CAVE_CREDENTIALS = None
-def cave_credentials():
+CAVE_CREDENTIALS:CredentialCacheType = {}
+def cave_credentials(server = ''):
   global CAVE_CREDENTIALS
-  default_file_path = 'cave-secret.json'
-  path = secretpath(default_file_path)
 
-  if CAVE_CREDENTIALS:
-    return CAVE_CREDENTIALS
+  paths = [
+    secretpath('cave-secret.json')
+  ]
 
-  if os.path.exists(path):
-    with open(path, 'rt') as f:
-      CAVE_CREDENTIALS = json.loads(f.read())
-  else:
-    CAVE_CREDENTIALS = None
+  if server:
+    paths = [ secretpath(f'{server}-cave-secret.json') ] + paths
+
+  if server in CAVE_CREDENTIALS:
+    return CAVE_CREDENTIALS.get(server, None)
 
-  return CAVE_CREDENTIALS
+  for path in paths:
+    if os.path.exists(path):
+      with open(path, 'rt') as f:
+        CAVE_CREDENTIALS[server] = json.loads(f.read())
+      break
 
+  return CAVE_CREDENTIALS.get(server, None)
 
 HTTP_CREDENTIALS = None
 def http_credentials():

{cloud_files-5.3.2 → cloud_files-5.4.1}/cloudfiles_cli/cloudfiles_cli.py

@@ -84,7 +84,7 @@ def license():
 @main.command()
 @click.option('--shortpath', is_flag=True, default=False, help='Don\'t print the common base path for each listed path.',show_default=True)
 @click.option('--flat', is_flag=True, default=False, help='Only produce a single level of directory hierarchy.',show_default=True)
-@click.option('-e','--expr',is_flag=True, default=False, help='Use a limited regexp language (e.g. [abc123]\{3\}) to generate prefixes.', show_default=True)
+@click.option('-e','--expr',is_flag=True, default=False, help=r'Use a limited regexp language (e.g. [abc123]{3}) to generate prefixes.', show_default=True)
 @click.option('--no-auth',is_flag=True, default=False, help='Uses the http API for read-only operations.', show_default=True)
 @click.argument("cloudpath")
 def ls(shortpath, flat, expr, cloudpath, no_auth):

{cloud_files-5.3.2 → cloud_files-5.4.1}/setup.cfg

@@ -7,11 +7,10 @@ description_file = README.md
 author = William Silversmith
 author_email = ws9@princeton.edu
 home_page = https://github.com/seung-lab/cloud-files/
-license = License :: OSI Approved :: BSD License
+license = BSD-3-Clause
 classifier = 
 	Intended Audience :: Developers
 	Development Status :: 4 - Beta
-	License :: OSI Approved :: BSD License
 	Programming Language :: Python :: 3
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10

cloud_files-5.3.2/cloud_files.egg-info/pbr.json

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