quadra 2.2.7__tar.gz → 2.3.0__tar.gz

{quadra-2.2.7 → quadra-2.3.0}/PKG-INFO

@@ -1,19 +1,18 @@
 Metadata-Version: 2.1
 Name: quadra
-Version: 2.2.7
+Version: 2.3.0
 Summary: Deep Learning experiment orchestration library
 Home-page: https://orobix.github.io/quadra
 License: Apache-2.0
 Keywords: deep learning,experiment,lightning,hydra-core
 Author: Federico Belotti
 Author-email: federico.belotti@orobix.com
-Requires-Python: >=3.9,<3.11
+Requires-Python: >=3.10,<3.11
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development
@@ -21,7 +20,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: onnx
 Requires-Dist: albumentations (>=1.3,<1.4)
-Requires-Dist: anomalib-orobix (==0.7.0.dev143)
+Requires-Dist: anomalib-orobix (==0.7.0.dev150)
 Requires-Dist: boto3 (>=1.26,<1.27)
 Requires-Dist: grad-cam-orobix (==1.5.3.dev001)
 Requires-Dist: h5py (>=3.8,<3.9)
@@ -32,17 +31,18 @@ Requires-Dist: label_studio_converter (>=0.0,<0.1)
 Requires-Dist: matplotlib (>=3.6,<3.7)
 Requires-Dist: minio (>=7.1,<7.2)
 Requires-Dist: mlflow-skinny (>=2.3.1,<3.0.0)
+Requires-Dist: numpy (<2)
 Requires-Dist: nvitop (>=0.11,<0.12)
 Requires-Dist: onnx (==1.15.0) ; extra == "onnx"
 Requires-Dist: onnxconverter-common (>=1.14.0,<2.0.0) ; extra == "onnx"
-Requires-Dist: onnxruntime_gpu (==1.17.0) ; extra == "onnx"
+Requires-Dist: onnxruntime_gpu (==1.20.0) ; extra == "onnx"
 Requires-Dist: onnxsim (==0.4.28) ; extra == "onnx"
 Requires-Dist: opencv_python_headless (>=4.7.0,<4.8.0)
 Requires-Dist: pandas (<2.0)
-Requires-Dist: pillow (>=9.3,<9.4)
+Requires-Dist: pillow (>=10,<11)
 Requires-Dist: pydantic (==1.10.10)
 Requires-Dist: python_dotenv (>=0.21,<0.22)
-Requires-Dist: pytorch_lightning (>=2.1,<2.2)
+Requires-Dist: pytorch_lightning (>=2.4,<2.5)
 Requires-Dist: rich (>=13.2,<13.3)
 Requires-Dist: scikit_learn (>=1.2,<1.3)
 Requires-Dist: scikit_multilearn (>=0.2,<0.3)
@@ -50,11 +50,11 @@ Requires-Dist: seaborn (>=0.12,<0.13)
 Requires-Dist: segmentation_models_pytorch-orobix (==0.3.3.dev1)
 Requires-Dist: tensorboard (>=2.11,<2.12)
 Requires-Dist: timm (==0.9.12)
-Requires-Dist: torch (==2.1.2)
+Requires-Dist: torch (==2.4.1)
 Requires-Dist: torchinfo (>=1.8,<1.9)
 Requires-Dist: torchmetrics (>=0.10,<0.11)
 Requires-Dist: torchsummary (>=1.5,<1.6)
-Requires-Dist: torchvision (>=0.16,<0.17)
+Requires-Dist: torchvision (>=0.19,<0.20)
 Requires-Dist: tripy (>=1.0,<1.1)
 Requires-Dist: typing_extensions (==4.11.0) ; python_version < "3.10"
 Requires-Dist: xxhash (>=3.2,<3.3)

