cloud-files 6.2.0__tar.gz → 6.2.2__tar.gz

{cloud_files-6.2.0 → cloud_files-6.2.2}/ChangeLog

@@ -1,6 +1,16 @@
 CHANGES
 =======
 
+6.2.2
+-----
+
+* fix: handle more synthetic etags
+
+6.2.1
+-----
+
+* fix: handle synthetic etags from NFS uploaded objects on Dell ECS
+
 6.2.0
 -----
 

{cloud_files-6.2.0 → cloud_files-6.2.2}/PKG-INFO

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

{cloud_files-6.2.0 → cloud_files-6.2.2}/cloud_files.egg-info/PKG-INFO

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

{cloud_files-6.2.0 → cloud_files-6.2.2}/cloud_files.egg-info/SOURCES.txt

@@ -29,7 +29,6 @@ cloudfiles/paths.py
 cloudfiles/resumable_tools.py
 cloudfiles/scheduler.py
 cloudfiles/secrets.py
-cloudfiles/test.py
 cloudfiles/threaded_queue.py
 cloudfiles/typing.py
 cloudfiles_cli/LICENSE

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

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

{cloud_files-6.2.0 → cloud_files-6.2.2}/cloudfiles/interfaces.py

@@ -30,6 +30,7 @@ from .secrets import (
   CLOUD_FILES_LOCK_DIR,
 )
 
+NFS_ETAG_REGEXP = re.compile(r'\d+\-$')
 COMPRESSION_EXTENSIONS = ('.gz', '.br', '.zstd','.bz2','.xz')
 GZIP_TYPES = (True, 'gzip', 1)
 
@@ -1327,8 +1328,10 @@ class S3Interface(StorageInterface):
         etag = etag.lstrip('"').rstrip('"')
         # AWS has special multipart validation
         # so we handle it here... leaky abstraction.
-        if '-' in etag: 
-          if not validate_s3_multipart_etag(content, etag, part_size):
+        if '-' in etag:
+          # Dell ECS S3 uses a synthetic Etag of "1-" (and similar) for objects 
+          # ingested via NFS. Not good behavior, but nothing much we can do other than ignore it.
+          if not NFS_ETAG_REGEXP.match(etag) and not validate_s3_multipart_etag(content, etag, part_size):
             raise MD5IntegrityError(f"{file_path} failed its multipart md5 check. server md5: {etag}")
           etag = None
         else:

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

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

cloud_files-6.2.0/cloudfiles/test.py

@@ -1,28 +0,0 @@
-import igneous.task_creation as tc
-import os
-from taskqueue import totask
-import igneous.tasks
-
-
-def process_task(msg):
-    task = totask(msg)
-    task.execute()
-    return None
-
-def submit_tasks():
-    paths = [
-        "gs://ng_scratch_ranl_7/make_cv_happy/seg/20250403024338",]
-    all_tasks = []
-    for img_path in paths:
-        mip = 0
-        num_mips = 2
-        tasks = tc.create_downsampling_tasks(img_path,
-                fill_missing=False,
-                delete_black_uploads=True,
-                mip=mip, num_mips=num_mips)
-        all_tasks += list(tasks)
-    return all_tasks
-
-if __name__ == "__main__":
-    tasks = submit_tasks()
-    process_task(tasks[0])