fastapi-extra 0.1.5__cp312-cp312-win_amd64.whl → 0.1.6__cp312-cp312-win_amd64.whl

fastapi_extra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"
 
 
 from fastapi import FastAPI

fastapi_extra/cache/__init__.py

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

fastapi_extra/cache/redis.py

@@ -8,6 +8,7 @@ from fastapi.params import Depends
 from pydantic import BaseModel, Field, RedisDsn
 from redis.asyncio import ConnectionPool, Redis
 
+from fastapi_extra.dependency import AbstractWidget
 from fastapi_extra.settings import Settings
 
 
@@ -21,32 +22,38 @@ class DefaultRedisSettings(Settings):
     redis: RedisConfig
 
 
-def load_pool(config: RedisConfig) -> ConnectionPool:
-    return ConnectionPool.from_url(
-        config.url, 
-        **config.model_dump(exclude_defaults=True, exclude={"url", "connection_kwargs"}), 
-        **config.connection_kwargs
-    )
+_settings = DefaultRedisSettings()  # type: ignore
+_loaded_pools: list[ConnectionPool] = []
 
 
-_settings = DefaultRedisSettings()  # type: ignore
-DEFAULT_POOL = load_pool(_settings.redis)
+class RedisCli(AbstractWidget):
+    default_config = _settings.redis
+
+    
+    def __init__(self):
+        self._pool = 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
 
 
 async def dispose() -> None:
-    await DEFAULT_POOL.aclose()
+    for redis_pool in _loaded_pools:
+        redis_pool.aclose()
 
 
-class RedisMaker(Depends):
-    
-    def __init__(self, pool: ConnectionPool):
-        super().__init__()
-        self.dependency = self
-        self.pool = pool
-    
-    async def __call__(self) -> AsyncGenerator[Redis, None]:
-        async with Redis(connection_pool=self.pool) as session:
-            yield session
+
+async def get_redis(redis_cli: RedisCli) -> AsyncGenerator[Redis, None]:
+    async with Redis(connection_pool=redis_cli.pool) as redis:
+        yield redis
 
 
-RedisCli = Annotated[Redis, RedisMaker(DEFAULT_POOL)]
+DefaultRedis = Annotated[Redis, Depends(get_redis)]

fastapi_extra/database/__init__.py

@@ -4,14 +4,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 AsyncSessionMaker
 from fastapi_extra.database.session import DefaultSession as Session
-from fastapi_extra.database.session import SessionMaker
 
 __all__ = [
     "AsyncSessionMaker",
     "ModelService",
     "Session",
-    "SessionMaker",
     "SQLBase"
 ]

fastapi_extra/database/driver.py

