xn-model 1.0.1.dev2__tar.gz → 1.0.3__tar.gz

{xn_model-1.0.1.dev2/xn_model.egg-info → xn_model-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xn-model
-Version: 1.0.1.dev2
+Version: 1.0.3
 Summary: Base model for xn-api
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/XyncNet/x-model
 Keywords: tortoise,model,crud,generator,api,admin
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: tortoise-orm[accel,asyncpg]
+Requires-Dist: tortoise-orm[asyncpg]
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: python-dotenv; extra == "dev"

{xn_model-1.0.1.dev2 → xn_model-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ requires-python = ">=3.11"
 authors = [
     {name = "Mike Artemiev", email = "mixartemev@gmail.com"},
 ]
-dependencies = ['tortoise-orm[accel,asyncpg]']
+dependencies = ['tortoise-orm[asyncpg]']
 keywords = ["tortoise", "model", "crud", "generator", "api", "admin"]
 description = 'Base model for xn-api'
 readme = "README.md"

{xn_model-1.0.1.dev2 → xn_model-1.0.3}/x_model/__init__.py

@@ -2,21 +2,15 @@ import logging
 from enum import IntEnum
 from types import ModuleType
 
-from starlette import status
-from tortoise import Tortoise, connections, ConfigurationError
+from tortoise import Tortoise, connections
 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]
+    await Tortoise.init(db_url=dsn, modules={"models": [models]})
+    if create_tables:
+        await Tortoise.generate_schemas()
+    cn: AsyncpgDBClient = connections.get("default")
     return cn
 
 
@@ -29,12 +23,12 @@ class FailReason(IntEnum):
     method = 13
 
 
-class HTTPException(BaseHTTPException):
+class HTTPException(Exception):
     def __init__(
         self,
         reason: IntEnum,
         parent: Exception | str = None,
-        status_: status = status.HTTP_400_BAD_REQUEST,
+        status_: int = 400,
         hdrs: dict = None,
     ) -> None:
         detail = f"{reason.name}{f': {parent}' if parent else ''}"

{xn_model-1.0.1.dev2 → xn_model-1.0.3}/x_model/models.py

@@ -21,23 +21,18 @@ class TsTrait:
 class Model(BaseModel):
     id: int = IntField(True)
 
+    _pyd: type[PydanticModel] = None
     _name: tuple[str] = ("name",)
     _sorts: tuple[str] = ("-id",)
 
     def repr(self) -> str:
         return " ".join(getattr(self, name_fragment) for name_fragment in self._name)
 
-    @classmethod
-    def _pyd(cls, suffix: str, **kwargs) -> type[PydanticModel]:
-        return pydantic_model_creator(cls, name=cls.__name__ + suffix, **kwargs)
-
     @classmethod
     def pyd(cls):
-        return cls._pyd("Root")
-
-    @classmethod
-    def pyd_in(cls):
-        return cls._pyd("In", exclude_readonly=True)
+        if not cls._pyd:
+            cls._pyd = pydantic_model_creator(cls, name=cls.__name__)
+        return cls._pyd
 
     # # # CRUD Methods # # #
     @classmethod
@@ -60,7 +55,7 @@ class Model(BaseModel):
         # exclude: tuple[str, ...] = ("Meta",)
         # computed: tuple[str, ...] = ()
         # backward_relations: bool = True
-        max_recursion: int = 1  # default: 3
+        max_recursion: int = 0  # default: 3
         # allow_cycles: bool = False
         # exclude_raw_fields: bool = True
         # sort_alphabetically: bool = False

{xn_model-1.0.1.dev2 → xn_model-1.0.3}/x_model/pydantic.py

@@ -1,14 +1,4 @@
-# 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
+from pydantic import BaseModel
 
 
 class Names(BaseModel):

{xn_model-1.0.1.dev2 → xn_model-1.0.3/xn_model.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xn-model
-Version: 1.0.1.dev2
+Version: 1.0.3
 Summary: Base model for xn-api
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/XyncNet/x-model
 Keywords: tortoise,model,crud,generator,api,admin
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: tortoise-orm[accel,asyncpg]
+Requires-Dist: tortoise-orm[asyncpg]
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: python-dotenv; extra == "dev"

{xn_model-1.0.1.dev2 → xn_model-1.0.3}/xn_model.egg-info/requires.txt

@@ -1,4 +1,4 @@
-tortoise-orm[accel,asyncpg]
+tortoise-orm[asyncpg]
 
 [dev]
 pytest