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

{dycw_utilities-0.133.6.dist-info → dycw_utilities-0.134.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.133.6
+Version: 0.134.0
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.133.6.dist-info → dycw_utilities-0.134.0.dist-info}/RECORD

@@ -1,74 +1,74 @@
-utilities/__init__.py,sha256=zEbfqlJXaAM2jeU-uk4y12_DIVcHjGVmBbiIiG_zz0Q,60
+utilities/__init__.py,sha256=6Kft8t6oHMNZG-gaM4ZQ07SvvDvKryeqHULU_jPaWnE,60
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
-utilities/arq.py,sha256=objwVQZEmpX8XEtSdLB_Md_HY8VDEnT-_4Y_ujRy4NM,6498
-utilities/asyncio.py,sha256=USWMMrHqPVRr20vlIn_n5JLimyqa-5xLhuqDYWJed8A,37586
+utilities/arq.py,sha256=S-sfBfY-E1ErRKf4sSXt2YyCjKvu-pBlOECDfjBebRA,6399
+utilities/asyncio.py,sha256=F12PF2z0letHzFhESXLlAYLTSV7MpTAGfW8FF3EWFmM,37403
 utilities/atomicwrites.py,sha256=geFjn9Pwn-tTrtoGjDDxWli9NqbYfy3gGL6ZBctiqSo,5393
-utilities/atools.py,sha256=-bFGIrwYMFR7xl39j02DZMsO_u5x5_Ph7bRlBUFVYyw,1048
-utilities/cachetools.py,sha256=uBtEv4hD-TuCPX_cQy1lOpLF-QqfwnYGSf0o4Soqydc,2826
-utilities/click.py,sha256=2k7Ss2qKwYb1JCDB5IWpNf-B2WTyjKR1GxDW-Y6anPs,15736
-utilities/concurrent.py,sha256=s2scTEd2AhXVTW4hpASU2qxV_DiVLALfms55cCQzCvM,2886
+utilities/atools.py,sha256=9im2g8OCf-Iynqa8bAv8N0Ycj9QvrJmGO7yLCZEdgII,986
+utilities/cachetools.py,sha256=v1-9sXHLdOLiwmkq6NB0OUbxeKBuVVN6wmAWefWoaHI,2744
+utilities/click.py,sha256=rXCbuBi6xqRK2-2e0hXQ2vYBWJzT9vPY6KkRIu73_uI,16049
+utilities/concurrent.py,sha256=ZdhcNeBl1-HaAPY3h7bZ5ccuYdfdq2ATHplvZdnzlhk,2858
 utilities/contextlib.py,sha256=lpaLJBy3X0UGLWjM98jkQZZq8so4fRmoK-Bheq0uOW4,1027
 utilities/contextvars.py,sha256=RsSGGrbQqqZ67rOydnM7WWIsM2lIE31UHJLejnHJPWY,505
 utilities/cryptography.py,sha256=_CiK_K6c_-uQuUhsUNjNjTL-nqxAh4_1zTfS11Xe120,972
 utilities/cvxpy.py,sha256=Rv1-fD-XYerosCavRF8Pohop2DBkU3AlFaGTfD8AEAA,13776
-utilities/dataclasses.py,sha256=iiC1wpGXWhaocIikzwBt8bbLWyImoUlOlcDZJGejaIg,33011
-utilities/enum.py,sha256=HoRwVCWzsnH0vpO9ZEcAAIZLMv0Sn2vJxxA4sYMQgDs,5793
+utilities/dataclasses.py,sha256=1-REGxtzCo2BbGkjLw5idjbTaiItpOiWvMNbVkJrFXM,32663
+utilities/enum.py,sha256=IEPMGiNJBcofGPuoGZErf4bMNSBE4SLs32nvm2r81h0,5791
 utilities/errors.py,sha256=nC7ZYtxxDBMfrTHtT_MByBfup_wfGQFRo3eDt-0ZPe8,1045
-utilities/eventkit.py,sha256=6M5Xu1SzN-juk9PqBHwy5dS-ta7T0qA6SMpDsakOJ0E,13039
+utilities/eventkit.py,sha256=cV76NIHKDPyrhnZRuhjCXse5CQqgRGXZ7p7Gon4Mu2g,12646
 utilities/fastapi.py,sha256=E8T2J1-N_RbpkN4czthU6NPIxAZDzxy-k_WGJaxeJ48,2671
 utilities/fpdf2.py,sha256=PmPj8ugr_SlxFEpw-9OsI8--mteLQ4MaXv_Cbmf7XXs,1852