@@ -0,0 +1,81 @@
+__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 AbstractWidget
+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(AbstractWidget):
+    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:
+        return AsyncEngine(super().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/database/session.py

@@ -5,35 +5,20 @@ __date__ = "2025-01-05"
 from typing import Annotated, AsyncGenerator, Generator
 
 from fastapi.params import Depends
-from sqlalchemy.ext.asyncio import AsyncEngine
-from sqlmodel import Session as _Session
+from sqlmodel import Session
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from fastapi_extra.database.engine import DEFAULT_ENGINE, Engine
+from fastapi_extra.database.driver import DB, AsyncDB
 
 
-class SessionMaker(Depends):
-    __slots__ = ("engine", )
-    
-    def __init__(self, engine: Engine):
-        super().__init__()
-        self.engine = engine
-        self.dependency = self
+async def get_async_session(db: AsyncDB) -> AsyncGenerator[AsyncSession, None]:
+    async with db.session as session:
+        yield session
 
-    def __call__(self) -> Generator[_Session, None, None]:
-        with _Session(self.engine) as session:
-            yield session
 
+def get_session(db: DB) -> Generator[Session, None, None]:
+    with db.session as session:
+        yield session
 
-class AsyncSessionMaker(SessionMaker):
-    
-    def __init__(self, engine: Engine):
-        super().__init__(engine)
-        self.async_engine: AsyncEngine = AsyncEngine(self.engine)
-    
-    async def __call__(self) -> AsyncGenerator[AsyncSession, None]:
-        async with AsyncSession(self.async_engine) as session:
-            yield session
-            
 
-DefaultSession = Annotated[AsyncSession, AsyncSessionMaker(DEFAULT_ENGINE)]
+DefaultSession = Annotated[AsyncSession, Depends(get_async_session)]

{fastapi_extra-0.1.5.dist-info → fastapi_extra-0.1.6.dist-info}/METADATA

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

fastapi_extra-0.1.6.dist-info/RECORD

@@ -0,0 +1,23 @@
+fastapi_extra/__init__.py,sha256=s2AZTyatkiSeY9OmuW6p45fFgX9Dz_nVH0jV8ut52q0,286
+fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=IWj0owGMJBYMGeuU-MXPSVRwUCt1hwrlJoqnp97OBNk,57344
+fastapi_extra/dependency.py,sha256=Pgl4Y9Mm6JY5pw19w_xJEmnnLkQ9p_K1h1w9lLVHUJQ,907
+fastapi_extra/form.py,sha256=LikaJkA16dSRGCqX9K7z2S8-e3SJcMiVXX5nRZU_kVY,957
+fastapi_extra/response.py,sha256=DHvhOSgwot5eBNKuI_jPYxZ5rshZ55Xkg-FNBJlHD1E,9609
+fastapi_extra/routing.cp312-win_amd64.pyd,sha256=to_HPQbAav7fTQeOYYaFT9zb1b4qdABNkWqQb1uDZdo,94720
+fastapi_extra/settings.py,sha256=cCcwaper5GiNNoT4gNKqf-iloSOTNnMsiUR0knJx4Mw,1461
+fastapi_extra/types.py,sha256=EUjT9jFryzlazHvWs4m-IfUezmSEvyxwaOGe_vTTBnY,763
+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=N4ntWFNjW1w3OJB64AYSrXbLumPUPK9j2iQcfXxJTC8,1586
+fastapi_extra/database/__init__.py,sha256=B59umaoNjDuXyoNh7EYWYEk4xr9tfgVjXsSaOPz3y_Q,328
+fastapi_extra/database/driver.py,sha256=VOJxRtXusuRyOJHMHLu18ZYbPQtoIbrkQyyADpHs9cA,2146
+fastapi_extra/database/model.py,sha256=icHh6tnVKYVGl0hNX6pYypTiyGQt3g41geOkjBZTTv4,2467
+fastapi_extra/database/service.py,sha256=efDZuz__RqEom-UZHfKQ3rHkxnEYmQocWduVbm3rcy0,1478
+fastapi_extra/database/session.py,sha256=XZ5DfkDn4rHHqdJwhRDP87VPDcycxrq6-j_mu4w9Ou0,633
+fastapi_extra/native/cursor.pyx,sha256=bESprFDgk9gGjyPQ4YCSg51dov2WB6s60XrOs3r5-r0,1146
+fastapi_extra/native/routing.pyx,sha256=GrdGAoBospwCpxMHBon5cuRYcz9ifAFSSYa2Ytf49lg,3841
+fastapi_extra-0.1.6.dist-info/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
+fastapi_extra-0.1.6.dist-info/METADATA,sha256=U2HYhcc5OTpOGcN5-hOdLXJ4pEIbzqMk5FC5C62lAX0,1348
+fastapi_extra-0.1.6.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
+fastapi_extra-0.1.6.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
+fastapi_extra-0.1.6.dist-info/RECORD,,

fastapi_extra/database/engine.py

@@ -1,50 +0,0 @@
-__author__ = "ziyan.yin"
-__date__ = "2024-12-26"
-
-
-from typing import Any, Literal
-
-from pydantic import AnyUrl, BaseModel, Field
-from sqlalchemy import Engine, NullPool
-from sqlalchemy.util import _concurrency_py3k
-from sqlmodel import create_engine
-
-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
-    
-
-def load_engine(config: DatabaseConfig, **kw: Any) -> Engine:
-    return create_engine(
-        url=str(config.url),
-        **config.model_dump(exclude_defaults=True, exclude={"url", "options"}), 
-        **config.options,
-        **kw
-    )
-    
-
-_settings = DefaultDatabaseSettings()  # type: ignore
-if _settings.mode == "test":
-    DEFAULT_ENGINE: Engine = load_engine(_settings.datasource, poolclass=NullPool)
-else:
-    DEFAULT_ENGINE: Engine = load_engine(_settings.datasource)
-
-
-async def dispose() -> None:
-    await _concurrency_py3k.greenlet_spawn(DEFAULT_ENGINE.dispose)

fastapi_extra-0.1.5.dist-info/RECORD

@@ -1,23 +0,0 @@
-fastapi_extra/__init__.py,sha256=lG8uGj4bf5IlFbIznHTkpa5IGXFcxcBfCa2x-b_HhXY,286
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=kWtFGDu_zSoytLufV74NuUciTAasxrJ73d5SlDpPWVo,57344
-fastapi_extra/dependency.py,sha256=Pgl4Y9Mm6JY5pw19w_xJEmnnLkQ9p_K1h1w9lLVHUJQ,907
-fastapi_extra/form.py,sha256=LikaJkA16dSRGCqX9K7z2S8-e3SJcMiVXX5nRZU_kVY,957
-fastapi_extra/response.py,sha256=DHvhOSgwot5eBNKuI_jPYxZ5rshZ55Xkg-FNBJlHD1E,9609
-fastapi_extra/routing.cp312-win_amd64.pyd,sha256=LSLlg7Ld5TtvJ46jhobMRuCCk5tsZqu6kcA86_J4Zk4,94720
-fastapi_extra/settings.py,sha256=cCcwaper5GiNNoT4gNKqf-iloSOTNnMsiUR0knJx4Mw,1461
-fastapi_extra/types.py,sha256=EUjT9jFryzlazHvWs4m-IfUezmSEvyxwaOGe_vTTBnY,763
-fastapi_extra/utils.py,sha256=tsPX3kpF_P5D9Bd3gnlG6rkVsLkv5gbxjml-s6ZL_6I,346
-fastapi_extra/cache/__init__.py,sha256=pg3VTyLBPy3j1pop_RSGLhaQqnUSNv0oznaOSjxM9rw,168
-fastapi_extra/cache/redis.py,sha256=6QNicKfn8_zkbL0m-mVAWcv5UrAbmH_ZZWz8xA7ES_w,1352
-fastapi_extra/database/__init__.py,sha256=GIWWUF-diioMsKW63x6lKpLWaRPCwTCZtr8n-EX3twc,468
-fastapi_extra/database/engine.py,sha256=vENq4-3mern_Nvd2n0GC5VeEvL6Ruv7uxutMBDpEJA8,1335
-fastapi_extra/database/model.py,sha256=icHh6tnVKYVGl0hNX6pYypTiyGQt3g41geOkjBZTTv4,2467
-fastapi_extra/database/service.py,sha256=efDZuz__RqEom-UZHfKQ3rHkxnEYmQocWduVbm3rcy0,1478
-fastapi_extra/database/session.py,sha256=KlzsZMQ1sHnUnYwLcI7AxY31vusmn_6aBT_YhsECQic,1152
-fastapi_extra/native/cursor.pyx,sha256=bESprFDgk9gGjyPQ4YCSg51dov2WB6s60XrOs3r5-r0,1146
-fastapi_extra/native/routing.pyx,sha256=GrdGAoBospwCpxMHBon5cuRYcz9ifAFSSYa2Ytf49lg,3841
-fastapi_extra-0.1.5.dist-info/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.1.5.dist-info/METADATA,sha256=5QzhRf1SGhVn8SHL35vQepsAbEREiOGoYzhAo4ambkk,1348
-fastapi_extra-0.1.5.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
-fastapi_extra-0.1.5.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.1.5.dist-info/RECORD,,