reyserver 1.1.52__py3-none-any.whl → 1.1.53__py3-none-any.whl

reyserver/rbase.py

@@ -9,11 +9,9 @@
 """
 
 
-from typing import Sequence, Literal, NoReturn
-from inspect import iscoroutinefunction
-from contextlib import asynccontextmanager, _AsyncGeneratorContextManager
+from typing import Literal, NoReturn
 from http import HTTPStatus
-from fastapi import FastAPI, HTTPException, UploadFile as File
+from fastapi import HTTPException, UploadFile as File
 from fastapi.params import (
     Depends,
     Path,
@@ -26,7 +24,7 @@ from fastapi.params import (
 )
 from reydb.rconn import DatabaseConnectionAsync
 from reydb.rorm import DatabaseORMModel, DatabaseORMSessionAsync
-from reykit.rbase import CoroutineFunctionSimple, Base, Exit, StaticMeta, ConfigMeta, Singleton, throw
+from reykit.rbase import Base, Exit, StaticMeta, ConfigMeta, Singleton, throw
 
 from . import rserver
 
@@ -259,57 +257,6 @@ class ServerBind(ServerBase, metaclass=StaticMeta):
     """
 
 
-    def create_lifespan(
-        before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
-        after: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
-    ) -> _AsyncGeneratorContextManager[None, None]:
-        """
-        Create asynchronous function of lifespan manager.
-
-        Parameters
-        ----------
-        before : Execute before server start.
-        after : Execute after server end.
-
-        Returns
-        -------
-        Asynchronous function.
-        """
-
-        # Parameter.
-        if before is None:
-            before = ()
-        elif iscoroutinefunction(before):
-            before = (before,)
-        if after is None:
-            after = ()
-        elif iscoroutinefunction(after):
-            after = (after,)
-
-
-        @asynccontextmanager
-        async def lifespan(app: FastAPI):
-            """
-            Server lifespan manager.
-
-            Parameters
-            ----------
-            app : Server APP.
-            """
-
-            # Before.
-            for task in before:
-                await task()
-            yield
-
-            # After.
-            for task in after:
-                await after()
-
-
-        return lifespan
-
-
     def create_depend_db(database: str, mode: Literal['sess', 'conn']) -> Depends:
         """
         Create dependencie type of asynchronous database.

reyserver/rserver.py

@@ -12,6 +12,7 @@
 from typing import Literal
 from collections.abc import Sequence, Callable, Coroutine
 from inspect import iscoroutinefunction
+from contextlib import asynccontextmanager, _AsyncGeneratorContextManager
 from uvicorn import run as uvicorn_run
 from starlette.middleware.base import _StreamingResponse
 from fastapi import FastAPI, Request
@@ -67,7 +68,6 @@ class Server(ServerBase, Singleton):
         # Parameter.
         if type(ssl_cert) != type(ssl_key):
             throw(AssertionError, ssl_cert, ssl_key)
-        lifespan = Bind.create_lifespan(before, after)
         if depend is None:
             depend = ()
         elif iscoroutinefunction(depend):
@@ -76,6 +76,7 @@ class Server(ServerBase, Singleton):
             Bind.Depend(task)
             for task in depend
         ]
+        lifespan = self.__create_lifespan(before, after)
 
         # Build.
         ServerConfig.server = self
@@ -111,6 +112,61 @@ class Server(ServerBase, Singleton):
         'File API store directory path.'
 
 
+    def __create_lifespan(
+        self,
+        before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
+        after: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
+    ) -> _AsyncGeneratorContextManager[None, None]:
+        """
+        Create asynchronous function of lifespan manager.
+
+        Parameters
+        ----------
+        before : Execute before server start.
+        after : Execute after server end.
+
+        Returns
+        -------
+        Asynchronous function.
+        """
+
+        # Parameter.
+        if before is None:
+            before = ()
+        elif iscoroutinefunction(before):
+            before = (before,)
+        if after is None:
+            after = ()
+        elif iscoroutinefunction(after):
+            after = (after,)
+
+
+        @asynccontextmanager
+        async def lifespan(app: FastAPI):
+            """
+            Server lifespan manager.
+
+            Parameters
+            ----------
+            app : Server APP.
+            """
+
+            # Before.
+            for task in before:
+                await task()
+            yield
+
+            # After.
+            for task in after:
+                await after()
+
+            # Database.
+            await self.db.dispose_all()
+
+
+        return lifespan
+
+
     def __add_default_middleware(self) -> None:
         """
         Add default handle middleware.

{reyserver-1.1.52.dist-info → reyserver-1.1.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reyserver
-Version: 1.1.52
+Version: 1.1.53
 Summary: Backend server method set.
 Project-URL: homepage, https://github.com/reyxbo/reyserver/
 Author-email: Rey <reyxbo@163.com>

{reyserver-1.1.52.dist-info → reyserver-1.1.53.dist-info}/RECORD

@@ -1,11 +1,11 @@
 reyserver/__init__.py,sha256=7GX64p7uI2eetJH9NJ-DTg-8iyQwOsGcviADFJCPxVA,373
 reyserver/rall.py,sha256=riyDRTUsigco_Bee1H4aZFb8IgvjnxdX9qcnVb9i9mE,270
 reyserver/rauth.py,sha256=oa6Iwuutcj9eO6RH7DaT-rPn_YqYwKuyHYaBd3lZoZE,11728
-reyserver/rbase.py,sha256=xgdLP_O77e-pSrRWm9GVSziPSqEOh2w20cWkF4HBeWo,7042
+reyserver/rbase.py,sha256=jgjAkT1kxzVKB60xfWxZbnQJsehhcTBr24AclTYjc4g,5603
 reyserver/rclient.py,sha256=IWZ3smyIP0_YJrfSrM8JFCr0FCtN02AyT3hp8YuSsDQ,5103
 reyserver/rfile.py,sha256=bvuXOYO3UDM1jMiyNzQDz56_0ekZUEIRcfNFAhGgdUY,9010
-reyserver/rserver.py,sha256=bfakJGhcHF0CIiAmRyMVOURLbPNCIALGyrnKpf_Yi80,6800
-reyserver-1.1.52.dist-info/METADATA,sha256=ujWE6YB95IdJf4nCYtq7FZW2sw0s_TGSeyuEwAjfHW8,1689
-reyserver-1.1.52.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.52.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.52.dist-info/RECORD,,
+reyserver/rserver.py,sha256=wQMAtCb3iu3XfYSiGS7TbqHslxdcMFLAmCaYdNToDbY,8241
+reyserver-1.1.53.dist-info/METADATA,sha256=9DvHdPLFWZ6BASCz_WFMmGLB5ZmTstbC0_99kaQjhw4,1689
+reyserver-1.1.53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.53.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.53.dist-info/RECORD,,