TypeDAL 5.1.4__tar.gz → 5.1.5__tar.gz

{typedal-5.1.4 → typedal-5.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: TypeDAL
-Version: 5.1.4
+Version: 5.1.5
 Summary: Typing support for PyDAL
 Keywords: 
 Author: Robin van der Noord
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Dist: pydal>=20251012.3
-Requires-Dist: pydal-stubs>=0.1.0
+Requires-Dist: pydal-stubs>=0.2.0
 Requires-Dist: dill<1
 Requires-Dist: configuraptor>=2.1.0,<3
 Requires-Dist: configurable-json<2

{typedal-5.1.4 → typedal-5.1.5}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "uv_build"
 name = "TypeDAL"
 description = "Typing support for PyDAL"
 readme = "README.md"
-version = "5.1.4"
+version = "5.1.5"
 requires-python = ">=3.12"
 license-expression = "MIT"
 keywords = []
@@ -21,7 +21,7 @@ classifiers = [
 ]
 dependencies = [
     "pydal >= 20251012.3",
-    "pydal-stubs >= 0.1.0",
+    "pydal-stubs >= 0.2.0",
     "dill < 1",
     "configuraptor >= 2.1.0, < 3",
     "Configurable-JSON < 2",

{typedal-5.1.4 → typedal-5.1.5}/pyproject.toml.orig

@@ -6,7 +6,7 @@ build-backend = "uv_build"
 name = "TypeDAL"
 description = 'Typing support for PyDAL'
 readme = "README.md"
-version = "5.1.4"
+version = "5.1.5"
 requires-python = ">=3.12"
 license-expression = "MIT"
 keywords = []
@@ -24,7 +24,7 @@ classifiers = [
 ]
 dependencies = [
     "pydal >= 20251012.3", # core
-    "pydal-stubs >= 0.1.0", # improved typing for pydal
+    "pydal-stubs >= 0.2.0", # improved typing for pydal
     "dill < 1", # caching
     "configuraptor >= 2.1.0, < 3", # config
     "Configurable-JSON < 2", # json dumping

{typedal-5.1.4 → typedal-5.1.5}/src/typedal/core.py

@@ -200,8 +200,13 @@ def resolve_annotation(ftype: str, namespace: t.Mapping[str, type] | None = None
         return resolve_annotation_314(ftype, namespace=namespace)
 
 
-class _TypeDALBase(pydal.DAL):
-    pass
+if t.TYPE_CHECKING:
+    # `pydal.DAL` is exported by pydal-stubs as a gradual alias, so subclassing
+    # it directly would make TypeDAL inherit from `Any` and lose the whole pydal
+    # API. `DALBase` is the nominal surface; it exists only for type checkers.
+    from pydal.base import DALBase as _TypeDALBase
+else:
+    _TypeDALBase = pydal.DAL
 
 
 class TypeDAL(_TypeDALBase):
@@ -224,7 +229,7 @@ class TypeDAL(_TypeDALBase):
 
     # pydal runs these around every statement; drop BlockingAccessHandler to disable the guard.
     execution_handlers: list[type[ExecutionHandler]] = [
-        *pydal.DAL.execution_handlers,
+        *_TypeDALBase.execution_handlers,
         BlockingAccessHandler,
     ]
 
@@ -419,9 +424,7 @@ class TypeDAL(_TypeDALBase):
                         hooks.clear()
 
                 if hasattr(table, "_db"):
-                    # outside pydal's contract: pydal only ever nulls a *field's*
-                    # bindings, but the cycle has to be broken here too.
-                    table._db = None  # ty: ignore[invalid-assignment]
+                    table._db = None
 
                 for field_name in getattr(table, "fields", ()):
                     field: Field | None = getattr(table, field_name, None)

{typedal-5.1.4 → typedal-5.1.5}/src/typedal/rows.py

@@ -278,8 +278,13 @@ class TypedRows(t.Collection[T_MetaInstance], Rows):
 
         return {k: v.as_dict() for k, v in self.records.items()}
 
-    def as_json(  # ty: ignore[invalid-method-override]
-        self, default: t.Callable[[t.Any], t.Any] | None = None, indent: int | None = None, **kwargs: t.Any
+    def as_json(
+        self,
+        mode: str = "object",  # noqa: ARG002 - Required by PyDAL's method signature.
+        default: t.Callable[[t.Any], t.Any] | None = None,
+        *,
+        indent: int | None = None,
+        **kwargs: t.Any,
     ) -> str:
         """
         Turn the data into a dict and then dump to JSON.
@@ -289,12 +294,17 @@ class TypedRows(t.Collection[T_MetaInstance], Rows):
         return as_json.encode(data, default=default, indent=indent, **kwargs)
 
     def json(
-        self, default: t.Callable[[t.Any], t.Any] | None = None, indent: int | None = None, **kwargs: t.Any
+        self,
+        mode: str = "object",
+        default: t.Callable[[t.Any], t.Any] | None = None,
+        *,
+        indent: int | None = None,
+        **kwargs: t.Any,
     ) -> str:
         """
         Turn the data into a dict and then dump to JSON.
         """
-        return self.as_json(default=default, indent=indent, **kwargs)
+        return self.as_json(mode=mode, default=default, indent=indent, **kwargs)
 
     def as_list(
         self,