reyserver 1.1.76__py3-none-any.whl → 1.1.78__py3-none-any.whl

reyserver/__init__.py

@@ -15,6 +15,7 @@ rbase : Base methods.
 rclient : Client methods.
 rfile : File methods.
 rpublic : Public methods.
+rredirect : Redirect methods.
 rserver : Server methods.
 rtest : Test methods.
 """

reyserver/rall.py

@@ -13,6 +13,7 @@ from .rauth import *
 from .rbase import *
 from .rclient import *
 from .rfile import *
-from rpublic import *
+from .rpublic import *
+from .rredirect import *
 from .rserver import *
 from .rtest import *

reyserver/rauth.py

@@ -18,7 +18,8 @@ from reykit.rdata import encode_jwt, decode_jwt, is_hash_bcrypt
 from reykit.rre import search_batch
 from reykit.rtime import now
 
-from .rbase import Bind, exit_api
+from .rbase import exit_api
+from .rbind import Bind
 
 
 __all__ = (

reyserver/rbase.py

@@ -9,39 +9,17 @@
 """
 
 
-from typing import Type, NoReturn, overload
+from typing import NoReturn
 from http import HTTPStatus
-from fastapi import FastAPI, Request, UploadFile, HTTPException
-from fastapi.params import (
-    Depends,
-    Path,
-    Query,
-    Header,
-    Cookie,
-    Body,
-    Form,
-    File as Forms
-)
-from reydb.rconn import DatabaseConnectionAsync
-from reydb.rorm import DatabaseORMSessionAsync
-from reykit.rbase import Base, Exit, StaticMeta, Singleton, throw
-
-from . import rserver
+from fastapi import HTTPException
+from reykit.rbase import Base, Exit, throw
 
 
 __all__ = (
     'ServerBase',
     'ServerExit',
     'ServerExitAPI',
-    'exit_api',
-    'ServerBindInstanceDatabaseSuper',
-    'ServerBindInstanceDatabaseConnection',
-    'ServerBindInstanceDatabaseSession',
-    'ServerBindInstance',
-    'ServerBind',
-    'Bind',
-    'router_test',
-    'router_public'
+    'exit_api'
 )
 
 
@@ -83,294 +61,3 @@ def exit_api(code: int = 400, text: str | None = None) -> NoReturn:
 
     # Throw exception.
     raise ServerExitAPI(code, text)
