fastapi-extra 0.1.8__cp312-cp312-win_amd64.whl → 0.2.0__cp312-cp312-win_amd64.whl

fastapi_extra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.8"
+__version__ = "0.2.0"
 
 
 from fastapi import FastAPI

fastapi_extra/cache/__init__.py

@@ -1,7 +1,7 @@
 __author__ = "ziyan.yin"
 __date__ = "2025-01-10"
 
-from .redis import DefaultRedis as Redis
+from .redis import RedisCli as Redis
 
 __all__ = [
     "Redis"

fastapi_extra/cache/redis.py

@@ -2,7 +2,7 @@ __author__ = "ziyan.yin"
 __date__ = "2025-01-17"
 
 
-from typing import Annotated, AsyncGenerator
+from typing import Annotated, AsyncGenerator, Self
 
 from fastapi.params import Depends
 from pydantic import BaseModel, Field, RedisDsn
@@ -23,37 +23,37 @@ class DefaultRedisSettings(Settings):
 
 
 _settings = DefaultRedisSettings()  # type: ignore
-_loaded_pools: list[ConnectionPool] = []
 
 
-class RedisCli(AbstractComponent):
+class RedisPool(AbstractComponent):
     default_config = _settings.redis
 
-    
     def __init__(self):
-        self._pool = None
+        self._pool: ConnectionPool | None = None
     
-    @property
-    def pool(self) -> ConnectionPool:
-        if not self._pool:
-            self._pool = ConnectionPool.from_url(
-                self.default_config.url, 
-                **self.default_config.model_dump(exclude_defaults=True, exclude={"url", "connection_kwargs"}), 
-                **self.default_config.connection_kwargs
-            )
-            _loaded_pools.append(self)
-        return self._pool
-
+    @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
+        )
+        return redis
+    
+    def get_client(self) -> Redis:
+        return Redis(connection_pool=self._pool)
 
-async def dispose() -> None:
-    for redis_pool in _loaded_pools:
-        redis_pool.aclose()
+    async def dispose(self) -> None:
+        if self._pool:
+            await self._pool.aclose()
 
 
 
-async def get_redis(redis_cli: RedisCli) -> AsyncGenerator[Redis, None]:
-    async with Redis(connection_pool=redis_cli.pool) as redis:
-        yield redis
+async def get_redis(pool: RedisPool) -> AsyncGenerator[Redis, None]:
+    async with RedisPool.get_client as client:
+        yield client
 
 
-DefaultRedis = Annotated[Redis, Depends(get_redis)]
+RedisCli = Annotated[Redis, Depends(get_redis)]

fastapi_extra/database/__init__.py

@@ -5,10 +5,11 @@ __date__ = "2025-01-05"
 from fastapi_extra.database.model import SQLBase
 from fastapi_extra.database.service import ModelService
 from fastapi_extra.database.session import DefaultSession as Session
+from fastapi_extra.database.session import SessionFactory
 
 __all__ = [
-    "AsyncSessionMaker",
-    "ModelService",
+    "SessionFactory",
     "Session",
-    "SQLBase"
+    "SQLBase",
+    "ModelService"
 ]

fastapi_extra/database/model.py

@@ -56,7 +56,7 @@ class Versioned(SQLModel):
     
     @declared_attr  # type: ignore
     def __mapper_args__(cls) -> dict:
-        return {"version_id_col": "version_id"}
+        return {"version_id_col": cls.version_id}
 
 
 class Optime(SQLModel):

fastapi_extra/database/service.py

@@ -1,18 +1,20 @@
 __author__ = "ziyan.yin"
 __date__ = "2025-01-12"
 
+from contextvars import ContextVar
 from typing import Any, Generic, Self, TypeVar
 
 from fastapi_extra.database.model import SQLModel
 from fastapi_extra.database.session import DefaultSession
-from fastapi_extra.dependency import AbstractDependency
+from fastapi_extra.dependency import AbstractService
 
 Model = TypeVar("Model", bound=SQLModel)
 
 
-class ModelService(AbstractDependency, Generic[Model], annotated=False):
-    __slot__ = ("session", )
+class ModelService(AbstractService, Generic[Model], abstract=True):
+    __slot__ = ()
     __model__: Model
+    __session_container__ = ContextVar("__session_container__", default=None)
     
     @classmethod
     def __class_getitem__(cls, item: type[SQLModel]) -> Self:
@@ -27,7 +29,13 @@ class ModelService(AbstractDependency, Generic[Model], annotated=False):
         return SubService
 
     def __init__(self, session: DefaultSession):
