TypeDAL 3.15.0__py3-none-any.whl → 3.15.2__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.0"
+__version__ = "3.15.2"

typedal/core.py

@@ -9,6 +9,7 @@ import functools
 import inspect
 import json
 import math
+import re
 import sys
 import types
 import typing
@@ -120,7 +121,8 @@ OnQuery: typing.TypeAlias = typing.Optional[
     ]
 ]
 
-To_Type = typing.TypeVar("To_Type", type[Any], Type[Any], str)
+# To_Type = typing.TypeVar("To_Type", type[Any], Type[Any], str)
+To_Type = typing.TypeVar("To_Type")
 
 
 class Relationship(typing.Generic[To_Type]):
@@ -201,6 +203,7 @@ class Relationship(typing.Generic[To_Type]):
         Get the table this relationship is bound to.
         """
         table = self.table  # can be a string because db wasn't available yet
+
         if isinstance(table, str):
             if mapped := db._class_map.get(table):
                 # yay
@@ -249,7 +252,9 @@ class Relationship(typing.Generic[To_Type]):
             return None
 
 
-def relationship(_type: To_Type, condition: Condition = None, join: JOIN_OPTIONS = None, on: OnQuery = None) -> To_Type:
+def relationship(
+    _type: typing.Type[To_Type], condition: Condition = None, join: JOIN_OPTIONS = None, on: OnQuery = None
+) -> To_Type:
     """
     Define a relationship to another table, when its id is not stored in the current table.
 
@@ -584,7 +589,9 @@ class TypeDAL(pydal.DAL):  # type: ignore
                 # by now, all relationships should be instances!
                 relationships=typing.cast(dict[str, Relationship[Any]], relationships),
             )
+            # map both name and rname:
             self._class_map[str(table)] = cls
+            self._class_map[table._rname] = cls
             cls.__on_define__(self)
         else:
             warnings.warn("db.define used without inheriting TypedTable. This could lead to strange problems!")
@@ -713,7 +720,7 @@ class TypeDAL(pydal.DAL):  # type: ignore
         table class matches the input name.
 
         Args:
-            table_name: The name of the table to retrieve the mapped class for.
+            table_name: The rname of the table to retrieve the mapped class for.
 
         Returns:
             The mapped table class if it exists, otherwise None.
@@ -1602,6 +1609,7 @@ class TypedTable(_TypedTable, metaclass=TableMeta):
 
     # set up by 'new':
     _row: Row | None = None
+    _rows: tuple[Row, ...] = ()
 
     _with: list[str]
 
@@ -1974,6 +1982,7 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
         model: Type[T_MetaInstance],
         records: dict[int, T_MetaInstance] = None,
         metadata: Metadata = None,
+        raw: dict[int, list[Row]] = None,
     ) -> None:
         """
         Should not be called manually!
@@ -1999,6 +2008,11 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
                 raise NotImplementedError(f"`id` could not be found for {row}")
 
         records = records or {_get_id(row): model(row) for row in rows}
+        raw = raw or {}
+
+        for idx, entity in records.items():
+            entity._rows = tuple(raw.get(idx, []))
+
         super().__init__(rows.db, records, rows.colnames, rows.compact, rows.response, rows.fields)
         self.model = model
         self.metadata = metadata or {}
@@ -2315,6 +2329,29 @@ from .caching import (  # noqa: E402
 )
 
 
+def normalize_table_keys(row: Row, pattern: re.Pattern = re.compile(r"^([a-zA-Z_]+)_(\d{5,})$")) -> Row:
+    """
+    Normalize table keys in a PyDAL Row object by stripping numeric hash suffixes
+    from table names, only if the suffix is 5 or more digits.
+
+    For example:
+        Row({'articles_12345': {...}}) -> Row({'articles': {...}})
+        Row({'articles_123': {...}})   -> unchanged
+
+    Returns:
+        Row: A new Row object with normalized keys.
+    """
+    new_data: dict[str, Any] = {}
+    for key, value in row.items():
+        if match := pattern.match(key):
+            base, _suffix = match.groups()
+            normalized_key = base
+            new_data[normalized_key] = value
+        else:
+            new_data[key] = value
+    return Row(new_data)
+
+
 class QueryBuilder(typing.Generic[T_MetaInstance]):
     """
     Abstration on top of pydal's query system.
@@ -2858,13 +2895,20 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         db = self._get_db()
         main_table = self.model._ensure_table_defined()
 
+        # id: Model
         records = {}
+
+        # id: [Row]
+        raw_per_id = defaultdict(list)
+
         seen_relations: dict[str, set[str]] = defaultdict(set)  # main id -> set of col + id for relation
 
         for row in rows:
             main = row[main_table]
             main_id = main.id
 
+            raw_per_id[main_id].append(normalize_table_keys(row))
+
             if main_id not in records:
                 records[main_id] = self.model(main)
                 records[main_id]._with = list(self.relationships.keys())
@@ -2909,7 +2953,7 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
                     # create single T
                     records[main_id][column] = instance
 
-        return _to(rows, self.model, records, metadata=metadata)
+        return _to(rows, self.model, records, metadata=metadata, raw=raw_per_id)
 
     def collect_or_fail(self, exception: typing.Optional[Exception] = None) -> "TypedRows[T_MetaInstance]":
         """

{typedal-3.15.0.dist-info → typedal-3.15.2.dist-info}/METADATA

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

{typedal-3.15.0.dist-info → typedal-3.15.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-typedal/__about__.py,sha256=tFYWLMmiY9IJaclhUwUG67qOTY5HFlDDVEQ-pJBZCAs,207
+typedal/__about__.py,sha256=_Wc0Uuj2sQ5BxBqJ8uVpOrT2tOe6xuQkzzf-hTl9rXo,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=awjvORId3Dx3P8NlCMTvJ9q_paG_auGSRg4-n-hg7ao,109186
+typedal/core.py,sha256=DbVUMUvFKFDSozyeylNnHdGqE-k6sduKuTsOu32YEsg,110475
 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.0.dist-info/METADATA,sha256=yuhuXMX56Wr_RmrPUODadHclKmDnJjMnAOFfZuwQuMc,10461
-typedal-3.15.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-typedal-3.15.0.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.15.0.dist-info/RECORD,,
+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.0.dist-info → typedal-3.15.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any