fastapi-extra 0.2.3__tar.gz → 0.2.5__tar.gz

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-extra
-Version: 0.2.3
+Version: 0.2.5
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.3"
+__version__ = "0.2.5"
 
 
 from fastapi import FastAPI
@@ -7,7 +7,7 @@ from fastapi import FastAPI
 def setup(app: FastAPI) -> None:
     try:
         from fastapi_extra import routing as native_routing  # type: ignore
-        
+
         native_routing.install(app)
     except ImportError:  # pragma: nocover
         pass

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/cache/__init__.py

@@ -3,6 +3,4 @@ __date__ = "2025-01-10"
 
 from .redis import RedisCli as Redis
 
-__all__ = [
-    "Redis"
-]
+__all__ = ["Redis"]

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/cache/redis.py

@@ -30,18 +30,20 @@ class RedisPool(AbstractComponent):
 
     def __init__(self):
         self._pool: ConnectionPool | None = None
-    
+
     @classmethod
     def setup(cls, **options) -> Self:
         redis = cls()
         redis._pool = ConnectionPool.from_url(
-            cls.default_config.url, 
-            **cls.default_config.model_dump(exclude_defaults=True, exclude={"url", "connection_kwargs"}), 
-            **cls.default_config.connection_kwargs
-            **options
+            str(cls.default_config.url),
+            **cls.default_config.model_dump(
+                exclude_defaults=True, exclude={"url", "connection_kwargs"}
+            ),
+            **cls.default_config.connection_kwargs,
+            **options,
         )
         return redis
-    
+
     def get_client(self) -> Redis:
         return Redis(connection_pool=self._pool)
 
@@ -50,9 +52,8 @@ class RedisPool(AbstractComponent):
             await self._pool.aclose()
 
 
-
 async def get_redis(pool: RedisPool) -> AsyncGenerator[Redis, None]:
-    async with RedisPool.get_client as client:
+    async with pool.get_client() as client:
         yield client
 
 

fastapi_extra-0.2.5/fastapi_extra/cursor.pyi

@@ -0,0 +1,8 @@
+__author__ = "ziyan.yin"
+__describe__ = ""
+
+class Cursor:
+    
+    def __init__(self, seed: int) -> None: ...
+    
+    def next_val(self) -> int: ...

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/database/__init__.py

@@ -7,9 +7,4 @@ from fastapi_extra.database.service import ModelService
 from fastapi_extra.database.session import DefaultSession as Session
 from fastapi_extra.database.session import SessionFactory
 
-__all__ = [
-    "SessionFactory",
-    "Session",
-    "SQLBase",
-    "ModelService"
-]
+__all__ = ["SessionFactory", "Session", "SQLBase", "ModelService"]

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/database/model.py

