cloud-files 5.4.0__tar.gz → 5.5.0__tar.gz

{cloud_files-5.4.0 → cloud_files-5.5.0}/ChangeLog

@@ -1,6 +1,15 @@
 CHANGES
 =======
 
+5.5.0
+-----
+
+* perf: use fewer threads if there are fewer things to upload (#116)
+* fix(cave): expanded credentials methods (#114)
+* fix: isdir was inverted for http
+* chore: update changelog
+* fix(cli): incorrect escaping
+
 5.4.0
 -----
 

{cloud_files-5.4.0 → cloud_files-5.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 5.4.0
+Version: 5.5.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.4.0 → cloud_files-5.5.0}/cloud_files.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 5.4.0
+Version: 5.5.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.5.0/cloud_files.egg-info/pbr.json

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

{cloud_files-5.4.0 → cloud_files-5.5.0}/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.4.0 → cloud_files-5.5.0}/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.4.0 → cloud_files-5.5.0}/cloudfiles/scheduler.py

@@ -137,7 +137,12 @@ def schedule_jobs(
     or (hasattr(fns, "__len__") and len(fns) <= 1)
   ):
     return schedule_single_threaded_jobs(fns, progress, total, count_return)
-    
+  
+  if isinstance(total, int):
+    concurrency = min(concurrency, max(total, 1))
+  elif hasattr(fns, "__len__"):
+    concurrency = min(concurrency, max(len(fns), 1))
+
   if green == True or (green is None and gevent.monkey.saved):
     return schedule_green_jobs(fns, concurrency, progress, total, count_return)
 

{cloud_files-5.4.0 → cloud_files-5.5.0}/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.4.0 → cloud_files-5.5.0}/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.4.0/cloud_files.egg-info/pbr.json

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