{quadra-2.2.7 → quadra-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "quadra"
-version = "2.2.7"
+version = "2.3.0"
 description = "Deep Learning experiment orchestration library"
 authors = [
 	"Federico Belotti <federico.belotti@orobix.com>",
@@ -38,12 +38,13 @@ build-backend = "poetry.core.masonry.api"
 quadra = "quadra.main:main"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.11"
+python = ">=3.10,<3.11"
 
-torch = { version = "2.1.2", source = "torch_cu121" }
-torchvision = { version = "~0.16", source = "torch_cu121" }
+torch = { version = "2.4.1", source = "torch_cu121" }
+torchvision = { version = "~0.19", source = "torch_cu121" }
 
-pytorch_lightning = "~2.1"
+pytorch_lightning = "~2.4"
+numpy = "<2"
 torchsummary = "~1.5"
 torchmetrics = "~0.10"
 hydra_core = "~1.3"
@@ -53,7 +54,7 @@ mlflow-skinny = "^2.3.1"
 boto3 = "~1.26"
 minio = "~7.1"
 tensorboard = "~2.11"
-pillow = "~9.3"
+pillow = "^10"
 pandas = "<2.0"
 opencv_python_headless = "~4.7.0"
 python_dotenv = "~0.21"
@@ -72,7 +73,7 @@ h5py = "~3.8"
 timm = "0.9.12"
 
 segmentation_models_pytorch-orobix = "0.3.3.dev1"
-anomalib-orobix = "0.7.0.dev143"
+anomalib-orobix = "0.7.0.dev150"
 xxhash = "~3.2"
 torchinfo = "~1.8"
 typing_extensions = { version = "4.11.0", python = "<3.10" }
@@ -80,7 +81,7 @@ typing_extensions = { version = "4.11.0", python = "<3.10" }
 # ONNX dependencies
 onnx = { version = "1.15.0", optional = true }
 onnxsim = { version = "0.4.28", optional = true }
-onnxruntime_gpu = { version = "1.17.0", optional = true, source = "onnx_cu12" }
+onnxruntime_gpu = { version = "1.20.0", optional = true }
 onnxconverter-common = { version = "^1.14.0", optional = true }
 
 [[tool.poetry.source]]
@@ -88,10 +89,6 @@ name = "torch_cu121"
 url = "https://download.pytorch.org/whl/cu121"
 priority = "explicit"
 
-[[tool.poetry.source]]
-name = "onnx_cu12"
-url = "https://pkgs.dev.azure.com/onnxruntime/onnxruntime/_packaging/onnxruntime-cuda-12/pypi/simple/"
-priority = "explicit"
 
 [tool.poetry.group.dev]
 optional = true
@@ -100,12 +97,14 @@ optional = true
 hydra-plugins = { path = "quadra_hydra_plugin" }
 # Dev dependencies
 interrogate = "~1.5"
-pre_commit = "~3.0"
-pylint = "~2.16"
+pre_commit = "^3.0"
+pylint = "^3.3"
 types_pyyaml = "~6.0.12"
 mypy = "^1.9.0"
 pandas_stubs = "~1.5.3"
 twine = "~4.0"
+ipython = ">8"
+ipykernel = ">6"
 
 
 # Test dependencies
@@ -229,7 +228,7 @@ exclude = ["quadra/utils/tests", "tests"]
 
 [tool.ruff]
 extend-include = ["*.ipynb"]
-target-version = "py39"
+target-version = "py310"
 # Orobix guidelines
 line-length = 120
 indent-width = 4

{quadra-2.2.7 → quadra-2.3.0}/quadra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.7"
+__version__ = "2.3.0"
 
 
 def get_version():

{quadra-2.2.7 → quadra-2.3.0}/quadra/callbacks/anomalib.py

@@ -64,7 +64,7 @@ class Visualizer:
         self.figure.subplots_adjust(right=0.9)
 
         axes = self.axis if len(self.images) > 1 else [self.axis]
-        for axis, image_dict in zip(axes, self.images):
+        for axis, image_dict in zip(axes, self.images, strict=False):
             axis.axes.xaxis.set_visible(False)
             axis.axes.yaxis.set_visible(False)
             axis.imshow(image_dict["image"], image_dict["color_map"], vmin=0, vmax=255)
@@ -201,6 +201,7 @@ class VisualizerCallback(Callback):
                 outputs["label"],
                 outputs["pred_labels"],
                 outputs["pred_scores"],
+                strict=False,
             )
         ):
             denormalized_image = Denormalize()(image.cpu())
