reyserver 1.1.47__py3-none-any.whl → 1.1.48__py3-none-any.whl

reyserver/rbase.py

@@ -9,10 +9,11 @@
 """
 
 
-from typing import Sequence, Literal
+from typing import Sequence, Literal, NoReturn
 from inspect import iscoroutinefunction
 from contextlib import asynccontextmanager, _AsyncGeneratorContextManager
-from fastapi import FastAPI, HTTPException, status, UploadFile as File
+from http import HTTPStatus
+from fastapi import FastAPI, HTTPException, UploadFile as File
 from fastapi.params import (
     Depends,
     Path,
@@ -26,7 +27,7 @@ from fastapi.params import (
 from reydb.rconn import DatabaseConnectionAsync
 from reydb.rorm import DatabaseORMModel, DatabaseORMSessionAsync
 from reykit.rwrap import wrap_cache
-from reykit.rbase import CoroutineFunctionSimple, Base, Exit, StaticMeta, ConfigMeta
+from reykit.rbase import CoroutineFunctionSimple, Base, Exit, StaticMeta, ConfigMeta, throw
 
 from . import rserver
 
@@ -35,10 +36,9 @@ __all__ = (
     'ServerBase',
     'ServerConfig',
     'ServerExit',
-    'ServerExitHTTP',
-    'ServerExitHTTP404',
-    'create_lifespan',
-    'create_depend_sess'
+    'ServerExitAPI',
+    'exit_api',
+    'ServerBind'
 )
 
 
@@ -63,33 +63,32 @@ class ServerExit(ServerBase, Exit):
     """
 
 
-class ServerExitHTTP(ServerExit, HTTPException):
+class ServerExitAPI(ServerExit, HTTPException):
     """
-    Server HTTP exit type.
+    Server exit API type.
     """
 
-    status_code: int
 
-
-    def __init__(self, text: str | None = None):
-        """
-        Build instance attributes.
-
-        Parameters
-        ----------
-        text : Explain text.
-        """
-
-        # Super.
-        super().__init__(self.status_code, text)
-
-
-class ServerExitHTTP404(ServerExitHTTP):
+def exit_api(code: int = 400, text: str | None = None) -> NoReturn:
     """
-    Server HTTP 404 exit type.
+    Throw exception to exit API.
+
+    Parameters
+    ----------
+    code : Response status code.
+    text : Explain text.
+        `None`: Use Default text.
     """
 
-    status_code = status.HTTP_404_NOT_FOUND
+    # Parameter.
+    if not 400 <= code <= 499:
+        throw(ValueError, code)
+    if text is None:
+        status = HTTPStatus(code)
+        text = status.description
+
+    # Throw exception.
+    raise ServerExitAPI(code, text)
 
 
 class ServerBind(ServerBase, metaclass=StaticMeta):

reyserver/rfile.py

@@ -12,11 +12,9 @@
 from fastapi import APIRouter
 from fastapi.responses import FileResponse
 from reydb import rorm
-from reydb.rorm import DatabaseORMSessionAsync
-from reydb.rconn import DatabaseConnectionAsync
 from reykit.ros import FileStore, get_md5
 
-from .rbase import ServerConfig, ServerExitHTTP404, Bind
+from .rbase import ServerConfig, Bind, exit_api
 
 
 __all__ = (
@@ -268,7 +266,7 @@ async def download_file(
 
     # Check.
     if result.empty:
-        raise ServerExitHTTP404("file ID '%s' not exist" % file_id)
+        exit_api(404)
     file_name, file_path = result.first()
 
     # Response.
@@ -299,6 +297,6 @@ async def get_file_info(
 
     # Check.
     if table_info is None:
-        raise ServerExitHTTP404("file ID '%s' not exist" % file_id)
+        exit_api(404)
 
     return table_info

{reyserver-1.1.47.dist-info → reyserver-1.1.48.dist-info}/METADATA

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

{reyserver-1.1.47.dist-info → reyserver-1.1.48.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=QyY4gZ0ulpH9Kxvux_jnZBhzfWZZEuOWB1oYU9uzCnY,167
-reyserver/rbase.py,sha256=nJ0x4hm_YZN210quppSFu_6mRNKDLLNyS27jzSc0Yg8,5220
+reyserver/rbase.py,sha256=IUVkkNsLmQh-QRLX6qtbCjPZAbQAsxoe0goPLCxG9KA,5283
 reyserver/rclient.py,sha256=pTJtn78jPKgFo5EoQwZRdM0cYHdCs7QUKqfl-jUBRgk,4220
-reyserver/rfile.py,sha256=5ynG0LlJLdvNiuFBBBuZhT-0jf_1LxEzac55Q40bsk8,9086
+reyserver/rfile.py,sha256=6Dwq8_X1kiY1n-9RhbLL3hvdhTAnsAUHyXivcviYcoA,8888
 reyserver/rserver.py,sha256=hqpemzJHO6xHy_7pO3cvvjnfy8Yfqy8HfyIq4sjk4Dc,5889
-reyserver-1.1.47.dist-info/METADATA,sha256=gav3pRrTdUZXsbSxo-3JkNjlzhzhasdolU8iywyKQmc,1689
-reyserver-1.1.47.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.47.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.47.dist-info/RECORD,,
+reyserver-1.1.48.dist-info/METADATA,sha256=T6Q2BrTheAiAziG15T9seCxh_Yi9IRcplL35YTa-wGo,1689
+reyserver-1.1.48.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.48.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.48.dist-info/RECORD,,