-utilities/functions.py,sha256=1GMHO3PJUPil9cpDNI656RN9aGWoJS2grzPFk3HWgJg,28267
-utilities/functools.py,sha256=WrpHt7NLNWSUn9A1Q_ZIWlNaYZOEI4IFKyBG9HO3BC4,1643
+utilities/functions.py,sha256=Teqm7ylOqEcBLHWhRwjKqouUfc6nv_6qO6fILpnOPyA,27937
+utilities/functools.py,sha256=mQv5yPMAy2CPVPnbxvRHhnDX3DnnyF1Mz5DIFWzWcro,1512
 utilities/getpass.py,sha256=DfN5UgMAtFCqS3dSfFHUfqIMZX2shXvwphOz_6J6f6A,103
 utilities/git.py,sha256=oi7-_l5e9haSANSCvQw25ufYGoNahuUPHAZ6114s3JQ,1191
 utilities/hashlib.py,sha256=SVTgtguur0P4elppvzOBbLEjVM3Pea0eWB61yg2ilxo,309
 utilities/http.py,sha256=WcahTcKYRtZ04WXQoWt5EGCgFPcyHD3EJdlMfxvDt-0,946
-utilities/hypothesis.py,sha256=LWEcjL0ip0cwawcIHhnWPVnB1OEH1GJnYEwYU6xtFpo,36259
+utilities/hypothesis.py,sha256=_OFFvb8rVvMgXo04zaIFYw4p32QGrVHzJsR8pL3G8l4,36195
 utilities/importlib.py,sha256=mV1xT_O_zt_GnZZ36tl3xOmMaN_3jErDWY54fX39F6Y,429
 utilities/inflect.py,sha256=DbqB5Q9FbRGJ1NbvEiZBirRMxCxgrz91zy5jCO9ZIs0,347
 utilities/ipython.py,sha256=V2oMYHvEKvlNBzxDXdLvKi48oUq2SclRg5xasjaXStw,763
-utilities/iterables.py,sha256=cuebB4ivKlZuKm8S3PQIfjavn9h-5mBGmvYq4FpSxFg,43812
+utilities/iterables.py,sha256=wlcm0PS2fKG-H0r0k367NOLrryMbfXLlwzUeAmBSvv8,43392
 utilities/jupyter.py,sha256=ft5JA7fBxXKzP-L9W8f2-wbF0QeYc_2uLQNFDVk4Z-M,2917
 utilities/libcst.py,sha256=Jto5ppzRzsxn4AD32IS8n0lbgLYXwsVJB6EY8giNZyY,4974
 utilities/lightweight_charts.py,sha256=JrkrAZMo6JID2Eoc9QCc05Y_pK4l2zsApIhmii1z2Ig,2764
 utilities/logging.py,sha256=j0xS7bNdZcMAobWSRahpg_d7GWewd_99oXvexrjWm6k,17841
-utilities/luigi.py,sha256=UAt4TDMtinLAN7sipX0jSvH-aZzHUTQbHB3Rwtbq994,4840
+utilities/luigi.py,sha256=wK7cB3y8NXeSa8d6r_yTKRmjMguNmIPmy52yg10vPaI,4774
 utilities/math.py,sha256=_6vrDyjtaqE_OFE-F2DNWrDG_J_kMl3nFAJsok9v_bY,26862
-utilities/memory_profiler.py,sha256=tf2C51P2lCujPGvRt2Rfc7VEw5LDXmVPCG3z_AvBmbU,962
+utilities/memory_profiler.py,sha256=XzN56jDCa5aqXS_DxEjb_K4L6aIWh_5zyKi6OhcIxw0,853
 utilities/modules.py,sha256=iuvLluJya-hvl1Q25-Jk3dLgx2Es3ck4SjJiEkAlVTs,3195
-utilities/more_itertools.py,sha256=tBbjjKx8_Uv_TCjxhPwrGfAx_jRHtvLIZqXVWAsjzqA,8842
+utilities/more_itertools.py,sha256=QCPzZvdsPbbd_ypPP06odqfyK79Vp4oQG9DQbaI205A,8644
 utilities/numpy.py,sha256=Xn23sA2ZbVNqwUYEgNJD3XBYH6IbCri_WkHSNhg3NkY,26122
-utilities/operator.py,sha256=DuiWdkmK0D-ddvFqOayDkazTQE1Ysvtl6-UiBN5gns8,3857
-utilities/optuna.py,sha256=loyJGWTzljgdJaoLhP09PT8Jz6o_pwBOwehY33lHkhw,1923
+utilities/operator.py,sha256=fZM2DBZdjtU8Lh9Z-eHC4ktNr0vO3JfX8hXgIYwdvBI,3826
+utilities/optuna.py,sha256=C-fhWYiXHVPo1l8QctYkFJ4DyhbSrGorzP1dJb_qvd8,1933
 utilities/orjson.py,sha256=y5ynSGhQjX7vikfvsHh_AklLnH7gjvsSkIC3h5tnx98,36474
 utilities/os.py,sha256=D_FyyT-6TtqiN9KSS7c9g1fnUtgxmyMtzAjmYLkk46A,3587
 utilities/parse.py,sha256=PCy73pBmXgFzjxV54BC7TzHVhV3caDQvdvfXYqE_UUQ,17642