@@ -256,7 +257,7 @@ class VisualizerCallback(Callback):
             visualizer.close()
 
             if self.plot_raw_outputs:
-                for raw_output, raw_name in zip([heatmap, vis_img], ["heatmap", "segmentation"]):
+                for raw_output, raw_name in zip([heatmap, vis_img], ["heatmap", "segmentation"], strict=False):
                     current_raw_output = raw_output
                     if raw_name == "segmentation":
                         current_raw_output = (raw_output * 255).astype(np.uint8)

{quadra-2.2.7 → quadra-2.3.0}/quadra/callbacks/lightning.py

@@ -79,6 +79,8 @@ def _scale_batch_size(
         new_size = _run_power_scaling(trainer, init_val, batch_arg_name, max_trials, params)
     elif mode == "binsearch":
         new_size = _run_binary_scaling(trainer, init_val, batch_arg_name, max_trials, params)
+    else:
+        raise ValueError(f"Unknown mode {mode}")
 
     garbage_collection_cuda()
 

{quadra-2.2.7 → quadra-2.3.0}/quadra/datamodules/base.py

@@ -7,7 +7,7 @@ import pickle as pkl
 import typing
 from collections.abc import Callable, Iterable, Sequence
 from functools import wraps
-from typing import Any, Literal, Union, cast
+from typing import Any, Literal, cast
 
 import albumentations
 import numpy as np
@@ -20,8 +20,8 @@ from tqdm import tqdm
 from quadra.utils import utils
 
 log = utils.get_logger(__name__)
-TrainDataset = Union[torch.utils.data.Dataset, Sequence[torch.utils.data.Dataset]]
-ValDataset = Union[torch.utils.data.Dataset, Sequence[torch.utils.data.Dataset]]
+TrainDataset = torch.utils.data.Dataset | Sequence[torch.utils.data.Dataset]
+ValDataset = torch.utils.data.Dataset | Sequence[torch.utils.data.Dataset]
 TestDataset = torch.utils.data.Dataset
 
 
@@ -260,7 +260,7 @@ class BaseDataModule(LightningDataModule, metaclass=DecorateParentMethod):
             return
 
         # TODO: We need to find a way to annotate the columns of data.
-        paths_and_hash_length = zip(self.data["samples"], [self.hash_size] * len(self.data))
+        paths_and_hash_length = zip(self.data["samples"], [self.hash_size] * len(self.data), strict=False)
 
         with mp.Pool(min(8, mp.cpu_count() - 1)) as pool:
             self.data["hash"] = list(
@@ -355,7 +355,7 @@ class BaseDataModule(LightningDataModule, metaclass=DecorateParentMethod):
             raise ValueError("`n_aug_to_take` is not set. Cannot load augmented samples.")
         aug_samples = []
         aug_labels = []
-        for sample, label in zip(samples, targets):
+        for sample, label in zip(samples, targets, strict=False):
             aug_samples.append(sample)
             aug_labels.append(label)
             final_sample = sample

{quadra-2.2.7 → quadra-2.3.0}/quadra/datamodules/classification.py

@@ -243,7 +243,7 @@ class ClassificationDataModule(BaseDataModule):
                 samples_test, targets_test = self._read_split(self.test_split_file)
                 if not self.train_split_file:
                     samples_train, targets_train = [], []
-                    for sample, target in zip(all_samples, all_targets):
+                    for sample, target in zip(all_samples, all_targets, strict=False):
                         if sample not in samples_test:
                             samples_train.append(sample)
                             targets_train.append(target)
@@ -251,7 +251,7 @@ class ClassificationDataModule(BaseDataModule):
                 samples_train, targets_train = self._read_split(self.train_split_file)
                 if not self.test_split_file:
                     samples_test, targets_test = [], []
-                    for sample, target in zip(all_samples, all_targets):
+                    for sample, target in zip(all_samples, all_targets, strict=False):
                         if sample not in samples_train:
                             samples_test.append(sample)
                             targets_test.append(target)

{quadra-2.2.7 → quadra-2.3.0}/quadra/datamodules/segmentation.py

@@ -187,7 +187,7 @@ class SegmentationDataModule(BaseDataModule):
             samples_test, targets_test, masks_test = self._read_split(self.test_split_file)
             if not self.train_split_file:
                 samples_train, targets_train, masks_train = [], [], []
-                for sample, target, mask in zip(all_samples, all_targets, all_masks):
+                for sample, target, mask in zip(all_samples, all_targets, all_masks, strict=False):
                     if sample not in samples_test:
                         samples_train.append(sample)
                         targets_train.append(target)
@@ -197,7 +197,7 @@ class SegmentationDataModule(BaseDataModule):
             samples_train, targets_train, masks_train = self._read_split(self.train_split_file)
             if not self.test_split_file:
                 samples_test, targets_test, masks_test = [], [], []
-                for sample, target, mask in zip(all_samples, all_targets, all_masks):
+                for sample, target, mask in zip(all_samples, all_targets, all_masks, strict=False):
                     if sample not in samples_train:
                         samples_test.append(sample)
                         targets_test.append(target)
@@ -549,7 +549,7 @@ class SegmentationMulticlassDataModule(BaseDataModule):
                 samples_and_masks_test,
                 targets_test,
             ) = iterative_train_test_split(
-                np.expand_dims(np.array(list(zip(all_samples, all_masks))), 1),
+                np.expand_dims(np.array(list(zip(all_samples, all_masks, strict=False))), 1),
                 np.array(all_targets),
                 test_size=self.test_size,
             )
@@ -561,7 +561,7 @@ class SegmentationMulticlassDataModule(BaseDataModule):
             samples_test, targets_test, masks_test = self._read_split(self.test_split_file)
             if not self.train_split_file:
                 samples_train, targets_train, masks_train = [], [], []
-                for sample, target, mask in zip(all_samples, all_targets, all_masks):
+                for sample, target, mask in zip(all_samples, all_targets, all_masks, strict=False):
                     if sample not in samples_test:
                         samples_train.append(sample)
                         targets_train.append(target)
@@ -571,7 +571,7 @@ class SegmentationMulticlassDataModule(BaseDataModule):
             samples_train, targets_train, masks_train = self._read_split(self.train_split_file)
             if not self.test_split_file:
                 samples_test, targets_test, masks_test = [], [], []
-                for sample, target, mask in zip(all_samples, all_targets, all_masks):
+                for sample, target, mask in zip(all_samples, all_targets, all_masks, strict=False):
                     if sample not in samples_train:
                         samples_test.append(sample)
                         targets_test.append(target)
@@ -583,7 +583,7 @@ class SegmentationMulticlassDataModule(BaseDataModule):
                 raise ValueError("Validation split file is specified but no train or test split file is specified.")
         else:
             samples_and_masks_train, targets_train, samples_and_masks_val, targets_val = iterative_train_test_split(
-                np.expand_dims(np.array(list(zip(samples_train, masks_train))), 1),
+                np.expand_dims(np.array(list(zip(samples_train, masks_train, strict=False))), 1),
                 np.array(targets_train),
                 test_size=self.val_size,
             )

{quadra-2.2.7 → quadra-2.3.0}/quadra/datasets/anomaly.py

@@ -220,7 +220,7 @@ class AnomalyDataset(Dataset):
             if not os.path.exists(valid_area_mask):
                 raise RuntimeError(f"Valid area mask {valid_area_mask} does not exist.")
 
-            self.valid_area_mask = cv2.imread(valid_area_mask, 0) > 0  # type: ignore[operator]
+            self.valid_area_mask = cv2.imread(valid_area_mask, 0) > 0
 
     def __len__(self) -> int:
         """Get length of the dataset."""
@@ -265,7 +265,7 @@ class AnomalyDataset(Dataset):
                 if label_index == 0:
                     mask = np.zeros(shape=original_image_shape[:2])
                 elif os.path.isfile(mask_path):
-                    mask = cv2.imread(mask_path, flags=0) / 255.0  # type: ignore[operator]
+                    mask = cv2.imread(mask_path, flags=0) / 255.0
                 else:
                     # We need ones in the mask to compute correctly at least image level f1 score
                     mask = np.ones(shape=original_image_shape[:2])

{quadra-2.2.7 → quadra-2.3.0}/quadra/datasets/classification.py

@@ -50,9 +50,9 @@ class ImageClassificationListDataset(Dataset):
         allow_missing_label: bool | None = False,
     ):
         super().__init__()
