TypeDAL 5.0.1__tar.gz → 5.0.3__tar.gz

{typedal-5.0.1 → typedal-5.0.3}/PKG-INFO

@@ -1,10 +1,9 @@
-Metadata-Version: 2.5
+Metadata-Version: 2.3
 Name: TypeDAL
-Version: 5.0.1
+Version: 5.0.3
 Summary: Typing support for PyDAL
-Project-URL: Documentation, https://typedal.readthedocs.io/
-Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
-Project-URL: Source, https://github.com/trialandsuccess/TypeDAL
+Keywords: 
+Author: Robin van der Noord
 Author-email: Robin van der Noord <contact@trialandsuccess.nl>
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
@@ -13,63 +12,68 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.12
-Requires-Dist: configurable-json<2
-Requires-Dist: configuraptor<3,>=2.1.0
-Requires-Dist: dill<1
-Requires-Dist: legacy-cgi; python_version >= '3.13'
 Requires-Dist: pydal>=20251012.3
-Requires-Dist: python-dateutil<3
+Requires-Dist: dill<1
+Requires-Dist: configuraptor>=2.1.0,<3
+Requires-Dist: configurable-json<2
 Requires-Dist: python-slugify<9
+Requires-Dist: legacy-cgi ; python_full_version >= '3.13'
+Requires-Dist: python-dateutil<3
+Requires-Dist: py4web ; extra == 'all'
+Requires-Dist: typtyp<1 ; extra == 'all'
+Requires-Dist: tabulate ; extra == 'all'
+Requires-Dist: edwh-migrate[full]>=0.8.0 ; extra == 'all'
+Requires-Dist: pydantic<3 ; extra == 'all'
+Requires-Dist: typer>=0.18,<0.19 ; extra == 'all'
+Requires-Dist: tabulate ; extra == 'all'
+Requires-Dist: questionary ; extra == 'all'
+Requires-Dist: tomlkit ; extra == 'all'
+Requires-Dist: pydal2sql[all]>=1.3.5 ; extra == 'all'
+Requires-Dist: typer>=0.18,<0.19 ; extra == 'cli'
+Requires-Dist: tabulate ; extra == 'cli'
+Requires-Dist: questionary ; extra == 'cli'
+Requires-Dist: tomlkit ; extra == 'cli'
+Requires-Dist: pydal2sql>=1.3.5 ; extra == 'cli'
+Requires-Dist: ewok ; extra == 'dev'
+Requires-Dist: su6[all]>=1.9.0 ; extra == 'dev'
+Requires-Dist: pytest-typing ; extra == 'dev'
+Requires-Dist: pytest-asyncio ; extra == 'dev'
+Requires-Dist: pyright<1.1.400 ; extra == 'dev'
+Requires-Dist: contextlib-chdir ; extra == 'dev'
+Requires-Dist: testcontainers ; extra == 'dev'
+Requires-Dist: pydantic<3 ; extra == 'dev'
+Requires-Dist: psycopg2-binary ; extra == 'dev'
+Requires-Dist: requests<2.32 ; extra == 'dev'
+Requires-Dist: types-tabulate ; extra == 'dev'
+Requires-Dist: types-pyyaml ; extra == 'dev'
+Requires-Dist: types-requests ; extra == 'dev'
+Requires-Dist: mkdocs ; extra == 'dev'
+Requires-Dist: mkdocs-dracula-theme ; extra == 'dev'
+Requires-Dist: tabulate ; extra == 'migrations'
+Requires-Dist: pydal2sql>=1.3.5 ; extra == 'migrations'
+Requires-Dist: edwh-migrate>=0.8.0 ; extra == 'migrations'
+Requires-Dist: typer>=0.18,<0.19 ; extra == 'migrations'
+Requires-Dist: tabulate ; extra == 'migrations'
+Requires-Dist: questionary ; extra == 'migrations'
+Requires-Dist: tomlkit ; extra == 'migrations'
+Requires-Dist: pydal2sql>=1.3.5 ; extra == 'migrations'
+Requires-Dist: py4web ; extra == 'py4web'
+Requires-Dist: typtyp<1 ; extra == 'typescript'
+Requires-Dist: typer>=0.18,<0.19 ; extra == 'typescript'
+Requires-Dist: tabulate ; extra == 'typescript'
+Requires-Dist: questionary ; extra == 'typescript'
+Requires-Dist: tomlkit ; extra == 'typescript'
+Requires-Dist: pydal2sql>=1.3.5 ; extra == 'typescript'
+Requires-Python: >=3.12
+Project-URL: Documentation, https://typedal.readthedocs.io/
+Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
+Project-URL: Source, https://github.com/trialandsuccess/TypeDAL
 Provides-Extra: all
