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

typedal/caching.py

@@ -1,6 +1,7 @@
 """
 Helpers to facilitate db-based caching.
 """
+
 import contextlib
 import hashlib
 import json

typedal/cli.py

@@ -1,6 +1,7 @@
 """
 Typer CLI for TypeDAL.
 """
+
 import sys
 import typing
 import warnings

typedal/config.py

@@ -1,6 +1,7 @@
 """
 TypeDAL can be configured by a combination of pyproject.toml (static), env (dynamic) and code (programmic).
 """
+
 import os
 import re
 import typing
@@ -34,7 +35,7 @@ class TypeDALConfig(TypedConfig):
     connection: str = "default"
 
     # pydal2sql:
-    input: str = ""  # noqa: A003
+    input: str = ""
     output: str = ""
     noop: bool = False
     magic: bool = True
@@ -204,14 +205,14 @@ def get_db_for_alias(db_name: str) -> str:
 
 DEFAULTS: dict[str, Any | typing.Callable[[dict[str, Any]], Any]] = {
     "database": lambda data: data.get("db_uri") or "sqlite:memory",
-    "dialect": lambda data: get_db_for_alias(data["database"].split(":")[0])
-    if ":" in data["database"]
-    else data.get("db_type"),
+    "dialect": lambda data: (
+        get_db_for_alias(data["database"].split(":")[0]) if ":" in data["database"] else data.get("db_type")
+    ),
     "migrate": lambda data: not (data.get("input") or data.get("output")),
     "folder": lambda data: data.get("db_folder"),
-    "flag_location": lambda data: f"{db_folder}/flags"
-    if (db_folder := (data.get("folder") or data.get("db_folder")))
-    else "/flags",
+    "flag_location": lambda data: (
+        f"{db_folder}/flags" if (db_folder := (data.get("folder") or data.get("db_folder"))) else "/flags"
+    ),
     "pool_size": lambda data: 1 if data.get("dialect", "sqlite") == "sqlite" else 3,
 }
 
@@ -232,9 +233,11 @@ def fill_defaults(data: dict[str, Any], prop: str) -> None:
 
 
 TRANSFORMS: dict[str, typing.Callable[[dict[str, Any]], Any]] = {
-    "database": lambda data: data["database"]
-    if (":" in data["database"] or not data.get("dialect"))
-    else (data["dialect"] + "://" + data["database"])
+    "database": lambda data: (
+        data["database"]
+        if (":" in data["database"] or not data.get("dialect"))
+        else (data["dialect"] + "://" + data["database"])
+    )
 }
 
 

typedal/core.py

@@ -1,6 +1,7 @@
 """
 Core functionality of TypeDAL.
 """
+
 import contextlib
 import csv
 import datetime as dt
@@ -747,7 +748,7 @@ class TableProtocol(typing.Protocol):  # pragma: no cover
     Make mypy happy.
     """
 
-    id: "TypedField[int]"  # noqa: A003
+    id: "TypedField[int]"
 
     def __getitem__(self, item: str) -> Field:
         """
