stouputils 1.10.4__tar.gz → 1.12.0__tar.gz

{stouputils-1.10.4 → stouputils-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stouputils
-Version: 1.10.4
+Version: 1.12.0
 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
@@ -9,22 +9,20 @@ License-File: LICENSE
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.12
 Requires-Dist: argcomplete>=3.0.0
-Requires-Dist: mypy>=1.18.2
-Requires-Dist: numpy>=2.4.0
-Requires-Dist: opencv-python>=4.0.0
-Requires-Dist: orjson>=3.0.0
+Requires-Dist: msgspec[toml,yaml]>=0.20.0
+Requires-Dist: numpy>=2.3.0
 Requires-Dist: pillow>=10.0.0
-Requires-Dist: pyfastcopy>=1.0.0
-Requires-Dist: python-box[all]>=7.0.0
-Requires-Dist: pyyaml>=6.0.0
+Requires-Dist: python-box>=7.0.0
 Requires-Dist: requests>=2.20.0
-Requires-Dist: toml>=0.10.0
 Requires-Dist: tqdm>=4.0.0
-Requires-Dist: zarr>=2.18.3
 Provides-Extra: data-science
 Requires-Dist: mlflow; extra == 'data-science'
+Requires-Dist: opencv-python; extra == 'data-science'
 Requires-Dist: pywavelets; extra == 'data-science'
 Requires-Dist: scikit-image; extra == 'data-science'
 Requires-Dist: scikit-learn; extra == 'data-science'
@@ -32,6 +30,7 @@ Requires-Dist: simpleitk; extra == 'data-science'
 Requires-Dist: tensorflow; extra == 'data-science'
 Provides-Extra: docs
 Requires-Dist: m2r2; extra == 'docs'
+Requires-Dist: mypy; extra == 'docs'
 Requires-Dist: myst-parser; extra == 'docs'
 Requires-Dist: pydata-sphinx-theme; extra == 'docs'
 Requires-Dist: sphinx-breeze-theme; extra == 'docs'

stouputils-1.12.0/pyproject.toml

@@ -0,0 +1,106 @@
+
+[build-system]
+requires = [
+    "hatchling",
+]
+build-backend = "hatchling.build"
+
+[project]
+name = "stouputils"
+version = "1.12.0"
+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.12"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "tqdm>=4.0.0",
+    "requests>=2.20.0",
+    "msgspec[toml,yaml]>=0.20.0",
+    "pillow>=10.0.0",
+    "numpy>=2.3.0",
+    "python-box>=7.0.0",
+    "argcomplete>=3.0.0",
+]
+authors = [
+    { name = "Stoupy51", email = "stoupy51@gmail.com" },
+]
+
+[project.optional-dependencies]
+docs = [
+    "mypy",
+    "m2r2",
+    "myst_parser",
+    "sphinx_copybutton",
+    "sphinx_design",
+    "sphinx_treeview",
+    "sphinx_breeze_theme",
+    "pydata_sphinx_theme",
+]
+data_science = [
+    "opencv-python",
+    "scikit-image",
+    "simpleitk",
+    "mlflow",
+    "tensorflow",
+    "scikit-learn",
+    "PyWavelets",
+]
+
+[project.urls]
+Homepage = "https://github.com/Stoupy51/stouputils"
+Issues = "https://github.com/Stoupy51/stouputils/issues"
+
+[project.scripts]
+stouputils = "stouputils.__main__:main"
+
+[tool.pyright]
+typeCheckingMode = "strict"
+
+[tool.ruff]
+exclude = [
+    ".git",
+    ".ruff_cache",
+    ".venv",
+    ".vscode",
+    ".cursor",
+    "build",
+    "dist",
+    "*.pyi",
+]
+line-length = 200
+
+[tool.ruff.lint]
+select = [
+    "E",
+    "W",
+    "F",
+    "I",
+    "N",
+    "UP",
+    "B",
+    "C4",
+    "T20",
+    "RUF",
+]
+ignore = [
+    "T201",
+    "W191",
+    "N803",
+    "N806",
+    "F403",
+    "F405",
+]
+
+[tool.hatch.build]
+include = [
+    "stouputils",
+]
+ignore-vcs = true
+

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/applications/automatic_docs.py

