xn-model 1.0.6__tar.gz → 1.0.8__tar.gz

{xn_model-1.0.6/xn_model.egg-info → xn_model-1.0.8}/PKG-INFO

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

{xn_model-1.0.6 → xn_model-1.0.8}/x_model/models.py

@@ -1,6 +1,8 @@
 from datetime import datetime
+from typing import Self
+
 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,51 +14,43 @@ 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: type[BaseModel] = None  # overridable
+    _in_type: 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
+    def out_type(cls):
+        if not cls._out_type:
+            cls._out = pydantic_model_creator(cls, name=cls.__name__ + "Out")
+        return cls._out_type
 
     @classmethod
-    def pyd_in(cls):
-        if not cls._pydIn:
-            cls._pydIn = pydantic_model_creator(
+    def in_type(cls):
+        if not cls._in_type:
+            cls._inn = pydantic_model_creator(
                 cls, name=cls.__name__ + "In", exclude_readonly=True, meta_override=cls.PydanticMetaIn
             )
-        return cls._pydIn
+        return cls._in_type
 
     # # # CRUD Methods # # #
     @classmethod
     async def get_one(cls, id_: int) -> PydanticModel:
         if obj := await cls.get_or_none(id=id_):
-            return await cls.pyd().from_tortoise_orm(obj)
+            return await cls.out_type().from_tortoise_orm(obj)
         raise LookupError(f"{cls.__name__}#{id_} not found")
 
     async def one(self) -> PydanticModel:
-        return await self.pyd().from_tortoise_orm(self)
+        return await self.out_type().from_tortoise_orm(self)
 
     @classmethod
-    async def get_or_create_by_name(cls, name: str, attr_name: str = None, def_dict: dict = None) -> "Model":
+    async def get_or_create_by_name(cls, name: str, attr_name: str = None, def_dict: dict = None) -> Self:
         attr_name = attr_name or list(cls._name)[0]
         if not (obj := await cls.get_or_none(**{attr_name: name})):
             next_id = (await cls.all().order_by("-id").first()).id + 1

xn_model-1.0.8/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 → xn_model-1.0.8/xn_model.egg-info}/PKG-INFO

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

{xn_model-1.0.6 → xn_model-1.0.8}/xn_model.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ x_model/__init__.py
 x_model/field.py
 x_model/func.py
 x_model/models.py
+x_model/types.py
 xn_model.egg-info/PKG-INFO
 xn_model.egg-info/SOURCES.txt
 xn_model.egg-info/dependency_links.txt