-Requires-Dist: edwh-migrate[full]>=0.8.0; extra == 'all'
-Requires-Dist: py4web; extra == 'all'
-Requires-Dist: pydal2sql[all]>=1.3.5; extra == 'all'
-Requires-Dist: pydantic<3; extra == 'all'
-Requires-Dist: questionary; extra == 'all'
-Requires-Dist: tabulate; extra == 'all'
-Requires-Dist: tomlkit; extra == 'all'
-Requires-Dist: typer<0.19,>=0.18; extra == 'all'
-Requires-Dist: typtyp<1; extra == 'all'
 Provides-Extra: cli
-Requires-Dist: pydal2sql>=1.3.5; extra == 'cli'
-Requires-Dist: questionary; extra == 'cli'
-Requires-Dist: tabulate; extra == 'cli'
-Requires-Dist: tomlkit; extra == 'cli'
-Requires-Dist: typer<0.19,>=0.18; extra == 'cli'
 Provides-Extra: dev
-Requires-Dist: contextlib-chdir; extra == 'dev'
-Requires-Dist: ewok; extra == 'dev'
-Requires-Dist: hatch; extra == 'dev'
-Requires-Dist: mkdocs; extra == 'dev'
-Requires-Dist: mkdocs-dracula-theme; extra == 'dev'
-Requires-Dist: psycopg2-binary; extra == 'dev'
-Requires-Dist: pydantic<3; extra == 'dev'
-Requires-Dist: pyright<1.1.400; extra == 'dev'
-Requires-Dist: pytest-asyncio; extra == 'dev'
-Requires-Dist: pytest-typing; extra == 'dev'
-Requires-Dist: requests<2.32; extra == 'dev'
-Requires-Dist: su6[all]>=1.9.0; extra == 'dev'
-Requires-Dist: testcontainers; extra == 'dev'
-Requires-Dist: types-pyyaml; extra == 'dev'
-Requires-Dist: types-requests; extra == 'dev'
-Requires-Dist: types-tabulate; extra == 'dev'
 Provides-Extra: migrations
-Requires-Dist: edwh-migrate>=0.8.0; extra == 'migrations'
-Requires-Dist: pydal2sql>=1.3.5; extra == 'migrations'
-Requires-Dist: questionary; extra == 'migrations'
-Requires-Dist: tabulate; extra == 'migrations'
-Requires-Dist: tomlkit; extra == 'migrations'
-Requires-Dist: typer<0.19,>=0.18; extra == 'migrations'
 Provides-Extra: py4web
-Requires-Dist: py4web; extra == 'py4web'
 Provides-Extra: typescript
-Requires-Dist: pydal2sql>=1.3.5; extra == 'typescript'
-Requires-Dist: questionary; extra == 'typescript'
-Requires-Dist: tabulate; extra == 'typescript'
-Requires-Dist: tomlkit; extra == 'typescript'
-Requires-Dist: typer<0.19,>=0.18; extra == 'typescript'
-Requires-Dist: typtyp<1; extra == 'typescript'
 Description-Content-Type: text/markdown
 
 # TypeDAL

typedal-5.0.3/pyproject.toml

