hunterMakesPy 0.7.1__tar.gz → 0.7.3__tar.gz

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hunterMakesPy
-Version: 0.7.1
+Version: 0.7.3
 Summary: Easy Python functions making making functional Python functions easier.
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License-Expression: CC-BY-NC-4.0
@@ -9,13 +9,11 @@ Project-URL: Donate, https://www.patreon.com/integrated
 Project-URL: Homepage, https://github.com/hunterhogan/hunterMakesPy
 Project-URL: Issues, https://github.com/hunterhogan/hunterMakesPy/issues
 Project-URL: Repository, https://github.com/hunterhogan/hunterMakesPy
-Keywords: attribute loading,configuration,defensive programming,dictionary merging,dynamic import,file system utilities,input validation,module loading,package settings,parameter validation
+Keywords: input validation,module loading,package settings,parameter validation
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: Other Audience
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -27,6 +25,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: Z0Z_tools>=2.2.1
 Requires-Dist: autoflake
 Requires-Dist: charset_normalizer
 Requires-Dist: isort

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/hunterMakesPy/dataStructures.py

@@ -17,8 +17,11 @@ Functions
 from __future__ import annotations
 
 from charset_normalizer import CharsetMatch
+from collections.abc import Hashable
+from humpy_cytoolz.dicttoolz import valmap
+from humpy_cytoolz.functoolz import compose
 from types import FunctionType
-from typing import cast, TYPE_CHECKING
+from typing import cast, TYPE_CHECKING, TypeVar
 import charset_normalizer
 import more_itertools
 import re as regex
