xn-model 1.0.10__tar.gz → 1.0.12__tar.gz

{xn_model-1.0.10/xn_model.egg-info → xn_model-1.0.12}/PKG-INFO

@@ -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.10 → xn_model-1.0.12}/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]):

xn_model-1.0.12/x_model/types.py

@@ -0,0 +1,16 @@
+from typing import ClassVar
+from pydantic import BaseModel
+
+
+class New(BaseModel):
+    _unq: ClassVar[tuple[str]] = ()
+
+    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):
+    _unq = ("id",)
+
+    id: int

{xn_model-1.0.10 → xn_model-1.0.12/xn_model.egg-info}/PKG-INFO

@@ -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.10/x_model/types.py

@@ -1,17 +0,0 @@
-from typing import ClassVar
-from msgspec import Struct
-from msgspec.structs import asdict
-
-
-class New(Struct):
-    _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}
-
-
-class Upd(New):
-    _unq = ("id",)
-
-    id: int