dycw-utilities 0.133.7__py3-none-any.whl → 0.134.0__py3-none-any.whl

utilities/slack_sdk.py

@@ -18,7 +18,7 @@ if TYPE_CHECKING:
     from slack_sdk.webhook import WebhookResponse
     from whenever import TimeDelta
 
-    from utilities.types import Coroutine1
+    from utilities.types import Coro
 
 
 _TIMEOUT: TimeDelta = MINUTE
@@ -48,7 +48,7 @@ class SlackHandlerService(Handler, Looper[str]):
         timeout: TimeDelta | None = None,
         _debug: bool = False,
         level: int = NOTSET,
-        sender: Callable[[str, str], Coroutine1[None]] = _send_adapter,
+        sender: Callable[[str, str], Coro[None]] = _send_adapter,
         send_timeout: TimeDelta = SECOND,
     ) -> None:
         Looper.__init__(  # Looper first

utilities/sqlalchemy.py

@@ -18,16 +18,7 @@ from itertools import chain
 from math import floor
 from operator import ge, le
 from re import search
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Literal,
-    TypeGuard,
-    TypeVar,
-    assert_never,
-    cast,
-    override,
-)
+from typing import TYPE_CHECKING, Any, Literal, TypeGuard, assert_never, cast, override
 
 from sqlalchemy import (
     URL,
@@ -96,7 +87,6 @@ from utilities.whenever import SECOND
 if TYPE_CHECKING:
     from whenever import TimeDelta
 
-_T = TypeVar("_T")
 type _EngineOrConnectionOrAsync = Engine | Connection | AsyncEngine | AsyncConnection
 type Dialect = Literal["mssql", "mysql", "oracle", "postgresql", "sqlite"]
 type ORMInstOrClass = DeclarativeBase | type[DeclarativeBase]
@@ -957,9 +947,9 @@ def _is_pair_of_tuple_or_str_mapping_and_table(
     return _is_pair_with_predicate_and_table(obj, is_tuple_or_str_mapping)
 
 
-def _is_pair_with_predicate_and_table(
-    obj: Any, predicate: Callable[[Any], TypeGuard[_T]], /
-) -> TypeGuard[tuple[_T, TableOrORMInstOrClass]]:
+def _is_pair_with_predicate_and_table[T](
+    obj: Any, predicate: Callable[[Any], TypeGuard[T]], /
+) -> TypeGuard[tuple[T, TableOrORMInstOrClass]]:
     """Check if an object is pair and a table."""
     return (
         isinstance(obj, tuple)

utilities/timer.py

@@ -46,6 +46,12 @@ class Timer:
         self._end = get_now_local()
         return False
 
+    # hash
+
+    @override
+    def __hash__(self) -> int:
+        return hash((id(self), self._start, self._end))
+
     # repr
 
     @override

utilities/typed_settings.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 from re import search
-from typing import TYPE_CHECKING, Any, TypeVar, override
+from typing import TYPE_CHECKING, Any, override
 
 import typed_settings
 from typed_settings import EnvLoader, FileLoader, find
@@ -32,9 +32,6 @@ if TYPE_CHECKING:
     from utilities.types import MaybeIterable, PathLike
 
 
-_T = TypeVar("_T")
-
-
 ##
 
 
@@ -65,10 +62,10 @@ class ExtendedTSConverter(TSConverter):
         self.scalar_converters |= extras
 
 
-def _make_converter(
-    cls: type[_T], parser: Callable[[str], _T], /
+def _make_converter[T](
+    cls: type[T], parser: Callable[[str], T], /
 ) -> Callable[[Any, type[Any]], Any]:
-    def hook(value: _T | str, _: type[_T] = cls, /) -> Any:
+    def hook(value: T | str, _: type[T] = cls, /) -> Any:
         if not isinstance(value, (cls, str)):  # pragma: no cover
             msg = f"Invalid type {type(value).__name__!r}; expected '{cls.__name__}' or 'str'"
             raise TypeError(msg)
@@ -84,8 +81,8 @@ def _make_converter(
 _BASE_DIR: Path = Path()
 
 
-def load_settings(
-    cls: type[_T],
+def load_settings[T](
+    cls: type[T],
     app_name: str,
     /,
     *,
@@ -94,7 +91,7 @@ def load_settings(
     loaders: MaybeIterable[Loader] | None = None,
     processors: MaybeIterable[Processor] = (),
     base_dir: Path = _BASE_DIR,
-) -> _T:
+) -> T:
     if not search(r"^[A-Za-z]+(?:_[A-Za-z]+)*$", app_name):
         raise LoadSettingsError(appname=app_name)
     filenames_use = list(always_iterable(filenames))

utilities/types.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import datetime as dt
 from asyncio import Event
-from collections.abc import Awaitable, Callable, Coroutine, Hashable, Iterable, Mapping
+from collections.abc import Callable, Coroutine, Hashable, Iterable, Mapping
 from enum import Enum
 from ipaddress import IPv4Address, IPv6Address
 from logging import Logger
@@ -58,36 +58,19 @@ type OpenMode = Literal[
     "x+b",
     "a+b",
 ]
-type MaybeCallable[_T] = _T | Callable[[], _T]
-type MaybeStr[_T] = _T | str
-type MaybeType[_T] = _T | type[_T]
+type MaybeCallable[T] = T | Callable[[], T]
+type MaybeStr[T] = T | str
+type MaybeType[T] = T | type[T]
 type StrMapping = Mapping[str, Any]
 type StrStrMapping = Mapping[str, str]
-type TypeLike[_T] = type[_T] | tuple[type[_T], ...]
+type TypeLike[T] = type[T] | tuple[type[T], ...]
 type TupleOrStrMapping = tuple[Any, ...] | StrMapping
 
 
 # asyncio
-type Coroutine1[_T] = Coroutine[Any, Any, _T]
-type MaybeAwaitable[_T] = _T | Awaitable[_T]
+type Coro[T] = Coroutine[Any, Any, T]
 type MaybeCallableEvent = MaybeCallable[Event]
-type MaybeCoroutine1[_T] = _T | Coroutine1[_T]
-type CallableCoroutine1[_T] = Callable[..., Coroutine1[_T]]
-
-
-# callable
-TCallable = TypeVar("TCallable", bound=Callable[..., Any])
-TCallable1 = TypeVar("TCallable1", bound=Callable[..., Any])
-TCallable2 = TypeVar("TCallable2", bound=Callable[..., Any])
-TCallableCoroutine1 = TypeVar(
-    "TCallableCoroutine1", bound=Callable[..., Coroutine1[Any]]
-)
-TCallableCoroutine1None = TypeVar(
-    "TCallableCoroutine1None", bound=Callable[..., Coroutine1[None]]
-)
-TCallableMaybeCoroutine1None = TypeVar(
-    "TCallableMaybeCoroutine1None", bound=Callable[..., MaybeCoroutine1[None]]
-)
+type MaybeCoro[T] = T | Coro[T]
 
 
 # concurrent
@@ -102,22 +85,8 @@ class Dataclass(Protocol):
     __dataclass_fields__: ClassVar[dict[str, Any]]
 
 
-TDataclass = TypeVar("TDataclass", bound=Dataclass)
-
-
 # enum
-type EnumLike[_TEnum: Enum] = MaybeStr[_TEnum]
-TEnum = TypeVar("TEnum", bound=Enum)
-
-
-# exceptions
-TBaseException = TypeVar("TBaseException", bound=BaseException)
-
-
-# hashable
-THashable = TypeVar("THashable", bound=Hashable)
-THashable1 = TypeVar("THashable1", bound=Hashable)
-THashable2 = TypeVar("THashable2", bound=Hashable)
+type EnumLike[E: Enum] = MaybeStr[E]
 
 
 # ipaddress
@@ -164,77 +133,47 @@ class SupportsAbs(Protocol[_T_co]):
     def __abs__(self) -> _T_co: ...  # pragma: no cover
 
 
-TSupportsAbs = TypeVar("TSupportsAbs", bound=SupportsAbs)
-
-
 @runtime_checkable
 class SupportsAdd(Protocol[_T_contra, _T_co]):
     def __add__(self, x: _T_contra, /) -> _T_co: ...  # pragma: no cover
 
 
-TSupportsAdd = TypeVar("TSupportsAdd", bound=SupportsAdd)
-
-
 @runtime_checkable
 class SupportsBytes(Protocol):
     def __bytes__(self) -> bytes: ...  # pragma: no cover
 
 
-TSupportsBytes = TypeVar("TSupportsBytes", bound=SupportsBytes)
-
-
 @runtime_checkable
 class SupportsComplex(Protocol):
     def __complex__(self) -> complex: ...  # pragma: no cover
 
 
-TSupportsComplex = TypeVar("TSupportsComplex", bound=SupportsComplex)
-
-
 @runtime_checkable
 class SupportsFloat(Protocol):
     def __float__(self) -> float: ...  # pragma: no cover
 
 
-TSupportsFloat = TypeVar("TSupportsFloat", bound=SupportsFloat)
-
-
 @runtime_checkable
 class SupportsGT(Protocol[_T_contra]):
     def __gt__(self, other: _T_contra, /) -> bool: ...  # pragma: no cover
 
 
-TSupportsGT = TypeVar("TSupportsGT", bound=SupportsGT)
-
-
 @runtime_checkable
 class SupportsIndex(Protocol):
     def __index__(self) -> int: ...  # pragma: no cover
 
 
-TSupportsIndex = TypeVar("TSupportsIndex", bound=SupportsIndex)
-
-
 @runtime_checkable
 class SupportsInt(Protocol):
     def __int__(self) -> int: ...  # pragma: no cover
 
 
-TSupportsInt = TypeVar("TSupportsInt", bound=SupportsInt)
-
-
 @runtime_checkable
 class SupportsLT(Protocol[_T_contra]):
     def __lt__(self, other: _T_contra, /) -> bool: ...  # pragma: no cover
 
 
-TSupportsLT = TypeVar("TSupportsLT", bound=SupportsLT)
-
-
 SupportsRichComparison = SupportsLT[Any] | SupportsGT[Any]
-TSupportsRichComparison = TypeVar(
-    "TSupportsRichComparison", bound=SupportsRichComparison
-)
 
 
 @runtime_checkable
@@ -299,8 +238,7 @@ type TimeZoneLike = (
 
 
 __all__ = [
-    "CallableCoroutine1",
-    "Coroutine1",
+    "Coro",
     "Dataclass",
     "DateDeltaLike",
     "DateLike",
@@ -315,13 +253,12 @@ __all__ = [
     "LogLevel",
     "LoggerOrName",
     "MathRoundMode",
-    "MaybeAwaitable",
     "MaybeCallable",
     "MaybeCallableDate",
     "MaybeCallableEvent",
     "MaybeCallablePathLike",
     "MaybeCallableZonedDateTime",
-    "MaybeCoroutine1",
+    "MaybeCoro",
     "MaybeIterable",
     "MaybeIterableHashable",
     "MaybeStr",
@@ -350,27 +287,6 @@ __all__ = [
     "SupportsLT",
     "SupportsRichComparison",
     "SupportsRound",
-    "TBaseException",
-    "TCallable",
-    "TCallable1",
-    "TCallable2",
-    "TCallableCoroutine1",
-    "TCallableCoroutine1None",
-    "TCallableMaybeCoroutine1None",
-    "TDataclass",
-    "TEnum",
-    "THashable",
-    "THashable1",
-    "THashable2",
-    "TSupportsAbs",
-    "TSupportsAdd",
-    "TSupportsBytes",
-    "TSupportsComplex",
-    "TSupportsGT",
-    "TSupportsIndex",
-    "TSupportsInt",
-    "TSupportsLT",
-    "TSupportsRichComparison",
     "TimeDeltaLike",
     "TimeLike",
     "TimeZone",

utilities/typing.py

@@ -13,7 +13,6 @@ from typing import (
     Optional,  # pyright: ignore[reportDeprecated]
     TypeAliasType,
     TypeGuard,
-    TypeVar,
     Union,  # pyright: ignore[reportDeprecated]
     get_origin,
     overload,
@@ -38,16 +37,6 @@ from utilities.iterables import unique_everseen
 from utilities.sentinel import Sentinel
 from utilities.types import StrMapping
 
-_T = TypeVar("_T")
-_T1 = TypeVar("_T1")
-_T2 = TypeVar("_T2")
-_T3 = TypeVar("_T3")
-_T4 = TypeVar("_T4")
-_T5 = TypeVar("_T5")
-
-
-##
-
 
 def get_args(obj: Any, /, *, optional_drop_none: bool = False) -> tuple[Any, ...]:
     """Get the arguments of an annotation."""
@@ -223,23 +212,25 @@ def is_frozenset_type(obj: Any, /) -> bool:
 
 
 @overload
-def is_instance_gen(obj: Any, type_: type[_T], /) -> TypeGuard[_T]: ...
+def is_instance_gen[T](obj: Any, type_: type[T], /) -> TypeGuard[T]: ...
 @overload
-def is_instance_gen(obj: Any, type_: tuple[_T1], /) -> TypeGuard[_T1]: ...
+def is_instance_gen[T1](obj: Any, type_: tuple[T1], /) -> TypeGuard[T1]: ...
 @overload
-def is_instance_gen(obj: Any, type_: tuple[_T1, _T2], /) -> TypeGuard[_T1 | _T2]: ...
+def is_instance_gen[T1, T2](
+    obj: Any, type_: tuple[T1, T2], /
+) -> TypeGuard[T1 | T2]: ...
 @overload
-def is_instance_gen(
-    obj: Any, type_: tuple[_T1, _T2, _T3], /
-) -> TypeGuard[_T1 | _T2 | _T3]: ...
+def is_instance_gen[T1, T2, T3](
+    obj: Any, type_: tuple[T1, T2, T3], /
+) -> TypeGuard[T1 | T2 | T3]: ...
 @overload
-def is_instance_gen(
-    obj: Any, type_: tuple[_T1, _T2, _T3, _T4], /
-) -> TypeGuard[_T1 | _T2 | _T3 | _T4]: ...
+def is_instance_gen[T1, T2, T3, T4](
+    obj: Any, type_: tuple[T1, T2, T3, T4], /
+) -> TypeGuard[T1 | T2 | T3 | T4]: ...
 @overload
-def is_instance_gen(
-    obj: Any, type_: tuple[_T1, _T2, _T3, _T4, _T5], /
-) -> TypeGuard[_T1 | _T2 | _T3 | _T4 | _T5]: ...
+def is_instance_gen[T1, T2, T3, T4, T5](
+    obj: Any, type_: tuple[T1, T2, T3, T4, T5], /
+) -> TypeGuard[T1 | T2 | T3 | T4 | T5]: ...
 @overload
 def is_instance_gen(obj: Any, type_: Any, /) -> bool: ...
 def is_instance_gen(obj: Any, type_: Any, /) -> bool:
@@ -265,7 +256,7 @@ def is_instance_gen(obj: Any, type_: Any, /) -> bool:
     raise IsInstanceGenError(obj=obj, type_=type_)
 
 
-def _is_instance_gen_type(obj: Any, type_: type[_T], /) -> TypeGuard[_T]:
+def _is_instance_gen_type[T](obj: Any, type_: type[T], /) -> TypeGuard[T]:
     return (
         isinstance(obj, type_)
         and not (
@@ -368,29 +359,27 @@ def is_set_type(obj: Any, /) -> bool:
 
 
 @overload
-def is_subclass_gen(cls: type[Any], parent: type[_T], /) -> TypeGuard[type[_T]]: ...
+def is_subclass_gen[T](cls: type[Any], parent: type[T], /) -> TypeGuard[type[T]]: ...
 @overload
-def is_subclass_gen(
-    cls: type[Any], parent: tuple[type[_T1]], /
-) -> TypeGuard[type[_T1]]: ...
+def is_subclass_gen[T1](
+    cls: type[Any], parent: tuple[type[T1]], /
+) -> TypeGuard[type[T1]]: ...
 @overload
-def is_subclass_gen(
-    cls: type[Any], parent: tuple[type[_T1], type[_T2]], /
-) -> TypeGuard[type[_T1 | _T2]]: ...
+def is_subclass_gen[T1, T2](
+    cls: type[Any], parent: tuple[type[T1], type[T2]], /
+) -> TypeGuard[type[T1 | T2]]: ...
 @overload
-def is_subclass_gen(
-    cls: type[Any], parent: tuple[type[_T1], type[_T2], type[_T3]], /
-) -> TypeGuard[type[_T1 | _T2 | _T3]]: ...
+def is_subclass_gen[T1, T2, T3](
+    cls: type[Any], parent: tuple[type[T1], type[T2], type[T3]], /
+) -> TypeGuard[type[T1 | T2 | T3]]: ...
 @overload
-def is_subclass_gen(
-    cls: type[Any], parent: tuple[type[_T1], type[_T2], type[_T3], type[_T4]], /
-) -> TypeGuard[type[_T1 | _T2 | _T3 | _T4]]: ...
+def is_subclass_gen[T1, T2, T3, T4](
+    cls: type[Any], parent: tuple[type[T1], type[T2], type[T3], type[T4]], /
+) -> TypeGuard[type[T1 | T2 | T3 | T4]]: ...
 @overload
-def is_subclass_gen(
-    cls: type[Any],
-    parent: tuple[type[_T1], type[_T2], type[_T3], type[_T4], type[_T5]],
-    /,
-) -> TypeGuard[type[_T1 | _T2 | _T3 | _T4 | _T5]]: ...
+def is_subclass_gen[T1, T2, T3, T4, T5](
+    cls: type[Any], parent: tuple[type[T1], type[T2], type[T3], type[T4], type[T5]], /
+) -> TypeGuard[type[T1 | T2 | T3 | T4 | T5]]: ...
 @overload
 def is_subclass_gen(cls: Any, parent: Any, /) -> bool: ...
 def is_subclass_gen(cls: Any, parent: Any, /) -> bool:
@@ -426,7 +415,7 @@ def is_subclass_gen(cls: Any, parent: Any, /) -> bool:
     raise IsSubclassGenError(cls=cls)
 
 
-def _is_subclass_gen_type(cls: type[Any], parent: type[_T], /) -> TypeGuard[type[_T]]:
+def _is_subclass_gen_type[T](cls: type[Any], parent: type[T], /) -> TypeGuard[type[T]]:
     return (
         issubclass(cls, parent)
         and not (

utilities/uuid.py

@@ -8,6 +8,7 @@ from utilities.random import get_state
 if TYPE_CHECKING:
     from utilities.types import Seed
 
+
 UUID_PATTERN = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
 UUID_EXACT_PATTERN = f"^{UUID_PATTERN}$"