@@ -566,7 +566,7 @@ a:hover {
 	background-clip: text;
 	-webkit-background-clip: text;
 	-webkit-text-fill-color: transparent;
-	animation: shine-slide 2s linear infinite;
+	animation: shine-slide 3.5s linear infinite;
 }
 """)
 

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/collections.py

@@ -29,7 +29,7 @@ if TYPE_CHECKING:
 T = TypeVar("T")
 
 # Functions
-def unique_list(list_to_clean: Iterable[T], method: Literal["id", "hash", "str"] = "str") -> list[T]:
+def unique_list[T](list_to_clean: Iterable[T], method: Literal["id", "hash", "str"] = "str") -> list[T]:
 	""" Remove duplicates from the list while keeping the order using ids (default) or hash or str
 
 	Args:
@@ -77,7 +77,7 @@ def unique_list(list_to_clean: Iterable[T], method: Literal["id", "hash", "str"]
 	# Return the cleaned list
 	return result
 
-def sort_dict_keys(dictionary: dict[T, Any], order: list[T], reverse: bool = False) -> dict[T, Any]:
+def sort_dict_keys[T](dictionary: dict[T, Any], order: list[T], reverse: bool = False) -> dict[T, Any]:
 	""" Sort dictionary keys using a given order list (reverse optional)
 
 	Args:
@@ -185,7 +185,10 @@ def array_to_disk(
 		)
 
 	# Imports
-	import zarr  # pyright: ignore[reportMissingTypeStubs]
+	try:
+		import zarr  # pyright: ignore[reportMissingTypeStubs]
+	except ImportError as e:
+		raise ImportError("zarr is required for array_to_disk function. Please install it via 'pip install zarr'.") from e
 
 	# If data is already a zarr.Array and more_data is present, just append and return
 	if isinstance(data, zarr.Array) and more_data is not None:

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/collections.pyi

@@ -6,7 +6,7 @@ from typing import Any, Literal, TypeVar
 
 T = TypeVar('T')
 
-def unique_list(list_to_clean: Iterable[T], method: Literal['id', 'hash', 'str'] = 'str') -> list[T]:
+def unique_list[T](list_to_clean: Iterable[T], method: Literal['id', 'hash', 'str'] = 'str') -> list[T]:
     ''' Remove duplicates from the list while keeping the order using ids (default) or hash or str
 
 \tArgs:
@@ -31,7 +31,7 @@ def unique_list(list_to_clean: Iterable[T], method: Literal['id', 'hash', 'str']
 \t\t>>> unique_list([s1, s2, s1, s1, s3, s2, s3], method="str")
 \t\t[{1, 2, 3}, {2, 3, 4}]
 \t'''
-def sort_dict_keys(dictionary: dict[T, Any], order: list[T], reverse: bool = False) -> dict[T, Any]:
+def sort_dict_keys[T](dictionary: dict[T, Any], order: list[T], reverse: bool = False) -> dict[T, Any]:
     ''' Sort dictionary keys using a given order list (reverse optional)
 
 \tArgs:

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/continuous_delivery/cd_utils.py

@@ -63,9 +63,9 @@ def load_credentials(credentials_path: str) -> dict[str, Any]:
 
 	# Else, load the file if it's a YAML file
 	elif credentials_path.endswith((".yml", ".yaml")):
-		import yaml
+		from msgspec import yaml
 		with open(credentials_path) as f:
-			return yaml.safe_load(f)
+			return yaml.decode(f.read())
 
 	# Else, raise an error
 	else:
@@ -106,7 +106,7 @@ def clean_version(version: str, keep: str = "") -> str:
 	return "".join(c for c in version if c in "0123456789." + keep)
 
 # Convert a version string to a float
-def version_to_float(version: str) -> float:
+def version_to_float(version: str, error: bool = True) -> Any:
 	""" Converts a version string into a float for comparison purposes.
 	The version string is expected to follow the format of major.minor.patch.something_else....,
 	where each part is separated by a dot and can be extended indefinitely.
@@ -115,6 +115,7 @@ def version_to_float(version: str) -> float:
 
 	Args:
 		version (str): The version string to convert. (e.g. "v1.0.0.1.2.3", "v2.0.0b2", "v1.0.0rc1")
+		error (bool): Return None on error instead of raising an exception
 	Returns:
 		float: The float representation of the version. (e.g. 0)
 
@@ -175,62 +176,68 @@ def version_to_float(version: str) -> float:
 	>>> sorted_versions == versions
 	True
 	"""
-	# Check for pre-release suffixes and calculate suffix modifier
-	# Suffixes are ordered from longest to shortest to avoid partial matches
-	suffix_modifiers: dict[str, int] = {
-		"dev": 4,  # dev is lowest
-		"d": 4,    # d (dev) is lowest
-		"a": 3,    # alpha
-		"b": 2,    # beta
-		"rc": 1,   # rc is highest pre-release
-		"c": 1,    # c (release candidate)
-	}
-	suffix_type: int = 0  # 0 = no suffix, 1-4 = rc/c, b, a, dev/d
-	suffix_number: int = 0
-
-	# Check for suffixes with optional numbers
-	for suffix, modifier in suffix_modifiers.items():
-		if suffix in version:
-			# Find the suffix position
-			suffix_pos: int = version.rfind(suffix)
-			after_suffix: str = version[suffix_pos + len(suffix):]
-
-			# Check if there's a number after the suffix
-			if after_suffix.isdigit():
-				suffix_number = int(after_suffix)
-				version = version[:suffix_pos]
-			elif after_suffix == "":
-				# Suffix at the end without number
-				version = version[:suffix_pos]
-			else:
-				# Not a valid suffix match, continue searching
-				continue
-
-			# Found a valid suffix, set the type and break
-			suffix_type = modifier
-			break
-
-	# Clean the version string by keeping only the numbers and dots
-	version = clean_version(version)
-
-	# Split the version string into parts
-	version_parts: list[str] = version.split(".")
-	total: float = 0.0
-	multiplier: float = 1.0
-
-	# Iterate over the parts and add lesser and lesser weight to each part
-	for part in version_parts:
-		total += int(part) * multiplier
-		multiplier /= 1_000
-
-	# Apply pre-release modifier
-	# Pre-releases are represented as negative offsets from the base version
-	# Lower suffix_type = closer to release (rc=1 is closest, dev=4 is furthest)
-	# Higher suffix_number = closer to release within the same suffix type
-	# Formula: base_version - (suffix_type * 1000 - suffix_number) * 1e-9
-	# This ensures: 1.0.0 > 1.0.0rc2 > 1.0.0rc1 > 1.0.0b2 > 1.0.0a2 > 1.0.0dev2
-	if suffix_type > 0:
-		total -= (suffix_type * 1000 - suffix_number) * 1e-9
-
-	return total
+	try:
+		# Check for pre-release suffixes and calculate suffix modifier
+		# Suffixes are ordered from longest to shortest to avoid partial matches
+		suffix_modifiers: dict[str, int] = {
+			"dev": 4,  # dev is lowest
+			"d": 4,    # d (dev) is lowest
+			"a": 3,    # alpha
+			"b": 2,    # beta
+			"rc": 1,   # rc is highest pre-release
+			"c": 1,    # c (release candidate)
+		}
+		suffix_type: int = 0  # 0 = no suffix, 1-4 = rc/c, b, a, dev/d
+		suffix_number: int = 0
+
+		# Check for suffixes with optional numbers
+		for suffix, modifier in suffix_modifiers.items():
+			if suffix in version:
+				# Find the suffix position
+				suffix_pos: int = version.rfind(suffix)
+				after_suffix: str = version[suffix_pos + len(suffix):]
+
+				# Check if there's a number after the suffix
+				if after_suffix.isdigit():
+					suffix_number = int(after_suffix)
+					version = version[:suffix_pos]
+				elif after_suffix == "":
+					# Suffix at the end without number
+					version = version[:suffix_pos]
+				else:
+					# Not a valid suffix match, continue searching
+					continue
+
+				# Found a valid suffix, set the type and break
+				suffix_type = modifier
+				break
+
+		# Clean the version string by keeping only the numbers and dots
+		version = clean_version(version)
+
+		# Split the version string into parts
+		version_parts: list[str] = version.split(".")
+		total: float = 0.0
+		multiplier: float = 1.0
+
+		# Iterate over the parts and add lesser and lesser weight to each part
+		for part in version_parts:
+			total += int(part) * multiplier
+			multiplier /= 1_000
+
+		# Apply pre-release modifier
+		# Pre-releases are represented as negative offsets from the base version
+		# Lower suffix_type = closer to release (rc=1 is closest, dev=4 is furthest)
+		# Higher suffix_number = closer to release within the same suffix type
+		# Formula: base_version - (suffix_type * 1000 - suffix_number) * 1e-9
+		# This ensures: 1.0.0 > 1.0.0rc2 > 1.0.0rc1 > 1.0.0b2 > 1.0.0a2 > 1.0.0dev2
+		if suffix_type > 0:
+			total -= (suffix_type * 1000 - suffix_number) * 1e-9
+
+		return total
+	except Exception as e:
+		if error:
+			raise ValueError(f"Invalid version string: '{version}'") from e
+		else:
+			return None # type: ignore
 

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/continuous_delivery/cd_utils.pyi

@@ -57,7 +57,7 @@ def clean_version(version: str, keep: str = '') -> str:
 \t>>> clean_version("v1.2.3b", keep="ab")
 \t\'1.2.3b\'
 \t'''
-def version_to_float(version: str) -> float:
+def version_to_float(version: str, error: bool = True) -> Any:
     ''' Converts a version string into a float for comparison purposes.
 \tThe version string is expected to follow the format of major.minor.patch.something_else....,
 \twhere each part is separated by a dot and can be extended indefinitely.
@@ -66,6 +66,7 @@ def version_to_float(version: str) -> float:
 
 \tArgs:
 \t\tversion (str): The version string to convert. (e.g. "v1.0.0.1.2.3", "v2.0.0b2", "v1.0.0rc1")
+\t\terror (bool): Return None on error instead of raising an exception
 \tReturns:
 \t\tfloat: The float representation of the version. (e.g. 0)
 

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/continuous_delivery/pyproject.py

@@ -25,12 +25,17 @@ def read_pyproject(pyproject_path: str) -> dict[str, Any]:
 
 	Args:
 		pyproject_path: Path to the pyproject.toml file.
-
 	Returns:
 		dict[str, Any]: The content of the pyproject.toml file.
+	Example:
+		>>> content = read_pyproject("pyproject.toml")
+		>>> "." in content["project"]["version"]
+		True
 	"""
-	import toml
-	return toml.load(pyproject_path)
+	from msgspec import toml
+	with open(pyproject_path) as file:
+		content = file.read()
+	return toml.decode(content)
 
 
 def format_toml_lists(content: str) -> str:
@@ -38,9 +43,18 @@ def format_toml_lists(content: str) -> str:
 
 	Args:
 		content (str): The content of the pyproject.toml file.
-
 	Returns:
 		str: The formatted content with properly indented lists.
+	Example:
+		>>> toml_content = '''[project]
+		... dependencies = [ "tqdm>=4.0.0", "requests>=2.20.0", "pyyaml>=6.0.0", ]'''
+		>>> format_toml_lists(toml_content).replace("\\t", "    ") == '''[project]
+		... dependencies = [
+		...     "tqdm>=4.0.0",
+		...     "requests>=2.20.0",
+		...     "pyyaml>=6.0.0",
+		... ]'''
+		True
 	"""
 	# Split the content into individual lines for processing
 	lines: list[str] = content.split("\n")
@@ -78,14 +92,20 @@ def format_toml_lists(content: str) -> str:
 	return "\n".join(formatted_lines)
 
 
-def write_pyproject(pyproject_path: str, pyproject_content: dict[str, Any]) -> None:
-	""" Write to the pyproject.toml file with properly indented lists. """
-	import toml
-	content: str = "\n" + toml.dumps(pyproject_content) + "\n"
-	content = format_toml_lists(content)  # Apply formatting
+def write_pyproject(path: str, content: dict[str, Any]) -> None:
+	""" Write to the pyproject.toml file with properly indented lists.
+
+	Args:
+		path: Path to the pyproject.toml file.
+		content: Content to write to the pyproject.toml file.
+	"""
+	from msgspec.toml import _import_tomli_w  # pyright: ignore[reportPrivateUsage]
+	toml = _import_tomli_w()
+	string: str = "\n" + toml.dumps(content) + "\n"
+	string = format_toml_lists(string)  # Apply formatting
 
-	with super_open(pyproject_path, "w") as file:
-		file.write(content)
+	with super_open(path, "w") as file:
+		file.write(string)
 
 
 def increment_version_from_input(version: str) -> str:
@@ -93,32 +113,35 @@ def increment_version_from_input(version: str) -> str:
 
 	Args:
 		version: The version to increment. (ex: "0.1.0")
-
 	Returns:
 		str: The incremented version. (ex: "0.1.1")
+	Example:
+		>>> increment_version_from_input("0.1.0")
+		'0.1.1'
+		>>> increment_version_from_input("1.2.9")
+		'1.2.10'
 	"""
 	version_parts: list[str] = version.split(".")
 	version_parts[-1] = str(int(version_parts[-1]) + 1)
 	return ".".join(version_parts)
 
-def increment_version_from_pyproject(pyproject_path: str) -> None:
+def increment_version_from_pyproject(path: str) -> None:
 	""" Increment the version in the pyproject.toml file.
 
 	Args:
-		pyproject_path: Path to the pyproject.toml file.
+		path: Path to the pyproject.toml file.
 	"""
-	pyproject_content: dict[str, Any] = read_pyproject(pyproject_path)
+	pyproject_content: dict[str, Any] = read_pyproject(path)
 	pyproject_content["project"]["version"] = increment_version_from_input(pyproject_content["project"]["version"])
-	write_pyproject(pyproject_path, pyproject_content)
+	write_pyproject(path, pyproject_content)
 
-def get_version_from_pyproject(pyproject_path: str) -> str:
+def get_version_from_pyproject(path: str) -> str:
 	""" Get the version from the pyproject.toml file.
 
 	Args:
-		pyproject_path: Path to the pyproject.toml file.
-
+		path: Path to the pyproject.toml file.
 	Returns:
 		str: The version. (ex: "0.1.0")
 	"""
-	return read_pyproject(pyproject_path)["project"]["version"]
+	return read_pyproject(path)["project"]["version"]
 

stouputils-1.12.0/stouputils/continuous_delivery/pyproject.pyi

@@ -0,0 +1,67 @@
+from ..io import super_open as super_open
+from typing import Any
+
+def read_pyproject(pyproject_path: str) -> dict[str, Any]:
+    ''' Read the pyproject.toml file.
+
+\tArgs:
+\t\tpyproject_path: Path to the pyproject.toml file.
+\tReturns:
+\t\tdict[str, Any]: The content of the pyproject.toml file.
+\tExample:
+\t\t>>> content = read_pyproject("pyproject.toml")
+\t\t>>> "." in content["project"]["version"]
+\t\tTrue
+\t'''
+def format_toml_lists(content: str) -> str:
+    ''' Format TOML lists with indentation.
+
+\tArgs:
+\t\tcontent (str): The content of the pyproject.toml file.
+\tReturns:
+\t\tstr: The formatted content with properly indented lists.
+\tExample:
+\t\t>>> toml_content = \'\'\'[project]
+\t\t... dependencies = [ "tqdm>=4.0.0", "requests>=2.20.0", "pyyaml>=6.0.0", ]\'\'\'
+\t\t>>> format_toml_lists(toml_content).replace("\\t", "    ") == \'\'\'[project]
+\t\t... dependencies = [
+\t\t...     "tqdm>=4.0.0",
+\t\t...     "requests>=2.20.0",
+\t\t...     "pyyaml>=6.0.0",
+\t\t... ]\'\'\'
+\t\tTrue
+\t'''
+def write_pyproject(path: str, content: dict[str, Any]) -> None:
+    """ Write to the pyproject.toml file with properly indented lists.
+
+\tArgs:
+\t\tpath: Path to the pyproject.toml file.
+\t\tcontent: Content to write to the pyproject.toml file.
+\t"""
+def increment_version_from_input(version: str) -> str:
+    ''' Increment the version.
+
+\tArgs:
+\t\tversion: The version to increment. (ex: "0.1.0")
+\tReturns:
+\t\tstr: The incremented version. (ex: "0.1.1")
+\tExample:
+\t\t>>> increment_version_from_input("0.1.0")
+\t\t\'0.1.1\'
+\t\t>>> increment_version_from_input("1.2.9")
+\t\t\'1.2.10\'
+\t'''
+def increment_version_from_pyproject(path: str) -> None:
+    """ Increment the version in the pyproject.toml file.
+
+\tArgs:
+\t\tpath: Path to the pyproject.toml file.
+\t"""
+def get_version_from_pyproject(path: str) -> str:
+    ''' Get the version from the pyproject.toml file.
+
+\tArgs:
+\t\tpath: Path to the pyproject.toml file.
+\tReturns:
+\t\tstr: The version. (ex: "0.1.0")
+\t'''

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/continuous_delivery/stubs.py

@@ -26,7 +26,10 @@ def generate_stubs(
 	Returns:
 		int: Return code of the os.system call.
 	"""
-	from mypy.stubgen import main as stubgen_main
+	try:
+		from mypy.stubgen import main as stubgen_main
+	except ImportError as e:
+		raise ImportError("mypy is required for array_to_disk function. Please install it via 'pip install mypy'.") from e
 	try:
 		stubgen_main(["-p", package_name, *extra_args.split()])
 		return 0

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/ctx.py

@@ -29,7 +29,7 @@ from .print import TeeMultiOutput, debug
 T = TypeVar("T")
 
 # Abstract base class for context managers supporting both sync and async usage
-class AbstractBothContextManager(AbstractContextManager[T], AbstractAsyncContextManager[T]):
+class AbstractBothContextManager[T](AbstractContextManager[T], AbstractAsyncContextManager[T]):
     """ Abstract base class for context managers that support both synchronous and asynchronous usage. """
     pass
 

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/ctx.pyi

@@ -7,7 +7,7 @@ from typing import Any, IO, TextIO, TypeVar
 
 T = TypeVar('T')
 
-class AbstractBothContextManager(AbstractContextManager[T], AbstractAsyncContextManager[T], metaclass=abc.ABCMeta):
+class AbstractBothContextManager[T](AbstractContextManager[T], AbstractAsyncContextManager[T], metaclass=abc.ABCMeta):
     """ Abstract base class for context managers that support both synchronous and asynchronous usage. """
 
 class LogToFile(AbstractBothContextManager['LogToFile']):

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/image.py

@@ -25,7 +25,7 @@ if TYPE_CHECKING:
 PIL_Image_or_NDArray = TypeVar("PIL_Image_or_NDArray", bound="Image.Image | NDArray[np.number]")
 
 # Functions
-def image_resize(
+def image_resize[PIL_Image_or_NDArray](
 	image: PIL_Image_or_NDArray,
 	max_result_size: int,
 	resampling: "Image.Resampling | None" = None,
@@ -83,7 +83,7 @@ def image_resize(
 	original_was_pil: bool = isinstance(image, Image.Image)
 
 	# Convert numpy array to PIL Image if needed
-	if isinstance(image, np.ndarray):
+	if not original_was_pil:
 		image = Image.fromarray(image)
 
 	if keep_aspect_ratio:
@@ -121,7 +121,7 @@ def image_resize(
 		return new_image
 
 
-def auto_crop(
+def auto_crop[PIL_Image_or_NDArray](
 	image: PIL_Image_or_NDArray,
 	mask: "NDArray[np.bool_] | None" = None,
 	threshold: int | float | Callable[["NDArray[np.number]"], int | float] | None = None,
@@ -135,7 +135,7 @@ def auto_crop(
 
 	Args:
 		image       (Image.Image | NDArray):	  The image to crop.
-		mask        (NDArray[np.bool_] | None):   Optional binary mask indicating regions to keep.
+		mask        (NDArray[bool] | None):       Optional binary mask indicating regions to keep.
 		threshold   (int | float | Callable):     Threshold value or function (default: np.min).
 		return_type (type | str):                 Type of the return value (Image.Image, NDArray[np.number], or "same" to match input type).
 		contiguous  (bool):                       If True (default), crop to bounding box. If False, remove entire rows/columns with no content.

{stouputils-1.10.4 → stouputils-1.12.0}/stouputils/image.pyi

@@ -8,7 +8,7 @@ from typing import Any, TypeVar
 
 PIL_Image_or_NDArray = TypeVar('PIL_Image_or_NDArray', bound='Image.Image | NDArray[np.number]')
 
-def image_resize(image: PIL_Image_or_NDArray, max_result_size: int, resampling: Image.Resampling | None = None, min_or_max: Callable[[int, int], int] = ..., return_type: type[PIL_Image_or_NDArray] | str = 'same', keep_aspect_ratio: bool = True) -> Any:
+def image_resize[PIL_Image_or_NDArray](image: PIL_Image_or_NDArray, max_result_size: int, resampling: Image.Resampling | None = None, min_or_max: Callable[[int, int], int] = ..., return_type: type[PIL_Image_or_NDArray] | str = 'same', keep_aspect_ratio: bool = True) -> Any:
     ''' Resize an image while preserving its aspect ratio by default.
 \tScales the image so that its largest dimension equals max_result_size.
 
@@ -47,7 +47,7 @@ def image_resize(image: PIL_Image_or_NDArray, max_result_size: int, resampling:
 \t\t>>> image_resize(pil_image, 50, resampling=Image.Resampling.NEAREST).size
 \t\t(50, 25)
 \t'''
-def auto_crop(image: PIL_Image_or_NDArray, mask: NDArray[np.bool_] | None = None, threshold: int | float | Callable[[NDArray[np.number]], int | float] | None = None, return_type: type[PIL_Image_or_NDArray] | str = 'same', contiguous: bool = True) -> Any:
+def auto_crop[PIL_Image_or_NDArray](image: PIL_Image_or_NDArray, mask: NDArray[np.bool_] | None = None, threshold: int | float | Callable[[NDArray[np.number]], int | float] | None = None, return_type: type[PIL_Image_or_NDArray] | str = 'same', contiguous: bool = True) -> Any:
     ''' Automatically crop an image to remove zero or uniform regions.
 
 \tThis function crops the image to keep only the region where pixels are non-zero
@@ -55,7 +55,7 @@ def auto_crop(image: PIL_Image_or_NDArray, mask: NDArray[np.bool_] | None = None
 
 \tArgs:
 \t\timage       (Image.Image | NDArray):\t  The image to crop.
-\t\tmask        (NDArray[np.bool_] | None):   Optional binary mask indicating regions to keep.
+\t\tmask        (NDArray[bool] | None):       Optional binary mask indicating regions to keep.
 \t\tthreshold   (int | float | Callable):     Threshold value or function (default: np.min).
 \t\treturn_type (type | str):                 Type of the return value (Image.Image, NDArray[np.number], or "same" to match input type).
 \t\tcontiguous  (bool):                       If True (default), crop to bounding box. If False, remove entire rows/columns with no content.