xn-model 0.11.4__py3-none-any.whl → 1.0.1__py3-none-any.whl

x_model/models.py

@@ -1,175 +1,70 @@
 from datetime import datetime
-from pydantic import create_model
-from tortoise import Model as TortoiseModel
-from tortoise.contrib.pydantic import pydantic_model_creator, PydanticModel
-from tortoise import fields
-from tortoise.exceptions import FieldError
-from tortoise.models import MetaInfo
-from tortoise.queryset import QuerySet
-from x_model import HTTPException, FailReason
 
-from x_model.field import DatetimeSecField
-from x_model.pydantic import PydList
+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 x_model import HTTPException, FailReason
 
-class BaseModel(TortoiseModel):
-    # todo: resolve ownable + add only own list method
-    # todo: refact: clean old garbage
-    id: int = fields.IntField(True)
 
-    _name: tuple[str] = ("name",)
-    _sorts: tuple[str] = ("-id",)
+class DatetimeSecField(DatetimeField):
+    class _db_postgres:
+        SQL_TYPE = "TIMESTAMPTZ(0)"
 
-    def repr(self, sep: str = " ") -> str:
-        return sep.join(getattr(self, name_fragment) for name_fragment in self._name)
 
-    @classmethod
-    async def get_or_create_by_name(cls, name: str, attr_name: str = None, def_dict: dict = None) -> TortoiseModel:
-        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
-            obj = await cls.create(id=next_id, **{attr_name: name}, **(def_dict or {}))
-        return obj
-
-    @classmethod
-    def _page_query(cls, sorts: tuple[str], limit: int = 1000, offset: int = 0, q: str = None, **filters) -> QuerySet:
-        query = cls.filter(**filters).order_by(*sorts).limit(limit).offset(offset)
-        if q:
-            query = query.filter(**{f"{cls._name[0]}__icontains": q})
-        return query
-
-    @classmethod
-    async def upsert(cls, data: dict, oid=None):
-        meta: MetaInfo = cls._meta
-
-        # pop fields for relations from general data dict # todo: add backwards fields for save
-        m2ms = {k: data.pop(k) for k in meta.m2m_fields if k in data}
-        # bfks = {k: data.pop(k) for k in meta.backward_fk_fields if k in data}
-        # bo2os = {k: data.pop(k) for k in meta.backward_o2o_fields if k in data}
-
-        # save general model
-        # if pk := meta.pk_attr in data.keys():
-        #     unq = {pk: data.pop(pk)}
-        # else:
-        #     unq = {key: data.pop(key) for key, ft in meta.fields_map.items() if ft.unique and key in data.keys()}
-        # # unq = meta.unique_together
-        # obj, is_created = await cls.update_or_create(data, **unq)
-        obj = (await cls.update_or_create(data, id=oid))[0] if oid else await cls.create(**data)
-
-        # save relations
-        for k, ids in m2ms.items():
-            if ids:
-                m2m_rel: fields.ManyToManyRelation = getattr(obj, k)
-                items = [await m2m_rel.remote_model[i] for i in ids]
-                await m2m_rel.clear()  # for updating, not just adding
-                await m2m_rel.add(*items)
-        # for k, ids in bfks.items():
-        #     bfk_rel: ReverseRelation = getattr(obj, k)
-        #     items = [await bfk_rel.remote_model[i] for i in ids]
-        #     [await item.update_from_dict({bfk_rel.relation_field: obj.pk}).save() for item in items]
-        # for k, oid in bo2os.items():
-        #     bo2o_rel: QuerySet = getattr(obj, k)
-        #     item = await bo2o_rel.model[oid]
-        #     await item.update_from_dict({obj._meta.db_table: obj}).save()
-
-        await obj.fetch_related(*cls._meta.fetch_fields)
-        return obj
-
-    class Meta:
-        abstract = True
+class TsTrait:
+    created_at: datetime | None = DatetimeSecField(auto_now_add=True)
+    updated_at: datetime | None = DatetimeSecField(auto_now=True)
 
 
 class Model(BaseModel):
-    _pyd: type[PydanticModel] = None
-    _pydIn: type[PydanticModel] = None
-    _pydListItem: type[PydanticModel] = None
+    id: int = IntField(True)
 
