xn-model 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

x_model/models.py

@@ -1,6 +1,7 @@
 from datetime import datetime
+
 from pydantic import ConfigDict, BaseModel
-from tortoise import Model as TrtModel
+from tortoise import Model as TortModel
 from tortoise.contrib.pydantic import pydantic_model_creator, PydanticModel
 from tortoise.fields import IntField
 
@@ -12,38 +13,30 @@ class TsTrait:
     updated_at: datetime | None = DatetimeSecField(auto_now=True)
 
 
-class PydIn(BaseModel):
-    _unq: list[str] = ["id"]
-
-    def df_unq(self) -> dict:
-        d = self.model_dump(exclude_none=True)
-        return {**{k: d.pop(k) for k in self._unq}, "defaults": d}
-
-
-class Model(TrtModel):
+class Model(TortModel):
     id: int = IntField(True)
 
-    _pyd: type[PydanticModel] = None  # overridable
-    _pydIn: type[PydIn | PydanticModel] = None  # overridable
+    _out: type[BaseModel] = None  # overridable
+    _in: type[BaseModel] = None  # overridable
     _name: tuple[str] = ("name",)
     _sorts: tuple[str] = ("-id",)
 
-    def repr(self) -> str:
-        return " ".join(getattr(self, name_fragment) for name_fragment in self._name)
+    def __repr__(self, sep: str = " ") -> str:
+        return sep.join(getattr(self, name_fragment) for name_fragment in self._name)
 
     @classmethod
     def pyd(cls):
-        if not cls._pyd:
-            cls._pyd = pydantic_model_creator(cls, name=cls.__name__)
-        return cls._pyd
+        if not cls._out:
+            cls._out = pydantic_model_creator(cls, name=cls.__name__ + "Out")
+        return cls._out
 
     @classmethod
     def pyd_in(cls):
-        if not cls._pydIn:
-            cls._pydIn = pydantic_model_creator(
+        if not cls._in:
+            cls._in = pydantic_model_creator(
                 cls, name=cls.__name__ + "In", exclude_readonly=True, meta_override=cls.PydanticMetaIn
             )
-        return cls._pydIn
+        return cls._in
 
     # # # CRUD Methods # # #
     @classmethod

x_model/types.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+
+class New(BaseModel):
+    _unq: list[str] = []
+
+    def df_unq(self) -> dict:
+        d = self.model_dump(exclude_none=True)
+        return {**{k: d.pop(k) for k in set(self._unq) & d.keys()}, "defaults": d}
+
+
+class Upd(New):
+    _unq: list[str] = ["id"]
+
+    id: int

{xn_model-1.0.6.dist-info → xn_model-1.0.7.dist-info}/METADATA

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

xn_model-1.0.7.dist-info/RECORD

@@ -0,0 +1,9 @@
+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=xalrke04TUv-pmzXwOir-naUREcBjaOXiOWQkUuj4Ic,2633
+x_model/types.py,sha256=m7B5XOQvXpOMe8GpO0IizmQLAMd-UzMa9t0hodnfCXw,301
+xn_model-1.0.7.dist-info/METADATA,sha256=UaOx1foFPLlj651w2uf1yp1su-0cYJ8tm4Ipl0wndHo,961
+xn_model-1.0.7.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+xn_model-1.0.7.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.7.dist-info/RECORD,,

{xn_model-1.0.6.dist-info → xn_model-1.0.7.dist-info}/WHEEL

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

xn_model-1.0.6.dist-info/RECORD

@@ -1,8 +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=H_4bNlzzRJuo6qlfB9HLmWR421pIQHWWnBb2CDP-SfY,2830
-xn_model-1.0.6.dist-info/METADATA,sha256=yc5mcKpcMB3eZoYalZ670MEdYTm6x4_D5EcHiU7jICY,961
-xn_model-1.0.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-xn_model-1.0.6.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-1.0.6.dist-info/RECORD,,