xn-model 1.0.22__py3-none-any.whl → 1.0.23__py3-none-any.whl

x_model/field.py

@@ -4,7 +4,7 @@ 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, BinaryField, BigIntField
+from tortoise.fields import Field, SmallIntField, IntField, FloatField, DatetimeField, BinaryField
 from tortoise.fields.base import VALUE
 
 
@@ -12,8 +12,20 @@ class UniqBinaryField(BinaryField):
     indexable = True
 
 
-class UInt1Field(SmallIntField):
-    SQL_TYPE = "SMALLINT"  # UINT2
+class UIntField(IntField):
+    def to_db_value(self, value: Any, instance: type[Model] | Model) -> Any:
+        self.validate(value)
+        return value if value is None or isinstance(value, str) else str(value)
+
+    def to_python_value(self, value: Any) -> Any:
+        return value if value is None or isinstance(value, int) else int(value)
+
+
+class UInt1Field(UIntField):
+    SQL_TYPE = "UINT1"
+
+    class _db_postgres:
+        GENERATED_SQL = "UINT1 NOT NULL PRIMARY KEY"
 
     @property
     def constraints(self) -> dict:
@@ -23,8 +35,11 @@ class UInt1Field(SmallIntField):
         }
 
 
-class UInt2Field(IntField):
-    SQL_TYPE = "INT"  # UINT2
+class UInt2Field(UIntField):
+    SQL_TYPE = "UINT2"
+
+    class _db_postgres:
+        GENERATED_SQL = "UINT2 NOT NULL PRIMARY KEY"
 
     @property
     def constraints(self) -> dict:
@@ -34,8 +49,11 @@ class UInt2Field(IntField):
         }
 
 
-class UIntField(BigIntField):
-    SQL_TYPE = "BIGINT"  # UINT4
+class UInt4Field(UIntField):
+    SQL_TYPE = "UINT4"
+
+    class _db_postgres:
+        GENERATED_SQL = "UINT4 NOT NULL PRIMARY KEY"
 
     @property
     def constraints(self) -> dict:
@@ -45,8 +63,11 @@ class UIntField(BigIntField):
         }
 
 
-class UInt8Field(BigIntField):
-    SQL_TYPE = "BIGINT"  # UINT8
+class UInt8Field(UIntField):
+    SQL_TYPE = "UINT8"
+
+    class _db_postgres:
+        GENERATED_SQL = "UINT8 NOT NULL PRIMARY KEY"
 
     @property
     def constraints(self) -> dict:
@@ -56,8 +77,11 @@ class UInt8Field(BigIntField):
         }
 
 
-class UInt16Field(BigIntField):
-    SQL_TYPE = "BIGINT"  # UINT16
+class UInt16Field(UIntField):
+    SQL_TYPE = "UINT16"
+
+    class _db_postgres:
+        GENERATED_SQL = "UINT16 NOT NULL PRIMARY KEY"
 
     @property
     def constraints(self) -> dict:

x_model/models.py

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

{xn_model-1.0.22.dist-info → xn_model-1.0.23.dist-info}/METADATA

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

xn_model-1.0.23.dist-info/RECORD

@@ -0,0 +1,9 @@
+x_model/__init__.py,sha256=1Lgvr-SZwkM4R7L0ceVLyArzzMJiFLgaid-RUOk_ypM,344
+x_model/field.py,sha256=Qf2nua1Qj_6OAtjLCCxC5h9dtEGNOWIA-Z8est_BoKY,4533
+x_model/func.py,sha256=flj89sCOou7NJlriPYbIpX8rdbugbe-vjT2C0ORl9DY,312
+x_model/models.py,sha256=apHNmhnzjjJ9ATUxSSdei7uixEUrNzc2PcwJhN4rayM,3791
+x_model/types.py,sha256=CITb6DSLZ3KHmEgQRjZCFRUId4x-_pecwZdh6xXt0HE,339
+xn_model-1.0.23.dist-info/METADATA,sha256=bCfadu4c_mKcDPS3K4R_j4eKEjFn8BPnPvnqbrUWpCw,986
+xn_model-1.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xn_model-1.0.23.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.23.dist-info/RECORD,,

xn_model-1.0.22.dist-info/RECORD

@@ -1,9 +0,0 @@
-x_model/__init__.py,sha256=1Lgvr-SZwkM4R7L0ceVLyArzzMJiFLgaid-RUOk_ypM,344
-x_model/field.py,sha256=C2eV5-FIWsMVknuQSUr9i8NjrScwvuEIuoPQik2qdd8,3866
-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.22.dist-info/METADATA,sha256=uL5UvNS6UxzOZy4ZfxVm1lbYL3FT1SsFM4CxaLrWDpM,986
-xn_model-1.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xn_model-1.0.22.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-1.0.22.dist-info/RECORD,,