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

typedal/core.py

@@ -2434,7 +2434,7 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
 
     def where(
         self,
-        *queries_or_lambdas: Query | typing.Callable[[Type[T_MetaInstance]], Query],
+        *queries_or_lambdas: Query | typing.Callable[[Type[T_MetaInstance]], Query] | dict,
         **filters: Any,
     ) -> "QueryBuilder[T_MetaInstance]":
         """
@@ -2453,20 +2453,28 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         new_query = self.query
         table = self.model._ensure_table_defined()
 
-        for field, value in filters.items():
-            new_query &= table[field] == value
+        queries_or_lambdas = (
+            *queries_or_lambdas,
+            filters,
+        )
 
         subquery: DummyQuery | Query = DummyQuery()
-        for query_or_lambda in queries_or_lambdas:
-            if isinstance(query_or_lambda, _Query):
-                subquery |= typing.cast(Query, query_or_lambda)
-            elif callable(query_or_lambda):
-                if result := query_or_lambda(self.model):
+        for query_part in queries_or_lambdas:
+            if isinstance(query_part, _Query):
+                subquery |= typing.cast(Query, query_part)
+            elif callable(query_part):
+                if result := query_part(self.model):
                     subquery |= result
-            elif isinstance(query_or_lambda, (Field, _Field)) or is_typed_field(query_or_lambda):
-                subquery |= typing.cast(Query, query_or_lambda != None)
+            elif isinstance(query_part, (Field, _Field)) or is_typed_field(query_part):
+                subquery |= typing.cast(Query, query_part != None)
+            elif isinstance(query_part, dict):
+                subsubquery = DummyQuery()
+                for field, value in query_part.items():
+                    subsubquery &= table[field] == value
+                if subsubquery:
+                    subquery |= subsubquery
             else:
-                raise ValueError(f"Unexpected query type ({type(query_or_lambda)}).")
+                raise ValueError(f"Unexpected query type ({type(query_part)}).")
 
         if subquery:
             new_query &= subquery

typedal/fields.py

@@ -267,16 +267,23 @@ def safe_decode_native_point(value: str | None):
         return ()
 
 
-def safe_encode_native_point(value):
+def safe_encode_native_point(value: tuple[str, str] | str) -> str:
     if not value:
         return ""
 
+    # Convert string to tuple if needed
     if isinstance(value, str):
-        value = tuple(float(_) for _ in value.strip("(").strip(")").split(","))
-    if not (isinstance(value, tuple) and len(value) == 2):
-        raise ValueError("Invalid point tuple")
+        value = value.strip("() ")
+        if not value:
+            return ""
+        value = tuple(float(x.strip()) for x in value.split(","))
 
-    return str(value)
+    # Validate and format
+    if len(value) != 2:
+        raise ValueError("Point must have exactly 2 coordinates")
+
+    x, y = value
+    return f"({x},{y})"
 
 
 NativePointField = SQLCustomType(

{typedal-3.14.2.dist-info → typedal-3.15.0.dist-info}/METADATA

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

{typedal-3.14.2.dist-info → typedal-3.15.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-typedal/__about__.py,sha256=LnRkisJqR9TtSx6juk47Ol7hpJEmaJC8mGpen-Uf_Cc,207
+typedal/__about__.py,sha256=tFYWLMmiY9IJaclhUwUG67qOTY5HFlDDVEQ-pJBZCAs,207
 typedal/__init__.py,sha256=Y6LT5UE3HrfWND_drJddYFbDjfnvqQER8MxZiEREFGw,366
 typedal/caching.py,sha256=6YUzUMpan56nSy3D-Jl0FS-8V4LbTnpRSoDJHj6yPYo,11782
 typedal/cli.py,sha256=SnWceLPDd-t90VPHAV9O3RR7JZtpVniT55TqtrRv3VM,19255
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
-typedal/core.py,sha256=GYNX7aGaqaPWZUYTxiNDAswQi7jeP87qAlYk1OzCO5g,108942
-typedal/fields.py,sha256=kN5m3L5FzukHiSdlRAHSGIGpm9kk8FBcRZiHQimicP4,7192
+typedal/core.py,sha256=awjvORId3Dx3P8NlCMTvJ9q_paG_auGSRg4-n-hg7ao,109186
+typedal/fields.py,sha256=oOmTonXG-g4Lpj5_gSr8GJ-EZIEqO435Fm8-MS_cmoc,7356
 typedal/for_py4web.py,sha256=KIIu8XgnAfRQCJfZCra79k8SInOHiFuLDKUv3hzTJng,1908
 typedal/for_web2py.py,sha256=xn7zo6ImsmTkH6LacbjLQl2oqyBvP0zLqRxEJvMQk1w,1929
 typedal/helpers.py,sha256=LpBgTwKmt9f1b4Mz98mxusvIHGiCpW_abDMZLP81g6Y,8850
@@ -13,7 +13,7 @@ typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typedal/types.py,sha256=1FIgv1s0be0E8r5Wd9E1nvDvK4ETV8u2NlfI7_P6UUY,6752
 typedal/web2py_py4web_shared.py,sha256=VK9T8P5UwVLvfNBsY4q79ANcABv-jX76YKADt1Zz_co,1539
 typedal/serializers/as_json.py,sha256=3JZlFhPrdvZVFAmH7P5DUAz8-TIk-br0F1CjKG3PFDM,2246
-typedal-3.14.2.dist-info/METADATA,sha256=CWdzLaTOMMBDjER1JnJDk1_ZneHznWNJHNFWBB2l668,10461
-typedal-3.14.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-typedal-3.14.2.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.14.2.dist-info/RECORD,,
+typedal-3.15.0.dist-info/METADATA,sha256=yuhuXMX56Wr_RmrPUODadHclKmDnJjMnAOFfZuwQuMc,10461
+typedal-3.15.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+typedal-3.15.0.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.15.0.dist-info/RECORD,,