xn-model 1.0.14__py3-none-any.whl → 1.0.16__py3-none-any.whl

x_model/func.py

@@ -1,10 +1,10 @@
-from pypika.terms import AggregateFunction
+from pypika_tortoise.terms import AggregateFunction, Field
 from tortoise.expressions import Function
 
 
 class ArrayAgg(AggregateFunction):
     def __init__(self, term, alias=None):
-        super(ArrayAgg, self).__init__("array_agg", term, alias=alias)
+        super(ArrayAgg, self).__init__("array_agg", Field(term), alias=alias)
 
 
 class Array(Function):

x_model/models.py

@@ -52,17 +52,17 @@ class Model(TortModel):
             #     fields.append(fld)
 
             dcl = make_dataclass(cls.__name__ + cn, fields, bases=(BaseUpd,), kw_only=True)
-            dcl._unq = (cls._meta.unique_together or ((),))[0]
+            dcl._unq = set((cls._meta.unique_together or ((),))[0])
             if with_pk:
-                dcl._unq += ("id",)
+                dcl._unq |= {"id"}
             setattr(cls, cn, dcl)
 
         return getattr(cls, cn)
 
     # # # CRUD Methods # # #
     @classmethod
-    def validate(cls, dct: dict) -> BaseUpd:
-        dcl = cls.in_type("id" in dct)
+    def validate(cls, dct: dict, with_pk: bool = None) -> BaseUpd:
+        dcl = cls.in_type("id" in dct if with_pk is None else with_pk)
         field_names = [n.name for n in fields(dcl)]
         return dcl(**{k: v for k, v in dct.items() if k in field_names})
 

x_model/types.py

@@ -4,7 +4,7 @@ from typing import ClassVar
 
 @dataclass
 class BaseUpd:
-    _unq: ClassVar[tuple[str]]
+    _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}

{xn_model-1.0.14.dist-info → xn_model-1.0.16.dist-info}/METADATA

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

xn_model-1.0.16.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=flj89sCOou7NJlriPYbIpX8rdbugbe-vjT2C0ORl9DY,312
+x_model/models.py,sha256=IMql5xfU1dw7n1uYba5pXQnsK7_1pzLTScGRWYUW2NA,3602
+x_model/types.py,sha256=iES9Oxj45hEBB1tvZlNAOM4eS7w3Y8iC37X7FmcEwe4,318
+xn_model-1.0.16.dist-info/METADATA,sha256=XD9qURCotfDXy2ry3iAFNYaqLSjQwiG28wzlrlj1v7U,986
+xn_model-1.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xn_model-1.0.16.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.16.dist-info/RECORD,,

{xn_model-1.0.14.dist-info → xn_model-1.0.16.dist-info}/WHEEL

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

xn_model-1.0.14.dist-info/RECORD

@@ -1,9 +0,0 @@
-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=EmudSEdcxsydnj6OyqnA1xdAVPhxRUN79610ncLpPXw,3544
-x_model/types.py,sha256=sF-j-IzL00as74pnQbjdDC82oKJlbpxzoAvbE7KDCHs,320
-xn_model-1.0.14.dist-info/METADATA,sha256=2CXAIifJuvL-0QoVum0pZcYSXvWHg3HYyRZOMpQlDo8,986
-xn_model-1.0.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-xn_model-1.0.14.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-1.0.14.dist-info/RECORD,,