@@ -15,8 +15,8 @@ from fastapi_extra.utils import get_machine_seed
 
 class AutoPK(SQLModel):
     id: int | None = Field(
-        default=None, 
-        title="ID", 
+        default=None,
+        title="ID",
         primary_key=True,
         sa_type=BigInteger,
         sa_column_kwargs={"autoincrement": True},
@@ -26,9 +26,9 @@ class AutoPK(SQLModel):
 
 class LocalPK(SQLModel):
     id: Cursor | None = Field(
-        default_factory=_Cursor(get_machine_seed()).next_val, 
-        title="ID", 
-        primary_key=True, 
+        default_factory=_Cursor(get_machine_seed()).next_val,
+        title="ID",
+        primary_key=True,
         sa_type=BigInteger,
         sa_column_kwargs={"autoincrement": False},
         schema_extra={"json_schema_extra": {"readOnly": True}},
@@ -53,7 +53,7 @@ class Versioned(SQLModel):
         sa_column_kwargs={"nullable": False, "comment": "VERSION_ID"},
         schema_extra={"json_schema_extra": {"readOnly": True}},
     )
-    
+
     @declared_attr  # type: ignore
     def __mapper_args__(cls) -> dict:
         return {"version_id_col": cls.version_id}
@@ -61,17 +61,26 @@ class Versioned(SQLModel):
 
 class Optime(SQLModel):
     create_at: LocalDateTime = Field(
-        default_factory=datetime.datetime.now, 
+        default_factory=datetime.datetime.now,
         title="CREATE_AT",
         sa_type=DateTime,
-        sa_column_kwargs={"default": func.now(), "nullable": False, "comment": "CREATE_AT"},
+        sa_column_kwargs={
+            "default": func.now(),
+            "nullable": False,
+            "comment": "CREATE_AT",
+        },
         schema_extra={"json_schema_extra": {"readOnly": True}},
     )
     update_at: LocalDateTime = Field(
-        default_factory=datetime.datetime.now, 
+        default_factory=datetime.datetime.now,
         title="UPDATE_AT",
         sa_type=DateTime,
-        sa_column_kwargs={"default": func.now(), "onupdate": func.now(), "nullable": False, "comment": "UPDATE_AT"},
+        sa_column_kwargs={
+            "default": func.now(),
+            "onupdate": func.now(),
+            "nullable": False,
+            "comment": "UPDATE_AT",
+        },
         schema_extra={"json_schema_extra": {"readOnly": True}},
     )
 

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/database/service.py

@@ -2,7 +2,7 @@ __author__ = "ziyan.yin"
 __date__ = "2025-01-12"
 
 from contextvars import ContextVar
-from typing import Any, Generic, Self, TypeVar
+from typing import Any, Generic, TypeVar
 
 from fastapi_extra.database.model import SQLModel
 from fastapi_extra.database.session import AsyncSession, DefaultSession
@@ -13,24 +13,27 @@ Model = TypeVar("Model", bound=SQLModel)
 
 class ModelService(AbstractService, Generic[Model], abstract=True):
     __slot__ = ()
-    __model__: Model
-    __session_container__ = ContextVar("__session_container__", default=None)
-    
+    __model__: type[Model]
+    __session_container__ = ContextVar[AsyncSession | None]("__session_container__", default=None)
+
     @classmethod
-    def __class_getitem__(cls, item: type[SQLModel]) -> Self:
+    def __class_getitem__(cls, item: type[SQLModel]) -> type["ModelService"]:
         if not issubclass(item, SQLModel):
             raise TypeError(f"type[SQLModel] expected, got {item}")
         if not (table_arg := item.model_config.get("table", None)):
-            raise AttributeError(f"True expected for argument {item.__name__}.model_config.table, got {table_arg}")
-        
+            raise AttributeError(
+                f"True expected for argument {item.__name__}.model_config.table, got {table_arg}"
+            )
+
         class SubService(ModelService):
+            __slot__ = ()
             __model__ = item
-        
+
         return SubService
 
     def __init__(self, session: DefaultSession):
         self.__session_container__.set(session)
-    
+
     @property
     def session(self) -> AsyncSession:
         _session = self.__session_container__.get()
@@ -45,6 +48,6 @@ class ModelService(AbstractService, Generic[Model], abstract=True):
         self.session.add(model)
         await self.session.flush()
         return model
-    
-    async def delete(self, model: Model) -> Model:
+
+    async def delete(self, model: Model) -> None:
         return await self.session.delete(model)

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/database/session.py

@@ -5,7 +5,7 @@ from typing import Annotated, AsyncGenerator, Literal, Self
 
 from fastapi.params import Depends
 from pydantic import AnyUrl, BaseModel, Field
-from sqlalchemy.ext.asyncio import create_async_engine
+from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from fastapi_extra.dependency import AbstractComponent
@@ -16,13 +16,16 @@ class DatabaseConfig(BaseModel):
     url: AnyUrl
     echo: bool = False
     echo_pool: bool = False
-    isolation_level: Literal[
-        "SERIALIZABLE",
-        "REPEATABLE READ",
-        "READ COMMITTED",
-        "READ UNCOMMITTED",
-        "AUTOCOMMIT",
-    ] | None = None
+    isolation_level: (
+        Literal[
+            "SERIALIZABLE",
+            "REPEATABLE READ",
+            "READ COMMITTED",
+            "READ UNCOMMITTED",
+            "AUTOCOMMIT",
+        ]
+        | None
+    ) = None
     options: dict = Field(default_factory=dict)
 
 
@@ -36,18 +39,20 @@ _settings = DefaultDatabaseSettings()  # type: ignore
 class SessionFactory(AbstractComponent):
     __slot__ = ("_engine",)
     default_config = _settings.datasource
-    
+
     def __init__(self):
-        self._engine = None
-    
+        self._engine: AsyncEngine | None = None
+
     @classmethod
     def setup(cls, **options) -> Self:
         db = cls()
         db._engine = create_async_engine(
             url=str(cls.default_config.url),
-            **cls.default_config.model_dump(exclude_defaults=True, exclude={"url", "options"}), 
+            **cls.default_config.model_dump(
+                exclude_defaults=True, exclude={"url", "options"}
+            ),
             **cls.default_config.options,
-            **options
+            **options,
         )
         return db
 

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/dependency.py

@@ -9,23 +9,19 @@ from fastapi import Depends, FastAPI, Request
 
 
 def async_wrapper(func: Callable):
-    
+
     async def func_wrapper(*args, **kwds):
         return func(*args, **kwds)
-    
+
     return update_wrapper(func_wrapper, func)
 
 
 class DependencyMetaClass(ABCMeta):
     __load__ = None
     __token__ = None
-    
+
     def __new__(
-        mcs,
-        name: str,
-        bases: tuple[type, ...],
-        attrs: dict,
-        abstract: bool = False
+        mcs, name: str, bases: tuple[type, ...], attrs: dict, abstract: bool = False
     ):
         new_cls = super().__new__(mcs, name, bases, attrs)
         new_cls.__token__ = f"{new_cls.__module__}.{new_cls.__name__}"
@@ -54,7 +50,9 @@ class AbstractComponent(metaclass=DependencyMetaClass, abstract=True):
     @final
     @classmethod
     async def __load__(cls, request: Request) -> Self:
-        assert hasattr(request.app.state, cls.__token__), f"{cls.__name__} must be installed in lifespan"
+        assert hasattr(
+            request.app.state, cls.__token__
+        ), f"{cls.__name__} must be installed in lifespan"
         return getattr(request.app.state, cls.__token__)
 
     async def dispose(self) -> None:

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/form.py

@@ -16,10 +16,12 @@ class DataRange(BaseModel, Generic[C]):
 
 class ColumnExpression(BaseModel, Generic[S]):
     column_name: str = Field(title="列名")
-    option: Literal["eq", "ne", "gt", "lt", "ge", "le"] = Field(default="eq", title="逻辑值")
+    option: Literal["eq", "ne", "gt", "lt", "ge", "le"] = Field(
+        default="eq", title="逻辑值"
+    )
     value: S = Field(title="参考值")
-    
-    @model_validator(mode="after")
+
+    @model_validator(mode="after")  # type: ignore
     def validate_value(self):
         if self.value is None and self.option not in ("eq", "ne"):
             raise ValueError("NoneType is not comparable")
@@ -27,7 +29,7 @@ class ColumnExpression(BaseModel, Generic[S]):
 
 class WhereClause(BaseModel):
     option: Literal["and", "or"] = Field(default="and", title="关系")
-    column_clauses: list[ColumnExpression | "WhereClause"]
+    column_clauses: list["ColumnExpression | WhereClause"]
 
 
 class Page(BaseModel, Generic[Schema]):

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/response.py

@@ -195,31 +195,39 @@ class APIResult(BaseModel, Generic[T]):
     data: T | None = Field(default=None, title="返回数据")
 
     if TYPE_CHECKING:
+
         @classmethod
         def ok(cls, data: T | None = None) -> "APIResult[T]":
             return APIResult(data=data)
+
     else:
+
         @classmethod
         def ok(cls, data: T | None = None) -> "APIResponse":
-            return APIResponse(APIResult(data=data))
+            model = cls.__new__(cls)
+            model.__dict__["data"] = data
+            return APIResponse(model)
 
 
 class APIResponse(JSONResponse):
-    
+
     def render(self, content: APIResult) -> bytes:
-        return content.__pydantic_serializer__.to_json(
+        return APIResult.__pydantic_serializer__.to_json(
+            content,
             indent=None,
             by_alias=True,
             exclude_defaults=False,
             exclude_none=False,
-            exclude_unset=False
+            exclude_unset=False,
         )
 
 
 class APIError(Exception):
     __slots__ = ("code", "message")
-    
-    def __init__(self, result: ResultEnum | None = None, code: str = "00000", message: str = "") -> None:
+
+    def __init__(
+        self, result: ResultEnum | None = None, code: str = "00000", message: str = ""
+    ) -> None:
         if result:
             self.code = result.value[0]
             self.message = message or result.value[1]
@@ -227,7 +235,7 @@ class APIError(Exception):
             self.code = code
             self.message = message
         super().__init__(self)
-    
+
     def __str__(self) -> str:
         return self.message
 

fastapi_extra-0.2.5/fastapi_extra/routing.pyi

@@ -0,0 +1,11 @@
+__author__ = "ziyan.yin"
+__describe__ = ""
+
+from typing import Any
+
+from fastapi import FastAPI
+
+class RouteNode:
+    def add_route(self, fullpath: str, handler: Any): ...
+
+def install(app: FastAPI) -> None: ...

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/settings.py

@@ -11,18 +11,18 @@ from pydantic_settings import (BaseSettings, PydanticBaseSettingsSource,
 
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(
-        toml_file=["config.default.toml", "config.custom.toml"], 
+        toml_file=["config.default.toml", "config.custom.toml"],
         validate_default=False,
-        extra="ignore"
+        extra="ignore",
     )
-    
+
     title: str = "FastAPI"
     version: str = "0.1.0"
     debug: bool = False
     root_path: str = ""
     include_in_schema: bool = True
     mode: Literal["dev", "test", "prod"] = "dev"
-    
+
     @classmethod
     def settings_customise_sources(
         cls,
@@ -33,10 +33,10 @@ class Settings(BaseSettings):
         file_secret_settings: PydanticBaseSettingsSource,
     ) -> Tuple[PydanticBaseSettingsSource, ...]:
         return (
-            TomlConfigSettingsSource(settings_cls), 
-            env_settings, 
+            TomlConfigSettingsSource(settings_cls),
+            env_settings,
             init_settings,
-            file_secret_settings
+            file_secret_settings,
         )
 
     @model_validator(mode="after")

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra/types.py

@@ -9,7 +9,9 @@ from typing import Annotated, Any, TypeVar, Union
 from pydantic import BaseModel, PlainSerializer
 from sqlmodel import SQLModel
 
-Comparable = Union[int, float, decimal.Decimal, datetime.datetime, datetime.date, datetime.time]
+Comparable = Union[
+    int, float, decimal.Decimal, datetime.datetime, datetime.date, datetime.time
+]
 Serializable = Union[Comparable, bool, str, None]
 
 
@@ -20,9 +22,8 @@ S = TypeVar("S", bound=Serializable)
 Schema = TypeVar("Schema", bound=BaseModel)
 Model = TypeVar("Model", bound=SQLModel)
 
-Cursor = Annotated[
-    int, PlainSerializer(lambda x: str(x), return_type=str)
-]
+Cursor = Annotated[int, PlainSerializer(lambda x: str(x), return_type=str)]
 LocalDateTime = Annotated[
-    datetime.datetime, PlainSerializer(lambda x: x.strftime("%Y-%m-%d %H:%M:%S"), return_type=str)
+    datetime.datetime,
+    PlainSerializer(lambda x: x.strftime("%Y-%m-%d %H:%M:%S"), return_type=str),
 ]

{fastapi_extra-0.2.3 → fastapi_extra-0.2.5}/fastapi_extra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-extra
-Version: 0.2.3
+Version: 0.2.5
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause

fastapi_extra-0.2.3/fastapi_extra/cursor.pyi

@@ -1,8 +0,0 @@
-__author__ = "ziyan.yin"
-__describe__ = ""
-
-
-class Cursor:
-    
-    def next_val(self) -> int:
-        ...

fastapi_extra-0.2.3/fastapi_extra/routing.pyi

@@ -1,16 +0,0 @@
-__author__ = "ziyan.yin"
-__describe__ = ""
-
-
-from typing import Any
-
-from fastapi import FastAPI
-
-class RouteNode:
-
-    def add_route(self, fullpath: str, handler: Any):
-        ...
-
-
-def install(app: FastAPI) -> None:
-    ...