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

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

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

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

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=0ew7YXcLdtzxH-7q4GWgY3emjEZ_c9LZ173C_Q0J4xI,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
@@ -68,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
@@ -89,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.136.0.dist-info/METADATA,sha256=IM9-dR9bLGWxZvhPixn8lYPDBpR-51PXzrwvgQXPDyI,1637
-dycw_utilities-0.136.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.136.0.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.136.0.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.136.0"
+__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
 
 
 ##