-utilities/pathlib.py,sha256=PK41rf1c9Wqv7h8f5R7H3_Lhq_gQZTUJD5tu3gMHVaU,3247
-utilities/period.py,sha256=opqpBevBGSGXbA7NYfRJjtthi1JPxdMaZ7QV3xosnTc,4774
+utilities/pathlib.py,sha256=jCFPZm4rBKylEva9wDVTwQlTTVKMepu92WrTpoGa438,3248
+utilities/period.py,sha256=QZsy2tCcoh0LGr70bkvlB5iWqEx6hdit3-iuaWJYXXc,4689
 utilities/pickle.py,sha256=MBT2xZCsv0pH868IXLGKnlcqNx2IRVKYNpRcqiQQqxw,653
 utilities/platform.py,sha256=5uCKRf_ij7ukJDcbnNfhY2ay9fbrpiNLRO1t2QvcwqQ,2825
-utilities/polars.py,sha256=BYTYniVSW9SrBWdmoTy8RqUgqBW4y07mlRPEWXPUyYg,63357
+utilities/polars.py,sha256=xCeB-pLkezOoQJvgxTdz2rNlaehdhek-HmDztXWn2j0,63266
 utilities/polars_ols.py,sha256=Uc9V5kvlWZ5cU93lKZ-cfAKdVFFw81tqwLW9PxtUvMs,5618
 utilities/pottery.py,sha256=RN3XwOEsVAPXvEfsRPmn3ZSKgTzK_c182PNrtksq-bg,3429
-utilities/pqdm.py,sha256=foRytQybmOQ05pjt5LF7ANyzrIa--4ScDE3T2wd31a4,3118
+utilities/pqdm.py,sha256=BTsYPtbKQWwX-iXF4qCkfPG7DPxIB54J989n83bXrIo,3092
 utilities/psutil.py,sha256=0j4YxtVb8VjaaKKiHg6UEK95SUPkEcENgPtLgPJsNv0,3760
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utilities/pydantic.py,sha256=aP6OKowg2Md4rgQuQ5qTSF4bTbBuq7WtRb7zS3JSRGY,1841
+utilities/pydantic.py,sha256=CmxCi4sukeHM3JGjJ1Rbp8UAvcx4MZapLg10mFYJ-nk,1771
 utilities/pyinstrument.py,sha256=_Rfq6Gg4NKV2NF0dRYOpK2IRyyePxI7-3UmHIQLYrlQ,852
-utilities/pytest.py,sha256=xSDybvkvdj7Ix-Tpc1INctKZV07qwrQvJlQonSimB7o,8273
+utilities/pytest.py,sha256=vv5ZpePZS6pBxl5jY3XQR5SnAhgd4f0sSMyRsvHWg60,8086
 utilities/pytest_regressions.py,sha256=YI55B7EtLjhz7zPJZ6NK9bWrxrKCKabWZJe1cwcbA5o,5082
-utilities/python_dotenv.py,sha256=edXsvHZhZnYeqfMfrsRRpj7_9eJI6uizh3xLx8Q9B3w,3228
-utilities/random.py,sha256=lYdjgxB7GCfU_fwFVl5U-BIM_HV3q6_urL9byjrwDM8,4157
+utilities/python_dotenv.py,sha256=dYooRYwqrvhSoZWuiVbCiKUWiS-M5b5yv2zDWGYPEvI,3209
+utilities/random.py,sha256=YWYzWxQDeyJRiuHGnO1OxF6dDucpq7qc1tH_ealwCRg,4130
 utilities/re.py,sha256=6qxeV0rQZaBDKWcB7apSBmxtg_XzoGY-EdegTkMn-ZY,4578
-utilities/redis.py,sha256=u1nYu3ccGni8u3AFg5aXDdpW4ZmT6lGAHIk-wKeZPq4,35761
+utilities/redis.py,sha256=FuVyxF70BMnlnbQdvdv09Nj7xNuWmws4s94Bb-tIMNc,35415
 utilities/reprlib.py,sha256=ssYTcBW-TeRh3fhCJv57sopTZHF5FrPyyUg9yp5XBlo,3953
 utilities/scipy.py,sha256=wZJM7fEgBAkLSYYvSmsg5ac-QuwAI0BGqHVetw1_Hb0,947
 utilities/sentinel.py,sha256=3jIwgpMekWgDAxPDA_hXMP2St43cPhciKN3LWiZ7kv0,1248
 utilities/shelve.py,sha256=HZsMwK4tcIfg3sh0gApx4-yjQnrY4o3V3ZRimvRhoW0,738
