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

fastapi_extra/__init__.py

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

fastapi_extra/cache/__init__.py

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

fastapi_extra/cache/redis.py

@@ -0,0 +1,52 @@
+__author__ = "ziyan.yin"
+__date__ = "2025-01-17"
+
+
+from typing import Annotated, AsyncGenerator
+
+from fastapi.params import Depends
+from pydantic import BaseModel, Field, RedisDsn
+from redis.asyncio import ConnectionPool, Redis
+
+from fastapi_extra.settings import Settings
+
+
+class RedisConfig(BaseModel):
+    url: RedisDsn = RedisDsn("redis://localhost:6379/0")
+    max_connections: int | None = None
+    connection_kwargs: dict = Field(default_factory=dict)
+
+
+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
+DEFAULT_POOL = load_pool(_settings.redis)
+
+
+async def dispose() -> None:
+    await DEFAULT_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
+
+
+RedisCli = Annotated[Redis, RedisMaker(DEFAULT_POOL)]

fastapi_extra/database/__init__.py

@@ -0,0 +1,17 @@
+__author__ = "ziyan.yin"
+__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/engine.py

@@ -0,0 +1,50 @@
+__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/database/model.py

@@ -0,0 +1,80 @@
+__author__ = "ziyan.yin"
+__date__ = "2024-12-25"
+
+
+import datetime
+
+from sqlalchemy import BigInteger, DateTime, Integer, SmallInteger, func
+from sqlalchemy.ext.declarative import declared_attr
+from sqlmodel import Field, SQLModel
+
+from fastapi_extra.cursor import Cursor as _Cursor  # type: ignore
+from fastapi_extra.types import Cursor, LocalDateTime
+from fastapi_extra.utils import get_machine_seed
+
+
+class AutoPK(SQLModel):
+    id: int | None = Field(
+        default_factory=lambda: None, 
+        title="ID", 
+        primary_key=True,
+        sa_type=BigInteger,
+        sa_column_kwargs={"autoincrement": True},
+        schema_extra={"json_schema_extra": {"readOnly": True}},
+    )
+
+
+class LocalPK(SQLModel):
+    id: Cursor | None = Field(
+        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}},
+    )
+
+
+class Deleted(SQLModel):
+    deleted: int = Field(
+        default=0,
+        title="DELETED",
+        sa_type=SmallInteger,
+        sa_column_kwargs={"nullable": False, "comment": "DELETED"},
+        schema_extra={"json_schema_extra": {"readOnly": True}},
+    )
+
+
+class Versioned(SQLModel):
+    version_id: int = Field(
+        default=0,
+        title="VERSION_ID",
+        sa_type=Integer,
+        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": "version_id"}
+
+
+class Optime(SQLModel):
+    create_at: LocalDateTime = Field(
+        default_factory=datetime.datetime.now, 
+        title="CREATE_AT",
+        sa_type=DateTime,
+        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, 
+        title="UPDATE_AT",
+        sa_type=DateTime,
+        sa_column_kwargs={"default": func.now(), "onupdate": func.now(), "nullable": False, "comment": "UPDATE_AT"},
+        schema_extra={"json_schema_extra": {"readOnly": True}},
+    )
+
+
+class SQLBase(LocalPK, Versioned, Deleted, Optime):
+    pass

fastapi_extra/database/service.py

@@ -0,0 +1,40 @@
+__author__ = "ziyan.yin"
+__date__ = "2025-01-12"
+
+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
+
+Model = TypeVar("Model", bound=SQLModel)
+
+
+class ModelService(AbstractDependency, Generic[Model], annotated=False):
+    __slot__ = ("session", )
+    __model__: SQLModel
+    
+    @classmethod
+    def __class_getitem__(cls, item: type[SQLModel]) -> Self:
+        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}")
+        cls.__model__ = item
+        return cls
+
+    def __init__(self, session: DefaultSession):
+        self.session = session
+
+    async def get(self, ident: int | str, **kwargs: Any) -> Model | None:
+        return await self.session.get(self.__model__, ident, **kwargs)
+
+    async def create(self, model: Model) -> Model:
+        return await self.session.add(model)
+    
+    async def create_model(self, **kwargs: Any) -> Model:
+        model = self.__model__.model_validate(kwargs)
+        return self.create(model)
+    
+    async def delete(self, model: Model) -> Model:
+        return await self.session.delete(model)

fastapi_extra/database/session.py

@@ -0,0 +1,39 @@
+__author__ = "ziyan.yin"
+__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.ext.asyncio.session import AsyncSession
+
+from fastapi_extra.database.engine import DEFAULT_ENGINE, Engine
+
+
+class SessionMaker(Depends):
+    __slots__ = ("engine", )
+    
+    def __init__(self, engine: Engine):
+        super().__init__()
+        self.engine = engine
+        self.dependency = self
+
+    def __call__(self) -> Generator[_Session, None, None]:
+        with _Session(self.engine) 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)]

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

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

fastapi_extra-0.1.5.dist-info/RECORD

@@ -0,0 +1,23 @@
+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,,

fastapi_extra-0.1.4.dist-info/RECORD

@@ -1,16 +0,0 @@
-fastapi_extra/__init__.py,sha256=wZGS0_cF9HspqetdvcDTIxjV9lp-0yTS7toLQQnJI0Q,286
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=Zj_hwMRczIkzNkXjW3dUeNqrpBXW-hcTyNPlHSYxW9s,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=4Vlhy3oYaYhUzj9jxQuONzlLYjfo03OmTsCg8jUUbcQ,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/native/cursor.pyx,sha256=bESprFDgk9gGjyPQ4YCSg51dov2WB6s60XrOs3r5-r0,1146
-fastapi_extra/native/routing.pyx,sha256=GrdGAoBospwCpxMHBon5cuRYcz9ifAFSSYa2Ytf49lg,3841
-fastapi_extra-0.1.4.dist-info/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.1.4.dist-info/METADATA,sha256=2YlZPZ_9Y8rbBVG2th19mmT12zzXuBTt7MQDsRtgIjo,1348
-fastapi_extra-0.1.4.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
-fastapi_extra-0.1.4.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.1.4.dist-info/RECORD,,