TypeDAL 3.8.0__py3-none-any.whl → 3.8.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.8.0"
+__version__ = "3.8.2"

typedal/core.py

@@ -279,9 +279,10 @@ def relationship(_type: To_Type, condition: Condition = None, join: JOIN_OPTIONS
     )
 
 
-def _generate_relationship_condition(
-    _: Type["TypedTable"], key: str, field: typing.Union["TypedField[Any]", "Table", Type["TypedTable"]]
-) -> Condition:
+T_Field: typing.TypeAlias = typing.Union["TypedField[Any]", "Table", Type["TypedTable"]]
+
+
+def _generate_relationship_condition(_: Type["TypedTable"], key: str, field: T_Field) -> Condition:
     origin = typing.get_origin(field)
     # else: generic
 
@@ -299,7 +300,7 @@ def _generate_relationship_condition(
 def to_relationship(
     cls: Type["TypedTable"] | type[Any],
     key: str,
-    field: typing.Union["TypedField[Any]", "Table", Type["TypedTable"]],
+    field: T_Field,
 ) -> typing.Optional[Relationship[Any]]:
     """
     Used to automatically create relationship instance for reference fields.
@@ -317,9 +318,14 @@ def to_relationship(
     Also works for list:reference (list[OtherTable]) and TypedField[OtherTable].
     """
     if looks_like(field, TypedField):
+        # typing.get_args works for list[str] but not for TypedField[role] :(
         if args := typing.get_args(field):
+            # TypedField[SomeType] -> SomeType
             field = args[0]
-        else:
+        elif hasattr(field, "_type"):
+            # TypedField(SomeType) -> SomeType
+            field = typing.cast(T_Field, field._type)
+        else:  # pragma: no cover
             # weird
             return None
 
@@ -543,13 +549,16 @@ class TypeDAL(pydal.DAL):  # type: ignore
         ]
 
         # add implicit relationships:
-        # User; list[User]; TypedField[User]; TypedField[list[User]]
+        # User; list[User]; TypedField[User]; TypedField[list[User]]; TypedField(User); TypedField(list[User])
         relationships |= {
             k: new_relationship
             for k in reference_field_keys
             if k not in relationships and (new_relationship := to_relationship(cls, k, annotations[k]))
         }
 
+        # fixme: list[Reference] is recognized as relationship,
+        #        TypedField(list[Reference]) is NOT recognized!!!
+
         cache_dependency = self._config.caching and kwargs.pop("cache_dependency", True)
 
         table: Table = self.define_table(tablename, *fields.values(), **kwargs)

typedal/for_web2py.py

@@ -10,6 +10,8 @@ from .core import TypeDAL, TypedField, TypedTable
 from .fields import TextField
 from .web2py_py4web_shared import AuthUser
 
+DAL = TypeDAL  # export as DAL for compatibility with py4web
+
 
 class AuthGroup(TypedTable):
     """

typedal/mixins.py

@@ -36,6 +36,14 @@ class Mixin(_TypedTable):
         ('inconsistent method resolution' or 'metaclass conflicts')
     """
 
