xn-model 1.0.10__py3-none-any.whl → 1.0.12__py3-none-any.whl

x_model/field.py

@@ -1,7 +1,7 @@
 from enum import IntEnum
 from typing import Any
 
-from asyncpg import Range  # Box, Point, Polygon,
+from asyncpg import Range, Point  # Box, Polygon,
 from tortoise import Model
 from tortoise.contrib.postgres.fields import ArrayField
 from tortoise.fields import Field, SmallIntField, IntField, FloatField, DatetimeField
@@ -51,11 +51,13 @@ class RangeField(CollectionField[Range]):
         return value
 
 
-# class PointField(CollectionField[Point]):
-#     SQL_TYPE = "POINT"
-#     field_type = Point
-#     base_field = FloatField
-#     labels = ("lat", "lon")
+class PointField(CollectionField[Point]):
+    SQL_TYPE = "POINT"
+    field_type = Point
+    base_field = FloatField
+    labels = ("lat", "lon")
+
+
 #
 #
 # class PolygonField(ListField[Polygon]):

x_model/types.py

@@ -1,14 +1,13 @@
 from typing import ClassVar
-from msgspec import Struct
-from msgspec.structs import asdict
+from pydantic import BaseModel
 
 
-class New(Struct):
+class New(BaseModel):
     _unq: ClassVar[tuple[str]] = ()
 
-    def df_unq(self, frozen_props: tuple[str] = ()) -> dict:
-        d = {k: v for k, v in asdict(self).items() if v is not None or k in frozen_props}
-        return {**{k: d.pop(k) for k in set(self._unq) & d.keys()}, "defaults": d}
+    def df_unq(self) -> dict:
+        d = {k: v for k, v in self.model_dump(exclude_none=True).items()}
+        return {**{k: d.pop(k, None) for k in set(self._unq)}, "defaults": d}
 
 
 class Upd(New):

{xn_model-1.0.10.dist-info → xn_model-1.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: xn-model
-Version: 1.0.10
+Version: 1.0.12
 Summary: Base model for xn-api
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT

xn_model-1.0.12.dist-info/RECORD

@@ -0,0 +1,9 @@
+x_model/__init__.py,sha256=JRsYD3P-8pHpEkCUgy6GuodkT7ZaY1AEeEK1CbpgZw4,428
+x_model/field.py,sha256=zVszcPZFVEwsurqbFQF-_caiSLruh3TRSZdgQqwWJV8,2776
+x_model/func.py,sha256=E7jDoHJGaFpKvxbHnT_lyBxUZeMo-GRd5gv9dLw7B9s,289
+x_model/models.py,sha256=-dhEPBoOIcMvkWayjgOBt9xYiOalv8ZIM9bmFziVdzM,2710
+x_model/types.py,sha256=u3oYmN1g2BpPUvmvPowuNh1lL3z4zJroJKsGre5Yxds,352
+xn_model-1.0.12.dist-info/METADATA,sha256=3-hj5vYl54hSa71r0Vfp8jVsCSz0naer2Jjtkc4DgCY,962
+xn_model-1.0.12.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
+xn_model-1.0.12.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.12.dist-info/RECORD,,

{xn_model-1.0.10.dist-info → xn_model-1.0.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.0.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

xn_model-1.0.10.dist-info/RECORD

@@ -1,9 +0,0 @@
-x_model/__init__.py,sha256=JRsYD3P-8pHpEkCUgy6GuodkT7ZaY1AEeEK1CbpgZw4,428
-x_model/field.py,sha256=w5BAoNA33a-uROaExx5Pr3jYQnUMKIYFYcPTjdBlx3M,2784
-x_model/func.py,sha256=E7jDoHJGaFpKvxbHnT_lyBxUZeMo-GRd5gv9dLw7B9s,289
-x_model/models.py,sha256=-dhEPBoOIcMvkWayjgOBt9xYiOalv8ZIM9bmFziVdzM,2710
-x_model/types.py,sha256=FEb0dPkmeU7sz_To1iT3-yk4UOD7S8xfiHGoYIFEpk0,432
-xn_model-1.0.10.dist-info/METADATA,sha256=4NkzzJAq2EuhxVlBI0Tj6MCsdjoKoTuUpEgbXfxEWps,962
-xn_model-1.0.10.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-xn_model-1.0.10.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-1.0.10.dist-info/RECORD,,