jetpytools 1.7.4__py3-none-any.whl → 2.0.1__py3-none-any.whl

jetpytools/utils/funcs.py

@@ -2,9 +2,7 @@ from __future__ import annotations
 
 from functools import update_wrapper
 from types import FunctionType
-from typing import Any, Callable, Sequence
-
-from ..types import F
+from typing import Any, Callable, Protocol, Sequence, runtime_checkable
 
 __all__ = ["copy_func", "erase_module"]
 
@@ -14,17 +12,22 @@ def copy_func(f: Callable[..., Any]) -> FunctionType:
 
     try:
         g = FunctionType(f.__code__, f.__globals__, name=f.__name__, argdefs=f.__defaults__, closure=f.__closure__)
+        g.__kwdefaults__ = f.__kwdefaults__
         g = update_wrapper(g, f)
-        g.__kwdefaults__ = f.__kwdefaults__  # type: ignore
-        return g  # type: ignore
-    except BaseException:  # for builtins
-        return f  # type: ignore
+        return g  # type: ignore[return-value]
+    except BaseException:
+        return f  # type: ignore[return-value]
+
+
+@runtime_checkable
+class _HasModule(Protocol):
+    __module__: str
 
 
-def erase_module(func: F, modules: Sequence[str] | None = None) -> F:
+def erase_module[F: Callable[..., Any]](func: F, modules: Sequence[str] | None = None) -> F:
     """Delete the __module__ of the function."""
 
-    if hasattr(func, "__module__") and (True if modules is None else (func.__module__ in modules)):
-        func.__module__ = None  # type: ignore
+    if isinstance(func, _HasModule) and (modules is None or func.__module__ in modules):
+        func.__module__ = ""
 
     return func

jetpytools/utils/math.py

@@ -3,8 +3,6 @@ from __future__ import annotations
 from math import ceil, log, log10
 from typing import Sequence
 
