stouputils 1.2.41__tar.gz → 1.2.43__tar.gz

{stouputils-1.2.41 → stouputils-1.2.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stouputils
-Version: 1.2.41
+Version: 1.2.43
 Summary: Stouputils is a collection of utility modules designed to simplify and enhance the development process. It includes a range of tools for tasks such as execution of doctests, display utilities, decorators, as well as context managers, and many more.
 Project-URL: Homepage, https://github.com/Stoupy51/stouputils
 Project-URL: Issues, https://github.com/Stoupy51/stouputils/issues

{stouputils-1.2.41 → stouputils-1.2.43}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "stouputils"
-version = "1.2.41"
+version = "1.2.43"
 description = "Stouputils is a collection of utility modules designed to simplify and enhance the development process. It includes a range of tools for tasks such as execution of doctests, display utilities, decorators, as well as context managers, and many more."
 readme = "README.md"
 requires-python = ">=3.10"

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/all_doctests.py

@@ -14,8 +14,8 @@ from doctest import TestResults, testmod
 from types import ModuleType
 
 from . import decorators
-from .decorators import LogLevels, handle_error, measure_time
-from .print import error, info, progress
+from .decorators import LogLevels, measure_time
+from .print import error, info, progress, warning
 from .io import clean_path, relative_path
 
 
@@ -104,12 +104,15 @@ def launch_tests(root_dir: str, importing_errors: LogLevels = LogLevels.WARNING_
 	for module_path in modules_file_paths:
 		separator: str = " " * (max_length - len(module_path))
 
-		@handle_error(error_log=importing_errors)
 		@measure_time(progress, message=f"Importing module '{module_path}' {separator}took")
 		def internal(a: str = module_path, b: str = separator) -> None:
 			modules.append(importlib.import_module(a))
 			separators.append(b)
-		internal()
+		
+		try:
+			internal()
+		except Exception as e:
+			warning(f"Failed to import module '{module_path}': ({type(e).__name__}) {e}")
 
 	# Run tests for each module
 	info(f"Testing {len(modules)} modules...")

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/config/set.py

@@ -24,13 +24,13 @@ class DataScienceConfig:
 	""" Log level for errors for all functions. """
 
 	AUGMENTED_FILE_SUFFIX: str = "_aug_"
-	""" Suffix for augmented files, ex: 'image_008_aug_1.png'. """
+	""" Suffix for augmented files, e.g. 'image_008_aug_1.png'. """
 
 	AUGMENTED_DIRECTORY_PREFIX: str = "aug_"
-	""" Prefix for augmented directories, ex: 'data/hip_implant' -> 'data/aug_hip_implant'. """
+	""" Prefix for augmented directories, e.g. 'data/hip_implant' -> 'data/aug_hip_implant'. """
 
 	PREPROCESSED_DIRECTORY_SUFFIX: str = "_preprocessed"
-	""" Suffix for preprocessed directories, ex: 'data/hip_implant' -> 'data/hip_implant_preprocessed'. """
+	""" Suffix for preprocessed directories, e.g. 'data/hip_implant' -> 'data/hip_implant_preprocessed'. """
 
 
 	# Directories

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/blur.py

@@ -26,7 +26,7 @@ def blur_image(image: NDArray[Any], blur_strength: float, ignore_dtype: bool = F
 	>>> img = np.zeros((5,5), dtype=np.uint8)
 	>>> img[2,2] = 255  # Single bright pixel
 	>>> blurred = blur_image(img, 1.0)
-	>>> blurred[2,2] < 255  # Center should be blurred
+	>>> bool(blurred[2,2] < 255)  # Center should be blurred
 	True
 
 	>>> rgb = np.full((3,3,3), 128, dtype=np.uint8)

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/brightness.py

@@ -26,7 +26,7 @@ def brightness_image(image: NDArray[Any], brightness_factor: float, ignore_dtype
 	>>> img = np.full((3,3), 100, dtype=np.uint8)
 	>>> bright = brightness_image(img, 2.0)
 	>>> dark = brightness_image(img, 0.5)
-	>>> np.mean(bright) > np.mean(img) > np.mean(dark)
+	>>> bool(np.mean(bright) > np.mean(img) > np.mean(dark))
 	True
 
 	>>> rgb = np.full((3,3,3), 128, dtype=np.uint8)

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/clahe.py

@@ -34,17 +34,17 @@ def clahe_image(
 	>>> img = np.full((10,10), 128, dtype=np.uint8)
 	>>> img[2:8, 2:8] = 200  # Create a bright region
 	>>> clahed = clahe_image(img, 2.0, 4)
-	>>> np.mean(clahed) > np.mean(img)  # Should enhance contrast
+	>>> bool(np.mean(clahed) > np.mean(img))  # Should enhance contrast
 	True
-	>>> np.std(clahed) > np.std(img)  # Should enhance contrast
+	>>> bool(np.std(clahed) > np.std(img))  # Should enhance contrast
 	True
 
 	>>> rgb = np.full((10,10,3), 128, dtype=np.uint8)
 	>>> rgb[2:8, 2:8, :] = 50  # Create a dark region
 	>>> clahed_rgb = clahe_image(rgb, 2.0, 4)
-	>>> np.mean(clahed_rgb) > np.mean(rgb)  # Should enhance contrast
+	>>> bool(np.mean(clahed_rgb) > np.mean(rgb))  # Should enhance contrast
 	True
-	>>> np.std(clahed_rgb) > np.std(rgb)  # Should enhance contrast
+	>>> bool(np.std(clahed_rgb) > np.std(rgb))  # Should enhance contrast
 	True
 	>>> clahed_rgb.shape == rgb.shape
 	True

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/contrast.py

@@ -23,7 +23,7 @@ def contrast_image(image: NDArray[Any], factor: float, ignore_dtype: bool = Fals
 	>>> img = np.array([[50, 100, 150]], dtype=np.uint8)
 	>>> high = contrast_image(img, 2.0)
 	>>> low = contrast_image(img, 0.5)
-	>>> high.std() > img.std() > low.std()  # Higher contrast = higher std
+	>>> bool(high.std() > img.std() > low.std())  # Higher contrast = higher std
 	True
 
 	>>> rgb = np.full((3,3,3), 128, dtype=np.uint8)

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/histogram_equalization.py

@@ -52,7 +52,7 @@ def histogram_equalization_image(
 	>>> rgb = np.full((3,3,3), 128, dtype=np.uint8)
 	>>> rgb[1, 1, :] = 50  # Create a dark region
 	>>> equalized_rgb = histogram_equalization_image(rgb)
-	>>> np.std(equalized_rgb) > np.std(rgb)  # Should enhance contrast
+	>>> bool(np.std(equalized_rgb) > np.std(rgb))  # Should enhance contrast
 	True
 	>>> equalized_rgb.tolist()
 	[[[255, 255, 255], [255, 255, 255], [255, 255, 255]], [[255, 255, 255], [0, 0, 0], [255, 255, 255]], [[255, 255, 255], [255, 255, 255], [255, 255, 255]]]
@@ -65,21 +65,21 @@ def histogram_equalization_image(
 	>>> lab_result = histogram_equalization_image(test_img, color_space="lab")
 	>>> isinstance(lab_result, np.ndarray) and lab_result.shape == test_img.shape
 	True
-	>>> np.std(lab_result) > np.std(test_img)  # Verify contrast enhancement
+	>>> bool(np.std(lab_result) > np.std(test_img))  # Verify contrast enhancement
 	True
 
 	>>> # Test YCbCr color space
 	>>> ycbcr_result = histogram_equalization_image(test_img, color_space="ycbcr")
 	>>> isinstance(ycbcr_result, np.ndarray) and ycbcr_result.shape == test_img.shape
 	True
-	>>> np.std(ycbcr_result) > np.std(test_img)  # Verify contrast enhancement
+	>>> bool(np.std(ycbcr_result) > np.std(test_img))  # Verify contrast enhancement
 	True
 
 	>>> # Test HSV color space
 	>>> hsv_result = histogram_equalization_image(test_img, color_space="hsv")
 	>>> isinstance(hsv_result, np.ndarray) and hsv_result.shape == test_img.shape
 	True
-	>>> np.std(hsv_result) > np.std(test_img)  # Verify contrast enhancement
+	>>> bool(np.std(hsv_result) > np.std(test_img))  # Verify contrast enhancement
 	True
 
 	>>> ## Test invalid inputs

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/invert.py

@@ -24,7 +24,7 @@ def invert_image(image: NDArray[Any], ignore_dtype: bool = False) -> NDArray[Any
 
 	>>> # Test with floating point image
 	>>> float_img = np.array([[0.1, 0.2], [0.3, 0.4]], dtype=np.float32)
-	>>> [round(x, 1) for x in invert_image(float_img).flatten()]
+	>>> [round(float(x), 1) for x in invert_image(float_img).flatten()]
 	[0.9, 0.8, 0.7, 0.6]
 
 	>>> # Test with RGB image

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/noise.py

@@ -19,7 +19,7 @@ def noise_image(image: NDArray[Any], amount: float, ignore_dtype: bool = False)
 	>>> noisy = noise_image(image.astype(np.uint8), 0.5)
 	>>> noisy.shape == image.shape
 	True
-	>>> np.all(noisy >= 0) and np.all(noisy <= 255)
+	>>> bool(np.all(noisy >= 0) and np.all(noisy <= 255))
 	True
 
 	>>> np.random.seed(0)

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/random_erase.py

@@ -25,7 +25,7 @@ def random_erase_image(image: NDArray[Any], erase_factor: float, ignore_dtype: b
 	>>> np.random.seed(42)
 	>>> img = np.ones((5,5), dtype=np.uint8) * 255
 	>>> erased = random_erase_image(img, 0.4)
-	>>> np.any(erased == 0)  # Should have some erased pixels
+	>>> bool(np.any(erased == 0))  # Should have some erased pixels
 	True
 
 	>>> rgb = np.full((3,3,3), 128, dtype=np.uint8)

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/image/sharpening.py

@@ -26,7 +26,7 @@ def sharpen_image(image: NDArray[Any], alpha: float, ignore_dtype: bool = False)
 	>>> img = np.full((5,5), 128, dtype=np.uint8)
 	>>> img[2,2] = 255  # Center bright pixel
 	>>> sharp = sharpen_image(img, 1.0)
-	>>> sharp[2,2] > img[2,2] * 0.9  # Center should stay bright
+	>>> bool(sharp[2,2] > img[2,2] * 0.9)  # Center should stay bright
 	True
 
 	>>> rgb = np.full((3,3,3), 128, dtype=np.uint8)

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/data_processing/technique.py

@@ -104,7 +104,7 @@ class ProcessingTechnique(NamedTuple):
 	Should be used on techniques like "axis_flip" or "random_erase"
 	where the probability of applying the technique is not 100%. """
 	custom: Callable[..., NDArray[Any]] | None = None
-	""" Custom processing technique (callable), name must be "custom", ex: ProcessingTechnique("custom", custom=f) """
+	""" Custom processing technique (callable), name must be "custom", e.g. ProcessingTechnique("custom", custom=f) """
 
 	def __str__(self) -> str:
 		return (

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/dataset/image_loader.py

@@ -74,7 +74,7 @@ def load_images_from_directory(
 
 		# Add channel dimension if grayscale
 		if is_grayscale:
-			img_array = np.expand_dims(img_array, axis=-1)  # Add channel dimension, ex: (224, 224, 1)
+			img_array = np.expand_dims(img_array, axis=-1)  # Add channel dimension, e.g. (224, 224, 1)
 
 		return img_array, img_path
 

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/dataset/xy_tuple.py

@@ -125,7 +125,7 @@ class XyTuple(tuple[list[list[Any]], list[Any], tuple[tuple[str, ...], ...]]):
 		self.filepaths: tuple[tuple[str, ...], ...] = self[2]
 		""" List of filepaths corresponding to the features (one file = list with one element) """
 		self.augmented_files: dict[str, str] = self.update_augmented_files()
-		""" Dictionary mapping all files to their original filepath, ex: {"file1_aug_1.jpg": "file1.jpg"} """
+		""" Dictionary mapping all files to their original filepath, e.g. {"file1_aug_1.jpg": "file1.jpg"} """
 
 	@property
 	def n_samples(self) -> int:
@@ -269,7 +269,7 @@ class XyTuple(tuple[list[list[Any]], list[Any], tuple[tuple[str, ...], ...]]):
 			>>> indices, labels = xy.group_by_original()
 			>>> sorted(indices.items())
 			[('file1.jpg', [0, 2]), ('file2.jpg', [1])]
-			>>> sorted(labels.items())
+			>>> [(x, str(y)) for x, y in sorted(labels.items())]
 			[('file1.jpg', 'a'), ('file2.jpg', 'b')]
 		"""
 		# Initializations

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/metric_utils.py

@@ -73,17 +73,17 @@ class MetricUtils:
 			... 	metrics = MetricUtils.metrics(dataset, predictions, run_name="")
 
 			>>> # Check metrics
-			>>> round(metrics[MetricDictionnary.ACCURACY], 2)
+			>>> round(float(metrics[MetricDictionnary.ACCURACY]), 2)
 			0.67
-			>>> round(metrics[MetricDictionnary.PRECISION], 2)
+			>>> round(float(metrics[MetricDictionnary.PRECISION]), 2)
 			0.5
-			>>> round(metrics[MetricDictionnary.RECALL], 2)
+			>>> round(float(metrics[MetricDictionnary.RECALL]), 2)
 			1.0
-			>>> round(metrics[MetricDictionnary.F1_SCORE], 2)
+			>>> round(float(metrics[MetricDictionnary.F1_SCORE]), 2)
 			0.67
-			>>> round(metrics[MetricDictionnary.AUC], 2)
+			>>> round(float(metrics[MetricDictionnary.AUC]), 2)
 			0.75
-			>>> round(metrics[MetricDictionnary.MATTHEWS_CORRELATION_COEFFICIENT], 2)
+			>>> round(float(metrics[MetricDictionnary.MATTHEWS_CORRELATION_COEFFICIENT]), 2)
 			0.5
 		"""
 		# Initialize metrics
@@ -159,15 +159,15 @@ class MetricUtils:
 			... 	metrics = MetricUtils.confusion_matrix(true_classes, pred_classes, labels, run_name="")
 
 			>>> # Check metrics
-			>>> metrics[MetricDictionnary.CONFUSION_MATRIX_TN]
+			>>> int(metrics[MetricDictionnary.CONFUSION_MATRIX_TN])
 			1
-			>>> metrics[MetricDictionnary.CONFUSION_MATRIX_FP]
+			>>> int(metrics[MetricDictionnary.CONFUSION_MATRIX_FP])
 			1
-			>>> metrics[MetricDictionnary.CONFUSION_MATRIX_FN]
+			>>> int(metrics[MetricDictionnary.CONFUSION_MATRIX_FN])
 			0
-			>>> metrics[MetricDictionnary.CONFUSION_MATRIX_TP]
+			>>> int(metrics[MetricDictionnary.CONFUSION_MATRIX_TP])
 			1
-			>>> metrics[MetricDictionnary.FALSE_POSITIVE_RATE]
+			>>> round(float(metrics[MetricDictionnary.FALSE_POSITIVE_RATE]), 2)
 			0.5
 		"""
 		metrics: dict[str, float] = {}
@@ -243,7 +243,7 @@ class MetricUtils:
 			>>> from stouputils.ctx import Muffle
 			>>> with Muffle():
 			... 	metrics = MetricUtils.f_scores(precision=0.5, recall=1.0)
-			>>> [round(x, 2) for x in metrics.values()]
+			>>> [round(float(x), 2) for x in metrics.values()]
 			[0.5, 0.51, 0.54, 0.58, 0.62, 0.67, 0.71, 0.75, 0.78, 0.81, 0.83]
 
 		"""
@@ -279,7 +279,7 @@ class MetricUtils:
 			>>> from stouputils.ctx import Muffle
 			>>> with Muffle():
 			... 	metrics = MetricUtils.matthews_correlation(true_classes, pred_classes)
-			>>> metrics[MetricDictionnary.MATTHEWS_CORRELATION_COEFFICIENT]
+			>>> float(metrics[MetricDictionnary.MATTHEWS_CORRELATION_COEFFICIENT])
 			0.5
 		"""
 		return {MetricDictionnary.MATTHEWS_CORRELATION_COEFFICIENT: matthews_corrcoef(true_classes, pred_classes)}
@@ -314,11 +314,11 @@ class MetricUtils:
 			... 	metrics = MetricUtils.roc_and_auc(true_classes, pred_probs, run_name="")
 
 			>>> # Check metrics
-			>>> metrics[MetricDictionnary.AUC]
+			>>> round(float(metrics[MetricDictionnary.AUC]), 2)
 			0.75
-			>>> metrics[MetricDictionnary.OPTIMAL_THRESHOLD_YOUDEN]
+			>>> round(float(metrics[MetricDictionnary.OPTIMAL_THRESHOLD_YOUDEN]), 2)
 			0.9
-			>>> metrics[MetricDictionnary.OPTIMAL_THRESHOLD_COST]
+			>>> float(metrics[MetricDictionnary.OPTIMAL_THRESHOLD_COST])
 			inf
 		"""
 		true_classes = Utils.convert_to_class_indices(true_classes)

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/mlflow_utils.py

@@ -18,16 +18,18 @@ import mlflow
 from mlflow.entities import Experiment, Run
 
 from ..decorators import handle_error, LogLevels
+from ..io import clean_path
 
 
 # Get artifact path
-def get_artifact_path(from_string: str = "") -> str:
+def get_artifact_path(from_string: str = "", os_name: str = os.name) -> str:
 	""" Get the artifact path from the current mlflow run (without the file:// prefix).
 
 	Handles the different path formats for Windows and Unix-based systems.
 
 	Args:
 		from_string	(str):		Path to the artifact (optional, defaults to the current mlflow run)
+		os_name		(str):		OS name (optional, defaults to os.name)
 	Returns:
 		str: The artifact path
 	"""
@@ -38,26 +40,30 @@ def get_artifact_path(from_string: str = "") -> str:
 		artifact_path: str = from_string
 
 	# Handle the different path formats for Windows and Unix-based systems
-	if os.name == "nt":
+	if os_name == "nt":
 		return artifact_path.replace("file:///", "")
 	else:
 		return artifact_path.replace("file://", "")
 
 # Get weights path
-def get_weights_path(from_string: str = "", weights_name: str = "best_model.keras") -> str:
+def get_weights_path(from_string: str = "", weights_name: str = "best_model.keras", os_name: str = os.name) -> str:
 	""" Get the weights path from the current mlflow run.
 
 	Args:
-		from_string	(str):		Path to the artifact (optional, defaults to the current mlflow run)
-		weights_name	(str):		Name of the weights file (optional, defaults to "best_model.keras")
+		from_string     (str):      Path to the artifact (optional, defaults to the current mlflow run)
+		weights_name    (str):      Name of the weights file (optional, defaults to "best_model.keras")
+		os_name         (str):      OS name (optional, defaults to os.name)
 	Returns:
 		str: The weights path
 
 	Examples:
-		>>> get_weights_path(from_string="file:///path/to/artifact", weights_name="best_model.keras")
+		>>> get_weights_path(from_string="file:///path/to/artifact", weights_name="best_model.keras", os_name="posix")
 		'/path/to/artifact/best_model.keras'
+
+		>>> get_weights_path(from_string="file:///C:/path/to/artifact", weights_name="best_model.keras", os_name="nt")
+		'C:/path/to/artifact/best_model.keras'
 	"""
-	return os.path.join(get_artifact_path(from_string=from_string), weights_name)
+	return clean_path(f"{get_artifact_path(from_string=from_string, os_name=os_name)}/{weights_name}")
 
 # Get runs by experiment name
 def get_runs_by_experiment_name(experiment_name: str, filter_string: str = "", set_experiment: bool = False) -> list[Run]:

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/models/all.py

@@ -25,13 +25,6 @@ from .keras.all import (
     ResNet50V2,
     ResNet101V2,
     ResNet152V2,
-    ResNetRS50,
-    ResNetRS101,
-    ResNetRS152,
-    ResNetRS200,
-    ResNetRS270,
-    ResNetRS350,
-    ResNetRS420,
     SqueezeNet,
     Xception,
 )
@@ -76,13 +69,6 @@ CLASS_MAP: ModelClassMap = ModelClassMap({
     ResNet50V2:         ("resnet50v2", "resnetsv2", "resnets", "all", "often"),
     ResNet101V2:        ("resnet101v2", "resnetsv2", "resnets", "all", "often"),
     ResNet152V2:        ("resnet152v2", "resnetsv2", "resnets", "all", "often"),
-    ResNetRS50:         ("resnetrs50", "resnetrs", "resnets", "all"),
-    ResNetRS101:        ("resnetrs101", "resnetrs", "resnets", "all"),
-    ResNetRS152:        ("resnetrs152", "resnetrs", "resnets", "all"),
-    ResNetRS200:        ("resnetrs200", "resnetrs", "resnets", "all"),
-    ResNetRS270:        ("resnetrs270", "resnetrs", "resnets", "all"),
-    ResNetRS350:        ("resnetrs350", "resnetrs", "resnets", "all"),
-    ResNetRS420:        ("resnetrs420", "resnetrs", "resnets", "all"),
 
     Xception:           ("xception", "xceptions", "all", "often"),
     Sandbox:            ("sandbox",),

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/models/keras/all.py

@@ -4,18 +4,7 @@ from .convnext import ConvNeXtBase, ConvNeXtLarge, ConvNeXtSmall, ConvNeXtTiny,
 from .densenet import DenseNet121, DenseNet169, DenseNet201
 from .efficientnet import EfficientNetB0, EfficientNetV2B0, EfficientNetV2L, EfficientNetV2M, EfficientNetV2S
 from .mobilenet import MobileNet, MobileNetV2, MobileNetV3Large, MobileNetV3Small
-from .resnet import (
-    ResNet50V2,
-    ResNet101V2,
-    ResNet152V2,
-    ResNetRS50,
-    ResNetRS101,
-    ResNetRS152,
-    ResNetRS200,
-    ResNetRS270,
-    ResNetRS350,
-    ResNetRS420,
-)
+from .resnet import ResNet50V2, ResNet101V2, ResNet152V2
 from .squeezenet import SqueezeNet
 from .vgg import VGG16, VGG19
 from .xception import Xception
@@ -43,13 +32,6 @@ __all__ = [
     "ResNet50V2",
     "ResNet101V2",
     "ResNet152V2",
-    "ResNetRS50",
-    "ResNetRS101",
-    "ResNetRS152",
-    "ResNetRS200",
-    "ResNetRS270",
-    "ResNetRS350",
-    "ResNetRS420",
     "SqueezeNet",
     "Xception",
 ]

stouputils-1.2.43/stouputils/data_science/models/keras/resnet.py

@@ -0,0 +1,52 @@
+""" ResNet models implementation.
+
+This module provides wrapper classes for the ResNet family of models from the Keras applications.
+It includes both ResNetV2 models with pre-activation residual blocks and ResNetRS
+(ResNet with Revisited Scaling) models that offer improved performance
+through various scaling techniques.
+
+Available models:
+
+- ResNetV2 family: Improved ResNet architectures with pre-activation blocks
+    - ResNet50V2
+    - ResNet101V2
+    - ResNet152V2
+
+All models support transfer learning from ImageNet pre-trained weights.
+"""
+# pyright: reportUnknownVariableType=false
+# pyright: reportMissingTypeStubs=false
+
+# Imports
+from __future__ import annotations
+
+from keras.models import Model
+from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2_keras
+from keras.src.applications.resnet_v2 import ResNet101V2 as ResNet101V2_keras
+from keras.src.applications.resnet_v2 import ResNet152V2 as ResNet152V2_keras
+
+from ....decorators import simple_cache
+from ..base_keras import BaseKeras
+from ..model_interface import CLASS_ROUTINE_DOCSTRING, MODEL_DOCSTRING
+
+
+# Classes
+class ResNet50V2(BaseKeras):
+	def _get_base_model(self) -> Model:
+		return ResNet50V2_keras(include_top=False, classes=self.num_classes)
+
+class ResNet101V2(BaseKeras):
+	def _get_base_model(self) -> Model:
+		return ResNet101V2_keras(include_top=False, classes=self.num_classes)
+
+class ResNet152V2(BaseKeras):
+	def _get_base_model(self) -> Model:
+		return ResNet152V2_keras(include_top=False, classes=self.num_classes)
+
+
+# Docstrings
+for model in [ResNet50V2, ResNet101V2, ResNet152V2]:
+	model.__doc__ = MODEL_DOCSTRING.format(model=model.__name__)
+	model.class_routine = simple_cache(model.class_routine)
+	model.class_routine.__doc__ = CLASS_ROUTINE_DOCSTRING.format(model=model.__name__)
+

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/models/keras_utils/callbacks/progressive_unfreezing.py

@@ -41,7 +41,7 @@ class ProgressiveUnfreezing(Callback):
 			reset_weights      (bool):    If True, reset weights after each unfreeze.
 			reset_optimizer_function (Callable | None):
 				If set, use this function to reset the optimizer every update_interval.
-				The function should return a compiled optimizer, ex: `lambda: model._get_optimizer(AdamW(...))`.
+				The function should return a compiled optimizer, e.g. `lambda: model._get_optimizer(AdamW(...))`.
 			update_per_epoch   (bool):    If True, unfreeze per epoch, else per batch.
 			update_interval    (int):     Number of steps between each unfreeze to allow model to stabilize.
 			progressive_freeze (bool):    If True, start with all layers unfrozen and progressively freeze them.

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/models/model_interface.py

@@ -386,7 +386,7 @@ class ModelInterface(AbstractModel):
 			return mlflow_utils.get_weights_path(from_string=str(run.info.artifact_uri))
 
 	def _get_total_layers(self) -> int:
-		""" Get the total number of layers in the model architecture, ex: 427 for DenseNet121.
+		""" Get the total number of layers in the model architecture, e.g. 427 for DenseNet121.
 
 		Compatible with Keras/TensorFlow and PyTorch models.
 
@@ -465,7 +465,7 @@ class ModelInterface(AbstractModel):
 		Args:
 			y_train (NDArray[Any]): Training labels
 		Returns:
-			dict[int, float]: Dictionary mapping class indices to weights, ex: {0: 0.34, 1: 0.66}
+			dict[int, float]: Dictionary mapping class indices to weights, e.g. {0: 0.34, 1: 0.66}
 		"""
 		# Get the true classes (one-hot -> class indices)
 		true_classes: NDArray[Any] = Utils.convert_to_class_indices(y_train)

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/range_tuple.py

@@ -16,7 +16,7 @@ This class contains methods for:
 from __future__ import annotations
 
 from collections.abc import Generator
-from typing import NamedTuple
+from typing import Any, NamedTuple
 
 import numpy as np
 
@@ -87,7 +87,7 @@ class RangeTuple(_RangeTupleBase):
 	def __repr__(self) -> str:
 		return f"RangeTuple(mini={self.mini!r}, maxi={self.maxi!r}, step={self.step!r}, default={self.default!r})"
 
-	def __iter__(self) -> Generator[float, None, None]:
+	def __iter__(self) -> Generator[float, Any, Any]:
 		""" Iterate over the range values.
 		If the range is not initialized (mini or maxi is None), yield the default value.
 		Else, yield from np.arange(...)
@@ -103,10 +103,10 @@ class RangeTuple(_RangeTupleBase):
 			>>> list(r)
 			[1.0]
 		"""
-		if self.mini is None or self.maxi is None or self.step is None:
+		if self.mini is None or self.maxi is None or self.step is None and self.default is not None:
 			yield float(self.default) # pyright: ignore [reportArgumentType]
 		else:
-			yield from np.arange(self.mini, self.maxi, self.step)
+			yield from [float(x) for x in np.arange(self.mini, self.maxi, self.step)]
 
 	def __len__(self) -> int:
 		""" Return the number of values in the range.

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/scripts/exhaustive_process.py

@@ -47,8 +47,8 @@ def exhaustive_process(
 
 	Args:
 		datasets_to_process (list[tuple[str, str]]): List of dataset paths to process.
-			Each tuple contains (dataset_path, based_of_path), ex: [("aug_preprocessed_path", "preprocessed_path")].
-		main_script_path (str): Path to the main script, ex: "src/main.py"
+			Each tuple contains (dataset_path, based_of_path), e.g. [("aug_preprocessed_path", "preprocessed_path")].
+		main_script_path (str): Path to the main script, e.g. "src/main.py"
 		default_model (str): Default model architecture to use for training.
 		default_kfold (int): Default number of folds for k-fold cross validation.
 		default_transfer_learning (str): Default source for transfer learning.

{stouputils-1.2.41 → stouputils-1.2.43}/stouputils/data_science/scripts/routine.py

@@ -13,8 +13,8 @@ from ..models.all import ALL_MODELS, CLASS_MAP, ModelInterface
 
 # Constants
 MODEL_HELP: str             = "Model(s) name or alias to use"
-INPUT_HELP: str             = "Path to the dataset, ex: 'data/aug_hip_implant'"
-BASED_OF_HELP: str          = "Path to the base dataset for filtering train/test, ex: 'data/hip_implant'"
+INPUT_HELP: str             = "Path to the dataset, e.g. 'data/aug_hip_implant'"
+BASED_OF_HELP: str          = "Path to the base dataset for filtering train/test, e.g. 'data/hip_implant'"
 TRANSFER_LEARNING_HELP: str = "Transfer learning source (imagenet, None, 'data/dataset_folder')"
 GROUPING_HELP: str          = "Grouping strategy for the dataset"
 K_FOLD_HELP: str            = "Number of folds for k-fold cross validation (0 = no k-fold, negative = LeavePOut)"

stouputils-1.2.41/stouputils/data_science/models/keras/resnet.py

@@ -1,99 +0,0 @@
-""" ResNet models implementation.
-
-This module provides wrapper classes for the ResNet family of models from the Keras applications.
-It includes both ResNetV2 models with pre-activation residual blocks and ResNetRS
-(ResNet with Revisited Scaling) models that offer improved performance
-through various scaling techniques.
-
-Available models:
-
-- ResNetV2 family: Improved ResNet architectures with pre-activation blocks
-    - ResNet50V2
-    - ResNet101V2
-    - ResNet152V2
-- ResNetRS family: ResNet models with revisited scaling for better efficiency
-    - ResNetRS50
-    - ResNetRS101
-    - ResNetRS152
-    - ResNetRS200
-    - ResNetRS270
-    - ResNetRS350
-    - ResNetRS420
-
-All models support transfer learning from ImageNet pre-trained weights.
-"""
-# pyright: reportUnknownVariableType=false
-# pyright: reportMissingTypeStubs=false
-
-# Imports
-from __future__ import annotations
-
-from keras.models import Model
-from keras.src.applications.resnet_rs import ResNetRS50 as ResNetRS50_keras
-from keras.src.applications.resnet_rs import ResNetRS101 as ResNetRS101_keras
-from keras.src.applications.resnet_rs import ResNetRS152 as ResNetRS152_keras
-from keras.src.applications.resnet_rs import ResNetRS200 as ResNetRS200_keras
-from keras.src.applications.resnet_rs import ResNetRS270 as ResNetRS270_keras
-from keras.src.applications.resnet_rs import ResNetRS350 as ResNetRS350_keras
-from keras.src.applications.resnet_rs import ResNetRS420 as ResNetRS420_keras
-from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2_keras
-from keras.src.applications.resnet_v2 import ResNet101V2 as ResNet101V2_keras
-from keras.src.applications.resnet_v2 import ResNet152V2 as ResNet152V2_keras
-
-from ....decorators import simple_cache
-from ..base_keras import BaseKeras
-from ..model_interface import CLASS_ROUTINE_DOCSTRING, MODEL_DOCSTRING
-
-
-# Classes
-class ResNet50V2(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNet50V2_keras(include_top=False, classes=self.num_classes)
-
-class ResNet101V2(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNet101V2_keras(include_top=False, classes=self.num_classes)
-
-class ResNet152V2(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNet152V2_keras(include_top=False, classes=self.num_classes)
-
-class ResNetRS50(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNetRS50_keras(include_top=False, classes=self.num_classes)
-
-class ResNetRS101(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNetRS101_keras(include_top=False, classes=self.num_classes)
-
-class ResNetRS152(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNetRS152_keras(include_top=False, classes=self.num_classes)
-
-class ResNetRS200(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNetRS200_keras(include_top=False, classes=self.num_classes)
-
-class ResNetRS270(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNetRS270_keras(include_top=False, classes=self.num_classes)
-
-class ResNetRS350(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNetRS350_keras(include_top=False, classes=self.num_classes)
-
-class ResNetRS420(BaseKeras):
-	def _get_base_model(self) -> Model:
-		return ResNetRS420_keras(include_top=False, classes=self.num_classes)
-
-
-# Docstrings
-for model in [
-	ResNet50V2, ResNet101V2, ResNet152V2,
-	ResNetRS50, ResNetRS101, ResNetRS152, ResNetRS200,
-	ResNetRS270, ResNetRS350, ResNetRS420
-]:
-	model.__doc__ = MODEL_DOCSTRING.format(model=model.__name__)
-	model.class_routine = simple_cache(model.class_routine)
-	model.class_routine.__doc__ = CLASS_ROUTINE_DOCSTRING.format(model=model.__name__)
-