xn-model 1.0.1.dev2__py3-none-any.whl → 1.0.2__py3-none-any.whl

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 ''}"

x_model/models.py

@@ -27,17 +27,9 @@ class Model(BaseModel):
     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)
+        return pydantic_model_creator(cls, name=cls.__name__)
 
     # # # CRUD Methods # # #
     @classmethod
@@ -60,7 +52,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

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.dist-info → xn_model-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xn-model
-Version: 1.0.1.dev2
+Version: 1.0.2
 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.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+x_model/__init__.py,sha256=JgpONZwWeYiV4mzk0nT8PM4ZzTSCSAGy4PV2G2ZIW04,933
+x_model/field.py,sha256=S461M94ryQG7yu8lreXtWnZo3YdCP97xhbcCJ3BzXsY,2751
+x_model/func.py,sha256=E7jDoHJGaFpKvxbHnT_lyBxUZeMo-GRd5gv9dLw7B9s,289
+x_model/models.py,sha256=XZu7jWf0Wl5JiHvS222iumMk3eJLuQBkhOVfq-46qd8,2141
+x_model/pydantic.py,sha256=18O4yFvYDyZaSqIaOKcZhQRpIBM2o73DNlqrXvU_4XM,342
+xn_model-1.0.2.dist-info/METADATA,sha256=0B-FErvCVRVC13r_j1TMqZrcQ6KssyvNoO6OlsnArsw,961
+xn_model-1.0.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+xn_model-1.0.2.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
+xn_model-1.0.2.dist-info/RECORD,,

{xn_model-1.0.1.dev2.dist-info → xn_model-1.0.2.dist-info}/WHEEL

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

xn_model-1.0.1.dev2.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=3ygo54HJTpHiD65Rgdzy5BNWJjtZiyypGiRlbDQ3oRc,2367
-x_model/pydantic.py,sha256=fe8yOCVlnlBcT64bhNodxegnA6f4YdJ0WcXDIs6Ug20,608
-xn_model-1.0.1.dev2.dist-info/METADATA,sha256=J4VHD6RXpem2cdyTQ-XlUr4j1y_ZDzjVKr5-EKUrYmY,972
-xn_model-1.0.1.dev2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-xn_model-1.0.1.dev2.dist-info/top_level.txt,sha256=QCYyfv5AA_8jPPtCpShkBXzQRUCGuuW7Ro0mqysDE8E,8
-xn_model-1.0.1.dev2.dist-info/RECORD,,