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

fastapi_extra/__init__.py

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

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-0.1.7.dist-info → fastapi_extra-0.1.8.dist-info}/METADATA

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

{fastapi_extra-0.1.7.dist-info → fastapi_extra-0.1.8.dist-info}/RECORD

@@ -1,9 +1,10 @@
-fastapi_extra/__init__.py,sha256=L5-iyVLp59WaMaG4Mu5VxTp4Ymwcgk7o_zrxJkv8VT0,286
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=Nug4pUw64XsmRotKgNusPmCS59AE-V07NDfGvOKh5ho,57344
+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=z6xTNU5a8OPh0MRhBEZz7OYTUz3TY4jMvrh15zd83Pw,94720
+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
@@ -11,13 +12,13 @@ fastapi_extra/cache/__init__.py,sha256=2bwWFRf6giDo0QiFWEvekQwga9kGTK_9BJdxe32Nr
 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=icHh6tnVKYVGl0hNX6pYypTiyGQt3g41geOkjBZTTv4,2467
-fastapi_extra/database/service.py,sha256=efDZuz__RqEom-UZHfKQ3rHkxnEYmQocWduVbm3rcy0,1478
-fastapi_extra/database/session.py,sha256=XZ5DfkDn4rHHqdJwhRDP87VPDcycxrq6-j_mu4w9Ou0,633
+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.7.dist-info/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.1.7.dist-info/METADATA,sha256=NBcCEjLJhFJs1K1PuBRxp-V2gC9efCXWdRkuUr-7-xU,1348
-fastapi_extra-0.1.7.dist-info/WHEEL,sha256=GNSMLKsI4JcODC8iIUwfCC2mP5aj3pHj8CNqlVH-mAI,101
-fastapi_extra-0.1.7.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.1.7.dist-info/RECORD,,
+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.7.dist-info → fastapi_extra-0.1.8.dist-info}/WHEEL

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