stouputils 1.18.5__py3-none-any.whl → 1.18.6__py3-none-any.whl

stouputils/all_doctests.py

@@ -94,15 +94,22 @@ def launch_tests(root_dir: str, strict: bool = True, pattern: str = "*") -> int:
 	if not modules_file_paths:
 		raise ValueError(f"No modules found in '{relative_path(root_dir)}'")
 
+	# Sort module by number of submodules and alphabetically
+	modules_file_paths.sort(key=lambda x: (x.count('.'), x))
+
 	# Filter modules based on pattern
 	if pattern != "*":
 		import fnmatch
-		modules_file_paths = [
+		new_paths: list[str] = [
 			path for path in modules_file_paths
 			if fnmatch.fnmatch(path, pattern)
 		]
-		if not modules_file_paths:
-			raise ValueError(f"No modules matching pattern '{pattern}' found in '{relative_path(root_dir)}'")
+		if not new_paths:
+			raise ValueError(
+				f"No modules matching pattern '{pattern}' found in '{relative_path(root_dir)}'.\n"
+				f"Candidates were: {', '.join(relative_path(p) for p in modules_file_paths)[:500]}..."
+			)
+		modules_file_paths = new_paths
 
 	# Find longest module path for alignment
 	max_length: int = max(len(path) for path in modules_file_paths)

stouputils/print.py

@@ -107,45 +107,67 @@ def format_colored(*values: Any) -> str:
 	Examples:
 		>>> # Test function names with parentheses
 		>>> result = format_colored("Call print() with 42 items")
-		>>> result.count(MAGENTA) == 2  # print and 42
-		True
+		>>> result.count(MAGENTA)  # print and 42
+		2
 
 		>>> # Test function names without parentheses
 		>>> result = format_colored("Use len and sum functions")
-		>>> result.count(MAGENTA) == 2  # len and sum
-		True
+		>>> result.count(MAGENTA)  # len and sum
+		2
 
 		>>> # Test exceptions (bold magenta)
 		>>> result = format_colored("Got ValueError when parsing")
-		>>> result.count(MAGENTA) == 1 and result.count(BOLD) == 1  # ValueError in bold magenta
-		True
+		>>> result.count(MAGENTA), result.count(BOLD)  # ValueError in bold magenta
+		(1, 1)
 
 		>>> # Test file paths
 		>>> result = format_colored("Processing ./data.csv file")
-		>>> result.count(MAGENTA) == 1  # ./data.csv
-		True
+		>>> result.count(MAGENTA)  # ./data.csv
+		1
 
 		>>> # Test file paths with quotes
 		>>> result = format_colored('File "/path/to/script.py" line 42')
-		>>> result.count(MAGENTA) == 2  # /path/to/script.py and 42
-		True
+		>>> result.count(MAGENTA)  # /path/to/script.py and 42
+		2
 
 		>>> # Test numbers
-		>>> result = format_colored("Found 100 items and 3.14 value")
-		>>> result.count(MAGENTA) == 2  # 100 and 3.14
-		True
+		>>> result = format_colored("Found 100 items and 3.14 value, 3.0e+10 is big")
+		>>> result.count(MAGENTA)  # 100 and 3.14
+		3
 
 		>>> # Test mixed content
 		>>> result = format_colored("Call sum() got IndexError at line 256 in utils.py")
-		>>> result.count(MAGENTA) == 3  # sum, IndexError (bold), and 256
-		True
-		>>> result.count(BOLD) == 1  # IndexError is bold
-		True
+		>>> result.count(MAGENTA)  # sum, IndexError (bold), and 256
+		3
+		>>> result.count(BOLD)  # IndexError is bold
+		1
+
+		>>> # Test keywords always colored
+		>>> result = format_colored("Check class dtype type")
+		>>> result.count(MAGENTA)  # class, dtype, type
+		3
 
 		>>> # Test plain text (no coloring)
 		>>> result = format_colored("This is plain text")
 		>>> result.count(MAGENTA) == 0 and result == "This is plain text"
 		True
+
+		>>> # Affix punctuation should not be colored (assert exact coloring, punctuation uncolored)
+		>>> result = format_colored("<class")
+		>>> result == "<" + MAGENTA + "class" + RESET
+		True
+		>>> result = format_colored("(dtype:")
+		>>> result == "(" + MAGENTA + "dtype" + RESET + ":"
+		True
+		>>> result = format_colored("[1.")
+		>>> result == "[" + MAGENTA + "1" + RESET + "."
+		True
+
+		>>> # Test complex
+		>>> text = "<class 'numpy.ndarray'>, <id 140357548266896>: (dtype: float32, shape: (6,), min: 0.0, max: 1.0) [1. 0. 0. 0. 1. 0.]"
+		>>> result = format_colored(text)
+		>>> result.count(MAGENTA)  # class, numpy, ndarray, float32, 6, 0.0, 1.0, 1. 0.
+		16
 	"""
 	import builtins
 	import re
@@ -163,6 +185,9 @@ def format_colored(*values: Any) -> str:
 			and issubclass(getattr(builtins, name), BaseException))
 	}
 
+	# Additional keywords always colored (case-insensitive on stripped words)
+	KEYWORDS: set[str] = {"class", "dtype", "type"}
+
 	def is_filepath(word: str) -> bool:
 		""" Check if a word looks like a file path """
 		# Remove quotes if present
@@ -187,7 +212,7 @@ def format_colored(*values: Any) -> str:
 
 	def is_number(word: str) -> bool:
 		try:
-			float(word.strip('.,;:!?'))
+			float(''.join(c for c in word if c.isdigit() or c in '.-+e'))
 			return True
 		except ValueError:
 			return False
@@ -201,7 +226,22 @@ def format_colored(*values: Any) -> str:
 
 	def is_exception(word: str) -> bool:
 		""" Check if a word is a known exception name """
-		return word.strip('.,;:!?') in EXCEPTION_NAMES
+		return ''.join(c for c in word if c.isalnum()) in EXCEPTION_NAMES
+
+	def is_keyword(word: str) -> bool:
+		""" Check if a word is one of the always-colored keywords """
+		clean_alnum = ''.join(c for c in word if c.isalnum())
+		return clean_alnum in KEYWORDS
+
+	def split_affixes(w: str) -> tuple[str, str, str]:
+		""" Split leading/trailing non-word characters and return (prefix, core, suffix).
+
+		This preserves punctuation like '<', '(', '[', '"', etc., while operating on the core text.
+		"""
+		m = re.match(r'^(\W*)(.*?)(\W*)$', w, re.ASCII)
+		if m:
+			return m.group(1), m.group(2), m.group(3)
+		return "", w, ""
 
 	# Convert all values to strings and join them and split into words while preserving separators
 	text: str = " ".join(str(v) for v in values)
@@ -219,36 +259,43 @@ def format_colored(*values: Any) -> str:
 			i += 1
 			continue
 
-		# Try to identify and color the word
+		# If the whole token looks like a filepath (e.g. './data.csv' or '/path/to/file'), color it as-is
 		colored: bool = False
 		if is_filepath(word):
 			colored_words.append(f"{MAGENTA}{word}{RESET}")
 			colored = True
-		elif is_exception(word):
-			colored_words.append(f"{BOLD}{MAGENTA}{word}{RESET}")
-			colored = True
-		elif is_number(word):
-			# Preserve punctuation
-			clean_word = word.strip('.,;:!?')
-			prefix = word[:len(word) - len(word.lstrip('.,;:!?'))]
-			suffix = word[len(clean_word) + len(prefix):]
-			colored_words.append(f"{prefix}{MAGENTA}{clean_word}{RESET}{suffix}")
-			colored = True
-		elif is_function_name(word)[0]:
-			func_name = is_function_name(word)[1]
-			# Find where the function name ends in the original word
-			func_start = word.find(func_name)
-			if func_start != -1:
-				prefix = word[:func_start]
-				func_end = func_start + len(func_name)
-				suffix = word[func_end:]
-				colored_words.append(f"{prefix}{MAGENTA}{func_name}{RESET}{suffix}")
-			else:
-				# Fallback if we can't find it (shouldn't happen)
-				colored_words.append(f"{MAGENTA}{word}{RESET}")
-			colored = True
+		else:
+			# Split affixes to preserve punctuation like '<', '(', '[' etc.
+			prefix, core, suffix = split_affixes(word)
+
+			# Try to identify and color the word (operate on core where applicable)
+			if is_filepath(core):
+				colored_words.append(f"{prefix}{MAGENTA}{core}{RESET}{suffix}")
+				colored = True
+			elif is_exception(core):
+				colored_words.append(f"{prefix}{BOLD}{MAGENTA}{core}{RESET}{suffix}")
+				colored = True
+			elif is_number(core):
+				colored_words.append(f"{prefix}{MAGENTA}{core}{RESET}{suffix}")
+				colored = True
+			elif is_keyword(core):
+				colored_words.append(f"{prefix}{MAGENTA}{core}{RESET}{suffix}")
+				colored = True
+			elif is_function_name(core)[0]:
+				func_name = is_function_name(core)[1]
+				# Find where the function name ends in the core
+				func_start = core.find(func_name)
+				if func_start != -1:
+					pre_core = core[:func_start]
+					func_end = func_start + len(func_name)
+					post_core = core[func_end:]
+					colored_words.append(f"{prefix}{pre_core}{MAGENTA}{func_name}{RESET}{post_core}{suffix}")
+				else:
+					# Fallback if we can't find it (shouldn't happen)
+					colored_words.append(f"{prefix}{MAGENTA}{core}{RESET}{suffix}")
+				colored = True
 
-		# If nothing matched, keep the word as is
+		# If nothing matched, keep the original word
 		if not colored:
 			colored_words.append(word)
 		i += 1

stouputils/print.pyi

@@ -53,45 +53,67 @@ def format_colored(*values: Any) -> str:
 \tExamples:
 \t\t>>> # Test function names with parentheses
 \t\t>>> result = format_colored("Call print() with 42 items")
-\t\t>>> result.count(MAGENTA) == 2  # print and 42
-\t\tTrue
+\t\t>>> result.count(MAGENTA)  # print and 42
+\t\t2
 
 \t\t>>> # Test function names without parentheses
 \t\t>>> result = format_colored("Use len and sum functions")
-\t\t>>> result.count(MAGENTA) == 2  # len and sum
-\t\tTrue
+\t\t>>> result.count(MAGENTA)  # len and sum
+\t\t2
 
 \t\t>>> # Test exceptions (bold magenta)
 \t\t>>> result = format_colored("Got ValueError when parsing")
-\t\t>>> result.count(MAGENTA) == 1 and result.count(BOLD) == 1  # ValueError in bold magenta
-\t\tTrue
+\t\t>>> result.count(MAGENTA), result.count(BOLD)  # ValueError in bold magenta
+\t\t(1, 1)
 
 \t\t>>> # Test file paths
 \t\t>>> result = format_colored("Processing ./data.csv file")
-\t\t>>> result.count(MAGENTA) == 1  # ./data.csv
-\t\tTrue
+\t\t>>> result.count(MAGENTA)  # ./data.csv
+\t\t1
 
 \t\t>>> # Test file paths with quotes
 \t\t>>> result = format_colored(\'File "/path/to/script.py" line 42\')
-\t\t>>> result.count(MAGENTA) == 2  # /path/to/script.py and 42
-\t\tTrue
+\t\t>>> result.count(MAGENTA)  # /path/to/script.py and 42
+\t\t2
 
 \t\t>>> # Test numbers
-\t\t>>> result = format_colored("Found 100 items and 3.14 value")
-\t\t>>> result.count(MAGENTA) == 2  # 100 and 3.14
-\t\tTrue
+\t\t>>> result = format_colored("Found 100 items and 3.14 value, 3.0e+10 is big")
+\t\t>>> result.count(MAGENTA)  # 100 and 3.14
+\t\t3
 
 \t\t>>> # Test mixed content
 \t\t>>> result = format_colored("Call sum() got IndexError at line 256 in utils.py")
-\t\t>>> result.count(MAGENTA) == 3  # sum, IndexError (bold), and 256
-\t\tTrue
-\t\t>>> result.count(BOLD) == 1  # IndexError is bold
-\t\tTrue
+\t\t>>> result.count(MAGENTA)  # sum, IndexError (bold), and 256
+\t\t3
+\t\t>>> result.count(BOLD)  # IndexError is bold
+\t\t1
+
+\t\t>>> # Test keywords always colored
+\t\t>>> result = format_colored("Check class dtype type")
+\t\t>>> result.count(MAGENTA)  # class, dtype, type
+\t\t3
 
 \t\t>>> # Test plain text (no coloring)
 \t\t>>> result = format_colored("This is plain text")
 \t\t>>> result.count(MAGENTA) == 0 and result == "This is plain text"
 \t\tTrue
+
+\t\t>>> # Affix punctuation should not be colored (assert exact coloring, punctuation uncolored)
+\t\t>>> result = format_colored("<class")
+\t\t>>> result == "<" + MAGENTA + "class" + RESET
+\t\tTrue
+\t\t>>> result = format_colored("(dtype:")
+\t\t>>> result == "(" + MAGENTA + "dtype" + RESET + ":"
+\t\tTrue
+\t\t>>> result = format_colored("[1.")
+\t\t>>> result == "[" + MAGENTA + "1" + RESET + "."
+\t\tTrue
+
+\t\t>>> # Test complex
+\t\t>>> text = "<class \'numpy.ndarray\'>, <id 140357548266896>: (dtype: float32, shape: (6,), min: 0.0, max: 1.0) [1. 0. 0. 0. 1. 0.]"
+\t\t>>> result = format_colored(text)
+\t\t>>> result.count(MAGENTA)  # class, numpy, ndarray, float32, 6, 0.0, 1.0, 1. 0.
+\t\t16
 \t'''
 def colored(*values: Any, file: TextIO | None = None, **print_kwargs: Any) -> None:
     ''' Print with Python 3.14 style colored formatting.

{stouputils-1.18.5.dist-info → stouputils-1.18.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stouputils
-Version: 1.18.5
+Version: 1.18.6
 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.
 Keywords: utilities,tools,helpers,development,python
 Author: Stoupy51

{stouputils-1.18.5.dist-info → stouputils-1.18.6.dist-info}/RECORD

@@ -3,7 +3,7 @@ stouputils/__init__.pyi,sha256=T8-ovn3Kl5CxYtBjJJ5AzR2qujECMI1Biwahz0nooBo,395
 stouputils/__main__.py,sha256=MA3jjc1yL8_0Z9oB55BMqrFq1ot_-e5rNqSxFQGsMzs,2910
 stouputils/_deprecated.py,sha256=Bcq6YjdM9Rk9Vq-WMhc_tuEbPORX6U8HAJ9Vh-VIWTA,1478
 stouputils/_deprecated.pyi,sha256=6-8YsftJd2fRAdBLsysc6jf-uA8V2wiqkiFAbdfWfJQ,664
-stouputils/all_doctests.py,sha256=alihPKBSdOBuNBQu7zoyYowN1PumZwuemUZOFvfGFrk,6313
+stouputils/all_doctests.py,sha256=jQ7HXWoj2VTUbsu8eBq7EiW9mbx-_yXycdpS1fD8Tro,6566
 stouputils/all_doctests.pyi,sha256=R3FRKaQv3sTZbxLvvsChHZZKygVMhmL6pqrYYLqvZCg,2017
 stouputils/applications/__init__.py,sha256=dbjwZt8PZF043KoJSItqCpH32FtRxN5sgV-8Q2b1l10,457
 stouputils/applications/__init__.pyi,sha256=DTYq2Uqq1uLzCMkFByjRqdtREA-9SaQnp4QpgmCEPFg,56
@@ -149,14 +149,14 @@ stouputils/parallel/multi.py,sha256=tHJgcQJwsI6QeKEHoGJC4tsVK_6t1Fazkb06i1u-W_8,
 stouputils/parallel/multi.pyi,sha256=DWolZn1UoXxOfuw7LqEJcU8aQJsN-_DRhPGJlJCA5pQ,8021
 stouputils/parallel/subprocess.py,sha256=LWbwwAmnz54dCz9TAcKNg1TOMCVSP0C-0GIXaS5nVx0,6728
 stouputils/parallel/subprocess.pyi,sha256=gzRtpTslvoENLtSNk79fe3Xz8lV3IwuopT9uMHW9BTU,3680
-stouputils/print.py,sha256=WITobaFWrnVfrE4YRwHTRzf6H6V0BhxSIoQ9LRIrRiQ,24831
-stouputils/print.pyi,sha256=GOgbg7YomG-D9n2hcM0bUOaUU1PBjazWIn4vUSBYDDU,10365
+stouputils/print.py,sha256=86Qjyyj_riU7w3RQdYIHTlPVICUzKsfEBF6NBwZc20g,26745
+stouputils/print.pyi,sha256=qu7Pr1c6let2fLcBvbfrrcfCg0s3rf_1jD8FDhR1bgk,11188
 stouputils/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 stouputils/typing.py,sha256=TwvxrvxhBRkyHkoOpfyXebN13M3xJb8MAjKXiNIWjew,2205
 stouputils/typing.pyi,sha256=U2UmFZausMYpnsUQROQE2JOwHcjx2hKV0rJuOdR57Ew,1341
 stouputils/version_pkg.py,sha256=Jsp-s03L14DkiZ94vQgrlQmaxApfn9DC8M_nzT1SJLk,7014
 stouputils/version_pkg.pyi,sha256=QPvqp1U3QA-9C_CC1dT9Vahv1hXEhstbM7x5uzMZSsQ,755
-stouputils-1.18.5.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
-stouputils-1.18.5.dist-info/entry_points.txt,sha256=tx0z9VOnE-sfkmbFbA93zaBMzV3XSsKEJa_BWIqUzxw,57
-stouputils-1.18.5.dist-info/METADATA,sha256=EZJ0wIP6L2MHi74YnsJio3ofTMjC4k5ca9tlf6OSXmM,14011
-stouputils-1.18.5.dist-info/RECORD,,
+stouputils-1.18.6.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
+stouputils-1.18.6.dist-info/entry_points.txt,sha256=tx0z9VOnE-sfkmbFbA93zaBMzV3XSsKEJa_BWIqUzxw,57
+stouputils-1.18.6.dist-info/METADATA,sha256=w_R6exClXWoaJI171uO0hX5rZ3oh3hTvCtCua1di9RM,14011
+stouputils-1.18.6.dist-info/RECORD,,