TypeDAL 3.10.3__tar.gz → 3.10.5__tar.gz

{typedal-3.10.3 → typedal-3.10.5}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v3.10.5 (2025-04-22)
+
+### Fix
+
+* `repr(rows)` crashed when `rows` contained no data ([`cc3b2d0`](https://github.com/trialandsuccess/TypeDAL/commit/cc3b2d0bd332faee579e6fdfb7068bd511f22093))
+
+## v3.10.4 (2025-04-17)
+
+### Fix
+
+* Prevent duplicate callback hooks (before/after insert/update/delete) ([`e8e2271`](https://github.com/trialandsuccess/TypeDAL/commit/e8e2271da87d1993afc586060052dd5d057c28e1))
+
 ## v3.10.3 (2025-04-03)
 
 ### Fix

{typedal-3.10.3 → typedal-3.10.5}/PKG-INFO

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

{typedal-3.10.3 → typedal-3.10.5}/example_new.py

@@ -1,13 +1,12 @@
-from src.typedal import TypeDAL, TypedField, TypedTable, TypedRows, fields
-
+import datetime as dt
 import typing
 from decimal import Decimal
-import datetime as dt
 
-from src.typedal.fields import TextField
-from src.typedal.helpers import utcnow
 from pydal.validators import IS_NOT_EMPTY
 
+from src.typedal import TypeDAL, TypedField, TypedRows, TypedTable, fields
+from src.typedal.fields import TextField
+from src.typedal.helpers import utcnow
 from typedal.fields import TimestampField
 
 db = TypeDAL("sqlite:memory")
@@ -15,6 +14,7 @@ db = TypeDAL("sqlite:memory")
 
 ### basic examples
 
+
 @db.define(format="%(name)s")
 class Person(TypedTable):
     name: TypedField[str]
@@ -81,9 +81,9 @@ assert not max.owners
 
 ### example with all possible field types;
 
+
 @db.define
-class OtherTable(TypedTable):
-    ...
+class OtherTable(TypedTable): ...
 
 
 @db.define
@@ -161,7 +161,7 @@ class AllFieldsExplicit(TypedTable):
     reference_two = fields.ReferenceField("other_table", notnull=False)
     list_string = fields.ListStringField()
     list_integer = fields.ListIntegerField()
-    list_reference = fields.ListReferenceField('other_table')
+    list_reference = fields.ListReferenceField("other_table")
     json = fields.JSONField()
     bigint = fields.BigintField()
 
@@ -173,7 +173,7 @@ db.other_table.insert()
 other1 = db.other_table(id=1)
 other2 = db.other_table(id=2)
 
-with open('example_new.py', 'rb') as stream:
+with open("example_new.py", "rb") as stream:
     db.all_fields_basic.insert(
         string="hi!",
         text="hi but longer",
@@ -192,11 +192,11 @@ with open('example_new.py', 'rb') as stream:
         list_string=["hi", "there"],
         list_integer=[1, 2],
         list_reference=[other1, other2],
-        json={'hi': 'there'},
+        json={"hi": "there"},
         bigint=42,
     )
 
-with open('example_new.py', 'rb') as stream:
+with open("example_new.py", "rb") as stream:
     (
         AllFieldsAdvanced.insert(
             string="hi!",
@@ -216,12 +216,12 @@ with open('example_new.py', 'rb') as stream:
             list_string=["hi", "there"],
             list_integer=[1, 2],
             list_reference=[other1, other2],
-            json={'hi': 'there'},
+            json={"hi": "there"},
             bigint=42,
         )
     )
 
-with open('example_new.py', 'rb') as stream:
+with open("example_new.py", "rb") as stream:
     AllFieldsExplicit.insert(
         string="hi!",
         text="hi but longer",
@@ -240,23 +240,23 @@ with open('example_new.py', 'rb') as stream:
         list_string=["hi", "there"],
         list_integer=[1, 2],
         list_reference=[other1, other2],
-        json={'hi': 'there'},
+        json={"hi": "there"},
         bigint=42,
     )
 
 rowa = db.all_fields_advanced(string="hi!")
-print('advanced')
+print("advanced")
 # for field in rowa:
 #     print(field, type(rowa[field]))
 print(rowa)
 
-print('basic')
+print("basic")
 rowb = db.all_fields_basic(string="hi!")
 # for field in rowa:
 #     print(field, type(rowa[field]))
 print(rowb)
 
-print('explicit')
+print("explicit")
 rowb = db.all_fields_explicit(string="hi!")
 # for field in rowa:
 #     print(field, type(rowa[field]))

typedal-3.10.5/example_old.py

@@ -0,0 +1,93 @@
+import datetime
+
+from pydal import DAL, Field
+
+from typedal.helpers import utcnow
+
+db = DAL("sqlite:memory")
+
+### basic examples
+
+db.define_table(
+    "person", Field("name", "string"), Field("age", "integer", default=18), Field("nicknames", "list:string")
+)
+
+db.define_table("pet", Field("name", "string"), Field("owners", "list:reference person"))
+
+db.person.insert(name="Henk", age=44, nicknames=["Henkie", "Gekke Henk"])
+db.person.insert(name="Ingrid", age=47, nicknames=[])
+
+henk = db(db.person.name == "Henk").select().first()
+ingrid = db(db.person.name == "Ingrid").select().first()
+print(henk, ingrid)
+
+db.pet.insert(name="Max", owners=[henk, ingrid])
+
+max = db.pet(name="Max")
+print(max)
+
+people = db(db.person.id > 0).select()
+
+for person in people:
+    print(person.name)
+
+### example with all possible field types;
+db.define_table("other_table")
+
+db.define_table(
+    "all_fields",
+    Field("string", "string"),
+    Field("text", "text"),
+    Field("blob", "blob"),
+    Field("boolean", "boolean"),
+    Field("integer", "integer"),
+    Field("double", "double"),
+    Field("decimal", "decimal(2,3)"),
+    Field("date", "date"),
+    Field("time", "time"),
+    Field("datetime", "datetime"),
+    Field("password", "password"),
+    Field("upload", "upload", uploadfield="upload_data"),
+    Field("upload_data", "blob"),
+    Field("reference", "reference other_table"),
+    Field("list_string", "list:string"),
+    Field("list_integer", "list:integer"),
+    Field("list_reference", "list:reference other_table"),
+    Field("json", "json"),
+    Field("bigint", "bigint"),
+    # The big-id and, big-reference are only supported by some of the database engines and are experimental.
+)
+
+now = utcnow()
+
+db.other_table.insert()
+db.other_table.insert()
+other1 = db.other_table(id=1)
+other2 = db.other_table(id=2)
+
+with open("example_old.py", "rb") as stream:
+    db.all_fields.insert(
+        string="hi",
+        text="hi but longer",
+        blob=b"\x23",
+        boolean=True,
+        integer=1,
+        double=1.11111111111111111111111111111,
+        decimal=1.11111111111111111111111111111,
+        date=now.date(),
+        time=now.time(),
+        datetime=now,
+        password="secret",
+        upload=stream,
+        upload_data=stream.read(),
+        reference=other1,
+        list_string=["hi", "there"],
+        list_integer=[1, 2],
+        list_reference=[other1, other2],
+        json={"hi": "there"},
+        bigint=42,
+    )
+
+row = db.all_fields(string="hi")
+for field in row:
+    print(field, type(row[field]))

{typedal-3.10.3 → typedal-3.10.5}/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.10.3"
+__version__ = "3.10.5"

{typedal-3.10.3 → typedal-3.10.5}/src/typedal/cli.py

@@ -392,8 +392,7 @@ def fake_migrations(
 
     previously_migrated = (
         db(
-            db.ewh_implemented_features.name.belongs(to_fake)
-            & (db.ewh_implemented_features.installed == True)  # noqa E712
+            db.ewh_implemented_features.name.belongs(to_fake) & (db.ewh_implemented_features.installed == True)  # noqa E712
         )
         .select(db.ewh_implemented_features.name)
         .column("name")

{typedal-3.10.3 → typedal-3.10.5}/src/typedal/core.py

@@ -1186,7 +1186,8 @@ class TableMeta(type):
         """
         Add a before insert hook.
         """
-        cls._before_insert.append(fn)
+        if fn not in cls._before_insert:
+            cls._before_insert.append(fn)
         return cls
 
     def after_insert(
@@ -1199,7 +1200,8 @@ class TableMeta(type):
         """
         Add an after insert hook.
         """
-        cls._after_insert.append(fn)
+        if fn not in cls._after_insert:
+            cls._after_insert.append(fn)
         return cls
 
     def before_update(
@@ -1209,7 +1211,8 @@ class TableMeta(type):
         """
         Add a before update hook.
         """
-        cls._before_update.append(fn)
+        if fn not in cls._before_update:
+            cls._before_update.append(fn)
         return cls
 
     def after_update(
@@ -1219,21 +1222,24 @@ class TableMeta(type):
         """
         Add an after update hook.
         """
-        cls._after_update.append(fn)
+        if fn not in cls._after_update:
+            cls._after_update.append(fn)
         return cls
 
     def before_delete(cls: Type[T_MetaInstance], fn: typing.Callable[[Set], Optional[bool]]) -> Type[T_MetaInstance]:
         """
         Add a before delete hook.
         """
-        cls._before_delete.append(fn)
+        if fn not in cls._before_delete:
+            cls._before_delete.append(fn)
         return cls
 
     def after_delete(cls: Type[T_MetaInstance], fn: typing.Callable[[Set], Optional[bool]]) -> Type[T_MetaInstance]:
         """
         Add an after delete hook.
         """
-        cls._after_delete.append(fn)
+        if fn not in cls._after_delete:
+            cls._after_delete.append(fn)
         return cls
 
 
@@ -1257,7 +1263,10 @@ class TypedField(Expression, typing.Generic[T_Value]):  # pragma: no cover
     # NOTE: for the logic of converting a TypedField into a pydal Field, see TypeDAL._to_field
 
     def __init__(
-        self, _type: Type[T_Value] | types.UnionType = str, /, **settings: Unpack[FieldSettings]  # type: ignore
+        self,
+        _type: Type[T_Value] | types.UnionType = str,
+        /,
+        **settings: Unpack[FieldSettings],  # type: ignore
     ) -> None:
         """
         Typed version of pydal.Field, which will be converted to a normal Field in the background.
@@ -1968,7 +1977,11 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
         Print a table on repr().
         """
         data = self.as_dict()
-        headers = list(next(iter(data.values())).keys())
+        try:
+            headers = list(next(iter(data.values())).keys())
+        except StopIteration:
+            headers = []
+
         return mktable(data, headers)
 
     def group_by_value(
@@ -2623,7 +2636,6 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
             join.append(other.on(condition))
 
         if limitby := select_kwargs.pop("limitby", ()):
-
             # if limitby + relationships:
             # 1. get IDs of main table entries that match 'query'
             # 2. change query to .belongs(id)

{typedal-3.10.3 → typedal-3.10.5}/tests/test_main.py

@@ -1,4 +1,5 @@
 import re
+from copy import copy
 from sqlite3 import IntegrityError
 
 import pydal
@@ -480,6 +481,39 @@ def test_hooks_v2(capsys):
     assert "after delete" in captured.out
 
 
+def test_hooks_duplicates():
+    counter = 0
+
+    @db.define()
+    class HookedTableV3(TypedTable):
+        name: str
+
+    def increase_counter(_, __):
+        nonlocal counter
+        counter += 1
+
+    HookedTableV3.after_insert(increase_counter)
+    HookedTableV3.after_insert(increase_counter)
+    HookedTableV3.after_insert(copy(increase_counter))  # other id, same hash
+
+    assert counter == 0
+
+    HookedTableV3.insert(name="Should increase counter once")
+
+    assert counter == 1
+
+    # other function hash -> allow 'duplicate'
+    def increase_counter_v2(_, __):
+        nonlocal counter
+        counter += 1
+
+    HookedTableV3.after_insert(increase_counter_v2)  # other hash
+
+    HookedTableV3.insert(name="Should increase counter twice")
+
+    assert counter == 3
+
+
 def test_try():
     class SomeTableToRetry(TypedTable):
         key: int

{typedal-3.10.3 → typedal-3.10.5}/tests/test_mixins.py

@@ -86,7 +86,7 @@ def test_slug(db):
     row, error = TableWithMixins.validate_and_insert(name="Two Words")
     assert row is None
     assert error == {
-        'name': 'This slug is not unique: two-words.',
+        "name": "This slug is not unique: two-words.",
     }
 
     # with random suffix: duplicates are fine

{typedal-3.10.3 → typedal-3.10.5}/tests/test_mypy.py

@@ -52,7 +52,7 @@ def mypy_test_typedal_define() -> None:
     reveal_type(MyTable().fancy.lower())  # R: builtins.str
 
     aliased_cls = MyTable.with_alias("---")
-    reveal_type(aliased_cls),  # R: type[tests.test_mypy.MyTable]
+    (reveal_type(aliased_cls),)  # R: type[tests.test_mypy.MyTable]
     aliased_instance = aliased_cls()
     reveal_type(aliased_instance)  # R: tests.test_mypy.MyTable
 

{typedal-3.10.3 → typedal-3.10.5}/tests/test_py4web.py

@@ -1,7 +1,7 @@
 import json
 import tempfile
-from contextlib_chdir import chdir
 
+from contextlib_chdir import chdir
 from pydal.validators import IS_EMAIL, IS_NOT_IN_DB
 
 from src.typedal import TypedTable
@@ -60,27 +60,22 @@ def test_py4web_dal_singleton():
             db_2a = DAL("sqlite://test_py4web_dal_singleton", folder=d, enable_typedal_caching=False)
             db_2b = DAL("sqlite://test_py4web_dal_singleton", folder=d, enable_typedal_caching=False)
 
-            conf = {
-                "database": "sqlite:memory",
-                "dialect": "sqlite",
-                "pyproject": "",
-                "flag_location": f"{d}/flags"
-            }
+            conf = {"database": "sqlite:memory", "dialect": "sqlite", "pyproject": "", "flag_location": f"{d}/flags"}
             db_3a = DAL(config=TypeDALConfig.load(conf))
             db_3b = DAL(config=TypeDALConfig.load(conf))
 
             assert db_1a is db_1b
             assert db_1a._uri == db_1b._uri
             assert db_1a._db_uid == db_1b._db_uid
-            
+
             assert db_2a is db_2b
             assert db_2a._uri == db_2b._uri
             assert db_2a._db_uid == db_2b._db_uid
-            
+
             assert db_1a is not db_2a
             assert db_1a._uri != db_2a._uri
             assert db_1a._db_uid != db_2a._db_uid
-            
+
             assert db_1b is not db_2b
             assert db_1b._uri != db_2b._uri
             assert db_1b._db_uid != db_2b._db_uid

{typedal-3.10.3 → typedal-3.10.5}/tests/test_relationships.py

@@ -328,9 +328,9 @@ def test_reprs():
 
     assert "AND" not in repr(relation)
 
-    relation = Article.join("author",
-                            condition_and=lambda article, author: author.name != "Hank"
-                            ).relationships["author"]
+    relation = Article.join("author", condition_and=lambda article, author: author.name != "Hank").relationships[
+        "author"
+    ]
 
     assert "AND" in repr(relation) and "Hank" in repr(relation)
 

{typedal-3.10.3 → typedal-3.10.5}/tests/test_row.py

@@ -214,3 +214,7 @@ def test_rows():
     assert len(empty) == 0
     assert len(empty.exclude(lambda x: x)) == 0
     assert len(empty.find(lambda x: x)) == 0
+
+    empty_rows = NewStyleClass.where(NewStyleClass.id < 0).collect()
+    assert str(empty_rows)
+    assert repr(empty_rows)

typedal-3.10.3/example_old.py

@@ -1,97 +0,0 @@
-import datetime
-
-from pydal import DAL, Field
-
-from typedal.helpers import utcnow
-
-db = DAL("sqlite:memory")
-
-### basic examples
-
-db.define_table("person",
-                Field("name", "string"),
-                Field("age", "integer", default=18),
-                Field("nicknames", "list:string")
-                )
-
-db.define_table("pet",
-                Field("name", "string"),
-                Field("owners", "list:reference person")
-                )
-
-db.person.insert(name="Henk", age=44, nicknames=["Henkie", "Gekke Henk"])
-db.person.insert(name="Ingrid", age=47, nicknames=[])
-
-henk = db(db.person.name == "Henk").select().first()
-ingrid = db(db.person.name == "Ingrid").select().first()
-print(henk, ingrid)
-
-db.pet.insert(name="Max", owners=[henk, ingrid])
-
-max = db.pet(name="Max")
-print(max)
-
-people = db(db.person.id > 0).select()
-
-for person in people:
-    print(person.name)
-
-### example with all possible field types;
-db.define_table("other_table")
-
-db.define_table("all_fields",
-                Field("string", "string"),
-                Field("text", "text"),
-                Field("blob", "blob"),
-                Field("boolean", "boolean"),
-                Field("integer", "integer"),
-                Field("double", "double"),
-                Field("decimal", "decimal(2,3)"),
-                Field("date", "date"),
-                Field("time", "time"),
-                Field("datetime", "datetime"),
-                Field("password", "password"),
-                Field("upload", "upload", uploadfield="upload_data"),
-                Field("upload_data", "blob"),
-                Field("reference", "reference other_table"),
-                Field("list_string", "list:string"),
-                Field("list_integer", "list:integer"),
-                Field("list_reference", "list:reference other_table"),
-                Field("json", "json"),
-                Field("bigint", "bigint"),
-                # The big-id and, big-reference are only supported by some of the database engines and are experimental.
-                )
-
-now = utcnow()
-
-db.other_table.insert()
-db.other_table.insert()
-other1 = db.other_table(id=1)
-other2 = db.other_table(id=2)
-
-with open('example_old.py', 'rb') as stream:
-    db.all_fields.insert(
-        string="hi",
-        text="hi but longer",
-        blob=b"\x23",
-        boolean=True,
-        integer=1,
-        double=1.11111111111111111111111111111,
-        decimal=1.11111111111111111111111111111,
-        date=now.date(),
-        time=now.time(),
-        datetime=now,
-        password="secret",
-        upload=stream,
-        upload_data=stream.read(),
-        reference=other1,
-        list_string=["hi", "there"],
-        list_integer=[1, 2],
-        list_reference=[other1, other2],
-        json={'hi': 'there'},
-        bigint=42,
-    )
-
-row = db.all_fields(string="hi")
-for field in row:
-    print(field, type(row[field]))