Merge pull request #69 from Hendrik-code/chore-python-3.9-compat

Chore python 3.9 compat

Author: Hendrik-code

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v4

TPTBox/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 # POI
 import sys
 from pathlib import Path

TPTBox/core/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 # POI
 # packages
 from . import bids_files, np_utils, sitk_utils

TPTBox/core/bids_constants.py

@@ -1,5 +1,7 @@
 ### Legal formats ###
 # https://flexikon.doccheck.com/de/MRT-Sequenz
+from __future__ import annotations
+
 formats = [
     "ct",
     "dixon",

TPTBox/core/bids_files.py

@@ -270,7 +270,7 @@ def __init__(
             self.sequence_splitting_keys = sequence_splitting_keys
 
         self.sequence_splitting_keys = sequence_splitting_keys
-        if isinstance(datasets, Path | str):
+        if isinstance(datasets, (Path, str)):
             datasets = [datasets]  # type: ignore
         if isinstance(parents, str):
             parents = [parents]

TPTBox/core/compat.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+
+
+def zip_strict(*iterables):
+    """
+    A strict version of zip that raises a ValueError if the input iterables have different lengths.
+
+    Converts each iterable to a list to check lengths. This assumes all iterables are finite.
+
+    Args:
+        *iterables: Finite iterables to be zipped together.
+
+    Returns:
+        An iterator of tuples, where the i-th tuple contains the i-th element from each iterable.
+
+    Raises:
+        ValueError: If the input iterables have different lengths.
+    """
+    lists = [list(it) for it in iterables]
+    lengths = [len(lst) for lst in lists]
+    if len(set(lengths)) != 1:
+        raise ValueError(f"Length mismatch: {lengths}")
+    return zip(*lists)

TPTBox/core/dicom/dicom2nii_utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import pickle
 from copy import deepcopy

TPTBox/core/dicom/dicom_extract.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import shutil
 import sys
@@ -18,6 +20,7 @@
 from pydicom.dataset import FileDataset
 
 from TPTBox import BIDS_FILE, Log_Type, Print_Logger
+from TPTBox.core.compat import zip_strict
 from TPTBox.core.dicom.dicom_header_to_keys import extract_keys_from_json
 from TPTBox.core.nii_wrapper import NII
 
@@ -399,7 +402,7 @@ def _filter_file_type(dicom_types: dict[str, list[str]]):
         for sublist in split_lists:
             filtered_set.append([item for item in sublist if item in unique_strings])  # noqa: PERF401
         # Add to dicom_parts if there are unique strings
-        for l, i in zip(filtered_set, v, strict=True):
+        for l, i in zip_strict(filtered_set, v):
             dicom_parts[f"{k}_{i}"] = l
     return dicom_parts
 

TPTBox/core/dicom/dicom_header_to_keys.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 from collections.abc import Callable
 from pathlib import Path

TPTBox/core/dicom/fix_brocken.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pickle
 from pathlib import Path