-utilities/slack_sdk.py,sha256=SsRMJD2HuPUjAFg-2JxOQ9IhKViu4f66cN5kt-C2a7M,4245
+utilities/slack_sdk.py,sha256=RrB34gOj4TzBFh1vzMy6wL_ajzIG-2c9kiS6c6LzMFM,4233
 utilities/socket.py,sha256=K77vfREvzoVTrpYKo6MZakol0EYu2q1sWJnnZqL0So0,118
-utilities/sqlalchemy.py,sha256=A4_31D58RECTshpYQWRJ6Rr3s5gm8YeySp-5Z4R7lRQ,38065
+utilities/sqlalchemy.py,sha256=5Cx-ioYb099xDUDZuXrXp5tFU90HnCvu3jUu6wkGxrg,38001
 utilities/sqlalchemy_polars.py,sha256=5TwuUPORZ1Nz3qbI6L6pzeThtEv8Ws4aQW8cm3MG-v0,14293
 utilities/statsmodels.py,sha256=koyiBHvpMcSiBfh99wFUfSggLNx7cuAw3rwyfAhoKpQ,3410
 utilities/streamlit.py,sha256=U9PJBaKP1IdSykKhPZhIzSPTZsmLsnwbEPZWzNhJPKk,2955
@@ -76,20 +76,20 @@ utilities/string.py,sha256=XmU-s04qIV_tODnKl2pQiwmHaxzgOqRKU-RyzdrfvSE,620
 utilities/tempfile.py,sha256=VqmZJAhTJ1OaVywFzk5eqROV8iJbW9XQ_QYAV0bpdRo,1384
 utilities/text.py,sha256=ymBFlP_cA8OgNnZRVNs7FAh7OG8HxE6YkiLEMZv5g_A,11297
 utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
-utilities/timer.py,sha256=oYqRQ-G-DMOOHB6a4yP5-PJDVimLnbNkMnkOj_jUmFg,2474
+utilities/timer.py,sha256=oXfTii6ymu57niP0BDGZjFD55LEHi2a19kqZKiTgaFQ,2588
 utilities/traceback.py,sha256=i-790AQbTrDA8MiYyOcYPFpm48I558VR_kL_7x4ypfY,8503
-utilities/typed_settings.py,sha256=io3bhnglxO5FRNuTz1vpgbbGgvyj6VGJ5pytPRUeJo4,3769
-utilities/types.py,sha256=-ql33onw3mp3nS6ZBXyE-g1uYEdGhoTJQcYOfatSNGI,19360
-utilities/typing.py,sha256=kVWK6ciV8T0MKxnFQcMSEr_XlRisspH5aBTTosMUh30,13872
+utilities/typed_settings.py,sha256=niNxgvVKrTy1c0j0D0Jp2tO3m231f4yJJ-38ni-xY3Q,3739
+utilities/types.py,sha256=DrFWZQqpkekHdnr2-G2eBaxGX8FoND6ON2XFRvhm8Jo,17177
+utilities/typing.py,sha256=Z-_XDaWyT_6wIo3qfNK-hvRlzxP2Jxa9PgXzm5rDYRA,13790
 utilities/tzdata.py,sha256=fgNVj66yUbCSI_-vrRVzSD3gtf-L_8IEJEPjP_Jel5Y,266
 utilities/tzlocal.py,sha256=KyCXEgCTjqGFx-389JdTuhMRUaT06U1RCMdWoED-qro,728
-utilities/uuid.py,sha256=jJTFxz-CWgltqNuzmythB7iEQ-Q1mCwPevUfKthZT3c,611
+utilities/uuid.py,sha256=32p7DGHGM2Btx6PcBvCZvERSWbpupMXqx6FppPoSoTU,612
 utilities/version.py,sha256=ufhJMmI6KPs1-3wBI71aj5wCukd3sP_m11usLe88DNA,5117
 utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=A-yoOqBqrcVD1yDINDsTFDw7dq9-zgUGn_f8CxVUQJs,23332
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=oEH-nL3t4h9uawyZqWDtNtDAl6M-CLpLYGI_nI6DulM,1971
-dycw_utilities-0.133.6.dist-info/METADATA,sha256=2kzp_mBpkFfRF9tQRbGoeEZN13gmZG4UpUS3DqB7RfE,1584
-dycw_utilities-0.133.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.133.6.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.133.6.dist-info/RECORD,,
+dycw_utilities-0.134.0.dist-info/METADATA,sha256=ge1UR3zk8DRZIcXfN3RY6DR9oh5TJ-nT-A2YWjlPz_4,1584
+dycw_utilities-0.134.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.134.0.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.134.0.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.133.6"
+__version__ = "0.134.0"

