datamint 1.4.0__tar.gz → 1.4.1__tar.gz

{datamint-1.4.0 → datamint-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamint
-Version: 1.4.0
+Version: 1.4.1
 Summary: A library for interacting with the Datamint API, designed for efficient data management, processing and Deep Learning workflows.
 Requires-Python: >=3.10
 Classifier: Programming Language :: Python :: 3

{datamint-1.4.0 → datamint-1.4.1}/datamint/client_cmd_tools/datamint_upload.py

@@ -267,7 +267,13 @@ def _find_json_metadata(file_path: str | Path) -> Optional[str]:
         Optional[str]: Path to the JSON metadata file if found, None otherwise
     """
     file_path = Path(file_path)
-    json_path = file_path.with_suffix('.json')
+    
+    # Handle .nii.gz files specially - need to remove both extensions
+    if file_path.name.endswith('.nii.gz'):
+        base_name = file_path.name[:-7]  # Remove .nii.gz
+        json_path = file_path.parent / f"{base_name}.json"
+    else:
+        json_path = file_path.with_suffix('.json')
 
     if json_path.exists() and json_path.is_file():
         _LOGGER.debug(f"Found JSON metadata file: {json_path}")
@@ -313,12 +319,11 @@ def _collect_metadata_files(files_path: list[str], auto_detect_json: bool) -> tu
     if used_json_files:
         _LOGGER.debug(f"Filtering out {len(used_json_files)} JSON metadata files from main upload list")
         filtered_metadata_files = []
-        filtered_file_index = 0
-
+        
         for original_file in files_path:
             if original_file not in used_json_files:
-                filtered_metadata_files.append(metadata_files[files_path.index(original_file)])
-                filtered_file_index += 1
+                original_index = files_path.index(original_file)
+                filtered_metadata_files.append(metadata_files[original_index])
 
         metadata_files = filtered_metadata_files
 

{datamint-1.4.0 → datamint-1.4.1}/datamint/experiment/experiment.py

@@ -803,7 +803,7 @@ class Experiment:
         Args:
             resource_id: The resource ID of the sample.
             predictions: The predictions of the model. One binary mask for each class. Can be a numpy array of shape (H, W) or (N,H,W);
-                Or a path to a png file; Or a path to a .nii.gz file.
+                Or a path to a png file; Or a path to a .nii/.nii.gz file.
             label_name: The name of the class or a dictionary mapping pixel values to names.
                 Example: ``{1: 'Femur', 2: 'Tibia'}`` means that pixel value 1 is 'Femur' and pixel value 2 is 'Tibia'.
             frame_index: The frame index of the prediction or a list of frame indexes.

{datamint-1.4.0 → datamint-1.4.1}/datamint/utils/io_utils.py

@@ -54,17 +54,32 @@ def read_video(file_path: str, index: int = None) -> np.ndarray:
 
 
 def read_nifti(file_path: str) -> np.ndarray:
-    imgs = nib.load(file_path).get_fdata()  # shape: (W, H, #frame) or (W, H)
-    if imgs.ndim == 2:
-        imgs = imgs.transpose(1, 0)
-        imgs = imgs[np.newaxis, np.newaxis]
-    elif imgs.ndim == 3:
-        imgs = imgs.transpose(2, 1, 0)
-        imgs = imgs[:, np.newaxis]
-    else:
-        raise ValueError(f"Unsupported number of dimensions in '{file_path}': {imgs.ndim}")
+    """
+    Read a NIfTI file and return the image data in standardized format.
+    
+    Args:
+        file_path: Path to the NIfTI file (.nii or .nii.gz)
+        
+    Returns:
+        np.ndarray: Image data with shape (#frames, C, H, W)
+    """
+    try:
+        nii_img = nib.load(file_path)
+        imgs = nii_img.get_fdata()  # shape: (W, H, #frame) or (W, H)
+        
+        if imgs.ndim == 2:
+            imgs = imgs.transpose(1, 0)  # (W, H) -> (H, W)
+            imgs = imgs[np.newaxis, np.newaxis]  # -> (1, 1, H, W)
+        elif imgs.ndim == 3:
+            imgs = imgs.transpose(2, 1, 0)  # (W, H, #frame) -> (#frame, H, W)
+            imgs = imgs[:, np.newaxis]  # -> (#frame, 1, H, W)
+        else:
+            raise ValueError(f"Unsupported number of dimensions in '{file_path}': {imgs.ndim}")
 
-    return imgs
+        return imgs
+    except Exception as e:
+        _LOGGER.error(f"Failed to read NIfTI file '{file_path}': {e}")
+        raise e
 
 
 def read_image(file_path: str) -> np.ndarray:
@@ -123,6 +138,18 @@ def read_array_normalized(file_path: str,
             else:
                 if mime_type == 'image/x.nifti' or file_path.endswith(NII_EXTS):
                     imgs = read_nifti(file_path)
+                    # For NIfTI files, try to load associated JSON metadata
+                    if return_metainfo:
+                        json_path = file_path.replace('.nii.gz', '.json').replace('.nii', '.json')
+                        if os.path.exists(json_path):
+                            try:
+                                import json
+                                with open(json_path, 'r') as f:
+                                    metainfo = json.load(f)
+                                _LOGGER.debug(f"Loaded JSON metadata from {json_path}")
+                            except Exception as e:
+                                _LOGGER.warning(f"Failed to load JSON metadata from {json_path}: {e}")
+                                metainfo = None
                 elif mime_type.startswith('image/') or file_path.endswith(IMAGE_EXTS):
                     imgs = read_image(file_path)
                 elif file_path.endswith('.npy') or mime_type == 'application/x-numpy-data':

{datamint-1.4.0 → datamint-1.4.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "datamint"
 description = "A library for interacting with the Datamint API, designed for efficient data management, processing and Deep Learning workflows."
-version = "1.4.0"
+version = "1.4.1"
 dynamic = ["dependencies"]
 requires-python = ">=3.10"
 readme = "README.md"