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

jetpytools/_metadata.py

@@ -1,6 +1,6 @@
 """Collection of stuff that's useful in general python programming"""
 
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 __author_name__, __author_email__ = "Jaded Encoding Thaumaturgy", "jaded.encoding.thaumaturgy@gmail.com"
 __maintainer_name__, __maintainer_email__ = __author_name__, __author_email__

jetpytools/types/supports.py

@@ -113,14 +113,16 @@ class ComparatorFunc(Protocol):
     ) -> T0 | T1: ...
 
 
+@runtime_checkable
 class SupportsIndexing[T](Protocol):
     def __getitem__(self, k: int) -> T: ...
 
 
+@runtime_checkable
 class SupportsKeysAndGetItem[KT, VT](Protocol):
     def keys(self) -> Iterable[KT]: ...
 
     def __getitem__(self, k: KT) -> VT: ...
 
 
-type SupportsFloatOrIndex = SupportsFloat | SupportsIndex
+SupportsFloatOrIndex = SupportsFloat | SupportsIndex

jetpytools/types/utils.py

@@ -192,10 +192,12 @@ class _InjectSelfBase(Generic[_T_co, _P, _R_co]):
         self.args = args
         self.kwargs = kwargs
 
-    def __get__[T](self, instance: T | None, owner: type[T]) -> _InjectedSelfFunc[T, _P, _R_co]:  # pyright: ignore[reportGeneralTypeIssues]
+    def __get__(self, instance: Any | None, owner: type | None = None) -> _InjectedSelfFunc[_T_co, _P, _R_co]:  # pyright: ignore[reportGeneralTypeIssues]
         """
         Return a wrapped callable that automatically injects an instance as the first argument when called.
         """
+        if owner is None:
+            owner = type(instance)
 
         @wraps(self._function)
         def _wrapper(*args: Any, **kwargs: Any) -> _R_co:
@@ -263,6 +265,9 @@ class _InjectSelfBase(Generic[_T_co, _P, _R_co]):
 
         return owner(*self.args, **self.kwargs), kwargs
 
+    def __call__(self_, self: _T_co, *args: _P.args, **kwargs: _P.kwargs) -> _R_co:  # type: ignore[misc]  # noqa: N805
+        return self_.__get__(self, type(self))(*args, **kwargs)
+
     @property
     def __func__(self) -> Callable[Concatenate[_T_co, _P], _R_co]:
         """Return the original wrapped function."""
@@ -377,10 +382,10 @@ class _InjectKwargsParamsBase(Generic[_T_co, _P, _R_co]):
         self._signature = None
 
     @overload
-    def __get__(self, instance: None, owner: type[Any]) -> Self: ...
+    def __get__(self, instance: None, owner: type) -> Self: ...
     @overload
-    def __get__(self, instance: Any, owner: type[Any]) -> Callable[_P, _R_co]: ...
-    def __get__(self, instance: Any | None, owner: type[Any]) -> Self | Callable[_P, _R_co]:
+    def __get__(self, instance: Any, owner: type | None = None) -> Callable[_P, _R_co]: ...
+    def __get__(self, instance: Any | None, owner: type | None = None) -> Any:
         """
         Descriptor binding logic.
 
@@ -435,6 +440,9 @@ class _InjectKwargsParamsBase(Generic[_T_co, _P, _R_co]):
 
         return wrapper
 
+    def __call__(self_, self: _T_co, *args: _P.args, **kwargs: _P.kwargs) -> _R_co:  # type: ignore[misc]  # noqa: N805
+        return self_.__get__(self, type(self))(*args, **kwargs)
+
     @property
     def __func__(self) -> Callable[Concatenate[_T_co, _P], _R_co]:
         """Return the original wrapped function."""
@@ -467,7 +475,7 @@ class _InjectKwargsParamsBase(Generic[_T_co, _P, _R_co]):
         return _wrapper
 
 
-class inject_kwargs_params[T, **P, R](_InjectKwargsParamsBase[T, P, R]):
+class inject_kwargs_params(_InjectKwargsParamsBase[_T_co, _P, _R_co]):
     """
     Descriptor that injects parameters into functions based on an instance's keyword mapping.
 
@@ -478,7 +486,7 @@ class inject_kwargs_params[T, **P, R](_InjectKwargsParamsBase[T, P, R]):
 
     __slots__ = ()
 
