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

fastapi_extra/__init__.py

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

fastapi_extra/cache/redis.py

@@ -8,7 +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.dependency import AbstractComponent
 from fastapi_extra.settings import Settings
 
 
@@ -26,7 +26,7 @@ _settings = DefaultRedisSettings()  # type: ignore
 _loaded_pools: list[ConnectionPool] = []
 
 
-class RedisCli(AbstractWidget):
+class RedisCli(AbstractComponent):
     default_config = _settings.redis
 
     

fastapi_extra/database/driver.py

@@ -11,7 +11,7 @@ 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.dependency import AbstractComponent
 from fastapi_extra.settings import Settings
 
 
@@ -37,7 +37,7 @@ _settings = DefaultDatabaseSettings()  # type: ignore
 _loaded_engines: list[Engine] = []
 
 
-class DB(AbstractWidget):
+class DB(AbstractComponent):
     default_config = _settings.datasource
     default_options = {}
     
@@ -65,7 +65,9 @@ class AsyncDB(DB):
     
     @property
     def engine(self) -> AsyncEngine:
-        return AsyncEngine(super().engine)
+        if not self._engine:
+            self._engine = AsyncEngine(super().engine)
+        return self._engine
 
     @property
     def session(self) -> AsyncSession:

fastapi_extra/database/model.py

@@ -15,7 +15,7 @@ from fastapi_extra.utils import get_machine_seed
 
 class AutoPK(SQLModel):
     id: int | None = Field(
-        default_factory=lambda: None, 
+        default=None, 
         title="ID", 
         primary_key=True,
         sa_type=BigInteger,

fastapi_extra/database/service.py

@@ -12,7 +12,7 @@ Model = TypeVar("Model", bound=SQLModel)
 
 class ModelService(AbstractDependency, Generic[Model], annotated=False):
     __slot__ = ("session", )
-    __model__: SQLModel
+    __model__: Model
     
     @classmethod
     def __class_getitem__(cls, item: type[SQLModel]) -> Self:
@@ -20,8 +20,11 @@ class ModelService(AbstractDependency, Generic[Model], annotated=False):
             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
+        
+        class SubService(ModelService):
+            __model__ = item
+        
+        return SubService
 
     def __init__(self, session: DefaultSession):
         self.session = session
@@ -29,12 +32,11 @@ class ModelService(AbstractDependency, Generic[Model], annotated=False):
     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)
+        self.session.add(model)
+        await self.session.flush()
+        return model
     
     async def delete(self, model: Model) -> Model:
         return await self.session.delete(model)

fastapi_extra/database/session.py

@@ -14,11 +14,13 @@ from fastapi_extra.database.driver import DB, AsyncDB
 async def get_async_session(db: AsyncDB) -> AsyncGenerator[AsyncSession, None]:
     async with db.session as session:
         yield session
+        await session.commit()
 
 
 def get_session(db: DB) -> Generator[Session, None, None]:
     with db.session as session:
         yield session
+        session.commit()
 
 
 DefaultSession = Annotated[AsyncSession, Depends(get_async_session)]

fastapi_extra/dependency.py

@@ -8,7 +8,7 @@ from typing import Annotated, Any, Self
 from fastapi.params import Depends
 
 
-class AnnotationMetaClass(ABCMeta):
+class DependencyMetaClass(ABCMeta):
     
     def __new__(
         mcs,
@@ -23,11 +23,11 @@ class AnnotationMetaClass(ABCMeta):
         return new_cls
 
 
-class AbstractDependency(metaclass=AnnotationMetaClass, annotated=False):
+class AbstractDependency(metaclass=DependencyMetaClass, annotated=False):
     __slot__ = ()
 
 
-class AbstractWidget(AbstractDependency, annotated=False):
+class AbstractComponent(AbstractDependency, annotated=False):
     __slot__ = ()
     __instance__: Any = None
     

fastapi_extra/form.py

@@ -6,7 +6,7 @@ from typing import Generic, Literal
 
 from pydantic import BaseModel, Field, model_validator
 
-from fastapi_extra.types import C, S
+from fastapi_extra.types import C, S, Schema
 
 
 class DataRange(BaseModel, Generic[C]):
@@ -28,3 +28,10 @@ class ColumnExpression(BaseModel, Generic[S]):
 class WhereClause(BaseModel):
     option: Literal["and", "or"] = Field(default="and", title="关系")
     column_clauses: list[ColumnExpression | "WhereClause"]
+
+
+class Page(BaseModel, Generic[Schema]):
+    items: list[Schema] = Field(default_factory=list, title="列表")
+    total: int = Field(default=0, title="总量")
+    page_num: int = Field(default=0, title="页码")
+    page_size: int = Field(default=0, title="单页大小")

fastapi_extra/types.py

@@ -6,7 +6,7 @@ import datetime
 import decimal
 from typing import Annotated, Any, TypeVar, Union
 
-from pydantic import PlainSerializer
+from pydantic import BaseModel, PlainSerializer
 from sqlmodel import SQLModel
 
 Comparable = Union[int, float, decimal.Decimal, datetime.datetime, datetime.date, datetime.time]
@@ -17,6 +17,7 @@ T = TypeVar("T", bound=Any)
 E = TypeVar("E", bound=Exception)
 C = TypeVar("C", bound=Comparable)
 S = TypeVar("S", bound=Serializable)
+Schema = TypeVar("Schema", bound=BaseModel)
 Model = TypeVar("Model", bound=SQLModel)
 
 Cursor = Annotated[

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

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

fastapi_extra-0.1.8.dist-info/RECORD

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

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

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

fastapi_extra-0.1.6.dist-info/RECORD

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