fastapi-extra 0.2.1__cp312-cp312-win_amd64.whl → 0.2.3__cp312-cp312-win_amd64.whl

fastapi_extra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.1"
+__version__ = "0.2.3"
 
 
 from fastapi import FastAPI

fastapi_extra/database/service.py

@@ -5,7 +5,7 @@ from contextvars import ContextVar
 from typing import Any, Generic, Self, TypeVar
 
 from fastapi_extra.database.model import SQLModel
-from fastapi_extra.database.session import DefaultSession
+from fastapi_extra.database.session import AsyncSession, DefaultSession
 from fastapi_extra.dependency import AbstractService
 
 Model = TypeVar("Model", bound=SQLModel)
@@ -32,7 +32,7 @@ class ModelService(AbstractService, Generic[Model], abstract=True):
         self.__session_container__.set(session)
     
     @property
-    def session(self):
+    def session(self) -> AsyncSession:
         _session = self.__session_container__.get()
         assert _session is not None, "Session is not initialized"
         return _session

fastapi_extra/native/routing.pyx

@@ -122,7 +122,6 @@ async def handle(scope, receive, send):
     partial = None
 
     scope["path"] = route_path = starlette_utils.get_route_path(scope)
-    scope["root_path"] = ""
     leaf_node = search_node(route_path)
 
     if leaf_node.prefix == route_path:

fastapi_extra/response.py

@@ -3,8 +3,9 @@ __date__ = "2024-12-24"
 
 
 from enum import Enum
-from typing import Generic
+from typing import TYPE_CHECKING, Generic
 
+from fastapi.responses import JSONResponse
 from pydantic import BaseModel, Field
 
 from fastapi_extra.types import T
@@ -193,9 +194,26 @@ class ResultEnum(Enum):
 class APIResult(BaseModel, Generic[T]):
     data: T | None = Field(default=None, title="返回数据")
 
-    @classmethod
-    def ok(cls, data: T | None = None) -> "APIResult[T]":
-        return APIResult(data=data)
+    if TYPE_CHECKING:
+        @classmethod
+        def ok(cls, data: T | None = None) -> "APIResult[T]":
+            return APIResult(data=data)
+    else:
+        @classmethod
+        def ok(cls, data: T | None = None) -> "APIResponse":
+            return APIResponse(APIResult(data=data))
+
+
+class APIResponse(JSONResponse):
+    
+    def render(self, content: APIResult) -> bytes:
+        return content.__pydantic_serializer__.to_json(
+            indent=None,
+            by_alias=True,
+            exclude_defaults=False,
+            exclude_none=False,
+            exclude_unset=False
+        )
 
 
 class APIError(Exception):

fastapi_extra/routing.pyi

@@ -3,8 +3,8 @@ __describe__ = ""
 
 
 from typing import Any
-from fastapi import FastAPI
 
+from fastapi import FastAPI
 
 class RouteNode:
 

{fastapi_extra-0.2.1.dist-info → fastapi_extra-0.2.3.dist-info}/METADATA

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

{fastapi_extra-0.2.1.dist-info → fastapi_extra-0.2.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
-fastapi_extra/__init__.py,sha256=nZY4R9s4b2NNPoO6UZnpGbs_Vm2cXhT_Infu-VyNvWM,286
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=nKZAYOxCrwr51-YZnXjKFTvpL6RKBMeQd55elvgiqhk,53760
+fastapi_extra/__init__.py,sha256=R03bRZYl4AVdbnAFZ3g-AlNlR6fvByDmK7lqJuApDgI,286
+fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=cmeCdfqVMua1kmwFAMUjlWPeC28fQbmJneNcjaUz2bI,53760
 fastapi_extra/cursor.pyi,sha256=t1_ub-dRhu3OcXB_dIw5MdBG9r1n7853Vtgzc6bk6dw,115
 fastapi_extra/dependency.py,sha256=LtYnOTMyhOQUFSbNEViw7lxJvAFpPWbyuY4e2goSG-8,2130
 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=kOfgWarbRkQDTYZAh4LYvyEB5d6DoxnpfzOYbRl6qJk,91136
-fastapi_extra/routing.pyi,sha256=QslcOUnVJqFCqt14VJQwjUYQ7Qd3bQBTo34Yx1xS7TA,243
+fastapi_extra/response.py,sha256=9rSoFDjLGBQTXrKrLuiX0rlaGSxR7YAFVlGKDc4Q9S8,10173
+fastapi_extra/routing.cp312-win_amd64.pyd,sha256=L92GqIq7WQdzcSJfJt9qsdGt4mrHQ1hMj1adPj_vwRY,91648
+fastapi_extra/routing.pyi,sha256=pW9O3noU4F-7l7LLViTVBLgzY468JS0jO96vdfL7CPA,243
 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
@@ -14,12 +14,12 @@ fastapi_extra/cache/__init__.py,sha256=kq4b_AYKCSJ0fEp4rqpeaoNJilko4XbtfC81xzUaY
 fastapi_extra/cache/redis.py,sha256=-hr2DRkmruzH4cIArdjsytqRiiWWtDJt9GIDy38wmtQ,1600
 fastapi_extra/database/__init__.py,sha256=pCYUoEylTponWqpR0AXJHcRo_cs4fnEXVVV9B5J9rt0,384
 fastapi_extra/database/model.py,sha256=2lDi9PQ5F0PSM7BGZozZf1wSefpXnTWqAVzEyGPaXRI,2453
-fastapi_extra/database/service.py,sha256=-tBC17jEbGZhnxdtWyftP2BUXfCwcOtxzNZ53qLp518,1798
+fastapi_extra/database/service.py,sha256=V5ojRpiWs9_B3XVQz-PtyvBePfmByTn8WG2gXwuhpO0,1828
 fastapi_extra/database/session.py,sha256=PALArHhXNS2gCgeMkiKjyatvINV_VW1LjgEIwXDKyfQ,1903
 fastapi_extra/native/cursor.pyx,sha256=GchJIPY6e5scuyl1BbA-Et0CdRcHOI3xgsTvDem0B70,1141
-fastapi_extra/native/routing.pyx,sha256=DfK83nSwI2l8KATZ9YXLXjMXSy42YxjxZvwhQEpa0fI,6262
-fastapi_extra-0.2.1.dist-info/licenses/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.2.1.dist-info/METADATA,sha256=ii3OEMR1gHqVOIQzzDTQiGNVXQXqmT_NtRthARtu_is,1371
-fastapi_extra-0.2.1.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-fastapi_extra-0.2.1.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.2.1.dist-info/RECORD,,
+fastapi_extra/native/routing.pyx,sha256=NisJ9YaxzceDVWJnF3EeVXWT8rv_6WRDuIfLEK0eWbc,6233
+fastapi_extra-0.2.3.dist-info/licenses/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
+fastapi_extra-0.2.3.dist-info/METADATA,sha256=ncCoVqk0MpEjPC2GE-wHHKhfVvocUbKvjlweKpSbvuY,1371
+fastapi_extra-0.2.3.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+fastapi_extra-0.2.3.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
+fastapi_extra-0.2.3.dist-info/RECORD,,