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

x_model/models.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Self
 
 from pydantic import ConfigDict, BaseModel
 from tortoise import Model as TortModel
@@ -16,8 +17,8 @@ class TsTrait:
 class Model(TortModel):
     id: int = IntField(True)
 
-    _out: type[BaseModel] = None  # overridable
-    _in: type[BaseModel] = None  # overridable
+    _out_type: type[BaseModel] = None  # overridable
+    _in_type: type[BaseModel] = None  # overridable
     _name: tuple[str] = ("name",)
     _sorts: tuple[str] = ("-id",)
 
@@ -25,31 +26,31 @@ class Model(TortModel):
         return sep.join(getattr(self, name_fragment) for name_fragment in self._name)
 
     @classmethod
-    def pyd(cls):
-        if not cls._out:
-            cls._out = pydantic_model_creator(cls, name=cls.__name__ + "Out")
-        return cls._out
+    def out_type(cls):
+        if not cls._out_type:
+            cls._out_type = pydantic_model_creator(cls, name=cls.__name__ + "Out")
+        return cls._out_type
 
     @classmethod
-    def pyd_in(cls):
-        if not cls._in:
-            cls._in = pydantic_model_creator(
+    def in_type(cls):
+        if not cls._in_type:
+            cls._in_type = pydantic_model_creator(
                 cls, name=cls.__name__ + "In", exclude_readonly=True, meta_override=cls.PydanticMetaIn
             )
-        return cls._in
+        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.7.dist-info → xn_model-1.0.9.dist-info}/METADATA

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

{xn_model-1.0.7.dist-info → xn_model-1.0.9.dist-info}/RECORD

@@ -1,9 +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/models.py,sha256=-dhEPBoOIcMvkWayjgOBt9xYiOalv8ZIM9bmFziVdzM,2710
 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.9.dist-info/METADATA,sha256=T5WCjgQpW4Jp-TH2rwqBmXO7N3dy3felQZ9_AJxbSe8,961
+xn_model-1.0.9.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+xn_model-1.0.9.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.9.dist-info/RECORD,,