utilities/arq.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from functools import wraps
 from itertools import chain
-from typing import TYPE_CHECKING, Any, ParamSpec, Self, TypeVar, cast, override
+from typing import TYPE_CHECKING, Any, Self, cast, override
 
 from arq.constants import default_queue_name, expires_extra_ms
 from arq.cron import cron
@@ -27,18 +27,11 @@ if TYPE_CHECKING:
     )
     from arq.worker import Function
 
-    from utilities.types import CallableCoroutine1, Coroutine1, StrMapping
-
-
-_P = ParamSpec("_P")
-_T = TypeVar("_T")
-
-
-##
+    from utilities.types import Coro, StrMapping
 
 
 def cron_raw(
-    coroutine: CallableCoroutine1[Any],
+    coroutine: Callable[..., Coro[Any]],
     /,
     *,
     name: str | None = None,
@@ -83,13 +76,13 @@ def cron_raw(
     )
 
 
-def _lift_cron(
-    func: Callable[_P, Coroutine1[_T]], *args: _P.args, **kwargs: _P.kwargs
+def _lift_cron[**P, T](
+    func: Callable[P, Coro[T]], *args: P.args, **kwargs: P.kwargs
 ) -> WorkerCoroutine:
     """Lift a coroutine function & call arg/kwargs for `cron`."""
 
     @wraps(func)
-    async def wrapped(ctx: StrMapping, /) -> _T:
+    async def wrapped(ctx: StrMapping, /) -> T:
         _ = ctx
         return await func(*args, **kwargs)
 
@@ -110,12 +103,12 @@ class _JobEnqueuer:
     expires: int | float | timedelta | None = None
     job_try: int | None = None
 
-    async def __call__(
+    async def __call__[**P, T](
         self,
         redis: ArqRedis,
-        function: Callable[_P, Coroutine1[_T]],
-        *args: _P.args,
-        **kwargs: _P.kwargs,
+        function: Callable[P, Coro[T]],
+        *args: P.args,
+        **kwargs: P.kwargs,
     ) -> Job | None:
         return await redis.enqueue_job(  # skipif-ci-and-not-linux
             function.__name__,
@@ -171,11 +164,11 @@ class _WorkerMeta(type):
         return cls
 
     @classmethod
-    def _lift(cls, func: Callable[_P, Coroutine1[_T]]) -> WorkerCoroutine:
+    def _lift[**P, T](cls, func: Callable[P, Coro[T]]) -> WorkerCoroutine:
         """Lift a coroutine function to accept the required `ctx` argument."""
 
         @wraps(func)
-        async def wrapped(ctx: StrMapping, *args: _P.args, **kwargs: _P.kwargs) -> _T:
+        async def wrapped(ctx: StrMapping, *args: P.args, **kwargs: P.kwargs) -> T:
             _ = ctx
             return await func(*args, **kwargs)
 
@@ -187,7 +180,7 @@ class Worker(metaclass=_WorkerMeta):
     """Base class for all workers."""
 
     functions: Sequence[Function | WorkerCoroutine] = ()
-    functions_raw: Sequence[CallableCoroutine1[Any]] = ()
+    functions_raw: Sequence[Callable[..., Coro[Any]]] = ()
     queue_name: str | None = default_queue_name
     cron_jobs: Sequence[CronJob] | None = None
     redis_settings: RedisSettings | None = None

utilities/asyncio.py

@@ -16,7 +16,7 @@ from asyncio import (
     create_task,
     sleep,
 )
-from collections.abc import Callable, Iterable, Iterator
+from collections.abc import Callable, Hashable, Iterable, Iterator
 from contextlib import (
     AbstractAsyncContextManager,
     AsyncExitStack,
@@ -30,17 +30,7 @@ from itertools import chain
 from logging import DEBUG, Logger, getLogger
 from subprocess import PIPE
 from sys import stderr, stdout
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Generic,
-    Self,
-    TextIO,
-    TypeVar,
-    assert_never,
-    overload,
-    override,
-)
+from typing import TYPE_CHECKING, Any, Self, TextIO, assert_never, overload, override
 
 from typing_extensions import deprecated
 
@@ -49,13 +39,7 @@ from utilities.errors import repr_error
 from utilities.functions import ensure_int, ensure_not_none
 from utilities.random import SYSTEM_RANDOM
 from utilities.sentinel import Sentinel, sentinel
-from utilities.types import (
-    DateTimeRoundUnit,
-    MaybeCallableEvent,
-    MaybeType,
-    THashable,
-    TSupportsRichComparison,
-)
+from utilities.types import SupportsRichComparison
 from utilities.whenever import SECOND, get_now
 
 if TYPE_CHECKING:
@@ -69,11 +53,10 @@ if TYPE_CHECKING:
 
     from whenever import TimeDelta, ZonedDateTime
 
-
-_T = TypeVar("_T")
+    from utilities.types import DateTimeRoundUnit, MaybeCallableEvent, MaybeType
 
 
-class EnhancedQueue(Queue[_T]):
+class EnhancedQueue[T](Queue[T]):
     """An asynchronous deque."""
 
     @override
@@ -82,39 +65,39 @@ class EnhancedQueue(Queue[_T]):
         self._finished: Event
         self._getters: deque[Any]
         self._putters: deque[Any]
-        self._queue: deque[_T]
+        self._queue: deque[T]
         self._unfinished_tasks: int
 
     @override
     @deprecated("Use `get_left`/`get_right` instead")
-    async def get(self) -> _T:
+    async def get(self) -> T:
         raise RuntimeError  # pragma: no cover
 
     @override
     @deprecated("Use `get_left_nowait`/`get_right_nowait` instead")
-    def get_nowait(self) -> _T:
+    def get_nowait(self) -> T:
         raise RuntimeError  # pragma: no cover
 
     @override
     @deprecated("Use `put_left`/`put_right` instead")
-    async def put(self, item: _T) -> None:
+    async def put(self, item: T) -> None:
         raise RuntimeError(item)  # pragma: no cover
 
     @override
     @deprecated("Use `put_left_nowait`/`put_right_nowait` instead")
-    def put_nowait(self, item: _T) -> None:
+    def put_nowait(self, item: T) -> None:
         raise RuntimeError(item)  # pragma: no cover
 
     # get all
 
-    async def get_all(self, *, reverse: bool = False) -> Sequence[_T]:
+    async def get_all(self, *, reverse: bool = False) -> Sequence[T]:
         """Remove and return all items from the queue."""
         first = await (self.get_right() if reverse else self.get_left())
         return list(chain([first], self.get_all_nowait(reverse=reverse)))
 
-    def get_all_nowait(self, *, reverse: bool = False) -> Sequence[_T]:
+    def get_all_nowait(self, *, reverse: bool = False) -> Sequence[T]:
         """Remove and return all items from the queue without blocking."""
-        items: Sequence[_T] = []
+        items: Sequence[T] = []
         while True:
             try:
                 items.append(
@@ -125,49 +108,49 @@ class EnhancedQueue(Queue[_T]):
 
     # get left/right
 
-    async def get_left(self) -> _T:
+    async def get_left(self) -> T:
         """Remove and return an item from the start of the queue."""
         return await self._get_left_or_right(self._get)
 
-    async def get_right(self) -> _T:
+    async def get_right(self) -> T:
         """Remove and return an item from the end of the queue."""
         return await self._get_left_or_right(self._get_right)
 
-    def get_left_nowait(self) -> _T:
+    def get_left_nowait(self) -> T:
         """Remove and return an item from the start of the queue without blocking."""
         return self._get_left_or_right_nowait(self._get)
 
-    def get_right_nowait(self) -> _T:
+    def get_right_nowait(self) -> T:
         """Remove and return an item from the end of the queue without blocking."""
         return self._get_left_or_right_nowait(self._get_right)
 
     # put left/right
 
-    async def put_left(self, *items: _T) -> None:
+    async def put_left(self, *items: T) -> None:
         """Put items into the queue at the start."""
         return await self._put_left_or_right(self._put_left, *items)
 
-    async def put_right(self, *items: _T) -> None:
+    async def put_right(self, *items: T) -> None:
         """Put items into the queue at the end."""
         return await self._put_left_or_right(self._put, *items)
 
-    def put_left_nowait(self, *items: _T) -> None:
+    def put_left_nowait(self, *items: T) -> None:
         """Put items into the queue at the start without blocking."""
         self._put_left_or_right_nowait(self._put_left, *items)
 
-    def put_right_nowait(self, *items: _T) -> None:
+    def put_right_nowait(self, *items: T) -> None:
         """Put items into the queue at the end without blocking."""
         self._put_left_or_right_nowait(self._put, *items)
 
     # private
 
-    def _put_left(self, item: _T) -> None:
+    def _put_left(self, item: T) -> None:
         self._queue.appendleft(item)
 
-    def _get_right(self) -> _T:
+    def _get_right(self) -> T:
         return self._queue.pop()
 
-    async def _get_left_or_right(self, getter_use: Callable[[], _T], /) -> _T:
+    async def _get_left_or_right(self, getter_use: Callable[[], T], /) -> T:
         while self.empty():  # pragma: no cover
             getter = self._get_loop().create_future()  # pyright: ignore[reportAttributeAccessIssue]
             self._getters.append(getter)
@@ -182,7 +165,7 @@ class EnhancedQueue(Queue[_T]):
                 raise
         return getter_use()
 
-    def _get_left_or_right_nowait(self, getter: Callable[[], _T], /) -> _T:
+    def _get_left_or_right_nowait(self, getter: Callable[[], T], /) -> T:
         if self.empty():
             raise QueueEmpty
         item = getter()
@@ -190,14 +173,14 @@ class EnhancedQueue(Queue[_T]):
         return item
 
     async def _put_left_or_right(
-        self, putter_use: Callable[[_T], None], /, *items: _T
+        self, putter_use: Callable[[T], None], /, *items: T
     ) -> None:
         """Put an item into the queue."""
         for item in items:
             await self._put_left_or_right_one(putter_use, item)
 
     async def _put_left_or_right_one(
-        self, putter_use: Callable[[_T], None], item: _T, /
+        self, putter_use: Callable[[T], None], item: T, /
     ) -> None:
         """Put an item into the queue."""
         while self.full():  # pragma: no cover
@@ -215,13 +198,13 @@ class EnhancedQueue(Queue[_T]):
         return putter_use(item)
 
     def _put_left_or_right_nowait(
-        self, putter: Callable[[_T], None], /, *items: _T
+        self, putter: Callable[[T], None], /, *items: T
     ) -> None:
         for item in items:
             self._put_left_or_right_nowait_one(putter, item)
 
     def _put_left_or_right_nowait_one(
-        self, putter: Callable[[_T], None], item: _T, /
+        self, putter: Callable[[T], None], item: T, /
     ) -> None:
         if self.full():  # pragma: no cover
             raise QueueFull
@@ -274,13 +257,13 @@ class EnhancedTaskGroup(TaskGroup):
         _ = await super().__aexit__(et, exc, tb)
 
     @override
-    def create_task(
+    def create_task[T](
         self,
-        coro: _CoroutineLike[_T],
+        coro: _CoroutineLike[T],
         *,
         name: str | None = None,
         context: Context | None = None,
-    ) -> Task[_T]:
+    ) -> Task[T]:
         if self._semaphore is None:
             coroutine = coro
         else:
@@ -288,18 +271,18 @@ class EnhancedTaskGroup(TaskGroup):
         coroutine = self._wrap_with_timeout(coroutine)
         return super().create_task(coroutine, name=name, context=context)
 
-    def create_task_context(self, cm: AbstractAsyncContextManager[_T], /) -> Task[_T]:
+    def create_task_context[T](self, cm: AbstractAsyncContextManager[T], /) -> Task[T]:
         """Have the TaskGroup start an asynchronous context manager."""
         _ = self._stack.push_async_callback(cm.__aexit__, None, None, None)
         return self.create_task(cm.__aenter__())
 
-    async def _wrap_with_semaphore(
-        self, semaphore: Semaphore, coroutine: _CoroutineLike[_T], /
-    ) -> _T:
+    async def _wrap_with_semaphore[T](
+        self, semaphore: Semaphore, coroutine: _CoroutineLike[T], /
+    ) -> T:
         async with semaphore:
             return await coroutine
 
-    async def _wrap_with_timeout(self, coroutine: _CoroutineLike[_T], /) -> _T:
+    async def _wrap_with_timeout[T](self, coroutine: _CoroutineLike[T], /) -> T:
         async with timeout_td(self._timeout, error=self._error):
             return await coroutine
 
@@ -321,7 +304,7 @@ class _LooperNoTaskError(LooperError):
 
 
 @dataclass(kw_only=True, unsafe_hash=True)
-class Looper(Generic[_T]):
+class Looper[T]:
     """A looper of a core coroutine, handling errors."""
 
     auto_start: bool = field(default=False, repr=False)
@@ -362,7 +345,7 @@ class Looper(Generic[_T]):
     # internal objects
     _lock: Lock = field(default_factory=Lock, init=False, repr=False, hash=False)
     _logger: Logger = field(init=False, repr=False, hash=False)
-    _queue: EnhancedQueue[_T] = field(
+    _queue: EnhancedQueue[T] = field(
         default_factory=EnhancedQueue, init=False, repr=False, hash=False
     )
     _stack: AsyncExitStack = field(
@@ -448,15 +431,15 @@ class Looper(Generic[_T]):
         """Check if the queue is empty."""
         return self._queue.empty()
 
-    def get_all_nowait(self, *, reverse: bool = False) -> Sequence[_T]:
+    def get_all_nowait(self, *, reverse: bool = False) -> Sequence[T]:
         """Remove and return all items from the queue without blocking."""
         return self._queue.get_all_nowait(reverse=reverse)
 
-    def get_left_nowait(self) -> _T:
+    def get_left_nowait(self) -> T:
         """Remove and return an item from the start of the queue without blocking."""
         return self._queue.get_left_nowait()
 
-    def get_right_nowait(self) -> _T:
+    def get_right_nowait(self) -> T:
         """Remove and return an item from the end of the queue without blocking."""
         return self._queue.get_right_nowait()
 
@@ -514,11 +497,11 @@ class Looper(Generic[_T]):
     async def _initialize_core(self) -> None:
         """Core part of initializing the looper."""
 
-    def put_left_nowait(self, *items: _T) -> None:
+    def put_left_nowait(self, *items: T) -> None:
         """Put items into the queue at the start without blocking."""
         self._queue.put_left_nowait(*items)
 
-    def put_right_nowait(self, *items: _T) -> None:
+    def put_right_nowait(self, *items: T) -> None:
         """Put items into the queue at the end without blocking."""
         self._queue.put_right_nowait(*items)
 
@@ -828,45 +811,47 @@ class _LooperStats:
 ##
 
 
-class UniquePriorityQueue(PriorityQueue[tuple[TSupportsRichComparison, THashable]]):
+class UniquePriorityQueue[T: SupportsRichComparison, U: Hashable](
+    PriorityQueue[tuple[T, U]]
+):
     """Priority queue with unique tasks."""
 
     @override
     def __init__(self, maxsize: int = 0) -> None:
         super().__init__(maxsize)
-        self._set: set[THashable] = set()
+        self._set: set[U] = set()
 
     @override
-    def _get(self) -> tuple[TSupportsRichComparison, THashable]:
+    def _get(self) -> tuple[T, U]:
         item = super()._get()
         _, value = item
         self._set.remove(value)
         return item
 
     @override
-    def _put(self, item: tuple[TSupportsRichComparison, THashable]) -> None:
+    def _put(self, item: tuple[T, U]) -> None:
         _, value = item
         if value not in self._set:
             super()._put(item)
             self._set.add(value)
 
 
-class UniqueQueue(Queue[THashable]):
+class UniqueQueue[T: Hashable](Queue[T]):
     """Queue with unique tasks."""
 
     @override
     def __init__(self, maxsize: int = 0) -> None:
         super().__init__(maxsize)
-        self._set: set[THashable] = set()
+        self._set: set[T] = set()
 
     @override
-    def _get(self) -> THashable:
+    def _get(self) -> T:
         item = super()._get()
         self._set.remove(item)
         return item
 
     @override
-    def _put(self, item: THashable) -> None:
+    def _put(self, item: T) -> None:
         if item not in self._set:
             super()._put(item)
             self._set.add(item)
@@ -903,7 +888,7 @@ def get_event(
 ##
 
 
-async def get_items(queue: Queue[_T], /, *, max_size: int | None = None) -> list[_T]:
+async def get_items[T](queue: Queue[T], /, *, max_size: int | None = None) -> list[T]:
     """Get items from a queue; if empty then wait."""
     try:
         items = [await queue.get()]
@@ -916,9 +901,9 @@ async def get_items(queue: Queue[_T], /, *, max_size: int | None = None) -> list
     return items
 
 
-def get_items_nowait(queue: Queue[_T], /, *, max_size: int | None = None) -> list[_T]:
+def get_items_nowait[T](queue: Queue[T], /, *, max_size: int | None = None) -> list[T]:
     """Get items from a queue; no waiting."""
-    items: list[_T] = []
+    items: list[T] = []
     if max_size is None:
         while True:
             try:
@@ -937,13 +922,13 @@ def get_items_nowait(queue: Queue[_T], /, *, max_size: int | None = None) -> lis
 ##
 
 
-async def put_items(items: Iterable[_T], queue: Queue[_T], /) -> None:
+async def put_items[T](items: Iterable[T], queue: Queue[T], /) -> None:
     """Put items into a queue; if full then wait."""
     for item in items:
         await queue.put(item)
 
 
-def put_items_nowait(items: Iterable[_T], queue: Queue[_T], /) -> None:
+def put_items_nowait[T](items: Iterable[T], queue: Queue[T], /) -> None:
     """Put items into a queue; no waiting."""
     for item in items:
         queue.put_nowait(item)