xn-model 0.11.1__tar.gz → 0.11.2__tar.gz

{xn_model-0.11.1/xn_model.egg-info → xn_model-0.11.2}/PKG-INFO

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

xn_model-0.11.2/x_model/__init__.py

@@ -0,0 +1,41 @@
+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:
+    try:
+        await Tortoise.init(db_url=dsn, modules={"models": [models]})
+        if create_tables:
+            await Tortoise.generate_schemas()
+        cn: AsyncpgDBClient = connections.get("default")
+    except (ConfigurationError, DBConnectionError) as ce:
+        return ce.args[0]
+    return cn
+
+
+class FailReason(IntEnum):
+    path = 8
+    query = 9
+    body = 10
+    method = 11
+    protocol = 12
+
+
+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)

{xn_model-0.11.1 → xn_model-0.11.2}/x_model/model.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 → xn_model-0.11.2/xn_model.egg-info}/PKG-INFO

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

xn_model-0.11.1/x_model/__init__.py

@@ -1,15 +0,0 @@
-from types import ModuleType
-from tortoise import Tortoise, connections, ConfigurationError
-from tortoise.backends.asyncpg import AsyncpgDBClient
-from tortoise.exceptions import DBConnectionError
-
-
-async def init_db(dsn: str, models: ModuleType, create_tables: bool = False) -> AsyncpgDBClient | str:
-    try:
-        await Tortoise.init(db_url=dsn, modules={"models": [models]})
-        if create_tables:
-            await Tortoise.generate_schemas()
-        cn: AsyncpgDBClient = connections.get("default")
-    except (ConfigurationError, DBConnectionError) as ce:
-        return ce.args[0]
-    return cn