-from ..types import Nb
-
 __all__ = [
     "clamp",
     "clamp_arr",
@@ -20,13 +18,13 @@ __all__ = [
 ]
 
 
-def clamp(val: Nb, min_val: Nb, max_val: Nb) -> Nb:
+def clamp[Nb: (int, float)](val: Nb, min_val: Nb, max_val: Nb) -> Nb:
     """Faster max(min(value, max_val), min_val) "wrapper" """
 
     return min_val if val < min_val else max_val if val > max_val else val
 
 
-def clamp_arr(vals: Sequence[Nb], min_val: Nb, max_val: Nb) -> list[Nb]:
+def clamp_arr[Nb: (int, float)](vals: Sequence[Nb], min_val: Nb, max_val: Nb) -> list[Nb]:
     """Map an array to clamp."""
 
     return [clamp(x, min_val, max_val) for x in vals]
@@ -163,7 +161,7 @@ def spline_coeff(
     return float(s)
 
 
-def ndigits(num: Nb) -> int:
+def ndigits(num: float) -> int:
     if num == 0:
         return 1
 

jetpytools/utils/ranges.py

@@ -1,57 +1,12 @@
 from __future__ import annotations
 
 from itertools import chain, zip_longest
-from typing import Iterable, overload
+from typing import Iterable
 
-from ..exceptions import CustomIndexError
-from ..types import T0, T
+__all__ = ["interleave_arr"]
 
-__all__ = ["interleave_arr", "ranges_product"]
 
-
-@overload
-def ranges_product(range0: range | int, range1: range | int, /) -> Iterable[tuple[int, int]]: ...
-
-
-@overload
-def ranges_product(
-    range0: range | int, range1: range | int, range2: range | int, /
-) -> Iterable[tuple[int, int, int]]: ...
-
-
-def ranges_product(*_iterables: range | int) -> Iterable[tuple[int, ...]]:
-    """
-    Take two or three lengths/ranges and make a cartesian product of them.
-
-    Useful for getting all coordinates of an image.
-    For example ranges_product(1920, 1080) will give you [(0, 0), (0, 1), (0, 2), ..., (1919, 1078), (1919, 1079)].
-    """
-
-    n_iterables = len(_iterables)
-
-    if n_iterables <= 1:
-        raise CustomIndexError(f"Not enough ranges passed! ({n_iterables})", ranges_product)
-
-    iterables = [range(x) if isinstance(x, int) else x for x in _iterables]
-
-    if n_iterables == 2:
-        first_it, second_it = iterables
-
-        for xx in first_it:
-            for yy in second_it:
-                yield xx, yy
-    elif n_iterables == 3:
-        first_it, second_it, third_it = iterables
-
-        for xx in first_it:
-            for yy in second_it:
-                for zz in third_it:
-                    yield xx, yy, zz
-    else:
-        raise CustomIndexError(f"Too many ranges passed! ({n_iterables})", ranges_product)
-
-
-def interleave_arr(arr0: Iterable[T], arr1: Iterable[T0], n: int = 2) -> Iterable[T | T0]:
+def interleave_arr[T0, T1](arr0: Iterable[T0], arr1: Iterable[T1], n: int = 2) -> Iterable[T0 | T1]:
     """
     Interleave two arrays of variable length.
 
@@ -62,9 +17,13 @@ def interleave_arr(arr0: Iterable[T], arr1: Iterable[T0], n: int = 2) -> Iterabl
 
     :yield:         Elements from either arr0 or arr01.
     """
-    if n == 1:
-        yield from (x for x in chain.from_iterable(zip_longest(arr0, arr1)) if x is not None)
+    if n <= 0:
+        raise ValueError("n must be a positive integer")
 
+    if n == 1:
+        for x in chain.from_iterable(zip_longest(arr0, arr1, fillvalue=None)):
+            if x is not None:
+                yield x
         return
 
     arr0_i, arr1_i = iter(arr0), iter(arr1)

{jetpytools-1.7.4.dist-info → jetpytools-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetpytools
-Version: 1.7.4
+Version: 2.0.1
 Summary: Collection of stuff that's useful in general python programming
 Project-URL: Source Code, https://github.com/Jaded-Encoding-Thaumaturgy/jetpytools
 Project-URL: Contact, https://discord.gg/XTpc6Fa9eB
@@ -15,8 +15,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Typing :: Typed
-Requires-Python: >=3.10
-Requires-Dist: typing-extensions>=4.12.2
+Requires-Python: >=3.12
+Requires-Dist: typing-extensions>=4.15.0
 Description-Content-Type: text/markdown
 
 # jetpytools

jetpytools-2.0.1.dist-info/RECORD

@@ -0,0 +1,33 @@
+jetpytools/__init__.py,sha256=ha_pCOMqfeIbipDRrtqKOqH3NQEpX4KwN2SskpsCGb4,114
+jetpytools/_metadata.py,sha256=Sh6w1MTmnsiXSW7bySj3rvnKAj6r6vq0Jf8-TqTi00Q,414
+jetpytools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jetpytools/enums/__init__.py,sha256=TvEt3TWmnzf2TWS_Gd6llyyXAGDKxdhdJsDgSvT7xys,41
+jetpytools/enums/base.py,sha256=Vuzlv84jXUCje7-yoyjucPcgkmfVkLHuuLXcmx4z1Yw,1970
+jetpytools/enums/other.py,sha256=Fwf8J98cqFQbnDsOPV90RTOJ_Ltd72Y3qVbSDzOl5Eg,1346
+jetpytools/exceptions/__init__.py,sha256=0rNEfnOuoSRUyKsutGzHFWQkgiFaK7diOT4VbRVKt9c,105
+jetpytools/exceptions/base.py,sha256=cKvND21z0McwbhpOg9oVYyMvLVa8MDs9m1g4FUbEHvM,6949
+jetpytools/exceptions/enum.py,sha256=euR6cyMetVWSfTgO5rkblhQyEgusdwhx6Rd9I5ZoFbA,293
+jetpytools/exceptions/file.py,sha256=7Eh4aPo4r1W-ppnf6XLwWaStOSjIxw9JfzOCa4W7m8E,1105
+jetpytools/exceptions/generic.py,sha256=dUMt70XW2QwQtyfwegPO_bfF4QNQOEMtqY9FfAMapFA,1504
+jetpytools/exceptions/module.py,sha256=iRKvbxa59MYDavIQIzPR-NjqjhZbBTLRvzAONMXs3Aw,1228
+jetpytools/functions/__init__.py,sha256=jCw3-aaOGxIzi6iyFInWPOxOFbzZg8IZhoSuGYaNgLA,67
+jetpytools/functions/funcs.py,sha256=_6zzloyVPE4GqRqqAsxiG4l49-dfVTEx7HsTP44p1VE,5306
+jetpytools/functions/normalize.py,sha256=zrhOIBjO1558-BxYjXQuZxuP_VjHmAIHYDVefiBwN0M,8532
+jetpytools/functions/other.py,sha256=P_NdrtFxR_Sosn9QblU-Ea4mKEyWY7AegQzmiQPSVLk,407
+jetpytools/types/__init__.py,sha256=oP1cm6LtRpjPXQ0M4JnKH4RkzrBxBPos_xLHaITrgSs,154
+jetpytools/types/builtins.py,sha256=dGevzNAC6szmQpcvH6jiYMk_h6wHwmcYdqeD1AAty9k,925
+jetpytools/types/check.py,sha256=ktQOykmryUkDa2j-zcL6uEWF8QlxJ4GW8YKdbqMHGcc,959
+jetpytools/types/file.py,sha256=6hV332qbBtvg3p3g6tNHiSnZGp4DhtcTZm-Vap7M72k,6400
+jetpytools/types/funcs.py,sha256=arlykyVyosdjBhUTrJDfAoGBdkI5zhoJc0yINMQEonw,2804
+jetpytools/types/generic.py,sha256=LlYiD54GPi5ghjdw4wJmulrZiqv5IUnfPfyr-fk-RlA,1138
+jetpytools/types/supports.py,sha256=uZ2N7XxAa5H3QcOKStCH8fp2x6EXvoKwLQZue5xTLFY,3400
+jetpytools/types/utils.py,sha256=GoRx3fjHRbdQ27L4jkUb_oUXAtupGUI2FHHWp8ccEWw,29599
+jetpytools/utils/__init__.py,sha256=_rJ-mY5PsGjBfy8Fihx_FYJfAIGSrYAYzI6Td9oFh9A,83
+jetpytools/utils/file.py,sha256=3fJxAHjIN5zdyzO0guc3jDspcs5HPG4t4cwB_ZrAhh4,10622
+jetpytools/utils/funcs.py,sha256=2jOOIUQpifQ_kTuVUSrCAi8hvCmmvieBpMTfF8XuM24,979
+jetpytools/utils/math.py,sha256=ZqsAyVNBT4LD-zqP7QxEkGwWdVfrR7YAkdv87NQTMV0,3460
+jetpytools/utils/ranges.py,sha256=RAknSZkTAYxAXdFn_CKY8xGASu7xS7Gu039DX89ugDc,1293
+jetpytools-2.0.1.dist-info/METADATA,sha256=c0AIK2JpabO43aUHc_3G-4wYSF4X19hcJw2goRGb-Oc,1198
+jetpytools-2.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+jetpytools-2.0.1.dist-info/licenses/LICENSE,sha256=l0PN-qDtXcgOB5aXP_nSUsvCK5V3o9pQCGsTzyZhKL0,1071
+jetpytools-2.0.1.dist-info/RECORD,,

jetpytools-1.7.4.dist-info/RECORD

@@ -1,33 +0,0 @@
-jetpytools/__init__.py,sha256=ha_pCOMqfeIbipDRrtqKOqH3NQEpX4KwN2SskpsCGb4,114
-jetpytools/_metadata.py,sha256=Ctf45XxZkSp6UiAUvlc0xW27P8V4tEMiFFSZtpGLKxA,414
-jetpytools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jetpytools/enums/__init__.py,sha256=TvEt3TWmnzf2TWS_Gd6llyyXAGDKxdhdJsDgSvT7xys,41
-jetpytools/enums/base.py,sha256=s5A9iQS22JdaZMM6jEXI31m0ZjtBx7GLQ-E0xBr90Zc,2032
-jetpytools/enums/other.py,sha256=9GGRS4P-P589C1HqNpDDBhLdphID1trwCJi7pbXT0iM,1317
-jetpytools/exceptions/__init__.py,sha256=0rNEfnOuoSRUyKsutGzHFWQkgiFaK7diOT4VbRVKt9c,105
-jetpytools/exceptions/base.py,sha256=4DNDYlH_196sZH9_B-mvs4pRxr2kcO3JSwDBmAaRT8o,7645
-jetpytools/exceptions/enum.py,sha256=euR6cyMetVWSfTgO5rkblhQyEgusdwhx6Rd9I5ZoFbA,293
-jetpytools/exceptions/file.py,sha256=7Eh4aPo4r1W-ppnf6XLwWaStOSjIxw9JfzOCa4W7m8E,1105
-jetpytools/exceptions/generic.py,sha256=91U6RoiAoejFOU2qjaJsmej8FhC0XXQuZ535XTi1qGA,1504
-jetpytools/exceptions/module.py,sha256=iRKvbxa59MYDavIQIzPR-NjqjhZbBTLRvzAONMXs3Aw,1228
-jetpytools/functions/__init__.py,sha256=jCw3-aaOGxIzi6iyFInWPOxOFbzZg8IZhoSuGYaNgLA,67
-jetpytools/functions/funcs.py,sha256=lcdWaJtslhXZNfNu_y-Badgz2uy0bVaoA3D_lLo_GNI,5286
-jetpytools/functions/normalize.py,sha256=czliT8iyYPdiJG3C7wHppFrOxeVP5OOWZGdRPHFvEi8,8594
-jetpytools/functions/other.py,sha256=P_NdrtFxR_Sosn9QblU-Ea4mKEyWY7AegQzmiQPSVLk,407
-jetpytools/types/__init__.py,sha256=oP1cm6LtRpjPXQ0M4JnKH4RkzrBxBPos_xLHaITrgSs,154
-jetpytools/types/builtins.py,sha256=4uAutpHlkcKM3K_6BbWomqR2QgWNt6294FHE3Ck_ZIA,2067
-jetpytools/types/check.py,sha256=ktQOykmryUkDa2j-zcL6uEWF8QlxJ4GW8YKdbqMHGcc,959
-jetpytools/types/file.py,sha256=LbOwMAwDALWxAZZ2i7ZNexoN3GHWD-uUoIhVvUy95Vo,6539
-jetpytools/types/funcs.py,sha256=U5tBmTtLS5CLp3ZtOiA5101PQiCWQOBsmf0bj1pRwgY,2778
-jetpytools/types/generic.py,sha256=RRg2U7wxaM4Uzwc6QvsO99euCF3sqr8Kh34XKtVbgT8,1136
-jetpytools/types/supports.py,sha256=woMTv62HpcRiC5TG18U8NU5v2Q6iqcrHzQgXl7QYEws,3516
-jetpytools/types/utils.py,sha256=2E7eNZjwlkQIL-9KC7xj7nMULTHoivrUI22rdzPRw88,23651
-jetpytools/utils/__init__.py,sha256=_rJ-mY5PsGjBfy8Fihx_FYJfAIGSrYAYzI6Td9oFh9A,83
-jetpytools/utils/file.py,sha256=3fJxAHjIN5zdyzO0guc3jDspcs5HPG4t4cwB_ZrAhh4,10622
-jetpytools/utils/funcs.py,sha256=2qhFyLD0OLvenjzOu2wu1ZWoZGzQ8aPmvbkAI1i9Gvk,914
-jetpytools/utils/math.py,sha256=I56OeHDDJl3X8EFXMWVEiXGAD16AKcn8KVnFuP5fFes,3445
-jetpytools/utils/ranges.py,sha256=glxypgmuzauV6KCSNujNHOdWkNEUNylOUAPS618jnIg,2559
-jetpytools-1.7.4.dist-info/METADATA,sha256=DP5E8ygPnwnPuriFpgxkrCLDQUqjzU93xiU-m1XnmD0,1198
-jetpytools-1.7.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-jetpytools-1.7.4.dist-info/licenses/LICENSE,sha256=l0PN-qDtXcgOB5aXP_nSUsvCK5V3o9pQCGsTzyZhKL0,1071
-jetpytools-1.7.4.dist-info/RECORD,,