xn-model 1.0.19__py3-none-any.whl → 1.0.21__py3-none-any.whl

x_model/field.py

@@ -4,10 +4,69 @@ from typing import Any
 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
+from tortoise.fields import Field, SmallIntField, IntField, FloatField, DatetimeField, BinaryField, BigIntField
 from tortoise.fields.base import VALUE
 
 
+class UniqBinaryField(BinaryField):
+    indexable = True
+
+
+class UInt1Field(IntField):
+    SQL_TYPE = "UINT2"
+
+    @property
+    def constraints(self) -> dict:
+        return {
+            "ge": 0,
+            "le": 255,
+        }
+
+
+class UInt2Field(IntField):
+    SQL_TYPE = "UINT2"
+
+    @property
+    def constraints(self) -> dict:
+        return {
+            "ge": 0,
+            "le": 65535,
+        }
+
+
+class UIntField(IntField):
+    SQL_TYPE = "UINT4"
+
+    @property
+    def constraints(self) -> dict:
+        return {
+            "ge": 0,
+            "le": 4_294_967_295,
+        }
+
+
+class UInt8Field(BigIntField):
+    SQL_TYPE = "UINT8"
+
+    @property
+    def constraints(self) -> dict:
+        return {
+            "ge": 0,
+            "le": 18_446_744_073_709_551_615,
+        }
+
+
+class UInt16Field(BigIntField):
+    SQL_TYPE = "UINT16"
+
+    @property
+    def constraints(self) -> dict:
+        return {
+            "ge": 0,
+            "le": 340282366920938463463374607431768211455,
+        }
+
+
 class ListField(Field[VALUE]):
     base_field = Field[VALUE]
     labels: tuple

x_model/models.py

@@ -4,10 +4,9 @@ from typing import Self
 
 from pydantic import ConfigDict
 from tortoise import Model as TortModel
-from tortoise.fields import IntField
 from tortoise.signals import Signals
 
-from x_model.field import DatetimeSecField
+from x_model.field import DatetimeSecField, UIntField
 from x_model.types import BaseUpd
 
 
@@ -17,7 +16,7 @@ class TsTrait:
 
 
 class Model(TortModel):
-    id: int = IntField(True)
+    id: int = UIntField(True)
 
     _in_type: type[BaseUpd] = None  # overridable
     _name: tuple[str] = ("name",)

x_model/types.py

@@ -6,6 +6,6 @@ from typing import ClassVar
 class BaseUpd:
     _unq: ClassVar[set[str]]
 
-    def df_unq(self) -> dict:
-        d = {k: v for k, v in asdict(self).items() if v is not None or k in self._unq}
+    def df_unq(self, **kwargs) -> dict:
+        d = {k: v for k, v in (asdict(self) | kwargs).items() if v is not None or k in self._unq}
         return {**{k: d.pop(k, None) for k in self._unq}, "defaults": d}

{xn_model-1.0.19.dist-info → xn_model-1.0.21.dist-info}/METADATA

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

xn_model-1.0.21.dist-info/RECORD

@@ -0,0 +1,9 @@
+x_model/__init__.py,sha256=1Lgvr-SZwkM4R7L0ceVLyArzzMJiFLgaid-RUOk_ypM,344
+x_model/field.py,sha256=1PzHWYodsjx5waC9aH07faAC4WBrEhpWgXL39SyKYQU,3809
+x_model/func.py,sha256=flj89sCOou7NJlriPYbIpX8rdbugbe-vjT2C0ORl9DY,312
+x_model/models.py,sha256=Pdkcemb2jSFU0x7YSz9nWVmoGyShF-TzAo2SOUjVbvM,3793
+x_model/types.py,sha256=CITb6DSLZ3KHmEgQRjZCFRUId4x-_pecwZdh6xXt0HE,339
+xn_model-1.0.21.dist-info/METADATA,sha256=EIxiWmHURXnDjfMNcdah-x2-P9segJeggINIK7-IBTA,986
+xn_model-1.0.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xn_model-1.0.21.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.21.dist-info/RECORD,,

xn_model-1.0.19.dist-info/RECORD

@@ -1,9 +0,0 @@
-x_model/__init__.py,sha256=1Lgvr-SZwkM4R7L0ceVLyArzzMJiFLgaid-RUOk_ypM,344
-x_model/field.py,sha256=zVszcPZFVEwsurqbFQF-_caiSLruh3TRSZdgQqwWJV8,2776
-x_model/func.py,sha256=flj89sCOou7NJlriPYbIpX8rdbugbe-vjT2C0ORl9DY,312
-x_model/models.py,sha256=aR55uKzYyIZNOIwWlzPym5EViyfcOFrVcMGIu8mItCA,3818
-x_model/types.py,sha256=iES9Oxj45hEBB1tvZlNAOM4eS7w3Y8iC37X7FmcEwe4,318
-xn_model-1.0.19.dist-info/METADATA,sha256=uOYNBeMcIc6GcdvagSwSsKzvxbjaPMeEAOhiBvFisSE,986
-xn_model-1.0.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xn_model-1.0.19.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-1.0.19.dist-info/RECORD,,