Merge branch 'main' into feature/add-color-maps-to-tiffwriter

ahcore/callbacks/h5_callback.py

@@ -125,7 +125,7 @@ def _batch_end(
             if mpp is None:
                 mpp = slide_image.mpp
 
-            size = slide_image.get_scaled_size(slide_image.get_scaling(mpp))
+            _, size = slide_image.get_scaled_slide_bounds(slide_image.get_scaling(mpp))
             num_samples = len(current_dataset)
 
             # Let's get the data_description, so we can figure out the tile size and things like that
@@ -142,6 +142,8 @@ def _batch_end(
                 tile_size=tile_size,
                 tile_overlap=tile_overlap,
                 num_samples=num_samples,
+                color_profile=None,
+                is_compressed_image=False,
                 progress=None,
             )
             new_process = Process(target=new_writer.consume, args=(self.generator(new_queue), child_conn))

ahcore/cli/data.py

@@ -1,4 +1,5 @@
 """Module to write copy manifests files over to SCRATCH directory"""
+from __future__ import annotations
 import argparse
 import hashlib
 import os