-    class add_to_kwargs[T0, **P0, R0](_InjectKwargsParamsBase[T0, P0, R0]):
+    class add_to_kwargs(_InjectKwargsParamsBase[_T0_co, _P0, _R0_co]):
         """
         Variant of `inject_kwargs_params` that merges unused entries from `self.kwargs` into the keyword arguments
         passed to the target function.
@@ -584,61 +592,59 @@ class classproperty_base(Generic[_T, _R_co, _T_Any]):
     def __set_name__(self, owner: object, name: str) -> None:
         self.__name__ = name
 
-    def _get_cache(self, type_: type[_T]) -> dict[str, Any]:
+    def _get_cache(self, owner: type[_T]) -> dict[str, Any]:
         cache_key = getattr(self, "cache_key")
 
-        if not hasattr(type_, cache_key):
-            setattr(type_, cache_key, {})
+        if not hasattr(owner, cache_key):
+            setattr(owner, cache_key, {})
 
-        return getattr(type_, cache_key)
+        return getattr(owner, cache_key)
 
-    def __get__(self, obj: _T | None, type_: type[_T] | None = None) -> _R_co:
-        if type_ is None and obj is not None:
-            type_ = type(obj)
-        elif type_ is None:
-            raise NotImplementedError("Both obj and type_ are None")
+    def __get__(self, instance: Any | None, owner: type | None = None) -> _R_co:
+        if owner is None:
+            owner = type(instance)
 
         if not isinstance(self, classproperty.cached):
-            return self.fget(type_)
+            return self.fget(owner)
 
-        if self.__name__ in (cache := self._get_cache(type_)):
+        if self.__name__ in (cache := self._get_cache(owner)):
             return cache[self.__name__]
 
-        value = self.fget(type_)
+        value = self.fget(owner)
         cache[self.__name__] = value
         return value
 
-    def __set__(self, obj: _T, value: _T_Any) -> None:
+    def __set__(self, instance: Any, value: _T_Any) -> None:
         if not self.fset:
             raise AttributeError(
-                f'classproperty with getter "{self.__name__}" of "{obj.__class__.__name__}" object has no setter.'
+                f'classproperty with getter "{self.__name__}" of "{instance.__class__.__name__}" object has no setter.'
             )
 
-        type_ = type(obj)
+        owner = type(instance)
 
         if not isinstance(self, classproperty.cached):
-            return self.fset(type_, value)
+            return self.fset(owner, value)
 
-        if self.__name__ in (cache := self._get_cache(type_)):
+        if self.__name__ in (cache := self._get_cache(owner)):
             del cache[self.__name__]
 
-        self.fset(type_, value)
+        self.fset(owner, value)
 
-    def __delete__(self, obj: _T) -> None:
+    def __delete__(self, instance: Any) -> None:
         if not self.fdel:
             raise AttributeError(
-                f'classproperty with getter "{self.__name__}" of "{obj.__class__.__name__}" object has no deleter.'
+                f'classproperty with getter "{self.__name__}" of "{instance.__class__.__name__}" object has no deleter.'
             )
 
-        type_ = type(obj)
+        owner = type(instance)
 
         if not isinstance(self, classproperty.cached):
-            return self.fdel(type_)
+            return self.fdel(owner)
 
-        if self.__name__ in (cache := self._get_cache(type_)):
+        if self.__name__ in (cache := self._get_cache(owner)):
             del cache[self.__name__]
 
-        self.fdel(type_)
+        self.fdel(owner)
 
 
 class classproperty(classproperty_base[_T, _R_co, _T_Any]):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetpytools
-Version: 2.0.0
+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

{jetpytools-2.0.0.dist-info → jetpytools-2.0.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 jetpytools/__init__.py,sha256=ha_pCOMqfeIbipDRrtqKOqH3NQEpX4KwN2SskpsCGb4,114
-jetpytools/_metadata.py,sha256=QeYkd0FebUmiwIAzUXzC3bAEDz8ahjql90oXjCZ7JVE,414
+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
@@ -20,14 +20,14 @@ 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=kzzQQaUs1MOqU9jZXu9lsN9ff9ay7dViftEDHkWTbSY,3367
-jetpytools/types/utils.py,sha256=Bm5zrAfKBgITcOkSemzuVhs44jEesBC73zDVHFBnXGc,29249
+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.0.dist-info/METADATA,sha256=glIX6YFKIMgzZcPxgr6DbXamv3ZsVJvzzM7UonTOcAc,1198
-jetpytools-2.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-jetpytools-2.0.0.dist-info/licenses/LICENSE,sha256=l0PN-qDtXcgOB5aXP_nSUsvCK5V3o9pQCGsTzyZhKL0,1071
-jetpytools-2.0.0.dist-info/RECORD,,
+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,,