xn-model 0.11.1__py3-none-any.whl → 0.11.3__py3-none-any.whl

x_model/__init__.py

@@ -1,7 +1,12 @@
+import logging
+from enum import IntEnum
 from types import ModuleType
+
+from starlette import status
 from tortoise import Tortoise, connections, ConfigurationError
 from tortoise.backends.asyncpg import AsyncpgDBClient
 from tortoise.exceptions import DBConnectionError
+from fastapi import HTTPException as BaseHTTPException
 
 
 async def init_db(dsn: str, models: ModuleType, create_tables: bool = False) -> AsyncpgDBClient | str:
@@ -13,3 +18,25 @@ async def init_db(dsn: str, models: ModuleType, create_tables: bool = False) ->
     except (ConfigurationError, DBConnectionError) as ce:
         return ce.args[0]
     return cn
+
+
+class FailReason(IntEnum):
+    body = 8
+    query = 9
+    path = 10
+    host = 11
+    protocol = 12
+    method = 13
+
+
+class HTTPException(BaseHTTPException):
+    def __init__(
+        self,
+        reason: IntEnum,
+        parent: Exception | str = None,
+        status_: status = status.HTTP_400_BAD_REQUEST,
+        hdrs: dict = None,
+    ) -> None:
+        detail = f"{reason.name}{f': {parent}' if parent else ''}"
+        logging.error(detail)
+        super().__init__(status_, detail, hdrs)

x_model/{model.py → models.py}

@@ -3,8 +3,10 @@ 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
@@ -33,7 +35,7 @@ class BaseModel(TortoiseModel):
     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}__icontains": q})
+            query = query.filter(**{f"{cls._name[0]}__icontains": q})
         return query
 
     @classmethod
@@ -152,7 +154,10 @@ class Model(BaseModel):
         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)
-        data = await pyd_item.from_queryset(query)
+        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:

{xn_model-0.11.1.dist-info → xn_model-0.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-model
-Version: 0.11.1
+Version: 0.11.3
 Summary: Base model for xn-api
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -10,12 +10,11 @@ Keywords: tortoise,model,crud,generator,api,admin
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: tortoise-orm[accel,asyncpg]
-Requires-Dist: python-dotenv
 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: setuptools-scm ; extra == 'dev'
 
 ## INSTALL
 ```bash

xn_model-0.11.3.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=VL6JE-oGU0xzolhEGD8Lp7xDV7LVNGS0klMsUOXPJi0,7029
+x_model/pydantic.py,sha256=OjNCp4ZFGvUIxZSbDCmXISl9mOjI_UnWi5JMVntSqjM,590
+xn_model-0.11.3.dist-info/METADATA,sha256=opjpi9JEK4UFyEqN8Eeak1AKBEkCenCNsMgEIBVW8D8,972
+xn_model-0.11.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+xn_model-0.11.3.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-0.11.3.dist-info/RECORD,,

{xn_model-0.11.1.dist-info → xn_model-0.11.3.dist-info}/WHEEL

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

xn_model-0.11.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-x_model/__init__.py,sha256=HBOZMb1HheFkak6Ih7YkSGiNtGkQq7L_fiWgL_zpEC0,607
-x_model/field.py,sha256=S461M94ryQG7yu8lreXtWnZo3YdCP97xhbcCJ3BzXsY,2751
-x_model/func.py,sha256=E7jDoHJGaFpKvxbHnT_lyBxUZeMo-GRd5gv9dLw7B9s,289
-x_model/model.py,sha256=JinApUsO_x5U9euiU64AscTZt4sYqXtP_2bvBJzwCas,6836
-x_model/pydantic.py,sha256=OjNCp4ZFGvUIxZSbDCmXISl9mOjI_UnWi5JMVntSqjM,590
-xn_model-0.11.1.dist-info/METADATA,sha256=N4ZUlk6hu6GyCwfd_b24CLfY_hNfdGa9EyxdgcspjhY,1002
-xn_model-0.11.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-xn_model-0.11.1.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-0.11.1.dist-info/RECORD,,