+    __settings__: typing.ClassVar[dict[str, Any]]
+
+    def __init_subclass__(cls, **kwargs: Any):
+        """
+        Ensures __settings__ exists for other mixins.
+        """
+        cls.__settings__ = getattr(cls, "__settings__", None) or {}
+
 
 class TimestampsMixin(Mixin):
     """
@@ -102,12 +110,16 @@ class SlugMixin(Mixin):
         },
     )  # set via init subclass
 
-    def __init_subclass__(cls, slug_field: str = None, slug_suffix_length: int = 0, **kw: Any) -> None:
+    def __init_subclass__(
+        cls, slug_field: str = None, slug_suffix_length: int = 0, slug_suffix: Optional[int] = None, **kw: Any
+    ) -> None:
         """
         Bind 'slug field' option to be used later (on_define).
 
         You can control the length of the random suffix with the `slug_suffix_length` option (0 is no suffix).
         """
+        super().__init_subclass__(**kw)
+
         # unfortunately, PyCharm and mypy do not recognize/autocomplete/typecheck init subclass (keyword) arguments.
         if slug_field is None:
             raise ValueError(
@@ -115,7 +127,7 @@ class SlugMixin(Mixin):
                 "e.g. `class MyClass(TypedTable, SlugMixin, slug_field='title'): ...`"
             )
 
-        if "slug_suffix" in kw:
+        if slug_suffix:
             warnings.warn(
                 "The 'slug_suffix' option is deprecated, use 'slug_suffix_length' instead.",
                 DeprecationWarning,
@@ -123,10 +135,9 @@ class SlugMixin(Mixin):
 
         slug_suffix = slug_suffix_length or kw.get("slug_suffix", 0)
 
-        cls.__settings__ = {
-            "slug_field": slug_field,
-            "slug_suffix": slug_suffix,
-        }
+        # append settings:
+        cls.__settings__["slug_field"] = slug_field
+        cls.__settings__["slug_suffix"] = slug_suffix
 
     @classmethod
     def __on_define__(cls, db: TypeDAL) -> None:

typedal/types.py

@@ -281,7 +281,7 @@ class FieldSettings(TypedDict, total=False):
     length: int
     default: Any
     required: bool
-    requires: list[AnyCallable | Any]
+    requires: list[AnyCallable | Any | Validator] | Validator | AnyCallable
     ondelete: str
     onupdate: str
     notnull: bool

{typedal-3.8.0.dist-info → typedal-3.8.2.dist-info}/METADATA

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

{typedal-3.8.0.dist-info → typedal-3.8.2.dist-info}/RECORD

@@ -1,19 +1,19 @@
-typedal/__about__.py,sha256=hzVDSJ5f3xoNXBaFcETdjYDr95oRwxVbBpMvLcLXfGU,206
+typedal/__about__.py,sha256=iu41-36uyyjXDWrYd_vxhv3fdbkaA4fF1hYPJrHMKTw,206
 typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
 typedal/caching.py,sha256=SMcJsahLlZ79yykWCveERFx1ZJUNEKhA9SPmCTIuLp8,11798
 typedal/cli.py,sha256=wzyId6YwRyqfuJ2byxvl6YecDNaKpkLmo-R5HvRuTok,19265
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
-typedal/core.py,sha256=f5HYfixyrYYvsV2rJUTGmlAcyWcbVWdhK20nTHtYiPo,99997
+typedal/core.py,sha256=3gIyFrnh3qLBxzwQJ9qsnXIX16ke9iAFODkt5bNuIYI,100433
 typedal/fields.py,sha256=A4qt0aK4F_-UeOY-xJ0ObVY-tFEoLFy7TYRMHnp4g6o,6516
 typedal/for_py4web.py,sha256=d07b8hL_PvNDUS26Z5fDH2OxWb-IETBuAFPSzrRwm04,1285
-typedal/for_web2py.py,sha256=4RHgzGXgKIO_BYB-7adC5e35u52rX-p1t4tPEz-NK24,1867
+typedal/for_web2py.py,sha256=xn7zo6ImsmTkH6LacbjLQl2oqyBvP0zLqRxEJvMQk1w,1929
 typedal/helpers.py,sha256=uej96exzJ9qVBd6LudP8uJ_7Cmq6vKraerdKvSRBVjc,8128
-typedal/mixins.py,sha256=OHhVYLBGTzPSJKgp1uovBs1Y6NJa0d-DxHTOk9LyOXA,5414
+typedal/mixins.py,sha256=6QfeVBAk7J4uHSR82Ek_Bhq43hzxnrmLn6xqxZqYtMk,5757
 typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-typedal/types.py,sha256=rjBKzbV3RMGoI3PTpW52XNNgobusFSCllh0jAVSDkjA,6714
+typedal/types.py,sha256=1FIgv1s0be0E8r5Wd9E1nvDvK4ETV8u2NlfI7_P6UUY,6752
 typedal/web2py_py4web_shared.py,sha256=VK9T8P5UwVLvfNBsY4q79ANcABv-jX76YKADt1Zz_co,1539
 typedal/serializers/as_json.py,sha256=ffo152W-sARYXym4BzwX709rrO2-QwKk2KunWY8RNl4,2229
-typedal-3.8.0.dist-info/METADATA,sha256=hlO3UDkZ7n7t1567Jg9aVPRKUl9gwcOsrEMnuiBdxpc,10463
-typedal-3.8.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-typedal-3.8.0.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.8.0.dist-info/RECORD,,
+typedal-3.8.2.dist-info/METADATA,sha256=YeMYoaZx1r1mHD6WZT7sFRDXUX0B2Ee0odsEVAhsl7E,10463
+typedal-3.8.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+typedal-3.8.2.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.8.2.dist-info/RECORD,,