-
-
-class ServerBindInstanceDatabaseSuper(ServerBase):
-    """
-    Server API bind parameter build database instance super type.
-    """
-
-
-    def __getattr__(self, name: str) -> Depends:
-        """
-        Create dependencie instance of asynchronous database.
-
-        Parameters
-        ----------
-        name : Database engine name.
-        mode : Mode.
-            - `Literl['sess']`: Create ORM session instance.
-            - `Literl['conn']`: Create connection instance.
-
-        Returns
-        -------
-        Dependencie instance.
-        """
-
-
-        async def depend_func(server: Bind.Server = Bind.server):
-            """
-            Dependencie function of asynchronous database.
-            """
-
-            # Parameter.
-            engine = server.db[name]
-
-            # Context.
-            match self:
-                case ServerBindInstanceDatabaseConnection():
-                    async with engine.connect() as conn:
-                        yield conn
-                case ServerBindInstanceDatabaseSession():
-                    async with engine.orm.session() as sess:
-                        yield sess
-
-
-        # Create.
-        depend = Depends(depend_func)
-
-        return depend
-
-
-    @overload
-    def __getitem__(self, engine: str) -> DatabaseConnectionAsync: ...
-
-    __getitem__ = __getattr__
-
-
-class ServerBindInstanceDatabaseConnection(ServerBindInstanceDatabaseSuper, Singleton):
-    """
-    Server API bind parameter build database connection instance type, singleton mode.
-    """
-
-
-class ServerBindInstanceDatabaseSession(ServerBindInstanceDatabaseSuper, Singleton):
-    """
-    Server API bind parameter build database session instance type, singleton mode.
-    """
-
-
-class ServerBindInstance(ServerBase, Singleton):
-    """
-    Server API bind parameter build instance type.
-    """
-
-
-    @property
-    def path(self) -> Path:
-        """
-        Path instance.
-        """
-
-        # Build.
-        path = Path()
-
-        return path
-
-
-    @property
-    def query(self) -> Query:
-        """
-        Query instance.
-        """
-
-        # Build.
-        query = Query()
-
-        return query
-
-
-    @property
-    def header(self) -> Header:
-        """
-        Header instance.
-        """
-
-        # Build.
-        header = Header()
-
-        return header
-
-
-    @property
-    def cookie(self) -> Cookie:
-        """
-        Cookie instance.
-        """
-
-        # Build.
-        cookie = Cookie()
-
-        return cookie
-
-
-    @property
-    def body(self) -> Body:
-        """
-        Body instance.
-        """
-
-        # Build.
-        body = Body()
-
-        return body
-
-
-    @property
-    def form(self) -> Form:
-        """
-        Form instance.
-        """
-
-        # Build.
-        form = Form()
-
-        return form
-
-
-    @property
-    def forms(self) -> Forms:
-        """
-        Forms instance.
-        """
-
-        # Build.
-        forms = Forms()
-
-        return forms
-
-
-    @property
-    def query_n(self) -> Query:
-        """
-        Query instance, default `None`.
-        """
-
-        # Build.
-        query = Query(None)
-
-        return query
-
-
-    @property
-    def header_n(self) -> Header:
-        """
-        Header instance, default `None`.
-        """
-
-        # Build.
-        header = Header(None)
-
-        return header
-
-
-    @property
-    def cookie_n(self) -> Cookie:
-        """
-        Cookie instance, default `None`.
-        """
-
-        # Build.
-        cookie = Cookie(None)
-
-        return cookie
-
-
-    @property
-    def body_n(self) -> Body:
-        """
-        Body instance, default `None`.
-        """
-
-        # Build.
-        body = Body(None)
-
-        return body
-
-
-    @property
-    def form_n(self) -> Form:
-        """
-        Form instance, default `None`.
-        """
-
-        # Build.
-        form = Form(None)
-
-        return form
-
-
-    @property
-    def forms_n(self) -> Forms:
-        """
-        Forms instance, default `None`.
-        """
-
-        # Build.
-        forms = Forms(None)
-
-        return forms
-
-
-async def depend_server(request: Request) -> 'rserver.Server':
-    """
-    Dependencie function of now Server instance.
-
-    Parameters
-    ----------
-    request : Request.
-
-    Returns
-    -------
-    Server.
-    """
-
-    # Get.
-    app: FastAPI = request.app
-    server: rserver.Server = app.extra['server']
-
-    return server
-
-
-class ServerBind(ServerBase, metaclass=StaticMeta):
-    """
-    Server API bind parameter type.
-    """
-
-    Request = Request
-    'Reqeust instance dependency type.'
-    Path = Path
-    'URL source path dependency type.'
-    Query = Query
-    'URL query parameter dependency type.'
-    Header = Header
-    'Request header parameter dependency type.'
-    Cookie = Cookie
-    'Request header cookie parameter dependency type.'
-    Body = Body
-    'Request body JSON parameter dependency type.'
-    Form = Form
-    'Request body form parameter dependency type.'
-    Forms = Forms
-    'Request body multiple forms parameter dependency type.'
-    File = UploadFile
-    'Type hints file type.'
-    Depend = Depends
-    'Dependency type.'
-    Conn = DatabaseConnectionAsync
-    Sess = DatabaseORMSessionAsync
-    Server = Type['rserver.Server']
-    'Server type.'
-    server: Depend = Depend(depend_server)
-    'Server instance dependency type.'
-    i = ServerBindInstance()
-    'Server API bind parameter build instance.'
-    conn = ServerBindInstanceDatabaseConnection()
-    'Server API bind parameter asynchronous database connection.'
-    sess = ServerBindInstanceDatabaseSession()
-    'Server API bind parameter asynchronous database session.'
-    token: Depend
-    'Server authentication token dependency type.'
-
-
-Bind = ServerBind

reyserver/rbind.py