-    class PydanticMeta:
-        # include: tuple[str, ...] = ()
-        # exclude: tuple[str, ...] = ()
-        # computed: tuple[str, ...] = ()
-        exclude_raw_fields = False  # default: True
-        max_recursion: int = 1  # default: 3
-
-    class PydanticMetaIn:
-        max_recursion: int = 0  # default: 3
-        backward_relations: bool = False  # no need to disable when max_recursion=0  # default: True
-        exclude_raw_fields: bool = False  # default: True
-
-    class PydanticMetaListItem:
-        max_recursion: int = 0  # default: 3
-        backward_relations: bool = False  # default: True
-        exclude_raw_fields = False  # default: True
-        sort_alphabetically: bool = True  # default: False
+    _name: tuple[str] = ("name",)
+    _sorts: tuple[str] = ("-id",)
 
-    @classmethod
-    def pyd(cls) -> type[PydanticModel]:
-        cls._pyd = cls._pyd or pydantic_model_creator(cls, name=cls.__name__)
-        return cls._pyd
+    def repr(self) -> str:
+        return " ".join(getattr(self, name_fragment) for name_fragment in self._name)
 
     @classmethod
-    def pyd_in(cls) -> type[PydanticModel]:
-        if not cls._pydIn:
-            opts = tuple(k for k, v in cls._meta.fields_map.items() if not v.required)
-            cls._pydIn = pydantic_model_creator(
-                cls,
-                name=cls.__name__ + "In",
-                meta_override=cls.PydanticMetaIn,
-                optional=opts,
-                exclude_readonly=True,
-                exclude=("created_at", "updated_at"),
-            )
-            if m2ms := cls._meta.m2m_fields:  # hack for direct inserting m2m values
-                cls._pydIn = create_model(
-                    cls._pydIn.__name__, __base__=cls._pydIn, **{m2m: (list[int] | None, None) for m2m in m2ms}
-                )
-        return cls._pydIn
+    def _pyd(cls, suffix: str, **kwargs) -> type[PydanticModel]:
+        return pydantic_model_creator(cls, name=cls.__name__ + suffix, **kwargs)
 
     @classmethod
-    def pyd_list_item(cls) -> type[PydanticModel]:
-        if not cls._pydListItem:
-            cls._pydListItem = pydantic_model_creator(
-                cls, name=cls.__name__ + "ListItem", meta_override=cls.PydanticMetaListItem
-            )
-        return cls._pydListItem
+    def pyd(cls):
+        return cls._pyd("Root")
 
     @classmethod
-    def pyds_list(cls) -> type[PydList]:
-        return create_model(
-            cls.__name__ + "List",
-            data=(list[cls.pyd_list_item()], []),
-            total=(int, 0),
-            filtered=(int | None, None),
-            __base__=PydList[cls.pyd_list_item()],
-        )
+    def pyd_in(cls):
+        return cls._pyd("In", exclude_readonly=True)
 
     # # # CRUD Methods # # #
     @classmethod
-    async def one_pyd(cls, uid: int, **filters) -> PydanticModel:
-        q = cls.get(id=uid, **filters)
-        return await cls.pyd().from_queryset_single(q)
+    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")
 
     @classmethod
-    async def page_pyd(cls, sorts: tuple[str], limit: int = 1000, offset: int = 0, q: str = None, **filters) -> PydList:
-        filters = {k: v for k, v in filters.items() if v is not None}
-        pyd_item = cls.pyd_list_item()
-        query = cls._page_query(sorts, limit, offset, q, **filters)
-        try:
-            data = await pyd_item.from_queryset(query)
-        except FieldError as e:
-            raise HTTPException(FailReason.body, e)
-        if limit - (li := len(data)):
-            filtered = total = li + offset
-        else:
-            total = await cls.all().count()
-            filtered_query = cls.filter(**filters)
-            if q:
-                filtered_query = filtered_query.filter(**{f"{cls._name}__icontains": q})
-            filtered = await filtered_query.count()
-        pyds = cls.pyds_list()
-        return pyds(data=data, total=total, filtered=filtered)
+    async def get_or_create_by_name(cls, name: str, attr_name: str = None, def_dict: dict = None) -> "Model":
+        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
+            obj = await cls.create(id=next_id, **{attr_name: name}, **(def_dict or {}))
+        return obj
 
