xn-model 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

x_model/__init__.py

@@ -1,36 +1,12 @@
-import logging
-from enum import IntEnum
 from types import ModuleType
 
 from tortoise import Tortoise, connections
 from tortoise.backends.asyncpg import AsyncpgDBClient
 
 
-async def init_db(dsn: str, models: ModuleType, create_tables: bool = False) -> AsyncpgDBClient | str:
+async def init_db(dsn: str, models: ModuleType, create_tables: bool = True) -> AsyncpgDBClient | str:
     await Tortoise.init(db_url=dsn, modules={"models": [models]})
     if create_tables:
         await Tortoise.generate_schemas()
     cn: AsyncpgDBClient = connections.get("default")
     return cn
-
-
-class FailReason(IntEnum):
-    body = 8
-    query = 9
-    path = 10
-    host = 11
-    protocol = 12
-    method = 13
-
-
-class HTTPException(Exception):
-    def __init__(
-        self,
-        reason: IntEnum,
-        parent: Exception | str = None,
-        status_: int = 400,
-        hdrs: dict = None,
-    ) -> None:
-        detail = f"{reason.name}{f': {parent}' if parent else ''}"
-        logging.error(detail)
-        super().__init__(status_, detail, hdrs)

x_model/field.py

@@ -1,7 +1,7 @@
 from enum import IntEnum
 from typing import Any
 
-from asyncpg import Point, Polygon, Range, Box
+from asyncpg import Range  # Box, Point, Polygon,
 from tortoise import Model
 from tortoise.contrib.postgres.fields import ArrayField
 from tortoise.fields import Field, SmallIntField, IntField, FloatField, DatetimeField
@@ -51,23 +51,23 @@ class RangeField(CollectionField[Range]):
         return value
 
 
-class PointField(CollectionField[Point]):
-    SQL_TYPE = "POINT"
-    field_type = Point
-    base_field = FloatField
-    labels = ("lat", "lon")
-
-
-class PolygonField(ListField[Polygon]):
-    SQL_TYPE = "POLYGON"
-    field_type = Polygon
-    base_field = PointField
-
-
-class BoxField(ListField[Box]):
-    SQL_TYPE = "BOX"
-    field_type = Box
-    base_field = PointField
+# class PointField(CollectionField[Point]):
+#     SQL_TYPE = "POINT"
+#     field_type = Point
+#     base_field = FloatField
+#     labels = ("lat", "lon")
+#
+#
+# class PolygonField(ListField[Polygon]):
+#     SQL_TYPE = "POLYGON"
+#     field_type = Polygon
+#     base_field = PointField
+#
+#
+# class BoxField(ListField[Box]):
+#     SQL_TYPE = "BOX"
+#     field_type = Box
+#     base_field = PointField
 
 
 class DatetimeSecField(DatetimeField):

x_model/models.py

@@ -3,14 +3,9 @@ from datetime import datetime
 from pydantic import ConfigDict
 from tortoise import Model as BaseModel
 from tortoise.contrib.pydantic import pydantic_model_creator, PydanticModel
-from tortoise.fields import DatetimeField, IntField
+from tortoise.fields import IntField
 
-from x_model import HTTPException, FailReason
-
-
-class DatetimeSecField(DatetimeField):
-    class _db_postgres:
-        SQL_TYPE = "TIMESTAMPTZ(0)"
+from x_model.field import DatetimeSecField
 
 
 class TsTrait:
@@ -21,6 +16,8 @@ class TsTrait:
 class Model(BaseModel):
     id: int = IntField(True)
 
+    _pyd: type[PydanticModel] = None  # overridable
+    _pydIn: type[PydanticModel] = None  # overridable
     _name: tuple[str] = ("name",)
     _sorts: tuple[str] = ("-id",)
 
@@ -29,14 +26,24 @@ class Model(BaseModel):
 
     @classmethod
     def pyd(cls):
-        return pydantic_model_creator(cls, name=cls.__name__)
+        if not cls._pyd:
+            cls._pyd = pydantic_model_creator(cls, name=cls.__name__)
+        return cls._pyd
+
+    @classmethod
+    def pyd_in(cls):
+        if not cls._pydIn:
+            cls._pydIn = pydantic_model_creator(
+                cls, name=cls.__name__ + "In", exclude_readonly=True, meta_override=cls.PydanticMetaIn
+            )
+        return cls._pydIn
 
     # # # CRUD Methods # # #
     @classmethod
     async def get_one(cls, id_: int, **filters) -> PydanticModel:
         if obj := await cls.get_or_none(id=id_, **filters):
             return await cls.pyd().from_tortoise_orm(obj)
-        raise HTTPException(reason=FailReason.path, status_=404, parent=f"{cls.__name__}#{id_} not found")
+        raise LookupError(f"{cls.__name__}#{id_} not found")
 
     @classmethod
     async def get_or_create_by_name(cls, name: str, attr_name: str = None, def_dict: dict = None) -> "Model":
@@ -52,11 +59,16 @@ class Model(BaseModel):
         # exclude: tuple[str, ...] = ("Meta",)
         # computed: tuple[str, ...] = ()
         # backward_relations: bool = True
-        max_recursion: int = 0  # default: 3
+        max_recursion: int = 1  # default: 3
         # allow_cycles: bool = False
         # exclude_raw_fields: bool = True
         # sort_alphabetically: bool = False
         # model_config: ConfigDict | None = None
 
+    class PydanticMetaIn:
+        backward_relations: bool = False
+        max_recursion: int = 0
+        exclude_raw_fields: bool = False
+
     class Meta:
         abstract = True

{xn_model-1.0.2.dist-info → xn_model-1.0.4.dist-info}/METADATA

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

xn_model-1.0.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+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=nI7HkWaSMs90AgT526HaaxWkEvakE8MlmaZZjHP5Fiw,2537
+xn_model-1.0.4.dist-info/METADATA,sha256=Dy-N6fK1wjfGdxytbYwIutLNq0cGxReRmsXqyNvi-So,961
+xn_model-1.0.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+xn_model-1.0.4.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.4.dist-info/RECORD,,

x_model/pydantic.py

@@ -1,16 +0,0 @@
-from pydantic import BaseModel
-
-
-class Names(BaseModel):
-    # models for name endpoint for select2 inputs
-    class Name(BaseModel):
-        id: int
-        text: str
-        logo: str | None = None
-        selected: bool | None = None
-
-    class Pagination(BaseModel):
-        more: bool
-
-    results: list[Name]
-    pagination: Pagination

xn_model-1.0.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-x_model/__init__.py,sha256=JgpONZwWeYiV4mzk0nT8PM4ZzTSCSAGy4PV2G2ZIW04,933
-x_model/field.py,sha256=S461M94ryQG7yu8lreXtWnZo3YdCP97xhbcCJ3BzXsY,2751
-x_model/func.py,sha256=E7jDoHJGaFpKvxbHnT_lyBxUZeMo-GRd5gv9dLw7B9s,289
-x_model/models.py,sha256=XZu7jWf0Wl5JiHvS222iumMk3eJLuQBkhOVfq-46qd8,2141
-x_model/pydantic.py,sha256=18O4yFvYDyZaSqIaOKcZhQRpIBM2o73DNlqrXvU_4XM,342
-xn_model-1.0.2.dist-info/METADATA,sha256=0B-FErvCVRVC13r_j1TMqZrcQ6KssyvNoO6OlsnArsw,961
-xn_model-1.0.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-xn_model-1.0.2.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-1.0.2.dist-info/RECORD,,