fastapi-extra 0.5.0__tar.gz → 0.6.0__tar.gz

{fastapi_extra-0.5.0 → fastapi_extra-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-extra
-Version: 0.5.0
+Version: 0.6.0
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause
@@ -30,6 +30,8 @@ Provides-Extra: mysql
 Requires-Dist: asyncmy; extra == "mysql"
 Provides-Extra: pgsql
 Requires-Dist: asyncpg; extra == "pgsql"
+Provides-Extra: oracle
+Requires-Dist: python-oracledb; extra == "oracle"
 Provides-Extra: aiomysql
 Requires-Dist: aiomysql; extra == "aiomysql"
 Dynamic: license-file

{fastapi_extra-0.5.0 → fastapi_extra-0.6.0}/fastapi_extra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.5.0"
+__version__ = "0.6.0"
 
 
 from fastapi import FastAPI

{fastapi_extra-0.5.0 → fastapi_extra-0.6.0}/fastapi_extra/database/model.py

@@ -14,7 +14,7 @@ from fastapi_extra.utils import get_machine_seed
 
 
 class AutoPK(SQLModel):
-    id: int | None = Field(
+    id: int = Field(
         default=None,
         title="ID",
         primary_key=True,
@@ -25,7 +25,7 @@ class AutoPK(SQLModel):
 
 
 class LocalPK(SQLModel):
-    id: Cursor | None = Field(
+    id: Cursor = Field(
         default_factory=_Cursor(get_machine_seed()).next_val,
         title="ID",
         primary_key=True,

{fastapi_extra-0.5.0 → fastapi_extra-0.6.0}/fastapi_extra/database/service.py

@@ -1,6 +1,7 @@
 __author__ = "ziyan.yin"
 __date__ = "2025-01-12"
 
+
 from contextvars import ContextVar
 from typing import Any, Generic, Sequence, TypeVar
 
@@ -57,10 +58,13 @@ class ModelService(AbstractService, Generic[Model], abstract=True):
         await self.session.flush()
         return model
     
-    async def update_model(self, model: Model, **kwargs: Any) -> Model:
+    async def update_model(self, model: Model, _ignore_none: bool = True, **kwargs: Any) -> Model:
         for key, value in kwargs.items():
-            if key in model.__fields__:
-                setattr(model, key, value)
+            if key not in model.__fields__:
+                continue
+            if _ignore_none and value is None:
+                continue
+            setattr(model, key, value)
         await self.session.flush()
         return model
 

{fastapi_extra-0.5.0 → fastapi_extra-0.6.0}/fastapi_extra/response.py

@@ -3,7 +3,8 @@ __date__ = "2024-12-24"
 
 
 from enum import Enum
-from typing import TYPE_CHECKING, Generic, Mapping
+from typing import (TYPE_CHECKING, Generic, Mapping, NotRequired, TypedDict,
+                    Unpack)
 
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel, Field
@@ -191,22 +192,25 @@ class ResultEnum(Enum):
     C0503 = ("C0503", "邮件提醒服务失败")
 
 
+class ResponseKwargs(TypedDict):
+    status_code: NotRequired[int]
+    headers: NotRequired[Mapping[str, str] | None]
+
+
 class APIResult(BaseModel, Generic[T]):
     data: T | None = Field(default=None, title="返回数据")
 
     if TYPE_CHECKING:
-
         @classmethod
-        def ok(cls, data: T | None = None) -> "APIResult[T]":
+        def ok(cls, data: T | None = None, **response_kwargs: Unpack[ResponseKwargs]) -> "APIResult[T]":
             return APIResult(data=data)
 
     else:
-
         @classmethod
-        def ok(cls, data: T | None = None) -> "APIResponse":
+        def ok(cls, data: T | None = None, status_code: int = 200, headers: Mapping[str, str] | None = None) -> "APIResponse":
             model = cls.__new__(cls)
             model.__dict__["data"] = data
-            return APIResponse(model)
+            return APIResponse(model, status_code=status_code, headers=headers)
 
 
 class APIResponse(JSONResponse):

{fastapi_extra-0.5.0 → fastapi_extra-0.6.0}/fastapi_extra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-extra
-Version: 0.5.0
+Version: 0.6.0
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause
@@ -30,6 +30,8 @@ Provides-Extra: mysql
 Requires-Dist: asyncmy; extra == "mysql"
 Provides-Extra: pgsql
 Requires-Dist: asyncpg; extra == "pgsql"
+Provides-Extra: oracle
+Requires-Dist: python-oracledb; extra == "oracle"
 Provides-Extra: aiomysql
 Requires-Dist: aiomysql; extra == "aiomysql"
 Dynamic: license-file

{fastapi_extra-0.5.0 → fastapi_extra-0.6.0}/fastapi_extra.egg-info/requires.txt

@@ -9,6 +9,9 @@ aiomysql
 [mysql]
 asyncmy
 
+[oracle]
+python-oracledb
+
 [pgsql]
 asyncpg
 

{fastapi_extra-0.5.0 → fastapi_extra-0.6.0}/pyproject.toml

@@ -41,6 +41,7 @@ redis = ["redis"]
 scheduler = ["apscheduler"]
 mysql = ["asyncmy"]
 pgsql = ["asyncpg"]
+oracle = ["python-oracledb"]
 aiomysql = ["aiomysql"]
 
 [tool.setuptools]