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

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

@@ -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.1 → xn_model-0.11.3}/pyproject.toml

@@ -5,8 +5,7 @@ authors = [
     {name = "Mike Artemiev", email = "mixartemev@gmail.com"},
 ]
 dependencies = [
-    'tortoise-orm[accel,asyncpg]',
-    "python-dotenv"
+    'tortoise-orm[accel,asyncpg]'
 ]
 keywords = ["tortoise", "model", "crud", "generator", "api", "admin"]
 description = 'Base model for xn-api'
@@ -32,9 +31,9 @@ local_scheme = "no-local-version"
 [project.optional-dependencies]
 dev = [
     "pytest",
+    "python-dotenv",
     "build",
-    "twine",
-    "setuptools_scm",
+    "twine"
 ]
 
 [tool.ruff]

{xn_model-0.11.1 → xn_model-0.11.3}/tests/test_db.py

@@ -3,7 +3,7 @@ from os import getenv as env
 from dotenv import load_dotenv
 from tortoise.backends.asyncpg import AsyncpgDBClient
 
-from x_model import init_db, model
+from x_model import init_db, models
 
 load_dotenv()
 
@@ -11,4 +11,4 @@ PG_DSN = f"postgres://{env('POSTGRES_USER')}:{env('POSTGRES_PASSWORD')}@{env('PO
 
 
 def test_init_db():
-    assert isinstance(run(init_db(PG_DSN, model)), AsyncpgDBClient), "DB corrupt"
+    assert isinstance(run(init_db(PG_DSN, models)), AsyncpgDBClient), "DB corrupt"

xn_model-0.11.3/x_model/__init__.py

@@ -0,0 +1,42 @@
+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):
+    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)

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

@@ -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.1 → xn_model-0.11.3}/xn_model.egg-info/SOURCES.txt

@@ -9,7 +9,7 @@ tests/test_db.py
 x_model/__init__.py
 x_model/field.py
 x_model/func.py
-x_model/model.py
+x_model/models.py
 x_model/pydantic.py
 xn_model.egg-info/PKG-INFO
 xn_model.egg-info/SOURCES.txt

{xn_model-0.11.1 → xn_model-0.11.3}/xn_model.egg-info/requires.txt

@@ -1,8 +1,7 @@
 tortoise-orm[accel,asyncpg]
-python-dotenv
 
 [dev]
 pytest
+python-dotenv
 build
 twine
-setuptools_scm

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