@@ -0,0 +1,330 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@Time    : 2025-10-21
+@Author  : Rey
+@Contact : reyxbo@163.com
+@Explain : Dependency bind methods.
+"""
+
+
+from typing import Type, overload
+from fastapi import FastAPI, Request, UploadFile
+from fastapi.params import (
+    Depends,
+    Path,
+    Query,
+    Header,
+    Cookie,
+    Body,
+    Form,
+    File as Forms
+)
+from reydb.rconn import DatabaseConnectionAsync
+from reydb.rorm import DatabaseORMSessionAsync
+from reykit.rbase import StaticMeta, Singleton
+
+from . import rserver
+from .rbase import ServerBase
+
+
+__all__ = (
+    'ServerBindInstanceDatabaseSuper',
+    'ServerBindInstanceDatabaseConnection',
+    'ServerBindInstanceDatabaseSession',
+    'ServerBindInstance',
+    'ServerBind',
+    'Bind'
+)
+
+
+class ServerBindInstanceDatabaseSuper(ServerBase):
+    """
+    Server API bind parameter build database instance super type.
+    """
+
+
+    def __getattr__(self, name: str) -> Depends:
+        """
+        Create dependencie instance of asynchronous database.
+
+        Parameters
+        ----------
+        name : Database engine name.
+        mode : Mode.
+            - `Literl['sess']`: Create ORM session instance.
+            - `Literl['conn']`: Create connection instance.
+
+        Returns
+        -------
+        Dependencie instance.
+        """
+
+
+        async def depend_func(server: Bind.Server = Bind.server):
+            """
+            Dependencie function of asynchronous database.
+            """
+
+            # Parameter.
+            engine = server.db[name]
+
+            # Context.
+            match self:
+                case ServerBindInstanceDatabaseConnection():
+                    async with engine.connect() as conn:
+                        yield conn
+                case ServerBindInstanceDatabaseSession():
+                    async with engine.orm.session() as sess:
+                        yield sess
+
+
+        # Create.
+        depend = Depends(depend_func)
+
+        return depend
+
+
+    @overload
+    def __getitem__(self, engine: str) -> DatabaseConnectionAsync: ...
+
+    __getitem__ = __getattr__
+
+
+class ServerBindInstanceDatabaseConnection(ServerBindInstanceDatabaseSuper, Singleton):
+    """
+    Server API bind parameter build database connection instance type, singleton mode.
+    """
+
+
+class ServerBindInstanceDatabaseSession(ServerBindInstanceDatabaseSuper, Singleton):
+    """
+    Server API bind parameter build database session instance type, singleton mode.
+    """
+
+
+class ServerBindInstance(ServerBase, Singleton):
+    """
+    Server API bind parameter build instance type.
+    """
+
+
+    @property
+    def path(self) -> Path:
+        """
+        Path instance.
+        """
+
+        # Build.
+        path = Path()
+
+        return path
+
+
+    @property
+    def query(self) -> Query:
+        """
+        Query instance.
+        """
+
+        # Build.
+        query = Query()
+
+        return query
+
+
+    @property
+    def header(self) -> Header:
+        """
+        Header instance.
+        """
+
+        # Build.
+        header = Header()
+
+        return header
+
+
+    @property
+    def cookie(self) -> Cookie:
+        """
+        Cookie instance.
+        """
+
+        # Build.
+        cookie = Cookie()
+
+        return cookie
+
+
+    @property
+    def body(self) -> Body:
+        """
+        Body instance.
+        """
+
+        # Build.
+        body = Body()
+
+        return body
+
+
+    @property
+    def form(self) -> Form:
+        """
+        Form instance.
+        """
+
+        # Build.
+        form = Form()
+
+        return form
+
+
+    @property
+    def forms(self) -> Forms:
+        """
+        Forms instance.
+        """
+
+        # Build.
+        forms = Forms()
+
+        return forms
+
+
+    @property
+    def query_n(self) -> Query:
+        """
+        Query instance, default `None`.
+        """
+
+        # Build.
+        query = Query(None)
+
+        return query
+
+
+    @property
+    def header_n(self) -> Header:
+        """
+        Header instance, default `None`.
+        """
+
+        # Build.
+        header = Header(None)
+
+        return header
+
+
+    @property
+    def cookie_n(self) -> Cookie:
+        """
+        Cookie instance, default `None`.
+        """
+
+        # Build.
+        cookie = Cookie(None)
+
+        return cookie
+
+
+    @property
+    def body_n(self) -> Body:
+        """
+        Body instance, default `None`.
+        """
+
+        # Build.
+        body = Body(None)
+
+        return body
+
+
+    @property
+    def form_n(self) -> Form:
+        """
+        Form instance, default `None`.
+        """
+
+        # Build.
+        form = Form(None)
+
+        return form
+
+
+    @property
+    def forms_n(self) -> Forms:
+        """
+        Forms instance, default `None`.
+        """
+
+        # Build.
+        forms = Forms(None)
+
+        return forms
+
+
+async def depend_server(request: Request) -> 'rserver.Server':
+    """
+    Dependencie function of now Server instance.
+
+    Parameters
+    ----------
+    request : Request.
+
+    Returns
+    -------
+    Server.
+    """
+
+    # Get.
+    app: FastAPI = request.app
+    server: rserver.Server = app.extra['server']
+
+    return server
+
+
+class ServerBind(ServerBase, metaclass=StaticMeta):
+    """
+    Server API bind parameter type.
+    """
+
+    Request = Request
+    'Reqeust instance dependency type.'
+    Path = Path
+    'URL source path dependency type.'
+    Query = Query
+    'URL query parameter dependency type.'
+    Header = Header
+    'Request header parameter dependency type.'
+    Cookie = Cookie
+    'Request header cookie parameter dependency type.'
+    Body = Body
+    'Request body JSON parameter dependency type.'
+    Form = Form
+    'Request body form parameter dependency type.'
+    Forms = Forms
+    'Request body multiple forms parameter dependency type.'
+    File = UploadFile
+    'Type hints file type.'
+    Depend = Depends
+    'Dependency type.'
+    Conn = DatabaseConnectionAsync
+    Sess = DatabaseORMSessionAsync
+    Server = rserver.Server
+    'Server type.'
+    server: Depend = Depend(depend_server)
+    'Server instance dependency type.'
+    i = ServerBindInstance()
+    'Server API bind parameter build instance.'
+    conn = ServerBindInstanceDatabaseConnection()
+    'Server API bind parameter asynchronous database connection.'
+    sess = ServerBindInstanceDatabaseSession()
+    'Server API bind parameter asynchronous database session.'
+    token: Depend
+    'Server authentication token dependency type.'
+
+
+Bind = ServerBind

reyserver/rclient.py

@@ -54,6 +54,7 @@ class ServerClient(ServerBase):
         self.password = password
         self.url = url
         self.token = self.get_token(username, password)
+        self.request = copy_type_hints(self._request, request)
 
 
     def get_token(
@@ -125,7 +126,7 @@ class ServerClient(ServerBase):
         return response
 
 
-    request = copy_type_hints(_request, request)
+    # request = copy_type_hints(_request, request)
 
 
     def upload_file(

reyserver/rfile.py

@@ -14,7 +14,8 @@ from fastapi.responses import FileResponse
 from reydb import rorm, DatabaseEngine, DatabaseEngineAsync
 from reykit.ros import get_md5
 
-from .rbase import Bind, exit_api
+from .rbase import exit_api
+from .rbind import Bind
 
 
 __all__ = (

reyserver/rpublic.py

@@ -13,7 +13,7 @@ from fastapi import APIRouter
 from fastapi.responses import HTMLResponse, FileResponse
 from reykit.ros import File, Folder
 
-from .rbase import Bind
+from .rbind import Bind
 
 
 __all__ = (
@@ -46,9 +46,9 @@ def home(server: Bind.Server = Bind.server) -> HTMLResponse:
 
 
 @router_public.get('/public/{path:path}')
-def get_public_file(path: str = Bind.i.path) -> FileResponse:
+def download_public_file(path: str = Bind.i.path) -> FileResponse:
     """
