Merge branch 'master' into dodam/typing

Author: dodamih

cloudvolume/datasource/precomputed/image/tx.py

@@ -326,6 +326,17 @@ def threaded_upload_chunks(
     secrets: Any = None,
     lru_encoding: str = "same",
   ) -> int:
+    meta, cache, lru,
+    img, mip, chunk_ranges,
+    compress, cdn_cache, progress,
+    n_threads=DEFAULT_THREADS,
+    delete_black_uploads=False,
+    background_color=0,
+    green=False,
+    compress_level=None,
+    secrets=None,
+    lru_encoding="same",
+  ):
 
   if cache.enabled:
     mkdir(cache.path)
@@ -395,10 +406,10 @@ def do_upload(i: int, imgchunk: np.ndarray, cloudpath: str) -> None:
     else:
       remote_encoded = encoded
 
-    cache_encoded = remote_encoded
-
     if cache.enabled and remote_compress != cache_compress:
       cache_encoded = compression.compress(encoded, cache_compress)
+    else:
+      cache_encoded = remote_encoded
 
     del encoded
 
@@ -447,7 +458,11 @@ def process(i: int, startpt: Vec, endpt: Vec, spt: Vec, ept: Vec) -> None:
     cloudpath = meta.join(meta.key(mip), filename)
 
     if delete_black_uploads:
-      if np.any(imgchunk != background_color):
+      if background_color == 0:
+        has_data = np.any(imgchunk)
+      else:
+        has_data = not np.array_equal(imgchunk, background_color)
+      if has_data:
         do_upload(i, imgchunk, cloudpath)
       else:
         do_delete(cloudpath)