@@ -173,7 +176,7 @@ def autoDecodingRLE(arrayTarget: NDArray[integer[Any]], *, assumeAddSpaces: bool
 	arrayAsStr = patternRegex.sub(replacementByContext, arrayAsStr)
 	arrayAsStr = patternRegex.sub(replacementByContext, arrayAsStr)
 
-	# Replace `range(0,stop)` syntax with `range(stop)` syntax.
+	# .replace `range(0,stop)` syntax with `range(stop)` syntax.
 	# Add unpack operator `*` for automatic decoding when evaluated.
 	return arrayAsStr.replace('range(0,', 'range(').replace('range', '*range')
 
@@ -239,14 +242,17 @@ def stringItUp(*scrapPile: Any) -> list[str]:
 		listStrungUp.append(repr(scrap))
 	return listStrungUp
 
-def updateExtendPolishDictionaryLists(*dictionaryLists: Mapping[str, list[小于] | set[小于] | tuple[小于, ...]], destroyDuplicates: bool = False, reorderLists: bool = False, killErroneousDataTypes: bool = False) -> dict[str, list[小于]]:
+文件 = TypeVar('文件', bound=Hashable)
+
+# TODO if `reorderLists: bool = False`, the elements do not need to be ordinals, and they should be covariant.
+def updateExtendPolishDictionaryLists(*dictionaryLists: Mapping[文件, list[小于] | set[小于] | tuple[小于, ...]], destroyDuplicates: bool = False, reorderLists: bool = False, killErroneousDataTypes: bool = False) -> dict[文件, list[小于]]:
 	"""Merge multiple dictionaries with `list` values into a single dictionary with the `list` values merged.
 
 	Plus options to destroy duplicates, sort `list` values, and handle erroneous data types.
 
 	Parameters
 	----------
-	*dictionaryLists : Mapping[str, list[Any] | set[Any] | tuple[Any, ...]]
+	*dictionaryLists : MutableMapping[文件, list[Any] | set[Any] | tuple[Any, ...]]
 		Variable number of dictionaries to be merged. If only one dictionary is passed, it will be
 		"polished".
 	destroyDuplicates : bool = False
@@ -260,37 +266,31 @@ def updateExtendPolishDictionaryLists(*dictionaryLists: Mapping[str, list[小于
 
 	Returns
 	-------
-	ePluribusUnum : dict[str, list[Any]]
+	ePluribusUnum : dict[文件, list[Any]]
 		A single dictionary with merged and optionally "polished" `list` values.
 
 	Notes
 	-----
-	The returned value, `ePluribusUnum`, is a so-called primitive dictionary (`dict`). Furthermore,
-	every dictionary key is a so-called primitive string (_cf._ `str()`) and every dictionary value
-	is a so-called primitive `list` (`list`). If `dictionaryLists` has other data types, the data
-	types will not be preserved. That could have unexpected consequences. Conversion from the
-	original data type to a `list`, for example, may not preserve the order even if you want the
-	order to be preserved.
+	The returned value, `ePluribusUnum`, is a dictionary (`dict`). Furthermore, every dictionary value
+	is a `list`. If `dictionaryLists` has values that are not data type `list`, the data type will not
+	be preserved. That could have unexpected consequences. Conversion from the original data type to a
+	`list`, for example, may not preserve the order even if you want the order to be preserved.
 	"""  # noqa: DOC501
-	ePluribusUnum: dict[str, list[小于]] = {}
+	ePluribusUnum: dict[文件, list[小于]] = {}
 
 	for dictionaryListTarget in dictionaryLists:
 		for keyName, keyValue in dictionaryListTarget.items():
 			try:
-				ImaStr = str(keyName)
 				ImaList: list[小于] = list(keyValue)
-				ePluribusUnum.setdefault(ImaStr, []).extend(ImaList)
-			except TypeError:  # noqa: PERF203
+				ePluribusUnum.setdefault(keyName, []).extend(ImaList)
+			except TypeError as error:  # noqa: PERF203
 				if killErroneousDataTypes:
 					continue
-				else:
-					raise
+				raise TypeError from error
 
 	if destroyDuplicates:
-		for ImaStr, ImaList in ePluribusUnum.items():
-			ePluribusUnum[ImaStr] = list(dict.fromkeys(ImaList))
+		ePluribusUnum = valmap(compose(list, dict.fromkeys), ePluribusUnum)
 	if reorderLists:
-		for ImaStr, ImaRichComparisonSupporter in ePluribusUnum.items():
-			ePluribusUnum[ImaStr] = sorted(ImaRichComparisonSupporter)
+		ePluribusUnum = valmap(sorted, ePluribusUnum)
 
 	return ePluribusUnum

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/hunterMakesPy/parseParameters.py

@@ -1,3 +1,4 @@
+# ruff: noqa: TRY301, DOC501, PLW0717 BLE001
 """Validate parameters and parse input with defensive error handling.
 
 (AI generated docstring)
@@ -35,7 +36,7 @@ References
 """
 from __future__ import annotations
 
-from collections.abc import Iterable, Sized
+from collections.abc import Sized
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 import charset_normalizer
@@ -44,6 +45,8 @@ import sys
 
 if TYPE_CHECKING:
 	from charset_normalizer.models import CharsetMatch
+	from collections.abc import Iterable
+	from hunterMakesPy.theTypes import Limitation
 	from typing import Any
 
 @dataclass
@@ -68,60 +71,9 @@ class ErrorMessageContext:
 	containerType: str | None = None
 	isElement: bool = False
 
-def _constructErrorMessage(context: ErrorMessageContext, parameterName: str, parameterType: type[Any] | None) -> str:
-	"""Construct error message from available context using template.
-
-	I received ["value" | a value | `None`] [of type `type` | `None`] [as an element in | `None`] [a `containerType` type |
-	`None`] but `parameterName` must have integers [in type(s) `parameterType` | `None`].
-
-	Hypothetically, this is a prototype that can be generalized to other functions. In this package and a few of my other
-	packages, I have developed standardized error messages, but those are quite different from this. I will certainly continue to
-	develop this kind of functionality, and this function will influence things.
-
-	Parameters
-	----------
-	context : ErrorMessageContext
-		The error context containing parameter value, type, and container information.
-	parameterName : str
-		The name of the parameter that caused the error.
-	parameterType : type[Any] | None
-		The expected type of the parameter, used in error messages.
-
-	Returns
-	-------
-	errorMessage : str
-		The constructed error message string.
-
-	"""
-	messageParts: list[str] = ["I received "]
-
-	if context.parameterValue is not None and not isinstance(context.parameterValue, (bytes, bytearray, memoryview)):
-		messageParts.append(f'"{context.parameterValue}"')
-	else:
-		messageParts.append("a value")
-
-	if context.parameterValueType:
-		messageParts.append(f" of type `{context.parameterValueType}`")
-
-	if context.isElement:
-		messageParts.append(" as an element in")
-
-	if context.containerType:
-		messageParts.append(f" a `{context.containerType}` type")
-
-	messageParts.append(f" but {parameterName} must have integers")
-
-	if parameterType:
-		messageParts.append(f" in type(s) `{parameterType}`")
-
-	return "".join(messageParts)
-
-def defineConcurrencyLimit(*, limit: bool | float | int | None, cpuTotal: int = multiprocessing.cpu_count()) -> int:
+def defineConcurrencyLimit(*, limit: Limitation, cpuTotal: int = multiprocessing.cpu_count()) -> int:
 	"""Determine the concurrency limit based on the provided parameter.
 
-	Tests for this function can be run with:
-	`from hunterMakesPy.tests.test_parseParameters import PytestFor_defineConcurrencyLimit`
-
 	Parameters
 	----------
 	limit : bool | float | int | None
@@ -134,20 +86,11 @@ def defineConcurrencyLimit(*, limit: bool | float | int | None, cpuTotal: int =
 	concurrencyLimit : int
 		The calculated concurrency limit, ensuring it is at least 1.
 
-	Notes
-	-----
-	Consider using `hunterMakesPy.oopsieKwargsie()` to handle malformed inputs. For example:
-
-	```
-	if not (CPUlimit is None or isinstance(CPUlimit, (bool, int, float))):
-		CPUlimit = oopsieKwargsie(CPUlimit)
-	```
-
 	Example parameters
 	------------------
 	```python
 	CPUlimit: bool | float | int | None
-	CPUlimit: bool | float | int | None = None
+	CPUlimit: Limitation = None
 	```
 
 	Example docstring
@@ -171,7 +114,7 @@ def defineConcurrencyLimit(*, limit: bool | float | int | None, cpuTotal: int =
 		- If the value of `CPUlimit` is a `float` greater than 1 or less than -1, the function truncates the value to an `int` with the same sign as the `float`.
 	```
 
-	"""  # noqa: DOC501
+	"""
 	if isinstance(limit, str):
 		limitFromString: bool | str | None = oopsieKwargsie(limit)
 		if isinstance(limitFromString, str):
@@ -204,7 +147,53 @@ def defineConcurrencyLimit(*, limit: bool | float | int | None, cpuTotal: int =
 		concurrencyLimit = min(concurrencyLimit, 61)
 	return max(int(concurrencyLimit), 1)
 
-# ruff: noqa: TRY301
+def _constructErrorMessage(context: ErrorMessageContext, parameterName: str, parameterType: type[Any] | None) -> str:
+	"""Construct error message from available context using template.
+
+	I received ["value" | a value | `None`] [of type `type` | `None`] [as an element in | `None`] [a `containerType` type |
+	`None`] but `parameterName` must have integers [in type(s) `parameterType` | `None`].
+
+	Hypothetically, this is a prototype that can be generalized to other functions. In this package and a few of my other
+	packages, I have developed standardized error messages, but those are quite different from this. I will certainly continue to
+	develop this kind of functionality, and this function will influence things.
+
+	Parameters
+	----------
+	context : ErrorMessageContext
+		The error context containing parameter value, type, and container information.
+	parameterName : str
+		The name of the parameter that caused the error.
+	parameterType : type[Any] | None
+		The expected type of the parameter, used in error messages.
+
+	Returns
+	-------
+	errorMessage : str
+		The constructed error message string.
+
+	"""
+	messageParts: list[str] = ["I received "]
+
+	if context.parameterValue is not None and not isinstance(context.parameterValue, (bytes, bytearray, memoryview)):
+		messageParts.append(f'"{context.parameterValue}"')
+	else:
+		messageParts.append("a value")
+
+	if context.parameterValueType:
+		messageParts.append(f" of type `{context.parameterValueType}`")
+
+	if context.isElement:
+		messageParts.append(" as an element in")
+
+	if context.containerType:
+		messageParts.append(f" a `{context.containerType}` type")
+
+	messageParts.append(f" but {parameterName} must have integers")
+
+	if parameterType:
+		messageParts.append(f" in type(s) `{parameterType}`")
+
+	return "".join(messageParts)
 
 def intInnit(listInt_Allegedly: Iterable[Any], parameterName: str | None = None, parameterType: type[Any] | None = None) -> list[int]:
 	"""Validate and convert input values to a `list` of integers.
@@ -252,7 +241,7 @@ def intInnit(listInt_Allegedly: Iterable[Any], parameterName: str | None = None,
 
 	# Be nice, and assume the input container is valid and every element is valid.
 	# Nevertheless, this is a "fail-early" step, so reject ambiguity and try to induce errors now that could be catastrophic later.
-	try:  # noqa: PLW0717
+	try:
 		iter(listInt_Allegedly)
 		lengthInitial: int | None = None
 		if isinstance(listInt_Allegedly, Sized):
@@ -349,7 +338,7 @@ def oopsieKwargsie(huh: Any) -> bool | str | None:
 	if not isinstance(huh, str):
 		try:
 			huh = str(huh)
-		except BaseException:  # noqa: BLE001
+		except BaseException:
 			return huh
 	formatted: str = huh.strip().title()
 	if formatted == str(True):

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/hunterMakesPy/tests/test_dataStructures.py

@@ -108,7 +108,6 @@ def test_stringItUp(description: str, value_scrapPile: list[Any], expected: list
 	("Set values", ({'ne': {11, 13}, 'sw': {17}}, {'ne': {19, 23, 13, 29, 11}, 'sw': {31, 17, 37}}), {'destroyDuplicates': True, 'reorderLists': True}, {'ne': [11, 13, 19, 23, 29], 'sw': [17, 31, 37]}),
 	("NumPy arrays", ({'ne': numpy.array([11, 13]), 'sw': numpy.array([17])}, {'ne': numpy.array([19, 23, 13, 29, 11]), 'sw': numpy.array([31, 17, 37])}), {'destroyDuplicates': False, 'reorderLists': False}, {'ne': [11, 13, 19, 23, 13, 29, 11], 'sw': [17, 31, 17, 37]}),
 	("Destroy duplicates", ({'fr': [11, 13], 'jp': [17]}, {'fr': [19, 23, 13, 29, 11], 'jp': [31, 17, 37]}), {'destroyDuplicates': True, 'reorderLists': False}, {'fr': [11, 13, 19, 23, 29], 'jp': [17, 31, 37]}),
-	("Non-string keys", ({None: [13], True: [17]}, {19: [23], (29, 31): [37]}), {'destroyDuplicates': False, 'reorderLists': False}, {'None': [13], 'True': [17], '19': [23], '(29, 31)': [37]}),
 	("Reorder lists", ({'fr': [11, 13], 'jp': [17]}, {'fr': [19, 23, 13, 29, 11], 'jp': [31, 17, 37]}), {'destroyDuplicates': False, 'reorderLists': True}, {'fr': [11, 11, 13, 13, 19, 23, 29], 'jp': [17, 17, 31, 37]}),
 	("Non-iterable values", ({'ne': 13, 'sw': 17}, {'ne': 19, 'nw': 23}), {'destroyDuplicates': False, 'reorderLists': False}, TypeError),
 	("Skip erroneous types", ({'ne': [11, 13], 'sw': [17, 19]}, {'ne': 23, 'nw': 29}), {'killErroneousDataTypes': True}, {'ne': [11, 13], 'sw': [17, 19]}),

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/hunterMakesPy/theTypes.py

@@ -11,6 +11,8 @@ identifierDotAttribute: TypeAlias = str
 `TypeAlias` for a `str` `object` using dot notation to access an attribute, such as 'scipy.signal.windows'.
 """
 
+Limitation: TypeAlias = bool | float | int | None
+
 class Ordinals(Protocol):
 	"""Any Python `object` `type` that may be ordered before or after a comparable `object` `type` by comparison operators."""
 

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/hunterMakesPy/theTypesCallableFunction.py

@@ -2,12 +2,13 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import Any, overload, ParamSpec, Protocol, runtime_checkable, TYPE_CHECKING, TypeAlias, TypeVar
-from typing_extensions import Self, TypeVarTuple
+from typing import Any, overload, ParamSpec, Protocol, runtime_checkable, TYPE_CHECKING, TypeVar
 import sys
 
 if TYPE_CHECKING:
 	from types import CodeType, MethodType
+	from typing import TypeAlias
+	from typing_extensions import Self, TypeVarTuple
 
 # TODO explore the following
 """

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/hunterMakesPy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hunterMakesPy
-Version: 0.7.1
+Version: 0.7.3
 Summary: Easy Python functions making making functional Python functions easier.
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License-Expression: CC-BY-NC-4.0
@@ -9,13 +9,11 @@ Project-URL: Donate, https://www.patreon.com/integrated
 Project-URL: Homepage, https://github.com/hunterhogan/hunterMakesPy
 Project-URL: Issues, https://github.com/hunterhogan/hunterMakesPy/issues
 Project-URL: Repository, https://github.com/hunterhogan/hunterMakesPy
-Keywords: attribute loading,configuration,defensive programming,dictionary merging,dynamic import,file system utilities,input validation,module loading,package settings,parameter validation
+Keywords: input validation,module loading,package settings,parameter validation
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: Other Audience
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -27,6 +25,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: Z0Z_tools>=2.2.1
 Requires-Dist: autoflake
 Requires-Dist: charset_normalizer
 Requires-Dist: isort

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/hunterMakesPy.egg-info/requires.txt

@@ -1,3 +1,4 @@
+Z0Z_tools>=2.2.1
 autoflake
 charset_normalizer
 isort

{huntermakespy-0.7.1 → huntermakespy-0.7.3}/pyproject.toml

@@ -1,18 +1,12 @@
 [project]
 name = "hunterMakesPy"
-version = "0.7.1"
+version = "0.7.3"
 description = "Easy Python functions making making functional Python functions easier."
 readme = "README.md"
 requires-python = ">=3.10"
 license = "CC-BY-NC-4.0"
 authors = [{ name = "Hunter Hogan", email = "HunterHogan@pm.me" }]
 keywords = [
-  "attribute loading",
-  "configuration",
-  "defensive programming",
-  "dictionary merging",
-  "dynamic import",
-  "file system utilities",
   "input validation",
   "module loading",
   "package settings",
@@ -23,8 +17,6 @@ classifiers = [
   "Environment :: Console",
   "Framework :: Pytest",
   "Intended Audience :: Developers",
-  "Intended Audience :: End Users/Desktop",
-  "Intended Audience :: Other Audience",
   "Natural Language :: English",
   "Operating System :: OS Independent",
   "Programming Language :: Python",
@@ -35,6 +27,7 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
+  "Z0Z_tools>=2.2.1",
   "autoflake",
   "charset_normalizer",
   "isort",
@@ -45,7 +38,7 @@ dependencies = [
 ]
 optional-dependencies = { development = ["pytest-cov"], testing = [
   "librosa",
-  "pytest",
+  "pytest"
 ] }
 
 [project.urls]
@@ -66,7 +59,7 @@ run = { branch = true, data_file = "hunterMakesPy/tests/coverage/.coverage", omi
 ], source = ["."] }
 
 [tool.pytest]
-addopts = ["--color=auto"]
+addopts = ["--color=yes"]
 log_auto_indent = "On"
 testpaths = ["hunterMakesPy/tests"]