-        assert len(samples) == len(
-            targets
-        ), f"Samples ({len(samples)}) and targets ({len(targets)}) must have the same length"
+        assert len(samples) == len(targets), (
+            f"Samples ({len(samples)}) and targets ({len(targets)}) must have the same length"
+        )
         # Setting the ROI
         self.roi = roi
 
@@ -201,9 +201,9 @@ class MultilabelClassificationDataset(torch.utils.data.Dataset):
         rgb: bool = True,
     ):
         super().__init__()
-        assert len(samples) == len(
-            targets
-        ), f"Samples ({len(samples)}) and targets ({len(targets)}) must have the same length"
+        assert len(samples) == len(targets), (
+            f"Samples ({len(samples)}) and targets ({len(targets)}) must have the same length"
+        )
 
         # Data
         self.x = samples
@@ -215,7 +215,7 @@ class MultilabelClassificationDataset(torch.utils.data.Dataset):
             class_to_idx = {c: i for i, c in enumerate(range(unique_targets))}
         self.class_to_idx = class_to_idx
         self.idx_to_class = {v: k for k, v in class_to_idx.items()}
-        self.samples = list(zip(self.x, self.y))
+        self.samples = list(zip(self.x, self.y, strict=False))
         self.rgb = rgb
         self.transform = transform
 