-        self.session = session
+        self.__session_container__.set(session)
+    
+    @property
+    def session(self):
+        _session = self.__session_container__.get()
+        assert _session is not None, "Session is not initialized"
+        return _session
 
     async def get(self, ident: int | str, **kwargs: Any) -> Model | None:
         return await self.session.get(self.__model__, ident, **kwargs)

fastapi_extra/database/session.py

@@ -1,26 +1,68 @@
 __author__ = "ziyan.yin"
-__date__ = "2025-01-05"
+__date__ = "2024-12-26"
 
-
-from typing import Annotated, AsyncGenerator, Generator
+from typing import Annotated, AsyncGenerator, Literal, Self
 
 from fastapi.params import Depends
-from sqlmodel import Session
+from pydantic import AnyUrl, BaseModel, Field
+from sqlalchemy.ext.asyncio import create_async_engine
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from fastapi_extra.database.driver import DB, AsyncDB
+from fastapi_extra.dependency import AbstractComponent
+from fastapi_extra.settings import Settings
 
 
-async def get_async_session(db: AsyncDB) -> AsyncGenerator[AsyncSession, None]:
-    async with db.session as session:
-        yield session
-        await session.commit()
+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
+    options: dict = Field(default_factory=dict)
+
+
+class DefaultDatabaseSettings(Settings):
+    datasource: DatabaseConfig
+
 
+_settings = DefaultDatabaseSettings()  # type: ignore
 
-def get_session(db: DB) -> Generator[Session, None, None]:
-    with db.session as session:
+
+class SessionFactory(AbstractComponent):
+    __slot__ = ("_engine",)
+    default_config = _settings.datasource
+    
+    def __init__(self):
+        self._engine = 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.options,
+            **options
+        )
+        return db
+
+    def create_session(self) -> AsyncSession:
+        return AsyncSession(self._engine)
+
+    async def dispose(self) -> None:
+        if self._engine:
+            await self._engine.dispose()
+
+
+async def get_session(factory: SessionFactory) -> AsyncGenerator[AsyncSession, None]:
+    async with factory.create_session() as session:
         yield session
-        session.commit()
+        await session.commit()
 
 
-DefaultSession = Annotated[AsyncSession, Depends(get_async_session)]
+DefaultSession = Annotated[AsyncSession, Depends(get_session)]

fastapi_extra/dependency.py

@@ -1,36 +1,72 @@
 __author__ = "ziyan.yin"
 __date__ = "2025-01-05"
 
-
 from abc import ABCMeta
-from typing import Annotated, Any, Self
+from functools import update_wrapper
+from typing import Annotated, Any, Callable, ClassVar, Self, final
+
+from fastapi import Depends, FastAPI, Request
+
 
-from fastapi.params import Depends
+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,
-        annotated: bool = True
+        abstract: bool = False
     ):
         new_cls = super().__new__(mcs, name, bases, attrs)
-        if annotated:
-            return Annotated[new_cls, Depends(new_cls)]
+        new_cls.__token__ = f"{new_cls.__module__}.{new_cls.__name__}"
+        if not abstract:
+            if not new_cls.__load__:
+                return Annotated[new_cls, Depends(async_wrapper(new_cls))]
+            return Annotated[new_cls, Depends(new_cls.__load__)]
         return new_cls
 
 
-class AbstractDependency(metaclass=DependencyMetaClass, annotated=False):
+class AbstractComponent(metaclass=DependencyMetaClass, abstract=True):
     __slot__ = ()
+    __token__: ClassVar[str]
+
+    @classmethod
+    def setup(cls, *args: Any, **kwargs: Any) -> Self:
+        raise NotImplementedError
 
+    @final
+    @classmethod
+    def install(cls, app: FastAPI, *args: Any, **kwargs: Any) -> Self:
+        component = cls.setup(*args, **kwargs)
+        setattr(app.state, cls.__token__, component)
+        return component
 
-class AbstractComponent(AbstractDependency, annotated=False):
+    @final
+    @classmethod
+    async def __load__(cls, request: Request) -> Self:
+        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:
+        pass
+
+
+class AbstractService(metaclass=DependencyMetaClass, abstract=True):
     __slot__ = ()
-    __instance__: Any = None
-    
+    __load__ = None
+    __instance__ = None
+    __token__: ClassVar[str]
+
     def __new__(cls, *args, **kwargs) -> Self:
         if cls.__instance__ is None:
             cls.__instance__ = super().__new__(cls)