+    class PydanticMeta:
+        model_config = ConfigDict(use_enum_values=True)
+        # include: tuple[str, ...] = ()
+        # exclude: tuple[str, ...] = ("Meta",)
+        # computed: tuple[str, ...] = ()
+        # backward_relations: bool = True
+        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 TsTrait:
-    created_at: datetime | None = DatetimeSecField(auto_now_add=True)
-    updated_at: datetime | None = DatetimeSecField(auto_now=True)
+    class Meta:
+        abstract = True

x_model/pydantic.py

@@ -1,14 +1,14 @@
-from typing import TypeVar, Generic
-from pydantic import BaseModel, ConfigDict
+# from typing import TypeVar, Generic
+from pydantic import BaseModel  # , ConfigDict
 
 
-RootModelType = TypeVar("RootModelType")
-
-
-class PydList(BaseModel, Generic[RootModelType]):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-    data: list[RootModelType]
-    total: int
+# RootModelType = TypeVar("RootModelType")
+#
+#
+# class PydList(BaseModel, Generic[RootModelType]):
+#     model_config = ConfigDict(arbitrary_types_allowed=True)
+#     data: list[RootModelType]
+#     total: int
 
 
 class Names(BaseModel):

{xn_model-0.11.4.dist-info → xn_model-1.0.1.dist-info}/METADATA

@@ -1,20 +1,21 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xn-model
-Version: 0.11.4
+Version: 1.0.1
 Summary: Base model for xn-api
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT
 Project-URL: Homepage, https://github.com/XyncNet/x-model
 Project-URL: Repository, https://github.com/XyncNet/x-model
 Keywords: tortoise,model,crud,generator,api,admin
-Requires-Python: >=3.12
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: tortoise-orm[accel,asyncpg]
+Requires-Dist: fastapi
 Provides-Extra: dev
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: python-dotenv ; extra == 'dev'
-Requires-Dist: build ; extra == 'dev'
-Requires-Dist: twine ; extra == 'dev'
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 
 ## INSTALL
 ```bash

xn_model-1.0.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+x_model/__init__.py,sha256=leq1K2Lq0zlTY2s5sdhDiGEyfNZPySCOJi0xB5xUSG0,1231
+x_model/field.py,sha256=S461M94ryQG7yu8lreXtWnZo3YdCP97xhbcCJ3BzXsY,2751
+x_model/func.py,sha256=E7jDoHJGaFpKvxbHnT_lyBxUZeMo-GRd5gv9dLw7B9s,289
+x_model/models.py,sha256=3ygo54HJTpHiD65Rgdzy5BNWJjtZiyypGiRlbDQ3oRc,2367
+x_model/pydantic.py,sha256=fe8yOCVlnlBcT64bhNodxegnA6f4YdJ0WcXDIs6Ug20,608
+xn_model-1.0.1.dist-info/METADATA,sha256=pk-jykzVjmVx3n6NnpYYvJyLXAyh8ohliVndnsijKeU,990
+xn_model-1.0.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+xn_model-1.0.1.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.1.dist-info/RECORD,,

{xn_model-0.11.4.dist-info → xn_model-1.0.1.dist-info}/WHEEL

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

xn_model-0.11.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-x_model/__init__.py,sha256=leq1K2Lq0zlTY2s5sdhDiGEyfNZPySCOJi0xB5xUSG0,1231
-x_model/field.py,sha256=S461M94ryQG7yu8lreXtWnZo3YdCP97xhbcCJ3BzXsY,2751
-x_model/func.py,sha256=E7jDoHJGaFpKvxbHnT_lyBxUZeMo-GRd5gv9dLw7B9s,289
-x_model/models.py,sha256=V1lrDJH-DPnGznhxCkNKFI58igzO2KTVCQNX2MDKzuM,7048
-x_model/pydantic.py,sha256=OjNCp4ZFGvUIxZSbDCmXISl9mOjI_UnWi5JMVntSqjM,590
-xn_model-0.11.4.dist-info/METADATA,sha256=1Njxvb3fKUa8Vrjec4Mdy_2Oh7tjpIk8DR2WJO34SjY,972
-xn_model-0.11.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-xn_model-0.11.4.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-0.11.4.dist-info/RECORD,,