TypeDAL 3.15.2__py3-none-any.whl → 3.15.4__py3-none-any.whl

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/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.dist-info → typedal-3.15.4.dist-info}/METADATA

@@ -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.dist-info → typedal-3.15.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
-typedal/__about__.py,sha256=_Wc0Uuj2sQ5BxBqJ8uVpOrT2tOe6xuQkzzf-hTl9rXo,207
+typedal/__about__.py,sha256=XWQ2g0KAzAE-gMhdmbRBnWKynVEEYuIEdgZ3XQ8_PNI,207
 typedal/__init__.py,sha256=Y6LT5UE3HrfWND_drJddYFbDjfnvqQER8MxZiEREFGw,366
 typedal/caching.py,sha256=6YUzUMpan56nSy3D-Jl0FS-8V4LbTnpRSoDJHj6yPYo,11782
 typedal/cli.py,sha256=SnWceLPDd-t90VPHAV9O3RR7JZtpVniT55TqtrRv3VM,19255
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
-typedal/core.py,sha256=DbVUMUvFKFDSozyeylNnHdGqE-k6sduKuTsOu32YEsg,110475
+typedal/core.py,sha256=LqJt271aYA7cE7voqCsg0GpB_REx8L4LeabM4ur3jOA,110753
 typedal/fields.py,sha256=oOmTonXG-g4Lpj5_gSr8GJ-EZIEqO435Fm8-MS_cmoc,7356
 typedal/for_py4web.py,sha256=KIIu8XgnAfRQCJfZCra79k8SInOHiFuLDKUv3hzTJng,1908
 typedal/for_web2py.py,sha256=xn7zo6ImsmTkH6LacbjLQl2oqyBvP0zLqRxEJvMQk1w,1929
@@ -13,7 +13,7 @@ typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typedal/types.py,sha256=1FIgv1s0be0E8r5Wd9E1nvDvK4ETV8u2NlfI7_P6UUY,6752
 typedal/web2py_py4web_shared.py,sha256=VK9T8P5UwVLvfNBsY4q79ANcABv-jX76YKADt1Zz_co,1539
 typedal/serializers/as_json.py,sha256=3JZlFhPrdvZVFAmH7P5DUAz8-TIk-br0F1CjKG3PFDM,2246
-typedal-3.15.2.dist-info/METADATA,sha256=IaoLwUjLcLPgsnt4UdBn_jk_TEoWzOzuHEnKhW4dl0w,10461
-typedal-3.15.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-typedal-3.15.2.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.15.2.dist-info/RECORD,,
+typedal-3.15.4.dist-info/METADATA,sha256=uO179KsWo2ua98HC3koZSo0DxKqheN3XdbqQt33yfDE,10461
+typedal-3.15.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+typedal-3.15.4.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.15.4.dist-info/RECORD,,