fastapi-extra 0.1.6__tar.gz → 0.1.8__tar.gz

{fastapi_extra-0.1.6 → fastapi_extra-0.1.8}/PKG-INFO

@@ -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.6 → fastapi_extra-0.1.8}/fastapi_extra/__init__.py

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

{fastapi_extra-0.1.6 → fastapi_extra-0.1.8}/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-0.1.6 → fastapi_extra-0.1.8}/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-0.1.6 → fastapi_extra-0.1.8}/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-0.1.6 → fastapi_extra-0.1.8}/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-0.1.6 → fastapi_extra-0.1.8}/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.6 → fastapi_extra-0.1.8}/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-0.1.6 → fastapi_extra-0.1.8}/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-0.1.6 → fastapi_extra-0.1.8}/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 → fastapi_extra-0.1.8}/fastapi_extra.egg-info/PKG-INFO

@@ -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.6 → fastapi_extra-0.1.8}/fastapi_extra.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 fastapi_extra/__init__.py
 fastapi_extra/dependency.py
 fastapi_extra/form.py
+fastapi_extra/py.typed
 fastapi_extra/response.py
 fastapi_extra/settings.py
 fastapi_extra/types.py