@@ -0,0 +1,271 @@
+[build-system]
+requires = ["uv_build>=0.12.4,<0.13"]
+build-backend = "uv_build"
+
+[project]
+name = "TypeDAL"
+description = "Typing support for PyDAL"
+readme = "README.md"
+version = "5.0.3"
+requires-python = ">=3.12"
+license-expression = "MIT"
+keywords = []
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = [
+    "pydal >= 20251012.3",
+    "dill < 1",
+    "configuraptor >= 2.1.0, < 3",
+    "Configurable-JSON < 2",
+    "python-slugify < 9",
+    "legacy-cgi; python_version >= '3.13'",
+    "python-dateutil < 3",
+]
+
+[[project.authors]]
+name = "Robin van der Noord"
+email = "contact@trialandsuccess.nl"
+
+[project.optional-dependencies]
+py4web = ["py4web"]
+cli = [
+    "typer >=0.18, <0.19",
+    "tabulate",
+    "questionary",
+    "tomlkit",
+    "pydal2sql>=1.3.5",
+]
+migrations = [
+    "tabulate",
+    "pydal2sql>=1.3.5",
+    "edwh-migrate>=0.8.0",
+    "typer >=0.18, <0.19",
+    "tabulate",
+    "questionary",
+    "tomlkit",
+    "pydal2sql>=1.3.5",
+]
+typescript = [
+    "typtyp < 1",
+    "typer >=0.18, <0.19",
+    "tabulate",
+    "questionary",
+    "tomlkit",
+    "pydal2sql>=1.3.5",
+]
+all = [
+    "py4web",
+    "typtyp < 1",
+    "tabulate",
+    "edwh-migrate[full]>=0.8.0",
+    "pydantic < 3",
+    "typer >=0.18, <0.19",
+    "tabulate",
+    "questionary",
+    "tomlkit",
+    "pydal2sql[all]>=1.3.5",
+]
+dev = [
+    "ewok",
+    "su6[all]>=1.9.0",
+    "pytest-typing",
+    "pytest-asyncio",
+    "pyright < 1.1.400",
+    "contextlib-chdir",
+    "testcontainers",
+    "pydantic < 3",
+    "psycopg2-binary",
+    "requests<2.32",
+    "types-tabulate",
+    "types-PyYAML",
+    "types-requests",
+    "mkdocs",
+    "mkdocs-dracula-theme",
+]
+
+[project.scripts]
+typedal = "typedal.cli:app"
+
+[project.urls]
+Documentation = "https://typedal.readthedocs.io/"
+Issues = "https://github.com/trialandsuccess/TypeDAL/issues"
+Source = "https://github.com/trialandsuccess/TypeDAL"
+
+[template.plugins.default]
+src-layout = true
+
+[tool.setuptools.package-data]
+typedal = ["py.typed"]
+
+[tool.vommit]
+allow_breaking_bang = true
+allow_breaking_footer = true
+prerelease_token = "beta"
+confirm = true
+
+[tool.vommit.git]
+enabled = true
+origin = "origin"
+branch = "master"
+on_wrong_branch = "error"
+tag_format = "v{version}"
+commit_format = "{version}"
+
+[tool.vommit.changelog]
+enabled = true
+file = "CHANGELOG.md"
+include_prereleases = false
+placeholder = "<!--next-version-placeholder-->"
+placeholder_regex = '^<!\-\-next\-version\-placeholder\-\->$'
+entry_title_format = "## v{version} ({date:%Y-%m-%d})"
+
+[tool.vommit.changelog.levels]
+feat = "Feature{s}"
+fix = "Fix{es}"
+break = "Breaking Change{s}"
+docs = "Documentation"
+perf = "Performance"
+
+[tool.vommit.pypi]
+enabled = true
+use_keyring = true
+
+[tool.vommit.commands]
+clean = "rm -rf ./dist"
+build = "uv build"
+publish = "uv publish"
+post_publish = "rm -rf ./dist"
+
+[tool.vommit.version_bump_map]
+break = "major"
+feat = "minor"
+fix = "patch"
+perf = "patch"
+
+[tool.edwh.test]
+directory = "src"
+
+[tool.su6]
+directory = "src"
+stop-after-first-failure = true
+include = []
+exclude = []
+coverage = 100
+badge = true
+
+[tool.su6.default-flags]
+mypy = "--disable-error-code misc"
+
+[tool.black]
+target-version = ["py314"]
+line-length = 120
+extend-exclude = '''
+# A regex preceded with ^/ will apply only to files and directories
+# in the root of the project.
+(
+  ^.*\.bak\/.+     # ignore every .bak directory
+  ^.*venv.+\/.+    # ignore every venv directory
+  venv.+|.+\.bak   # idk why it suddenly works, let's not touch it
+)
+'''
+
+[tool.coverage.run]
+source = ["src"]
+
+[tool.coverage.report]
+exclude_also = [
+    "if TYPE_CHECKING:",
+    "if t.TYPE_CHECKING:",
+    "if typing.TYPE_CHECKING:",
+    "except ImportError as e:",
+    "except ImportError:",
+]
+
+[tool.mypy]
+python_version = "3.13"
+no_implicit_optional = false
+ignore_missing_imports = true
+strict = true
+exclude = [
+    "venv",
+    ".bak",
+]
+
+[tool.ruff]
+target-version = "py314"
+line-length = 120
+extend-exclude = [
+    "*.bak/",
+    "venv*/",
+    "tests/",
+    "example_*.py",
+]
+
+[tool.ruff.lint]
+select = [
+    "F",
+    "E",
+    "W",
+    "Q",
+    "A",
+    "SIM",
+    "ARG",
+    "RUF",
+]
+unfixable = ["F401"]
+extend-ignore = [
+    "E711",
+    "D200",
+    "D212",
+    "D418",
+]
+ignore = ["RUF013"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.ty.src]
+include = ["src"]
+
+[tool.ty.environment]
+python-version = "3.14"
+
+[tool.bandit]
+exclude_dirs = [
+    ".bak",
+    "venv",
+]
+skips = ["B108"]
+
+[tool.isort]
+profile = "black"
+extend_skip_glob = ["*.bak/*"]
+
+[tool.pydocstyle]
+convention = "google"
+match-dir = '(?!venv)[^\.].*'
+add_select = [
+    "D213",
+    "D416",
+    "D417",
+]
+add_ignore = [
+    "D200",
+    "D212",
+]
+
+[tool.pytest]
+pythonpath = ["src"]
+typing_checkers = [
+    "mypy",
+    "pyright",
+]
+
+[tool.typedal]

