TypeDAL 3.16.2__py3-none-any.whl → 3.16.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.16.2"
+__version__ = "3.16.4"

typedal/core.py

@@ -2037,6 +2037,61 @@ class TypedTable(_TypedTable, metaclass=TableMeta):
 
         return pydal2sql.generate_sql(cls)
 
+    def render(self, fields=None, compact=False) -> Self:
+        row = copy.deepcopy(self)
+        keys = list(row)
+        if not fields:
+            fields = [self._table[f] for f in self._table._fields]
+            fields = [f for f in fields if isinstance(f, Field) and f.represent]
+
+        for field in fields:
+            if field._table == self._table:
+                row[field.name] = self._db.represent(
+                    "rows_render",
+                    field,
+                    row[field.name],
+                    row,
+                )
+            # else: relationship, different logic:
+
+        for relation_name in getattr(row, "_with", []):
+            if relation := self._relationships.get(relation_name):
+                relation_table = relation.table
+
+                relation_row = row[relation_name]
+
+                if isinstance(relation_row, list):
+                    # list of rows
+                    combined = []
+
+                    for related_og in relation_row:
+                        related = copy.deepcopy(related_og)
+                        for fieldname in related:
+                            field = relation_table[fieldname]
+                            related[field.name] = self._db.represent(
+                                "rows_render",
+                                field,
+                                related[field.name],
+                                related,
+                            )
+                        combined.append(related)
+
+                    row[relation_name] = combined
+                else:
+                    # 1 row
+                    for fieldname in relation_row:
+                        field = relation_table[fieldname]
+                        row[relation_name][fieldname] = self._db.represent(
+                            "rows_render",
+                            field,
+                            relation_row[field.name],
+                            relation_row,
+                        )
+
+        if compact and len(keys) == 1 and keys[0] != "_extra":  # pragma: no cover
+            return row[keys[0]]
+        return row
+
 
 # backwards compat:
 TypedRow = TypedTable
@@ -2431,38 +2486,8 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
                 "Rows.render() needs a `rows_render` representer in DAL instance",
             )
 
-        row = copy.deepcopy(self.records[i])
-        keys = list(row)
-        if not fields:
-            fields = [f for f in self.fields if isinstance(f, Field) and f.represent]
-
-        for field in fields:
-            if field._table == self.model._table:
-                row[field.name] = self.db.represent(
-                    "rows_render",
-                    field,
-                    row[field.name],
-                    row,
-                )
-            # else: relationship, different logic:
-
-        for relation_name in row._with:
-            if relation := self.model._relationships.get(relation_name):
-                relation_table = relation.table
-
-                relation_row = row[relation_name]
-                for fieldname in relation_row:
-                    field = relation_table[fieldname]
-                    row[relation_name][fieldname] = self.db.represent(
-                        "rows_render",
-                        field,
-                        relation_row[field.name],
-                        relation_row,
-                    )
-
-        if self.compact and len(keys) == 1 and keys[0] != "_extra":  # pragma: no cover
-            return row[keys[0]]
-        return row
+        row = self.records[i]
+        return row.render(fields, compact=self.compact)
 
 
 from .caching import (  # noqa: E402

{typedal-3.16.2.dist-info → typedal-3.16.4.dist-info}/METADATA

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

{typedal-3.16.2.dist-info → typedal-3.16.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
-typedal/__about__.py,sha256=CfP_J5AzovunEQDI3-cq85RLJlXs0vlk17loi0BtJQc,207
+typedal/__about__.py,sha256=b4WRvaxkT5bkr-NnSsTloyIQ-ekyL970tZv3Hsazu-s,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=4oyAT2Xuu3A4ROVGeScsshiYYTB2KEQWY3PO5GIhZfY,115008
+typedal/core.py,sha256=FGrxs8PCTO8mTGD4RjGRWxG4dLjrqECJPG1nNfqWkRA,116013
 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=UYmD0_aK1bSVBt_f3j59Mxq-zOmQNkYkb8sPDUibq68,1539
 typedal/serializers/as_json.py,sha256=3JZlFhPrdvZVFAmH7P5DUAz8-TIk-br0F1CjKG3PFDM,2246
-typedal-3.16.2.dist-info/METADATA,sha256=MPjhJzWC3x2_DcLXJbSlxlKVqNsKf0xE44mTZL_c9MU,10461
-typedal-3.16.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-typedal-3.16.2.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.16.2.dist-info/RECORD,,
+typedal-3.16.4.dist-info/METADATA,sha256=Vx98N5MXgzHzLrx79BWgQc-YQomJue_8T_zFmU3t5ZI,10461
+typedal-3.16.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+typedal-3.16.4.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.16.4.dist-info/RECORD,,