{quadra-2.2.7 → quadra-2.3.0}/quadra/datasets/patch.py

@@ -58,7 +58,7 @@ class PatchSklearnClassificationTrainDataset(Dataset):
 
             cls, counts = np.unique(targets_array, return_counts=True)
             max_count = np.max(counts)
-            for cl, count in zip(cls, counts):
+            for cl, count in zip(cls, counts, strict=False):
                 idx_to_pick = list(np.where(targets_array == cl)[0])
 
                 if count < max_count:

{quadra-2.2.7 → quadra-2.3.0}/quadra/metrics/segmentation.py

@@ -171,7 +171,7 @@ def segmentation_props(
         # Add dummy Dices so LSA is unique and i can compute FP and FN
         dice_mat = _pad_to_shape(dice_mat, (max_dim, max_dim), 1)
         lsa = linear_sum_assignment(dice_mat, maximize=False)
-        for row, col in zip(lsa[0], lsa[1]):
+        for row, col in zip(lsa[0], lsa[1], strict=False):
             # More preds than GTs --> False Positive
             if row < n_labels_pred and col >= n_labels_mask:
                 min_row = pred_bbox[row][0]

{quadra-2.2.7 → quadra-2.3.0}/quadra/models/base.py

@@ -76,7 +76,7 @@ class ModelSignatureWrapper(nn.Module):
 
         if isinstance(self.instance.forward, torch.ScriptMethod):
             # Handle torchscript backbones
-            for i, argument in enumerate(self.instance.forward.schema.arguments):
+            for i, argument in enumerate(self.instance.forward.schema.arguments):  # type: ignore[attr-defined]
                 if i < (len(args) + 1):  # +1 for self
                     continue
 

{quadra-2.2.7 → quadra-2.3.0}/quadra/models/evaluation.py

@@ -209,7 +209,7 @@ class ONNXEvaluationModel(BaseEvaluationModel):
 
         onnx_inputs: dict[str, np.ndarray | torch.Tensor] = {}
 
-        for onnx_input, current_input in zip(self.model.get_inputs(), inputs):
+        for onnx_input, current_input in zip(self.model.get_inputs(), inputs, strict=False):
             if isinstance(current_input, torch.Tensor):
                 onnx_inputs[onnx_input.name] = current_input
                 use_pytorch = True

{quadra-2.2.7 → quadra-2.3.0}/quadra/modules/base.py

@@ -7,6 +7,7 @@ import pytorch_lightning as pl
 import sklearn
 import torch
 import torchmetrics
+from pytorch_lightning.utilities.types import OptimizerLRScheduler
 from sklearn.linear_model import LogisticRegression
 from torch import nn
 from torch.optim import Optimizer
@@ -48,7 +49,7 @@ class BaseLightningModule(pl.LightningModule):
         """
         return self.model(x)
 
-    def configure_optimizers(self) -> tuple[list[Any], list[dict[str, Any]]]:
+    def configure_optimizers(self) -> OptimizerLRScheduler:
         """Get default optimizer if not passed a value.
 
         Returns:
@@ -68,7 +69,7 @@ class BaseLightningModule(pl.LightningModule):
             "monitor": "val_loss",
             "strict": False,
         }
