reyserver 1.1.60__py3-none-any.whl → 1.1.62__py3-none-any.whl

reyserver/__init__.py

@@ -9,7 +9,6 @@
 
 Modules
 -------
-radmin : Admin methods.
 rall : All methods.
 rauth : Authentication methods.
 rbase : Base methods.

reyserver/rall.py

@@ -9,7 +9,6 @@
 """
 
 
-from .radmin import *
 from .rauth import *
 from .rbase import *
 from .rclient import *

reyserver/rauth.py

@@ -11,10 +11,8 @@
 
 from typing import Any, TypedDict, NotRequired, Literal
 from datetime import datetime as Datetime
-from re import PatternError
 from fastapi import APIRouter, Request
-from fastapi.params import Depends
-from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+from fastapi.security import OAuth2PasswordBearer
 from reydb import rorm, DatabaseEngine, DatabaseEngineAsync
 from reykit.rdata import encode_jwt, decode_jwt, is_hash_bcrypt
 from reykit.rre import search_batch
@@ -29,35 +27,43 @@ __all__ = (
     'DatabaseORMTablePerm',
     'DatabaseORMTableUserRole',
     'DatabaseORMTableRolePerm',
-    'build_auth_db',
-    'auth_router'
+    'build_db_auth',
+    'router_auth'
 )
 
 
-UserInfo = TypedDict(
-        'UserInfo',
-        {
-            'create_time': float,
-            'udpate_time': float,
-            'user_id': int,
-            'user_name': str,
-            'role_names': list[str],
-            'perm_names': list[str],
-            'perm_apis': list[str],
-            'email': str | None,
-            'phone': str | None,
-            'avatar': int | None,
-            'password': NotRequired[str]
-        }
-    )
-Token = TypedDict(
-    'Token',
+UserData = TypedDict(
+    'UserData',
+    {
+        'create_time': float,
+        'udpate_time': float,
+        'user_id': int,
+        'user_name': str,
+        'role_names': list[str],
+        'perm_names': list[str],
+        'perm_apis': list[str],
+        'email': str | None,
+        'phone': str | None,
+        'avatar': int | None,
+        'password': NotRequired[str]
+    }
+)
+TokenData = TypedDict(
+    'TokenData',
     {
         'sub': int,
         'iat': int,
         'nbf': int,
         'exp': int,
-        'user': UserInfo
+        'user': UserData
+    }
+)
+Token = str
+JSONToken = TypedDict(
+    'JSONToken',
+    {
+        'access_token': Token,
+        'token_type': Literal['Bearer']
     }
 )
 
@@ -138,7 +144,7 @@ class DatabaseORMTableRolePerm(rorm.Table):
     perm_id: int = rorm.Field(rorm.types_mysql.SMALLINT(unsigned=True), key=True, comment='Permission ID.')
 
 
-def build_auth_db(engine: DatabaseEngine | DatabaseEngineAsync) -> None:
+def build_db_auth(engine: DatabaseEngine | DatabaseEngineAsync) -> None:
     """
     Check and build `auth` database tables.
 
@@ -231,17 +237,80 @@ def build_auth_db(engine: DatabaseEngine | DatabaseEngineAsync) -> None:
     engine.sync_engine.build.build(tables=tables, views_stats=views_stats, skip=True)
 
 
-auth_router = APIRouter()
+bearer = OAuth2PasswordBearer(
+    tokenUrl='/token',
+    scheme_name='OAuth2Password',
+    description='Authentication of OAuth2 password model.',
+    auto_error=False
+)
+
+
+async def depend_token(
+    request: Request,
+    server: Bind.Server = Bind.server,
+    token: Token | None = Bind.Depend(bearer)
+) -> TokenData:
+    """
+    Dependencie function of authentication token.
+    If the verification fails, then response status code is 401 or 403.
+
+    Parameters
+    ----------
+    request : Request.
+    server : Server.
+    token : Authentication token.
+
+    Returns
+    -------
+    Token data.
+    """
+
+    # Check.
+    if not server.is_started_auth:
+        return
+    if bearer is None:
+        exit_api(401)
+
+    # Parameter.
+    key = server.api_auth_key
+    api_path = f'{request.method} {request.url.path}'
+
+    # Cache.
+    token_data: UserData | None = getattr(request.state, 'token_data', None)
+
+    # Decode.
+    if token_data is None:
+        token_data: TokenData | None = decode_jwt(token, key)
+        if token_data is None:
+            exit_api(401)
+        request.state.token_data = token_data
+
+    # Authentication.
+    perm_apis = token_data['user']['perm_apis']
+    perm_apis = [
+        f'^{pattern}$'
+        for pattern in perm_apis
+    ]
+    result = search_batch(api_path, *perm_apis)
+    if result is None:
+        exit_api(403)
+
+    return token_data
+
 