@@ -847,7 +848,7 @@ class TableMeta(type):
         """
         return self(row)
 
-    def all(self: typing.Type[T_MetaInstance]) -> "TypedRows[T_MetaInstance]":  # noqa: A003
+    def all(self: typing.Type[T_MetaInstance]) -> "TypedRows[T_MetaInstance]":
         """
         Return all rows for this model.
         """
@@ -1323,7 +1324,7 @@ class TypedTable(metaclass=TableMeta):
 
     _with: list[str]
 
-    id: "TypedField[int]"  # noqa: A003
+    id: "TypedField[int]"
 
     _before_insert: list[BeforeInsertCallable]
     _after_insert: list[AfterInsertCallable]
@@ -2352,6 +2353,17 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
 
         return load_from_cache(key, self._get_db())
 
+    def execute(self, add_id: bool = False) -> Rows:
+        """
+        Raw version of .collect which only executes the SQL, without performing any magic afterwards.
+        """
+        db = self._get_db()
+        metadata = typing.cast(Metadata, self.metadata.copy())
+
+        query, select_args, select_kwargs = self._before_query(metadata, add_id=add_id)
+
+        return db(query).select(*select_args, **select_kwargs)
+
     def collect(
         self, verbose: bool = False, _to: typing.Type["TypedRows[Any]"] = None, add_id: bool = True
     ) -> "TypedRows[T_MetaInstance]":
@@ -2718,7 +2730,7 @@ class PaginatedRows(TypedRows[T_MetaInstance]):
             "prev_page": pagination_data["current_page"] - 1 if has_prev_page else None,
         }
 
-    def next(self) -> Self:  # noqa: A003
+    def next(self) -> Self:
         """
         Get the next page.
         """

typedal/for_py4web.py

@@ -1,6 +1,7 @@
 """
 ONLY USE IN COMBINATION WITH PY4WEB!
 """
+
 from typing import Any
 
 import threadsafevariable

typedal/helpers.py

@@ -1,6 +1,7 @@
 """
 Helpers that work independently of core.
 """
+
 import io
 import types
 import typing

typedal/types.py

@@ -1,6 +1,7 @@
 """
 Stuff to make mypy happy.
 """
+
 import typing
 from datetime import datetime
 from typing import Any, Optional, TypedDict

{typedal-2.3.6.dist-info → typedal-2.4.0.dist-info}/METADATA

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

typedal-2.4.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+typedal/__about__.py,sha256=ld9eMafpOoWREP5zR3MpQlKT_eergtY1xSbMOYaWfZ4,206
+typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
+typedal/caching.py,sha256=GCeU3m6O9VUOs9zDYlWILrjIEUcbfKJBjSlenkUYaoA,7710
+typedal/cli.py,sha256=--FH_WbjOiMFTqPtCwiWT8JHs2FArkFfWePG11w5WL0,11801
+typedal/config.py,sha256=wVfBZRFstPN6sC5E2JHYSKL_pj6LPoK5WxCzKJCULGc,11909
+typedal/core.py,sha256=DMc9071l1FiKnS7kHZNLdnlGCTb7p0VCJaLVJKGEMhg,95118
+typedal/fields.py,sha256=z2PD9vLWqBR_zXtiY0DthqTG4AeF3yxKoeuVfGXnSdg,5197
+typedal/for_py4web.py,sha256=xOm-ypTQTmTSzInvVQAf7f7c4XQ1il-fnT7kZoPoKP8,1303
+typedal/for_web2py.py,sha256=zvd5xC-SmuKc0JLDqT3hMIs6COaYnwTFXD_BIeC1vug,1832
+typedal/helpers.py,sha256=uwO9dl2hGPtSJzDDaK5dXmubX9WLSh2i9pkZRxuOSs0,6488
+typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+typedal/types.py,sha256=R6XU_tjd6zb8aI6nAXKepi3OEFwwGD8uig6Mzco9-jU,3380
+typedal/web2py_py4web_shared.py,sha256=cEbjkK0WOS9Q0nTyZuQaJWffeP4bjrL79Bx0xGy_UOs,1504
+typedal/serializers/as_json.py,sha256=ffo152W-sARYXym4BzwX709rrO2-QwKk2KunWY8RNl4,2229
+typedal-2.4.0.dist-info/METADATA,sha256=rqEP-7PeHPJ9W33FEP1J4x7el_Fza_w1nobTHBtqZe4,7573
+typedal-2.4.0.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
+typedal-2.4.0.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-2.4.0.dist-info/RECORD,,

typedal-2.3.6.dist-info/RECORD

@@ -1,18 +0,0 @@
-typedal/__about__.py,sha256=kbkWDzpCiYknqWjNq1J8RYaeb9wBLllZwZlNvQscZOk,206
-typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
-typedal/caching.py,sha256=cglkCphbg93Iy9-KHefQN9-JJxuA5-HjpzZAdw2BGvY,7709
-typedal/cli.py,sha256=F7M9D2pu2D-FoKZJrT3K9Wmbv5_ScUR8j5jNGoTgOfk,11800
-typedal/config.py,sha256=oDYSuPMm261hBoDBAXoq37Umf1Vw8rNx4BlP35WwCSY,11882
-typedal/core.py,sha256=hT4XLEMz_IzjTmWu2-scTP7VvrS0UwFSbG7A62OUnv0,94749
-typedal/fields.py,sha256=z2PD9vLWqBR_zXtiY0DthqTG4AeF3yxKoeuVfGXnSdg,5197
-typedal/for_py4web.py,sha256=dwh3cYThR6j2l_RDChcuSH3gXjv8FY-az3t5Lni5A7M,1302
-typedal/for_web2py.py,sha256=zvd5xC-SmuKc0JLDqT3hMIs6COaYnwTFXD_BIeC1vug,1832
-typedal/helpers.py,sha256=ZpHdwBMSANw-P9I5gs56Vf6GUbxGzFsIwbBvASKXX8s,6487
-typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-typedal/types.py,sha256=5qm3PgS8DXGCu9ZTUWQiIi2XXD8gz4_4Csg_vZlu_yo,3379
-typedal/web2py_py4web_shared.py,sha256=cEbjkK0WOS9Q0nTyZuQaJWffeP4bjrL79Bx0xGy_UOs,1504
-typedal/serializers/as_json.py,sha256=ffo152W-sARYXym4BzwX709rrO2-QwKk2KunWY8RNl4,2229
-typedal-2.3.6.dist-info/METADATA,sha256=NVLY0EjdnmVKMpFMpPxnmyz9hEQN1ZrQEHccMRNtkYY,7573
-typedal-2.3.6.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
-typedal-2.3.6.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-2.3.6.dist-info/RECORD,,