dycw-utilities 0.135.2__py3-none-any.whl → 0.136.1__py3-none-any.whl

{dycw_utilities-0.135.2.dist-info → dycw_utilities-0.136.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.135.2
+Version: 0.136.1
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -13,6 +13,7 @@ Requires-Dist: coloredlogs<15.1,>=15.0.1; extra == 'logging'
 Provides-Extra: test
 Requires-Dist: dycw-pytest-only<2.2,>=2.1.1; extra == 'test'
 Requires-Dist: hypothesis<6.136,>=6.135.2; extra == 'test'
+Requires-Dist: pudb<2025.2,>=2025.1; extra == 'test'
 Requires-Dist: pytest-asyncio<1.1,>=1.0.0; extra == 'test'
 Requires-Dist: pytest-cov<6.2,>=6.1.1; extra == 'test'
 Requires-Dist: pytest-instafail<0.6,>=0.5.0; extra == 'test'

{dycw_utilities-0.135.2.dist-info → dycw_utilities-0.136.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=dS9-gVIgJGzS5CZL-BTK1_FXZj4N7p0SWBqVdZrhTN4,60
+utilities/__init__.py,sha256=ghJADNjYC0lnQw7wfkYTP1svwcTYMtjPxrfG-2Yp7II,60
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
 utilities/arq.py,sha256=S-sfBfY-E1ErRKf4sSXt2YyCjKvu-pBlOECDfjBebRA,6399
@@ -53,7 +53,6 @@ utilities/polars_ols.py,sha256=Uc9V5kvlWZ5cU93lKZ-cfAKdVFFw81tqwLW9PxtUvMs,5618
 utilities/pottery.py,sha256=RN3XwOEsVAPXvEfsRPmn3ZSKgTzK_c182PNrtksq-bg,3429
 utilities/pqdm.py,sha256=BTsYPtbKQWwX-iXF4qCkfPG7DPxIB54J989n83bXrIo,3092
 utilities/psutil.py,sha256=0j4YxtVb8VjaaKKiHg6UEK95SUPkEcENgPtLgPJsNv0,3760
-utilities/pudb.py,sha256=Dte7P9J0VWrWTNYvwxZX6kgaEtdTt5ZnnmOAUTjltqU,1771
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utilities/pydantic.py,sha256=CmxCi4sukeHM3JGjJ1Rbp8UAvcx4MZapLg10mFYJ-nk,1771
 utilities/pyinstrument.py,sha256=_Rfq6Gg4NKV2NF0dRYOpK2IRyyePxI7-3UmHIQLYrlQ,852
@@ -69,7 +68,7 @@ utilities/sentinel.py,sha256=3jIwgpMekWgDAxPDA_hXMP2St43cPhciKN3LWiZ7kv0,1248
 utilities/shelve.py,sha256=HZsMwK4tcIfg3sh0gApx4-yjQnrY4o3V3ZRimvRhoW0,738
 utilities/slack_sdk.py,sha256=RrB34gOj4TzBFh1vzMy6wL_ajzIG-2c9kiS6c6LzMFM,4233
 utilities/socket.py,sha256=K77vfREvzoVTrpYKo6MZakol0EYu2q1sWJnnZqL0So0,118
-utilities/sqlalchemy.py,sha256=5Cx-ioYb099xDUDZuXrXp5tFU90HnCvu3jUu6wkGxrg,38001
+utilities/sqlalchemy.py,sha256=NAJGgCqdLoqPZIne74M3Z_sOaNYVEXiIhl3-6p-4UZE,38219
 utilities/sqlalchemy_polars.py,sha256=jXO-yizGuX_mivaQg7pe17GldcTMpeEldkIL4SpMyuI,14294
 utilities/statsmodels.py,sha256=koyiBHvpMcSiBfh99wFUfSggLNx7cuAw3rwyfAhoKpQ,3410
 utilities/streamlit.py,sha256=U9PJBaKP1IdSykKhPZhIzSPTZsmLsnwbEPZWzNhJPKk,2955
@@ -78,7 +77,7 @@ 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=oXfTii6ymu57niP0BDGZjFD55LEHi2a19kqZKiTgaFQ,2588
-utilities/traceback.py,sha256=TR-3XD40fVIfPT4TSX6E92BEl3xze03N_G4iEE8Qy-4,8837
+utilities/traceback.py,sha256=nvnhlsxLiViFkGLj5zQFNMs2IOoBEOzMZYjsEW_ESQM,9091
 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
@@ -90,7 +89,7 @@ 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.135.2.dist-info/METADATA,sha256=H4xe_yx3Eh17ngKfl6qkcPUlFUSeNYZmbfaf9IT1Kqs,1584
-dycw_utilities-0.135.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.135.2.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.135.2.dist-info/RECORD,,
+dycw_utilities-0.136.1.dist-info/METADATA,sha256=V3lMerqiPJLZQv-NaDpV_MHwsBt6fkaoZRslaaGRS7w,1637
+dycw_utilities-0.136.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.136.1.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.136.1.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.135.2"
+__version__ = "0.136.1"

utilities/sqlalchemy.py

@@ -66,6 +66,7 @@ from utilities.functions import (
     is_string_mapping,
     is_tuple,
     is_tuple_or_str_mapping,
+    yield_object_attributes,
 )
 from utilities.iterables import (
     CheckLengthError,
@@ -1036,21 +1037,31 @@ class _MapMappingToTableSnakeMapNonUniqueError(_MapMappingToTableError):
 
 def _orm_inst_to_dict(obj: DeclarativeBase, /) -> StrMapping:
     """Map an ORM instance to a dictionary."""
-    cls = type(obj)
+    attrs = {
+        k for k, _ in yield_object_attributes(obj, static_type=InstrumentedAttribute)
+    }
+    return {
+        name: _orm_inst_to_dict_one(obj, attrs, name) for name in get_column_names(obj)
+    }
 
-    def is_attr(attr: str, key: str, /) -> str | None:
-        if isinstance(value := getattr(cls, attr), InstrumentedAttribute) and (
-            value.name == key
-        ):
-            return attr
-        return None
 
-    def yield_items() -> Iterator[tuple[str, Any]]:
-        for key in get_column_names(cls):
-            attr = one(attr for attr in dir(cls) if is_attr(attr, key) is not None)
-            yield key, getattr(obj, attr)
+def _orm_inst_to_dict_one(
+    obj: DeclarativeBase, attrs: AbstractSet[str], name: str, /
+) -> Any:
+    attr = one(
+        attr for attr in attrs if _orm_inst_to_dict_predicate(type(obj), attr, name)
+    )
+    return getattr(obj, attr)
+
 
-    return dict(yield_items())
+def _orm_inst_to_dict_predicate(
+    cls: type[DeclarativeBase], attr: str, name: str, /
+) -> bool:
+    cls_attr = getattr(cls, attr)
+    try:
+        return cls_attr.name == name
+    except AttributeError:
+        return False
 
 
 ##

utilities/traceback.py

@@ -11,7 +11,7 @@ from itertools import repeat
 from pathlib import Path
 from socket import gethostname
 from traceback import TracebackException
-from typing import TYPE_CHECKING, override
+from typing import TYPE_CHECKING, assert_never, override
 
 from utilities.atomicwrites import writer
 from utilities.errors import repr_error
@@ -31,7 +31,7 @@ from utilities.version import get_version
 from utilities.whenever import format_compact, get_now, to_zoned_date_time
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Iterator, Sequence
+    from collections.abc import Iterator, Sequence
     from traceback import FrameSummary
     from types import TracebackType
 
@@ -203,7 +203,7 @@ def make_except_hook(
     max_depth: int | None = RICH_MAX_DEPTH,
     expand_all: bool = RICH_EXPAND_ALL,
     slack_url: str | None = None,
-    pudb_env_var: str | None = None,
+    pudb: str | None = None,
 ) -> Callable[
     [type[BaseException] | None, BaseException | None, TracebackType | None], None
 ]:
@@ -220,7 +220,7 @@ def make_except_hook(
         max_depth=max_depth,
         expand_all=expand_all,
         slack_url=slack_url,
-        pudb_env_var=pudb_env_var,
+        pudb=pudb,
     )
 
 
@@ -240,7 +240,7 @@ def _make_except_hook_inner(
     max_depth: int | None = RICH_MAX_DEPTH,
     expand_all: bool = RICH_EXPAND_ALL,
     slack_url: str | None = None,
-    pudb_env_var: str | None = None,
+    pudb: str | Callable[[], bool] | None = None,
 ) -> None:
     """Exception hook to log the traceback."""
     _ = (exc_type, traceback)
@@ -272,12 +272,18 @@ def _make_except_hook_inner(
 
         send = f"```{slim}```"
         run(send_to_slack(slack_url, send))
-    if (pudb_env_var is not None) and (  # pragma: no cover
-        get_env_var(pudb_env_var, nullable=True) is not None
-    ):
-        from pudb import post_mortem
-
-        post_mortem()
+    if pudb is not None:  # pragma: no cover
+        match pudb:
+            case str() as env_var:
+                call_pudb = get_env_var(env_var, nullable=True) is not None
+            case Callable() as func:
+                call_pudb = func()
+            case _ as never:
+                assert_never(never)
+        if call_pudb:
+            from pudb import post_mortem
+
+            post_mortem(tb=traceback, e_type=exc_type, e_value=exc_val)
 
 
 @dataclass(kw_only=True, slots=True)

utilities/pudb.py

@@ -1,62 +0,0 @@
-from __future__ import annotations
-
-from asyncio import iscoroutinefunction
-from functools import partial, wraps
-from typing import TYPE_CHECKING, Any, NoReturn, cast, overload
-
-from utilities.os import GetEnvVarError, get_env_var
-
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-
-_ENV_VAR = "DEBUG"
-
-
-@overload
-def call_pudb[F: Callable](func: F, /, *, env_var: str = _ENV_VAR) -> F: ...
-@overload
-def call_pudb[F: Callable](
-    func: None = None, /, *, env_var: str = _ENV_VAR
-) -> Callable[[F], F]: ...
-def call_pudb[F: Callable](
-    func: F | None = None, /, *, env_var: str = _ENV_VAR
-) -> F | Callable[[F], F]:
-    """Call `pudb` upon failure, if the required environment variable is set."""
-    if func is None:
-        result = partial(call_pudb, env_var=env_var)
-        return cast("Callable[[F], F]", result)
-
-    if not iscoroutinefunction(func):
-
-        @wraps(func)
-        def wrapped_sync(*args: Any, **kwargs: Any) -> Any:
-            try:
-                return func(*args, **kwargs)
-            except Exception as error:  # noqa: BLE001
-                _call_pudb(error, env_var=env_var)
-
-        return cast("F", wrapped_sync)
-
-    @wraps(func)
-    async def wrapped_async(*args: Any, **kwargs: Any) -> Any:
-        try:
-            return await func(*args, **kwargs)
-        except Exception as error:  # noqa: BLE001
-            _call_pudb(error, env_var=env_var)
-
-    return cast("F", wrapped_async)
-
-
-def _call_pudb(error: Exception, /, *, env_var: str = _ENV_VAR) -> NoReturn:
-    try:
-        _ = get_env_var(env_var)
-    except GetEnvVarError:
-        raise error from None
-    from pudb import post_mortem  # pragma: no cover
-
-    post_mortem()  # pragma: no cover
-    raise error  # pragma: no cover
-
-
-__all__ = ["call_pudb"]