{fastapi_extra-0.1.8.dist-info → fastapi_extra-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fastapi-extra
-Version: 0.1.8
+Version: 0.2.0
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause
@@ -32,3 +32,4 @@ Provides-Extra: pgsql
 Requires-Dist: asyncpg; extra == "pgsql"
 Provides-Extra: aiomysql
 Requires-Dist: aiomysql; extra == "aiomysql"
+Dynamic: license-file

fastapi_extra-0.2.0.dist-info/RECORD

@@ -0,0 +1,23 @@
+fastapi_extra/__init__.py,sha256=MXf66njTRTUqUMbjSkWGF6HxU-1Dm8UVgfC5qh-uehM,286
+fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=0HTvLo9ZEY-GwvATHIVeaU5x-B1nxhdA8EvCZ6WhOu8,53760
+fastapi_extra/dependency.py,sha256=LtYnOTMyhOQUFSbNEViw7lxJvAFpPWbyuY4e2goSG-8,2130
+fastapi_extra/form.py,sha256=Fs9uEDOQThjFroDVTrjWnIGJ107BgXCppIVTymwQLzg,1247
+fastapi_extra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fastapi_extra/response.py,sha256=DHvhOSgwot5eBNKuI_jPYxZ5rshZ55Xkg-FNBJlHD1E,9609
+fastapi_extra/routing.cp312-win_amd64.pyd,sha256=XlIyK5YoFeGcNGb_Mv27BYdjEEYJh2qlJagu7dZIJHk,87552
+fastapi_extra/settings.py,sha256=cCcwaper5GiNNoT4gNKqf-iloSOTNnMsiUR0knJx4Mw,1461
+fastapi_extra/types.py,sha256=3z6gUnao6WZL76asZYmex20xfY9mvYA-RbnsxUcui30,819
+fastapi_extra/utils.py,sha256=tsPX3kpF_P5D9Bd3gnlG6rkVsLkv5gbxjml-s6ZL_6I,346
+fastapi_extra/cache/__init__.py,sha256=kq4b_AYKCSJ0fEp4rqpeaoNJilko4XbtfC81xzUaYGI,122
+fastapi_extra/cache/redis.py,sha256=-hr2DRkmruzH4cIArdjsytqRiiWWtDJt9GIDy38wmtQ,1600
+fastapi_extra/database/__init__.py,sha256=pCYUoEylTponWqpR0AXJHcRo_cs4fnEXVVV9B5J9rt0,384
+fastapi_extra/database/model.py,sha256=2lDi9PQ5F0PSM7BGZozZf1wSefpXnTWqAVzEyGPaXRI,2453
+fastapi_extra/database/service.py,sha256=-tBC17jEbGZhnxdtWyftP2BUXfCwcOtxzNZ53qLp518,1798
+fastapi_extra/database/session.py,sha256=PALArHhXNS2gCgeMkiKjyatvINV_VW1LjgEIwXDKyfQ,1903
+fastapi_extra/native/cursor.pyx,sha256=bESprFDgk9gGjyPQ4YCSg51dov2WB6s60XrOs3r5-r0,1146
+fastapi_extra/native/routing.pyx,sha256=GrdGAoBospwCpxMHBon5cuRYcz9ifAFSSYa2Ytf49lg,3841
+fastapi_extra-0.2.0.dist-info/licenses/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
+fastapi_extra-0.2.0.dist-info/METADATA,sha256=CRLVgSMLpfE9MQ-pj1aEAdC_c_7wCtGG9pCA2ARn-ts,1371
+fastapi_extra-0.2.0.dist-info/WHEEL,sha256=RYNUKzg4pggqpqERKe4OLbPF4ZPP-Ng-rmq_sekLDXg,101
+fastapi_extra-0.2.0.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
+fastapi_extra-0.2.0.dist-info/RECORD,,

{fastapi_extra-0.1.8.dist-info → fastapi_extra-0.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-win_amd64
 

fastapi_extra/database/driver.py

@@ -1,83 +0,0 @@
-__author__ = "ziyan.yin"
-__date__ = "2024-12-26"
-
-
-from typing import Literal
-
-from pydantic import AnyUrl, BaseModel, Field
-from sqlalchemy import Engine, NullPool
-from sqlalchemy.ext.asyncio import AsyncEngine
-from sqlalchemy.util import _concurrency_py3k
-from sqlmodel import Session, create_engine
-from sqlmodel.ext.asyncio.session import AsyncSession
-
-from fastapi_extra.dependency import AbstractComponent
-from fastapi_extra.settings import Settings
-
-
-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
-    options: dict = Field(default_factory=dict)
-
-
-class DefaultDatabaseSettings(Settings):
-    datasource: DatabaseConfig
-
-
-_settings = DefaultDatabaseSettings()  # type: ignore
-_loaded_engines: list[Engine] = []
-
-
-class DB(AbstractComponent):
-    default_config = _settings.datasource
-    default_options = {}
-    
-    def __init__(self):
-        self._engine = None
-    
-    @property
-    def engine(self) -> Engine:
-        if not self._engine:
-            self._engine = create_engine(
-                url=str(self.default_config.url),
-                **self.default_config.model_dump(exclude_defaults=True, exclude={"url", "options"}), 
-                **self.default_config.options,
-                **self.default_options
-            )
-            _loaded_engines.append(self._engine)
-        return self._engine
-
-    @property
-    def session(self) -> Session:
-        return Session(self.engine)
-
-
-class AsyncDB(DB):
-    
-    @property
-    def engine(self) -> AsyncEngine:
-        if not self._engine:
-            self._engine = AsyncEngine(super().engine)
-        return self._engine
-
-    @property
-    def session(self) -> AsyncSession:
-        return AsyncSession(self.engine)
-        
-
-if _settings.mode == "test":
-    DB.default_options = {"poolclass": NullPool}
-
-
-async def dispose() -> None:
-    for engine in _loaded_engines:
-        await _concurrency_py3k.greenlet_spawn(engine.dispose)

fastapi_extra-0.1.8.dist-info/RECORD

@@ -1,24 +0,0 @@
-fastapi_extra/__init__.py,sha256=VmSUMSzhrVb6zSyHIl2-mi71gyGRMC9n400N5Gr3aT8,286
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=cuMCDVcrH1ltvx1s2zm2PXsbkj20hP-plud-YBKI9D8,57344
-fastapi_extra/dependency.py,sha256=8SgAky63hMa9pnttqRRZMyPAa3BwBMUvFA3ZLH86h44,910
-fastapi_extra/form.py,sha256=Fs9uEDOQThjFroDVTrjWnIGJ107BgXCppIVTymwQLzg,1247
-fastapi_extra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastapi_extra/response.py,sha256=DHvhOSgwot5eBNKuI_jPYxZ5rshZ55Xkg-FNBJlHD1E,9609
-fastapi_extra/routing.cp312-win_amd64.pyd,sha256=6ZHARNFCgL_tlmp6WPSZMR07yrlPe2WAg5jpeXFQTfc,94720
-fastapi_extra/settings.py,sha256=cCcwaper5GiNNoT4gNKqf-iloSOTNnMsiUR0knJx4Mw,1461
-fastapi_extra/types.py,sha256=3z6gUnao6WZL76asZYmex20xfY9mvYA-RbnsxUcui30,819
-fastapi_extra/utils.py,sha256=tsPX3kpF_P5D9Bd3gnlG6rkVsLkv5gbxjml-s6ZL_6I,346
-fastapi_extra/cache/__init__.py,sha256=2bwWFRf6giDo0QiFWEvekQwga9kGTK_9BJdxe32Nru8,126
-fastapi_extra/cache/redis.py,sha256=fLNJfL8V-HYek38WVNwxvW6cnd7rJpcd62vy4O07C44,1592
-fastapi_extra/database/__init__.py,sha256=B59umaoNjDuXyoNh7EYWYEk4xr9tfgVjXsSaOPz3y_Q,328
-fastapi_extra/database/driver.py,sha256=ar_vnfqjpoWjiW5eEdrisyi9CrhfdHtbhAGFxGMKC5E,2223
-fastapi_extra/database/model.py,sha256=2ISHT0NUz3-uoqlogxrthzM6GxAfPdghzx1j-lvkSRQ,2451
-fastapi_extra/database/service.py,sha256=TdKlcTQ_WoMqy-kmlYUcFKF7XpyFL8O4vkQ2glZc7P4,1495
-fastapi_extra/database/session.py,sha256=cpKj_NDBSATRCBbmfyYa4v-TKGrMMgRJQCEnkCR153s,691
-fastapi_extra/native/cursor.pyx,sha256=bESprFDgk9gGjyPQ4YCSg51dov2WB6s60XrOs3r5-r0,1146
-fastapi_extra/native/routing.pyx,sha256=GrdGAoBospwCpxMHBon5cuRYcz9ifAFSSYa2Ytf49lg,3841
-fastapi_extra-0.1.8.dist-info/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.1.8.dist-info/METADATA,sha256=Mg9fJV2_mAo_PZXq3JCq_Mv9t69noysoU7HmNnN1wzA,1348
-fastapi_extra-0.1.8.dist-info/WHEEL,sha256=A8mRFNvJcDL8dRPZ6k2ICKEOXwE8pzYFXYxEla0rR0g,101
-fastapi_extra-0.1.8.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.1.8.dist-info/RECORD,,