+Bind.token = Bind.Depend(depend_token)
 
-async def get_user_info(
+router_auth = APIRouter()
+
+
+async def get_user_data(
     conn: Bind.Conn,
     account: str,
-    account_type: Literal['name', 'email', 'phone'],
+    account_type: Literal['user_id', 'name', 'email', 'phone'] = 'name',
     filter_invalid: bool = True
-) -> UserInfo | None:
+) -> UserData | None:
     """
-    Get user information.
+    Get user data.
 
     Parameters
     ----------
@@ -255,7 +324,7 @@ async def get_user_info(
 
     Returns
     -------
-    User information or null.
+    User data or null.
     """
 
     # Parameters.
@@ -286,6 +355,7 @@ async def get_user_info(
         '    SELECT `create_time`, `update_time`, `user_id`, `password`, `name`, `email`, `phone`, `avatar`\n'
         '    FROM `test`.`user`\n'
         f'{sql_where}'
+        '    LIMIT 1\n'
         ') as `user`\n'
         'LEFT JOIN (\n'
         '    SELECT `user_id`, `role_id`\n'
@@ -319,7 +389,7 @@ async def get_user_info(
         info = None
     else:
         row: dict[str, Datetime | Any] = result.to_row()
-        info: UserInfo = {
+        info: UserData = {
             'create_time': row['create_time'].timestamp(),
             'udpate_time': row['update_time'].timestamp(),
             'user_id': row['user_id'],
@@ -336,25 +406,20 @@ async def get_user_info(
     return info
 
 
-@auth_router.post('/sessions')
+@router_auth.post('/token')
 async def create_sessions(
-    account: str = Bind.i.body,
-    password: str = Bind.i.body,
-    account_type: Literal['name', 'email', 'phone'] = Bind.Body('name'),
+    username: str = Bind.i.form,
+    password: str = Bind.i.form,
     conn: Bind.Conn = Bind.conn.auth,
     server: Bind.Server = Bind.server
-) -> dict:
+) -> JSONToken:
     """
-    Create session.
+    Create token.
 
     Parameters
     ----------
-    account : User account.
+    username : User name.
     password : User password.
-    account_type : User account type.
-        - `Literal['name']`: User name.
-        - `Literal['email']`: User Email.
-        - `Literal['phone']`: User phone mumber.
 
     Returns
     -------
@@ -365,86 +430,30 @@ async def create_sessions(
     key = server.api_auth_key
     sess_seconds = server.api_auth_sess_seconds
 
-    # User information.
-    info = await get_user_info(conn, account, account_type)
+    # User data.
+    user_data = await get_user_data(conn, username)
 
     # Check.
-    if info is None:
+    if user_data is None:
         exit_api(401)
-    password_hash = info.pop('password')
+    password_hash = user_data.pop('password')
     if not is_hash_bcrypt(password, password_hash):
         exit_api(401)
 
-    # JWT.
+    # Response.
     now_timestamp_s = now('timestamp_s')
-    user_id = info.pop('user_id')
-    data: Token = {
+    user_id = user_data.pop('user_id')
+    data: TokenData = {
         'sub': str(user_id),
         'iat': now_timestamp_s,
         'nbf': now_timestamp_s,
         'exp': now_timestamp_s + sess_seconds,
-        'user': info
+        'user': user_data
     }
     token = encode_jwt(data, key)
-    response = {'token': token}
+    response = {
+        'access_token': token,
+        'token_type': 'Bearer'
+    }
 
     return response
-
-
-bearer = HTTPBearer(
-    scheme_name='RBACBearer',
-    description='Global authentication of based on RBAC model and Bearer framework.',
-    bearerFormat='JWT standard.',
-    auto_error=False
-)
-
-
-async def depend_auth(
-    request: Request,
-    server: Bind.Server = Bind.server,
-    auth: HTTPAuthorizationCredentials | None = Depends(bearer)
-) -> None:
-    """
-    Dependencie function of authentication.
-
-    Parameters
-    ----------
-    request : Request.
-    server : Server.
-    auth : Authentication.
-    """
-
-    # Check.
-    print(11111111111111111)
-    api_path = f'{request.method} {request.url.path}'
-    if (
-        not server.is_started_auth
-        or api_path == 'POST /sessions'
-    ):
-        return
-    if auth is None:
-        exit_api(401)
-
-    # Parameter.
-    key = server.api_auth_key
-    token = auth.credentials
-
-    # Decode.
-    json = decode_jwt(token, key)
-    if json is None:
-        exit_api(401)
-    json: Token
-    request.state.user = json['user']
-
-    # Check.
-    perm_apis = json['user']['perm_apis']
-    perm_apis = [
-        f'^{pattern}$'
-        for pattern in perm_apis
-    ]
-    try:
-        result = search_batch(api_path, *perm_apis)
-    except PatternError:
-        exit_api(403)
-    if result is None:
-        exit_api(403)

reyserver/rbase.py

@@ -9,9 +9,9 @@
 """
 
 
-from typing import Type, NoReturn, overload
+from typing import Literal, Type, NoReturn, overload
 from http import HTTPStatus
-from fastapi import FastAPI
+from fastapi import APIRouter
 from fastapi import HTTPException, Request, UploadFile as File
 from fastapi.params import (
     Depends,
@@ -24,7 +24,7 @@ from fastapi.params import (
     File as Forms
 )
 from reydb.rconn import DatabaseConnectionAsync
-from reydb.rorm import DatabaseORMModel, DatabaseORMSessionAsync
+from reydb.rorm import DatabaseORMSessionAsync
 from reykit.rbase import Base, Exit, StaticMeta, Singleton, throw
 
 from . import rserver
@@ -311,49 +311,82 @@ class ServerBindInstance(ServerBase, Singleton):
         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 = 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 = File
+    'Verify file type.'
     Depend = Depends
-    JSON = DatabaseORMModel
+    'Dependency type.'
     Conn = DatabaseConnectionAsync
     Sess = DatabaseORMSessionAsync
     Server = Type['rserver.Server']
-    server = Depends(depend_server)
+    'Server type.'
+    server: Depend
+    '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
+
+router_base = APIRouter()
+
+
+@router_base.get('/test')
+def test() -> Literal['test']:
+    """
+    Test.
+
+    Returns
+    -------
+    Text `test`.
+    """
+
+    # Resposne.
+    response = 'test'
+
+    return response
+
+
+@router_base.post('/test/echo')
+def echo(data: dict = Bind.i.body) -> dict:
+    """
+    Echo test.
+
+    Paremeters
+    ----------
+    data : Echo data.
+
+    Returns
+    -------
+    Echo data.
+    """
+
+    # Resposne.
+
+    return data

reyserver/rclient.py

@@ -53,22 +53,21 @@ class ServerClient(ServerBase):
         self.username = username
         self.password = password
         self.url = url
-        self.token = self.create_session(username, password)
+        self.token = self.get_token(username, password)
 
 
-    def create_session(
+    def get_token(
         self,
         username: str,
         password: str
     ) -> str:
         """
-        Create session.
+        Get token.
 
         Parameters
         ----------
-        account : User name.
+        username : User name.
         password : User password.
-        account_type : User account type.
 
         Returns
         -------
@@ -76,16 +75,16 @@ class ServerClient(ServerBase):
         """
 
         # Parameter.
-        url = join_url(self.url, 'sessions')
-        json = {
-            'account': username,
+        url = join_url(self.url, 'token')
+        data = {
+            'username': username,
             'password': password
         }
 
         # Request.
-        response = request(url, json=json, check=True)
+        response = request(url, data=data, check=True)
         response_dict = response.json()
-        token = response_dict['token']
+        token = response_dict['access_token']
 
         return token
 

reyserver/rfile.py

@@ -20,8 +20,8 @@ from .rbase import Bind, exit_api
 __all__ = (
     'DatabaseORMTableInfo',
     'DatabaseORMTableData',
-    'build_file_db',
-    'file_router'
+    'build_db_file',
+    'router_file'
 )
 
 
@@ -51,7 +51,7 @@ class DatabaseORMTableData(rorm.Table):
     path: str = rorm.Field(rorm.types.VARCHAR(4095), not_null=True, comment='File disk storage path.')
 
 
-def build_file_db(engine: DatabaseEngine | DatabaseEngineAsync) -> None:
+def build_db_file(engine: DatabaseEngine | DatabaseEngineAsync) -> None:
     """
     Check and build `file` database tables.
 
@@ -177,10 +177,10 @@ def build_file_db(engine: DatabaseEngine | DatabaseEngineAsync) -> None:
     engine.sync_engine.build.build(tables=tables, views=views, views_stats=views_stats, skip=True)
 
 
-file_router = APIRouter()
+router_file = APIRouter()
 
 
-@file_router.get('/files/{file_id}')
+@router_file.get('/files/{file_id}')
 async def get_file_info(
     file_id: int = Bind.i.path,
     sess: Bind.Sess = Bind.sess.file
@@ -207,7 +207,7 @@ async def get_file_info(
     return table_info
 
 
-@file_router.post('/files')
+@router_file.post('/files')
 async def upload_file(
     file: Bind.File = Bind.i.forms,
     name: str = Bind.i.forms_n,
@@ -262,7 +262,7 @@ async def upload_file(
     return table_info
 
 
-@file_router.get('/files/{file_id}/download')
+@router_file.get('/files/{file_id}/download')
 async def download_file(
     file_id: int = Bind.i.path,
     conn: Bind.Conn = Bind.conn.file

reyserver/rserver.py

@@ -9,23 +9,21 @@
 """
 
 
-from typing import Any, Literal, Type
+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
-from fastapi.params import Depends
 from fastapi.staticfiles import StaticFiles
 from fastapi.middleware.gzip import GZipMiddleware
 from fastapi.middleware.httpsredirect import HTTPSRedirectMiddleware
-from reydb import rorm, DatabaseAsync, DatabaseEngineAsync
+from reydb import DatabaseAsync
 from reykit.rbase import CoroutineFunctionSimple, Singleton, throw
 from reykit.rrand import randchar
 
 from .rbase import ServerBase, Bind
-from . import radmin
 
 
 __all__ = (
@@ -69,8 +67,6 @@ class Server(ServerBase, Singleton):
         debug : Whether use development mode debug server.
         """
 
-        from .rauth import depend_auth
-
         # Parameter.
         if type(ssl_cert) != type(ssl_key):
             throw(AssertionError, ssl_cert, ssl_key)
@@ -79,8 +75,6 @@ class Server(ServerBase, Singleton):
         elif iscoroutinefunction(depend):
             depend = (depend,)
         depend = [
-            Bind.Depend(depend_auth)
-        ] + [
             Bind.Depend(task)
             for task in depend
         ]
@@ -90,8 +84,6 @@ class Server(ServerBase, Singleton):
         self.db = db
         self.ssl_cert = ssl_cert
         self.ssl_key = ssl_key
-
-        ## App.
         self.app = FastAPI(
             dependencies=depend,
             lifespan=lifespan,
@@ -99,17 +91,18 @@ class Server(ServerBase, Singleton):
             server=self
         )
 
+        # Public file.
         if public is not None:
             subapp = StaticFiles(directory=public, html=True)
             self.app.mount('/', subapp)
-        self.wrap_middleware = self.app.middleware('http')
-        'Decorator, add middleware to APP.'
 
         # Middleware
+        self.wrap_middleware = self.app.middleware('http')
+        'Decorator, add middleware to APP.'
         self.app.add_middleware(GZipMiddleware)
         if not debug:
             self.app.add_middleware(HTTPSRedirectMiddleware)
-        self.__add_default_middleware()
+        self.__add_base_middleware()
 
         # API.
         self.is_started_auth: bool = False
@@ -185,19 +178,19 @@ class Server(ServerBase, Singleton):
         return lifespan
 
 
-    def __add_default_middleware(self) -> None:
+    def __add_base_middleware(self) -> None:
         """
-        Add default handle middleware.
+        Add base middleware.
         """
 
         # Add.
         @self.wrap_middleware
-        async def middleware(
+        async def base_middleware(
             request: Request,
             call_next: Callable[[Request], Coroutine[None, None, _StreamingResponse]]
         ) -> _StreamingResponse:
             """
-            Default handle middleware.
+            Base middleware.
 
             Parameters
             ----------
@@ -217,6 +210,8 @@ class Server(ServerBase, Singleton):
                 and request.method == 'POST'
             ):
                 response.status_code = 201
+            elif response.status_code == 401:
+                response.headers.setdefault('WWW-Authenticate', 'Bearer')
 
             return response
 
@@ -234,6 +229,9 @@ class Server(ServerBase, Singleton):
         )
 
 
+    __call__ = run
+
+
     def set_doc(
         self,
         version: str | None = None,
@@ -273,50 +271,11 @@ class Server(ServerBase, Singleton):
         """
         Add base API.
         """
-        from fastapi import Request
-        @self.app.get('/test')
-        async def test(request: Request) -> str:
-            return 'test'
-
 
-    def add_api_admin(self) -> None:
-        """
-        Add admin API.
-        """
+        from .rbase import router_base
 
         # Add.
-        self.admin = radmin.ServerAdmin(self)
-
-
-    def add_admin_model(
-        self,
-        model: Type['radmin.ServerAdminModel'] | type[rorm.Model],
-        engine: DatabaseEngineAsync | str = None,
-        label: str | None = None,
-        name: str | None = None,
-        column: str | Sequence[str] | None = None,
-        **attrs: Any
-    ) -> None:
-        """
-        Add admin model type.
-
-        Parameters
-        ----------
-        model : Model type.
-            - `type[rorm.Model]`: Define as `ServerAdminModel`.
-        engine : Database engine or name.
-        label : Admin model class label.
-        name : Admin model name.
-        column : Admin model display column names.
-        attrs : Other admin model attributes.
-        """
-
-        # Check.
-        if not hasattr(self, 'admin'):
-            return
-
-        # Add.
-        self.admin.add_model(model, engine, label, name, column, **attrs)
+        self.app.include_router(router_base, tags=['test'])
 
 
     def add_api_auth(self, key: str | None = None, sess_seconds: int = 28800) -> None:
@@ -331,16 +290,7 @@ class Server(ServerBase, Singleton):
         sess_seconds : Session valid seconds.
         """
 
-        from .rauth import (
-            DatabaseORMTableUser,
-            DatabaseORMTableRole,
-            DatabaseORMTablePerm,
-            DatabaseORMTableUserRole,
-            DatabaseORMTableRolePerm,
-            build_auth_db,
-            auth_router,
-            depend_auth
-        )
+        from .rauth import build_db_auth, router_auth
 
         # Parameter.
         if key is None:
@@ -350,21 +300,14 @@ class Server(ServerBase, Singleton):
         if 'auth' not in self.db:
             throw(AssertionError, self.db)
         engine = self.db.auth
-        build_auth_db(engine)
+        build_db_auth(engine)
 
         # Add.
         self.api_auth_key = key
         self.api_auth_sess_seconds = sess_seconds
-        self.app.include_router(auth_router, tags=['auth'])
+        self.app.include_router(router_auth, tags=['auth'])
         self.is_started_auth = True
 
-        ## Admin.
-        self.add_admin_model(DatabaseORMTableUser, engine, category='auth', name='User', column_list=['user_id', 'name'])
-        self.add_admin_model(DatabaseORMTableRole, engine, category='auth', name='Role', column_list=['role_id', 'name'])
-        self.add_admin_model(DatabaseORMTablePerm, engine, category='auth', name='Perm', column_list=['perm_id', 'name'])
-        self.add_admin_model(DatabaseORMTableUserRole, engine, category='auth', name='User Role')
-        self.add_admin_model(DatabaseORMTableRolePerm, engine, category='auth', name='Role Perm')
-
 
     def add_api_file(self, file_dir: str = 'file') -> None:
         """
@@ -374,26 +317,40 @@ class Server(ServerBase, Singleton):
         Parameters
         ----------
         file_dir : File API store directory path.
-        prefix : File API path prefix.
         """
 
-        from .rfile import (
-            build_file_db,
-            file_router,
-            DatabaseORMTableInfo,
-            DatabaseORMTableData
-        )
+        from .rfile import build_db_file, router_file
 
         # Database.
         if 'file' not in self.db:
             throw(AssertionError, self.db)
         engine = self.db.file
-        build_file_db(engine)
+        build_db_file(engine)
 
         # Add.
         self.api_file_dir = file_dir
-        self.app.include_router(file_router, tags=['file'])
+        self.app.include_router(router_file, tags=['file'], dependencies=(Bind.token,))
+
+
+async def depend_server(request: Request) -> Server:
+    """
+    Dependencie function of now Server instance.
+
+    Parameters
+    ----------
+    request : Request.
+
+    Returns
+    -------
+    Server.
+    """
+
+    # Get.
+    app: FastAPI = request.app
+    server = app.extra['server']
+
+    return server
+
 
-        ## Admin.
-        self.add_admin_model(DatabaseORMTableInfo, engine, category='file', name='Info', column_list=['file_id', 'name'])
-        self.add_admin_model(DatabaseORMTableData, engine, category='file', name='Data')
+Bind.Server = Server
+Bind.server = Bind.Depend(depend_server)

{reyserver-1.1.60.dist-info → reyserver-1.1.62.dist-info}/METADATA

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

reyserver-1.1.62.dist-info/RECORD

@@ -0,0 +1,11 @@
+reyserver/__init__.py,sha256=7GX64p7uI2eetJH9NJ-DTg-8iyQwOsGcviADFJCPxVA,373
+reyserver/rall.py,sha256=riyDRTUsigco_Bee1H4aZFb8IgvjnxdX9qcnVb9i9mE,270
+reyserver/rauth.py,sha256=JGo5lLTRGoP1SFPyQA-Q5EE-O3OU_86Mb3pvwhvFu-w,15125
+reyserver/rbase.py,sha256=0ECJ1zuUpJhwaNc0u5GvR5VyGxIAnKQep-EdotwnLoE,7752
+reyserver/rclient.py,sha256=og5YuWm-PODkFn9njBwYQpGlk0j1BfqFuEarlCFSQYI,6229
+reyserver/rfile.py,sha256=6H5_7B9aiA3F56VToQDI9Trarkrl9gcIuFqYyCVCiCU,8877
+reyserver/rserver.py,sha256=UQXzYKS-xdH1zRfLQIiZn253kqONWhBzZ4QGLu6GEoQ,9537
+reyserver-1.1.62.dist-info/METADATA,sha256=RaK-segYQBiE3SqVbECLENKHd-1TOQFeYarUhtt6huI,1666
+reyserver-1.1.62.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.62.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.62.dist-info/RECORD,,

reyserver/radmin.py

@@ -1,171 +0,0 @@
-# !/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""
-@Time    : 2025-10-14
-@Author  : Rey
-@Contact : reyxbo@163.com
-@Explain : Admin methods.
-"""
-
-
-from typing import Any, Type
-from collections.abc import Sequence
-from sqlalchemy.ext.asyncio import async_sessionmaker
-from fastapi import Request
-from sqladmin import Admin, ModelView
-from sqladmin.authentication import AuthenticationBackend
-from reydb import DatabaseEngineAsync, rorm
-from reykit.rbase import Singleton
-
-from .rbase import ServerBase
-from . import rserver
-
-
-__all__ = (
-    'ServerAdminModel',
-    'ServerAdminModelView',
-    'ServerAdminModelViewStats',
-    'ServerAdmin'
-)
-
-
-class ServerAdminModel(ServerBase, ModelView):
-    """
-    Server admin model type.
-    """
-
-
-class ServerAdminModelView(ServerAdminModel):
-    """
-    Server admin view model type.
-    """
-
-    category = 'View'
-    can_view_details = can_edit = can_create = can_delete = False
-
-
-class ServerAdminModelViewStats(ServerAdminModelView):
-    """
-    Server admin stats view model type.
-    """
-
-    column_list = ['item', 'value', 'comment']
-
-
-# class ServerAdminAuthentication(ServerAdmin, AuthenticationBackend):
-#     """
-#     Server admin authentication type.
-#     """
-
-
-#     async def authenticate(self, request: Request) -> bool:
-#         """
-#         Authenticate request.
-
-#         Parameters
-#         ----------
-#         request : Request.
-#         """
-
-#         # 
-#         ...
-#         request.session['token']
-#         ...
-
-
-#     async def login(self, request: Request) -> bool:
-#         form = await request.form()
-#         form['username']
-#         form['password']
-#         ...
-#         request.session['token'] = ...
-#         ...
-
-
-#     async def logout(self, request: Request) -> None:
-#         request.session.clear()
-
-
-class ServerAdmin(ServerBase, Singleton):
-    """
-    Server admin type, singleton mode.
-    """
-
-
-    def __init__(self, server: 'rserver.Server') -> None:
-        """
-        Build instance attributes.
-
-        Parameters
-        ----------
-        server : Server.
-        """
-
-        # Build.
-        self.server = server
-
-        ## Admin.
-        self.api_admin_binds: dict[ServerAdminModel, DatabaseEngineAsync] = {}
-        'Admin API model bind database engine dictionary.'
-        Session = async_sessionmaker()
-        Session.configure(binds=self.api_admin_binds)
-        auth = self.__create_auth()
-        self.admin = Admin(
-            self.server.app,
-            session_maker=Session,
-            authentication_backend=auth
-        )
-
-
-
-    def add_model(
-        self,
-        model: Type[ServerAdminModel] | type[rorm.Model],
-        engine: DatabaseEngineAsync | str = None,
-        label: str | None = None,
-        name: str | None = None,
-        column: str | Sequence[str] | None = None,
-        **attrs: Any
-    ) -> None:
-        """
-        Add admin model type.
-
-        Parameters
-        ----------
-        model : Model type.
-            - `type[rorm.Model]`: Define as `ServerAdminModel`.
-        engine : Database engine or name.
-        label : Admin model class label.
-        name : Admin model name.
-        column : Admin model display column names.
-        attrs : Other admin model attributes.
-        """
-
-        # Parameter.
-        if issubclass(model, rorm.Model):
-            class ServerAdminModel_(ServerAdminModel, model=model): ...
-            model = ServerAdminModel_
-        if type(engine) == str:
-            engine = self.server.db[engine]
-        if label is not None:
-            model.category = label
-        if name is not None:
-            model.name = model.name_plural = name
-        if type(column) == str:
-            column = [column]
-        if column is not None:
-            model.column_list = list(column)
-        for key, value in attrs.items():
-            setattr(model, key, value)
-
-        # Add.
-        self.api_admin_binds[model.model] = engine.engine
-        self.admin.add_view(model)
-
-
-# Simple path.
-
-## Server admin model type.
-View = ServerAdminModelView
-ViewStats = ServerAdminModelViewStats

reyserver-1.1.60.dist-info/RECORD

@@ -1,12 +0,0 @@
-reyserver/__init__.py,sha256=Oq-lOcQInzhgKt1_4OB2jNx0OO2d9qZg9iZqUx6YRr8,398
-reyserver/radmin.py,sha256=0nOEBd1vFDn0annjiGXi3TN9C6Vofpb8W_UfXj5TuhM,4257
-reyserver/rall.py,sha256=MI1NnqUpq22CK9w3XPPBS0K8lNuf0BnbI0pn4MGMx38,293
-reyserver/rauth.py,sha256=KgHWuRmqmxMoeNFCvCpdxb0S5uv7VH75M0vuMrZTOt8,15111
-reyserver/rbase.py,sha256=kzSbo6yoPlWquR6XiseTKi5hEbllaG3qVmmwnnKKac0,6898
-reyserver/rclient.py,sha256=VDUqQMVUTGzmZ8kjiMet2_zEt0_Siw0gyQkqHRIZ594,6281
-reyserver/rfile.py,sha256=0wS-ohsAOGcSCg07U66wpqJlxnCLWN6gkEQJK4qavWQ,8877
-reyserver/rserver.py,sha256=mjc-SeE2RZZwB5Z1nUSMo_VMign3VcftIK1Kv7XIne8,11484
-reyserver-1.1.60.dist-info/METADATA,sha256=JuZnt-TPamZk_dtV07w4aEm6cT5fZa3Js146QUa6wNI,1666
-reyserver-1.1.60.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.60.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.60.dist-info/RECORD,,