TypeDAL 3.14.1__py3-none-any.whl → 3.14.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.14.1"
+__version__ = "3.14.2"

typedal/cli.py

@@ -392,8 +392,7 @@ def fake_migrations(
 
     previously_migrated = (
         db(
-            db.ewh_implemented_features.name.belongs(to_fake)
-            & (db.ewh_implemented_features.installed == True)  # noqa E712
+            db.ewh_implemented_features.name.belongs(to_fake) & (db.ewh_implemented_features.installed == True)  # noqa E712
         )
         .select(db.ewh_implemented_features.name)
         .column("name")

typedal/fields.py

@@ -256,11 +256,34 @@ def TimestampField(**kw: Unpack[FieldSettings]) -> TypedField[dt.datetime]:
     )
 
 
+def safe_decode_native_point(value: str | None):
+    if not value:
+        return ()
+
+    try:
+        return ast.literal_eval(value)
+    except ValueError:  # pragma: no cover
+        # should not happen when inserted with `safe_encode_native_point` but you never know
+        return ()
+
+
+def safe_encode_native_point(value):
+    if not value:
+        return ""
+
+    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")
+
+    return str(value)
+
+
 NativePointField = SQLCustomType(
     type="string",
     native="point",
-    encoder=str,
-    decoder=ast.literal_eval,
+    encoder=safe_encode_native_point,
+    decoder=safe_decode_native_point,
 )
 
 

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

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

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

@@ -1,10 +1,10 @@
-typedal/__about__.py,sha256=gPFJHgdYiAC_OUYO9TMMtO1NL7YgNLC8HD2pq-8nyuA,207
+typedal/__about__.py,sha256=LnRkisJqR9TtSx6juk47Ol7hpJEmaJC8mGpen-Uf_Cc,207
 typedal/__init__.py,sha256=Y6LT5UE3HrfWND_drJddYFbDjfnvqQER8MxZiEREFGw,366
 typedal/caching.py,sha256=6YUzUMpan56nSy3D-Jl0FS-8V4LbTnpRSoDJHj6yPYo,11782
-typedal/cli.py,sha256=e08L8k6q1NGSzpKs7ywin0uwkK7Kz07I4REVjHdbyyE,19267
+typedal/cli.py,sha256=SnWceLPDd-t90VPHAV9O3RR7JZtpVniT55TqtrRv3VM,19255
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
 typedal/core.py,sha256=GYNX7aGaqaPWZUYTxiNDAswQi7jeP87qAlYk1OzCO5g,108942
-typedal/fields.py,sha256=ThkI0_E6Oq_2Vj30j0AWHRSOLvUEPu1gyECtStoECjs,6556
+typedal/fields.py,sha256=kN5m3L5FzukHiSdlRAHSGIGpm9kk8FBcRZiHQimicP4,7192
 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.1.dist-info/METADATA,sha256=o-C0UjB75DrK1EyzNpDLiNWLSv56My69QO9z89IwWeU,10461
-typedal-3.14.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-typedal-3.14.1.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.14.1.dist-info/RECORD,,
+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,,