typedal-5.0.1/pyproject.toml → typedal-5.0.3/pyproject.toml.orig

@@ -1,14 +1,12 @@
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.metadata]
-allow-direct-references = true
+requires = ["uv_build>=0.12.4,<0.13"]
+build-backend = "uv_build"
 
 [project]
 name = "TypeDAL"
 description = 'Typing support for PyDAL'
 readme = "README.md"
+version = "5.0.3"
 requires-python = ">=3.12"
 license-expression = "MIT"
 keywords = []
@@ -33,7 +31,6 @@ dependencies = [
     "legacy-cgi; python_version >= '3.13'",
     "python-dateutil < 3",
 ]
-version = "5.0.1"
 
 [project.optional-dependencies]
 py4web = [
@@ -86,7 +83,6 @@ all = [
 
 dev = [
     # build:
-    "hatch",
     "ewok",
     # test:
     "su6[all]>=1.9.0",
@@ -242,7 +238,6 @@ extend-exclude = ["*.bak/", "venv*/", "tests/", "example_*.py"]
 include = ["src"]
 
 [tool.ty.environment]
-python = "./venv"
 python-version = "3.14"
 
 [tool.ruff.lint]

{typedal-5.0.1 → typedal-5.0.3}/src/typedal/caching.py

@@ -578,7 +578,7 @@ def memoize[T: t.Any](
             for row in arg:
                 deps.add((str(row._table), row.id))
         elif isinstance(arg, TypedTable):
-            deps.add((str(arg._table), t.cast(int, arg.id)))
+            deps.add((str(arg._table), arg.id))
 
     # Generate cache key
     _, hashed_key = create_and_hash_cache_key(key, *[getattr(arg, "id", None) for arg in args], kwargs)

{typedal-5.0.1 → typedal-5.0.3}/src/typedal/fields.py

@@ -198,7 +198,7 @@ class TypedField[T_Value](Expression):  # pragma: no cover
         self._field = t.cast(Field, field)
 
     def unbind(self) -> None:
-        """Remove references to the pydal objects created during ``bind``."""
+        """Remove references to the pydal objects created during `bind`."""
         if getattr(self, "requires", None):
             if isinstance(self.requires, list):
                 self.requires.clear()

{typedal-5.0.1 → typedal-5.0.3}/src/typedal/query_builder.py

@@ -873,7 +873,9 @@ class QueryBuilder[T_MetaInstance: _TypedTable](pydal.objects.Select):
     def _select_distinct_ids_with_orderby_fields(self, query: Query, select_kwargs: SelectKwargs) -> str:
         db = self._get_db()
         model = self.model
-        select_args: list[OrderBy] = [model.id]
+        id_field = t.cast(TypedField[int], model.id)
+
+        select_args: list[OrderBy] = [id_field]
         seen = {str(model.id)}
 
         for field in self._selectable_orderby_fields(select_kwargs.get("orderby")):
@@ -883,7 +885,7 @@ class QueryBuilder[T_MetaInstance: _TypedTable](pydal.objects.Select):
                 seen.add(key)
 
         ids = db(query)._select(*select_args, **select_kwargs).rstrip(";")
-        id_column = getattr(model.id, "_raw_rname", model.id.name)
+        id_column = getattr(model.id, "_raw_rname", id_field.name)
         return f'SELECT "{id_column}" FROM ({ids}) AS typedal_paginate_ids'  # nosec:
         # id_column originates from code
         # ids is a safe subquery, originating from code
@@ -914,7 +916,9 @@ class QueryBuilder[T_MetaInstance: _TypedTable](pydal.objects.Select):
         else:
             ids = db(query)._select(model.id, **kwargs)
 
-        query = model.id.belongs(ids)
+        id_field = t.cast(TypedField[int], model.id)
+
+        query = id_field.belongs(ids)
         metadata["ids"] = ids
 
         return query
@@ -1455,6 +1459,18 @@ class QueryBuilder[T_MetaInstance: _TypedTable](pydal.objects.Select):
         """
         return await self.collect_async() or throw(exception or ValueError("Nothing found!"))
 
+    @t.overload
+    async def column_async[T: t.Any](self, field: TypedField[T], **options: t.Unpack[SelectKwargs]) -> list[T]:
+        """
+        Get all values in a typed field asynchronously.
+        """
+
+    @t.overload
+    async def column_async[T: t.Any](self, field: T, **options: t.Unpack[SelectKwargs]) -> list[T]:
+        """
+        Get all values in an untyped field asynchronously.
+        """
+
     async def column_async[T: t.Any](self, field: TypedField[T] | T, **options: t.Unpack[SelectKwargs]) -> list[T]:
         """
         Async twin of `column()`.

{typedal-5.0.1 → typedal-5.0.3}/src/typedal/tables.py

@@ -126,7 +126,7 @@ class TableMeta(type):
         self._permissions = merge_permissions(permissions)
 
     def unbind(self) -> None:
-        """Remove the database bindings created by ``db.define``."""
+        """Remove the database bindings created by `db.define`."""
         for value in self.__dict__.values():
             if isinstance(value, TypedField):
                 value.unbind()
@@ -336,6 +336,26 @@ class TableMeta(type):
         """
         return QueryBuilder(self).select(*a, **kw)
 
+    @t.overload
+    def column[T: t.Any, T_MetaInstance: _TypedTable](
+        self: t.Type[T_MetaInstance],
+        field: TypedField[T],
+        **options: t.Unpack[SelectKwargs],
+    ) -> list[T]:
+        """
+        Get all values in a typed field.
+        """
+
+    @t.overload
+    def column[T: t.Any, T_MetaInstance: _TypedTable](
+        self: t.Type[T_MetaInstance],
+        field: T,
+        **options: t.Unpack[SelectKwargs],
+    ) -> list[T]:
+        """
+        Get all values in an untyped field.
+        """
+
     def column[T: t.Any, T_MetaInstance: _TypedTable](
         self: t.Type[T_MetaInstance],
         field: T | TypedField[T],
@@ -531,6 +551,26 @@ class TableMeta(type):
             **fields,
         )
 
+    @t.overload
+    async def column_async[T: t.Any, T_MetaInstance: _TypedTable](
+        self: t.Type[T_MetaInstance],
+        field: TypedField[T],
+        **options: t.Unpack[SelectKwargs],
+    ) -> list[T]:
+        """
+        Get all values in a typed field asynchronously.
+        """
+
+    @t.overload
+    async def column_async[T: t.Any, T_MetaInstance: _TypedTable](
+        self: t.Type[T_MetaInstance],
+        field: T,
+        **options: t.Unpack[SelectKwargs],
+    ) -> list[T]:
+        """
+        Get all values in an untyped field asynchronously.
+        """
+
     async def column_async[T: t.Any, T_MetaInstance: _TypedTable](
         self: t.Type[T_MetaInstance],
         field: T | TypedField[T],

{typedal-5.0.1 → typedal-5.0.3}/src/typedal/types.py

@@ -104,9 +104,9 @@ class TableProtocol(t.Protocol):  # pragma: no cover
         Type checkers cannot infer the owning table from a relationship's
         class-body assignment, and forward references can also obscure the
         related table. PyDAL exposes table fields dynamically, so arbitrary
-        field access must remain permissive here. Because ``__getattr__``
-        returns ``Any``, type checkers do not validate field names in
-        relationship callbacks; for example, ``self.fakefield`` is accepted
+        field access must remain permissive here. Because `__getattr__`
+        returns `Any`, type checkers do not validate field names in
+        relationship callbacks; for example, `self.fakefield` is accepted
         even when no such field exists.
         """
 
@@ -418,9 +418,12 @@ type P_Table = TableProtocol
 
 type QueryLike = Query | _Query | bool
 
-type Condition = t.Optional[t.Callable[[P_Table, P_Table], QueryLike]]
+type Condition = t.Callable[[P_Table, P_Table], QueryLike] | None
 
-type OnQuery = t.Optional[t.Callable[[P_Table, P_Table], list[Expression | _Expression]]]
+# An `on` callback can include an alias binding for later join expressions.
+# QueryBuilder ignores table entries when it constructs the actual joins.
+type OnQueryItem = Expression | _Expression | t.Type["TypedTable"]
+type OnQuery = t.Callable[[P_Table, P_Table], t.Sequence[OnQueryItem]] | None
 
 type CacheModel = t.Callable[[str, CacheFn, int], Rows]
 type CacheTuple = tuple[CacheModel, int]

typedal-5.0.1/.crush/.gitignore

@@ -1 +0,0 @@
-*