-        return [self.optimizer], [lr_scheduler_conf]
+        return [self.optimizer], [lr_scheduler_conf]  # type: ignore[return-value]
 
     # pylint: disable=unused-argument
     def optimizer_zero_grad(self, epoch, batch_idx, optimizer, optimizer_idx: int = 0):

{quadra-2.2.7 → quadra-2.3.0}/quadra/modules/ssl/byol.py

@@ -110,6 +110,7 @@ class BYOL(SSLModule):
             for student_ps, teacher_ps in zip(
                 list(self.model.parameters()) + list(self.student_projection_mlp.parameters()),
                 list(self.teacher.parameters()) + list(self.teacher_projection_mlp.parameters()),
+                strict=False,
             ):
                 teacher_ps.data = teacher_ps.data * teacher_momentum + (1 - teacher_momentum) * student_ps.data
 

{quadra-2.2.7 → quadra-2.3.0}/quadra/tasks/anomaly.py

@@ -161,7 +161,7 @@ class AnomalibDetection(Generic[AnomalyDataModuleT], LightningTask[AnomalyDataMo
         all_output_flatten: dict[str, torch.Tensor | list] = {}
 
         for key in all_output[0]:
-            if type(all_output[0][key]) == torch.Tensor:
+            if isinstance(all_output[0][key], torch.Tensor):
                 tensor_gatherer = torch.cat([x[key] for x in all_output])
                 all_output_flatten[key] = tensor_gatherer
             else:
@@ -205,13 +205,15 @@ class AnomalibDetection(Generic[AnomalyDataModuleT], LightningTask[AnomalyDataMo
             class_to_idx.pop("false_defect")
 
         anomaly_scores = all_output_flatten["pred_scores"]
+
+        exportable_anomaly_scores: list[Any] | np.ndarray
         if isinstance(anomaly_scores, torch.Tensor):
             exportable_anomaly_scores = anomaly_scores.cpu().numpy()
         else:
             exportable_anomaly_scores = anomaly_scores
 
         # Zip the lists together to create rows for the CSV file
-        rows = zip(image_paths, pred_labels, gt_labels, exportable_anomaly_scores)
+        rows = zip(image_paths, pred_labels, gt_labels, exportable_anomaly_scores, strict=False)
         # Specify the CSV file name
         csv_file = "test_predictions.csv"
         # Write the data to the CSV file
@@ -483,7 +485,7 @@ class AnomalibEvaluation(Evaluation[AnomalyDataModule]):
 
         if hasattr(self.datamodule, "valid_area_mask") and self.datamodule.valid_area_mask is not None:
             mask_area = cv2.imread(self.datamodule.valid_area_mask, 0)
-            mask_area = (mask_area > 0).astype(np.uint8)  # type: ignore[operator]
+            mask_area = (mask_area > 0).astype(np.uint8)
 
         if hasattr(self.datamodule, "crop_area") and self.datamodule.crop_area is not None:
             crop_area = self.datamodule.crop_area
@@ -499,12 +501,13 @@ class AnomalibEvaluation(Evaluation[AnomalyDataModule]):
                 self.metadata["image_labels"],
                 anomaly_scores,
                 anomaly_maps,
+                strict=False,
             ),
             total=len(self.metadata["image_paths"]),
         ):
             img = cv2.imread(img_path, 0)
             if mask_area is not None:
-                img = img * mask_area  # type: ignore[operator]
+                img = img * mask_area
 
             if crop_area is not None:
                 img = img[crop_area[1] : crop_area[3], crop_area[0] : crop_area[2]]

{quadra-2.2.7 → quadra-2.3.0}/quadra/tasks/base.py

@@ -382,15 +382,19 @@ class Evaluation(Generic[DataModuleT], Task[DataModuleT]):
             # We assume that each input size has the same height and width
             if input_size[1] != self.config.transforms.input_height:
                 log.warning(
-                    f"Input height of the model ({input_size[1]}) is different from the one specified "
-                    + f"in the config ({self.config.transforms.input_height}). Fixing the config."
+                    "Input height of the model (%s) is different from the one specified "
+                    + "in the config (%s). Fixing the config.",
+                    input_size[1],
+                    self.config.transforms.input_height,
                 )
                 self.config.transforms.input_height = input_size[1]
 
             if input_size[2] != self.config.transforms.input_width:
                 log.warning(
-                    f"Input width of the model ({input_size[2]}) is different from the one specified "
-                    + f"in the config ({self.config.transforms.input_width}). Fixing the config."
+                    "Input width of the model (%s) is different from the one specified "
+                    + "in the config (%s). Fixing the config.",
+                    input_size[2],
+                    self.config.transforms.input_width,
                 )
                 self.config.transforms.input_width = input_size[2]
 

{quadra-2.2.7 → quadra-2.3.0}/quadra/tasks/classification.py

@@ -623,7 +623,9 @@ class SklearnClassification(Generic[SklearnClassificationDataModuleT], Task[Skle
             all_labels = all_labels[sorted_indices]
 
         # cycle over all train/test split
-        for train_dataloader, test_dataloader in zip(self.train_dataloader_list, self.test_dataloader_list):
+        for train_dataloader, test_dataloader in zip(
+            self.train_dataloader_list, self.test_dataloader_list, strict=False
+        ):
             # Reinit classifier
             self.model = self.config.model
             self.trainer.change_classifier(self.model)
@@ -685,7 +687,7 @@ class SklearnClassification(Generic[SklearnClassificationDataModuleT], Task[Skle
             dl: PyTorch dataloader
             feature_extractor: PyTorch backbone
         """
-        if isinstance(feature_extractor, (TorchEvaluationModel, TorchscriptEvaluationModel)):
+        if isinstance(feature_extractor, TorchEvaluationModel | TorchscriptEvaluationModel):
             # TODO: I'm not sure torchinfo supports torchscript models
             # If we are working with torch based evaluation models we need to extract the model
             feature_extractor = feature_extractor.model
@@ -1202,6 +1204,8 @@ class ClassificationEvaluation(Evaluation[ClassificationDataModuleT]):
         probabilities = [max(item) for sublist in probabilities for item in sublist]
         if self.datamodule.class_to_idx is not None:
             idx_to_class = {v: k for k, v in self.datamodule.class_to_idx.items()}
+        else:
+            idx_to_class = None
 
         _, pd_cm, test_accuracy = get_results(
             test_labels=image_labels,

{quadra-2.2.7 → quadra-2.3.0}/quadra/tasks/patch.py

@@ -301,7 +301,7 @@ class PatchSklearnTestClassification(Evaluation[PatchSklearnClassificationDataMo
             "test_results": None,
             "test_labels": None,
         }
-        self.class_to_skip: list[str] = []
+        self.class_to_skip: list[str] | None = []
         self.reconstruction_results: dict[str, Any]
         self.return_polygon: bool = True
 

{quadra-2.2.7 → quadra-2.3.0}/quadra/tasks/segmentation.py

@@ -92,8 +92,10 @@ class Segmentation(Generic[SegmentationDataModuleT], LightningTask[SegmentationD
             len(self.datamodule.idx_to_class) + 1
         ):
             log.warning(
-                f"Number of classes in the model ({module_config.model.num_classes}) does not match the number of "
-                + f"classes in the datamodule ({len(self.datamodule.idx_to_class)}). Updating the model..."
+                "Number of classes in the model (%s) does not match the number of "
+                + "classes in the datamodule (%d). Updating the model...",
+                module_config.model.num_classes,
+                len(self.datamodule.idx_to_class),
             )
             module_config.model.num_classes = len(self.datamodule.idx_to_class) + 1
 
@@ -341,7 +343,7 @@ class SegmentationAnalysisEvaluation(SegmentationEvaluation):
         if self.datamodule.test_dataset_available:
             stages.append("test")
             dataloaders.append(self.datamodule.test_dataloader())
-        for stage, dataloader in zip(stages, dataloaders):
+        for stage, dataloader in zip(stages, dataloaders, strict=False):
             log.info("Running inference on %s set with batch size: %d", stage, dataloader.batch_size)
             image_list, mask_list, mask_pred_list, label_list = [], [], [], []
             for batch in dataloader:
@@ -369,10 +371,10 @@ class SegmentationAnalysisEvaluation(SegmentationEvaluation):
 
         for stage, output in self.test_output.items():
             image_mean = OmegaConf.to_container(self.config.transforms.mean)
-            if not isinstance(image_mean, list) or any(not isinstance(x, (int, float)) for x in image_mean):
+            if not isinstance(image_mean, list) or any(not isinstance(x, int | float) for x in image_mean):
                 raise ValueError("Image mean is not a list of float or integer values, please check your config")
             image_std = OmegaConf.to_container(self.config.transforms.std)
-            if not isinstance(image_std, list) or any(not isinstance(x, (int, float)) for x in image_std):
+            if not isinstance(image_std, list) or any(not isinstance(x, int | float) for x in image_std):
                 raise ValueError("Image std is not a list of float or integer values, please check your config")
             reports = create_mask_report(
                 stage=stage,

{quadra-2.2.7 → quadra-2.3.0}/quadra/tasks/ssl.py

@@ -468,8 +468,7 @@ class EmbeddingVisualization(Task):
         self.report_folder = report_folder
         if self.model_path is None:
             raise ValueError(
-                "Model path cannot be found!, please specify it in the config or pass it as an argument for"
-                " evaluation"
+                "Model path cannot be found!, please specify it in the config or pass it as an argument for evaluation"
             )
         self.embeddings_path = os.path.join(self.model_path, self.report_folder)
         if not os.path.exists(self.embeddings_path):
@@ -547,7 +546,7 @@ class EmbeddingVisualization(Task):
                 im = interpolate(im, self.embedding_image_size)
 
             images.append(im.cpu())
-            metadata.extend(zip(targets, class_names, file_paths))
+            metadata.extend(zip(targets, class_names, file_paths, strict=False))
             counter += len(im)
         images = torch.cat(images, dim=0)
         embeddings = torch.cat(embeddings, dim=0)