-    Get public file.
+    Download public file.
 
     Parameters
     ----------

reyserver/rredirect.py

@@ -0,0 +1,48 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@Time    : 2025-10-21
+@Author  : Rey
+@Contact : reyxbo@163.com
+@Explain : Redirect methods.
+"""
+
+
+from fastapi import APIRouter
+from fastapi.responses import RedirectResponse
+from reykit.rnet import join_url
+
+from .rbind import Bind
+
+
+__all__ = (
+    'router_redirect',
+)
+
+
+router_redirect = APIRouter()
+
+
+@router_redirect.get('/{path:path}')
+def redirect_all(
+    path: str = Bind.i.path,
+    server: Bind.Server = Bind.server
+) -> RedirectResponse:
+    """
+    Redirect all requests to the target server.
+
+    Parameters
+    ----------
+    path : Resource path.
+
+    Returns
+    -------
+    Redirect response.
+    """
+
+    # Response.
+    url = join_url(server.api_redirect_server_url, path)
+    response = RedirectResponse(url, 308)
+
+    return response

reyserver/rserver.py

@@ -13,7 +13,6 @@ from typing import Literal
 from collections.abc import Sequence, Callable, Coroutine
 from inspect import iscoroutinefunction
 from contextlib import asynccontextmanager, _AsyncGeneratorContextManager
-from logging import getLogger, Filter
 from uvicorn import run as uvicorn_run
 from starlette.middleware.base import _StreamingResponse
 from fastapi import FastAPI, Request
@@ -26,7 +25,8 @@ from reykit.rbase import CoroutineFunctionSimple, Singleton, throw
 from reykit.ros import FileStore
 from reykit.rrand import randchar
 
-from .rbase import ServerBase, Bind
+from .rbase import ServerBase
+from .rbind import Bind
 
 
 __all__ = (
@@ -45,6 +45,8 @@ class Server(ServerBase, Singleton):
     'Whether start authentication.'
     api_public_dir: str
     'Public directory.'
+    api_redirect_server_url: str
+    'Target server URL of redirect all requests.'
     api_auth_key: str
     'Authentication API JWT encryption key.'
     api_auth_sess_seconds: int
@@ -332,6 +334,23 @@ class Server(ServerBase, Singleton):
         self.app.include_router(router_public, tags=['public'])
 
 
+    def add_api_redirect(self, server_url: str) -> None:
+        """
+        Add redirect API.
+        Redirect all requests to the target server.
+
+        Parameters
+        ----------
+        server_url : Target server URL.
+        """
+
+        from .rredirect import router_redirect
+
+        # Add.
+        self.api_redirect_server_url = server_url
+        self.app.include_router(router_redirect, tags=['redirect'])
+
+
     def add_api_auth(self, key: str | None = None, sess_seconds: int = 28800) -> None:
         """
         Add authentication API.

