TypeDAL 3.15.2__tar.gz → 3.15.4__tar.gz

{typedal-3.15.2 → typedal-3.15.4}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v3.15.4 (2025-08-01)
+
+### Fix
+
+* Support `.as_dict(Field)` in addtion to just `.as_dict('field')` ([`3951cba`](https://github.com/trialandsuccess/TypeDAL/commit/3951cba06cbaba25137301571490a7149232e385))
+
+## v3.15.3 (2025-07-25)
+
+### Fix
+
+* Support `dict(row)` via `row.keys()`, also returning relationships ([`99fc2ef`](https://github.com/trialandsuccess/TypeDAL/commit/99fc2ef7b398947efae64f9be34770828a8d1730))
+
 ## v3.15.2 (2025-07-24)
 
 ### Fix

{typedal-3.15.2 → typedal-3.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TypeDAL
-Version: 3.15.2
+Version: 3.15.4
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues

{typedal-3.15.2 → typedal-3.15.4}/src/typedal/__about__.py

@@ -5,4 +5,4 @@ This file contains the Version info for this package.
 # SPDX-FileCopyrightText: 2023-present Robin van der Noord <robinvandernoord@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "3.15.2"
+__version__ = "3.15.4"

{typedal-3.15.2 → typedal-3.15.4}/src/typedal/core.py

@@ -1697,6 +1697,14 @@ class TypedTable(_TypedTable, metaclass=TableMeta):
 
         raise AttributeError(item)
 
+    def keys(self):
+        """
+        Return the combination of row + relationship keys.
+
+        Used by dict(row).
+        """
+        return list(self._row.keys()) + getattr(self, "_with", [])
+
     def get(self, item: str, default: Any = None) -> Any:
         """
         Try to get a column from this instance, else return default.
@@ -2145,7 +2153,7 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
 
     def as_dict(
         self,
-        key: str = None,
+        key: str | Field = None,
         compact: bool = False,
         storage_to_dict: bool = False,
         datetime_to_str: bool = False,
@@ -2156,6 +2164,9 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
         """
         if any([key, compact, storage_to_dict, datetime_to_str, custom_types]):
             # functionality not guaranteed
+            if isinstance(key, Field):
+                key = key.name
+
             return typing.cast(
                 dict[int, AnyDict],
                 super().as_dict(

{typedal-3.15.2 → typedal-3.15.4}/tests/test_relationships.py

@@ -293,6 +293,12 @@ def test_typedal_way():
 
     assert len(role_writer.users) == 2
 
+    author1 = User.where(id=4).join().first()
+
+    assert (
+        len(author1.as_dict()["articles"]) == len(author1.__dict__["articles"]) == len(dict(author1)["articles"]) == 2
+    )
+
 
 def test_reprs():
     _setup_data()

{typedal-3.15.2 → typedal-3.15.4}/tests/test_row.py

@@ -137,6 +137,8 @@ def test_rows():
 
     assert new_rows.as_dict(storage_to_dict=True)
 
+    assert new_rows.as_dict("int_field")[1] == new_rows.as_dict(NewStyleClass.int_field)[1]
+
     assert old_rows.as_json() == new_rows.as_json() == new_rows.json() == old_rows.json()
 
     assert old_rows.as_list()[0]["string_field"] == new_rows.as_list()[0]["string_field"]