{reyserver-1.1.76.dist-info → reyserver-1.1.78.dist-info}/METADATA

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

reyserver-1.1.78.dist-info/RECORD

@@ -0,0 +1,15 @@
+reyserver/__init__.py,sha256=iT5IWIBDvaeYvxs0HuV6mZfN2D0G4xkb_0DhX-VpsDk,454
+reyserver/rall.py,sha256=Kzh52bdDFxB0pcFLFnEh6q4mL4t9POAYJBhT4w0hxmA,342
+reyserver/rauth.py,sha256=7mANcRcbJ3e4u0PDSMquBeCWKchHbmVeFOVv7syU7Q0,15236
+reyserver/rbase.py,sha256=mq6ChIcxb8-RUZgYqJZ8LOa0XTr0d8VU-xVzhJ0q5AQ,1134
+reyserver/rbind.py,sha256=RBI6qfQvvO7H9S9lJfTK-OP01CzhN9oq8XERjaRXF5w,6752
+reyserver/rclient.py,sha256=w79RJEjAfIlQatCeZZIlrGLH_A5vEw9HvpHp3a5bNYw,6295
+reyserver/rfile.py,sha256=xudSM-bVRqzCvifCUTgiZwitPzPNe1KQ2GXLgHtu2zg,8891
+reyserver/rpublic.py,sha256=ixKDWdDihdVQ8Pqjpril7veJ9kkFK9yiRm8CTwmck4Q,1095
+reyserver/rredirect.py,sha256=c7wgXn5UeF53irMlbJ8vctec2KEc3DuHhBOa8NBoFjA,857
+reyserver/rserver.py,sha256=3fuXVwU_PPbDLCIYxvRJotSVhbY_0Vtpph7nh8M0S3Q,11321
+reyserver/rtest.py,sha256=z7i-tKwDzqErebLgF-M2hBg5HUKStK8b9398Yca9s-g,777
+reyserver-1.1.78.dist-info/METADATA,sha256=9mU07KCPhizs7VT1o_kTJpOZbTaYYr2sIh46DVc_5DY,1666
+reyserver-1.1.78.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.78.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.78.dist-info/RECORD,,

reyserver-1.1.76.dist-info/RECORD

@@ -1,13 +0,0 @@
-reyserver/__init__.py,sha256=umEAldZYjSIpHJQHUOXlgXqMgOiRC-FRGmRZjrji7as,423
-reyserver/rall.py,sha256=SoG4PX2YAz94EuelDNhk1wvwNkrLfzskiWoknEBZitk,315
-reyserver/rauth.py,sha256=SGBtopM4fwn7pFjFPmrh6mD61c0iSJmqYEYUpgoCayA,15217
-reyserver/rbase.py,sha256=hdBRiaGho12D7qoH8P8w7sZK7Jd6xTJSJXIiVoiFNFw,7654
-reyserver/rclient.py,sha256=og5YuWm-PODkFn9njBwYQpGlk0j1BfqFuEarlCFSQYI,6229
-reyserver/rfile.py,sha256=qqJrCwDr27ymXgBs1n6nFwqUrZZs-rxa97isaCOaGNY,8872
-reyserver/rpublic.py,sha256=_JoD3c-jYExarhyvl167zu29j22mUicXeBevjgqSjzk,1085
-reyserver/rserver.py,sha256=Bjde4jRQdeijJSWpz0eU0Dy3sNKxsQiY2xBmWoFaiuA,10817
-reyserver/rtest.py,sha256=z7i-tKwDzqErebLgF-M2hBg5HUKStK8b9398Yca9s-g,777
-reyserver-1.1.76.dist-info/METADATA,sha256=yiKnN5M5jYxtKmASTm80O7UNggfV4U0k2ekx48hvtJo,1666
-reyserver-1.1.76.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.76.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.76.dist-info/RECORD,,