reyserver 1.1.54__py3-none-any.whl → 1.1.56__py3-none-any.whl

reyserver/rauth.py

@@ -11,7 +11,7 @@
 
 from typing import Any, Literal
 from datetime import datetime as Datetime
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 from reydb import rorm, DatabaseEngine, DatabaseEngineAsync
 from reykit.rdata import encode_jwt, is_hash_bcrypt
 from reykit.rtime import now, time_to
@@ -30,7 +30,7 @@ __all__ = (
 )
 
 
-class DatabaseORMTableUser(rorm.Model, table=True):
+class DatabaseORMTableUser(rorm.Table):
     """
     Database `user` table ORM model.
     """
@@ -48,7 +48,7 @@ class DatabaseORMTableUser(rorm.Model, table=True):
     is_valid: bool = rorm.Field(rorm.types_mysql.TINYINT(unsigned=True), field_default='1', not_null=True, comment='Is the valid.')
 
 
-class DatabaseORMTableRole(rorm.Model, table=True):
+class DatabaseORMTableRole(rorm.Table):
     """
     Database `role` table ORM model.
     """
@@ -62,7 +62,7 @@ class DatabaseORMTableRole(rorm.Model, table=True):
     desc: str = rorm.Field(rorm.types.VARCHAR(500), comment='Role description.')
 
 
-class DatabaseORMTablePerm(rorm.Model, table=True):
+class DatabaseORMTablePerm(rorm.Table):
     """
     Database `perm` table ORM model.
     """
@@ -77,7 +77,7 @@ class DatabaseORMTablePerm(rorm.Model, table=True):
     api: str = rorm.Field(rorm.types.VARCHAR(1000), comment='API resource path regular expression "match" pattern.')
 
 
-class DatabaseORMTableUserRole(rorm.Model, table=True):
+class DatabaseORMTableUserRole(rorm.Table):
     """
     Database `user_role` table ORM model.
     """
@@ -90,7 +90,7 @@ class DatabaseORMTableUserRole(rorm.Model, table=True):
     role_id: int = rorm.Field(rorm.types_mysql.SMALLINT(unsigned=True), key=True, comment='Role ID.')
 
 
-class DatabaseORMTableRolePerm(rorm.Model, table=True):
+class DatabaseORMTableRolePerm(rorm.Table):
     """
     Database `role_perm` table ORM model.
     """
@@ -197,8 +197,6 @@ def build_auth_db(engine: DatabaseEngine | DatabaseEngineAsync) -> None:
 
 
 auth_router = APIRouter()
-depend_auth_sess = Bind.create_depend_db('auth', 'sess')
-depend_auth_conn = Bind.create_depend_db('auth', 'conn')
 
 
 @auth_router.post('/sessions')
@@ -206,7 +204,7 @@ async def create_sessions(
     account: str = Bind.i.body,
     password: str = Bind.i.body,
     account_type: Literal['name', 'email', 'phone'] = Bind.Body('name'),
-    conn: Bind.Conn = depend_auth_conn
+    conn: Bind.Conn = Bind.conn.auth
 ) -> dict:
     """
     Create session.
@@ -300,3 +298,6 @@ async def create_sessions(
     data = {'token': token}
 
     return data
+
+
+def has_auth(request: Request) -> bool: ...

reyserver/rbase.py

@@ -9,7 +9,7 @@
 """
 
 
-from typing import Literal, NoReturn
+from typing import NoReturn, overload
 from http import HTTPStatus
 from fastapi import HTTPException, UploadFile as File
 from fastapi.params import (
@@ -35,6 +35,10 @@ __all__ = (
     'ServerExit',
     'ServerExitAPI',
     'exit_api',
+    'ServerBindInstanceDatabaseSuper',
+    'ServerBindInstanceDatabaseConnection',
+    'ServerBindInstanceDatabaseSession',
+    'ServerBindInstance',
     'ServerBind',
     'Bind'
 )
@@ -89,6 +93,71 @@ def exit_api(code: int = 400, text: str | None = None) -> NoReturn:
     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():
+            """
+            Dependencie function of asynchronous database.
+            """
+
+            # Parameter.
+            engine = ServerConfig.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.
+    """
+
+
+class ServerBindInstanceDatabaseSession(ServerBindInstanceDatabaseSuper, Singleton):
+    """
+    Server API bind parameter build database session instance type.
+    """
+
+
 class ServerBindInstance(ServerBase, Singleton):
     """
     Server API bind parameter build instance type.
@@ -256,47 +325,6 @@ class ServerBind(ServerBase, metaclass=StaticMeta):
     Server API bind parameter type.
     """
 
-
-    def create_depend_db(database: str, mode: Literal['sess', 'conn']) -> Depends:
-        """
-        Create dependencie type of asynchronous database.
-
-        Parameters
-        ----------
-        database : Database name.
-        mode : Mode.
-            - `Literl['sess']`: Create ORM session instance.
-            - `Literl['conn']`: Create connection instance.
-
-        Returns
-        -------
-        Dependencie type.
-        """
-
-
-        async def depend_db():
-            """
-            Dependencie function of asynchronous database.
-            """
-
-            # Parameter.
-            engine = ServerConfig.server.db[database]
-
-            # Context.
-            if mode == 'sess':
-                async with engine.orm.session() as sess:
-                    yield sess
-            elif mode == 'conn':
-                async with engine.connect() as conn:
-                    yield conn
-
-
-        # Create.
-        depend = Depends(depend_db)
-
-        return depend
-
-
     Depend = Depends
     Path = Path
     Query = Query
@@ -310,6 +338,8 @@ class ServerBind(ServerBase, metaclass=StaticMeta):
     Conn = DatabaseConnectionAsync
     Sess = DatabaseORMSessionAsync
     i = ServerBindInstance()
+    conn = ServerBindInstanceDatabaseConnection()
+    sess = ServerBindInstanceDatabaseSession()
 
 
 Bind = ServerBind

reyserver/rfile.py

@@ -25,7 +25,7 @@ __all__ = (
 )
 
 
-class DatabaseORMTableInfo(rorm.Model, table=True):
+class DatabaseORMTableInfo(rorm.Table):
     """
     Database `info` table ORM model.
     """
@@ -39,7 +39,7 @@ class DatabaseORMTableInfo(rorm.Model, table=True):
     note: str = rorm.Field(rorm.types.VARCHAR(500), comment='File note.')
 
 
-class DatabaseORMTableData(rorm.Model, table=True):
+class DatabaseORMTableData(rorm.Table):
     """
     Database `data` table ORM model.
     """
@@ -178,14 +178,12 @@ def build_file_db(engine: DatabaseEngine | DatabaseEngineAsync) -> None:
 
 
 file_router = APIRouter()
-depend_file_sess = Bind.create_depend_db('file', 'sess')
-depend_file_conn = Bind.create_depend_db('file', 'conn')
 
 
 @file_router.get('/files/{file_id}')
 async def get_file_info(
     file_id: int = Bind.i.path,
-    sess: Bind.Sess = depend_file_sess
+    sess: Bind.Sess = Bind.sess.file
 ) -> DatabaseORMTableInfo:
     """
     Get file information.
@@ -214,7 +212,7 @@ async def upload_file(
     file: Bind.File = Bind.i.forms,
     name: str = Bind.i.forms_n,
     note: str = Bind.i.forms_n,
-    sess: Bind.Sess = depend_file_sess
+    sess: Bind.Sess = Bind.sess.file
 ) -> DatabaseORMTableInfo:
     """
     Upload file.
@@ -266,7 +264,7 @@ async def upload_file(
 @file_router.get('/files/{file_id}/download')
 async def download_file(
     file_id: int = Bind.i.path,
-    conn: Bind.Conn = depend_file_conn
+    conn: Bind.Conn = Bind.conn.file
 ) -> FileResponse:
     """
     Download file.

reyserver/rserver.py

@@ -159,7 +159,7 @@ class Server(ServerBase, Singleton):
             for task in before:
                 await task()
 
-            # Databse.
+            ## Databse.
             if db_warm:
                 await self.db.warm_all()
 
@@ -170,7 +170,7 @@ class Server(ServerBase, Singleton):
             for task in after:
                 await after()
 
-            # Database.
+            ## Database.
             await self.db.dispose_all()
 
 

{reyserver-1.1.54.dist-info → reyserver-1.1.56.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reyserver
-Version: 1.1.54
+Version: 1.1.56
 Summary: Backend server method set.
 Project-URL: homepage, https://github.com/reyxbo/reyserver/
 Author-email: Rey <reyxbo@163.com>
@@ -19,6 +19,7 @@ Requires-Dist: fastapi
 Requires-Dist: python-multipart
 Requires-Dist: reydb
 Requires-Dist: reykit
+Requires-Dist: sqladmin
 Requires-Dist: uvicorn[standard]
 Description-Content-Type: text/markdown
 

reyserver-1.1.56.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=pOkA7E4W31Ii8iCLkhhcoL5-ge9cFq7lMYxQtLYvQbg,11606
+reyserver/rbase.py,sha256=WbL2W6nc2jbkDumiXWrb25TaAhT-9xAI4wE0e_2prtg,6553
+reyserver/rclient.py,sha256=IWZ3smyIP0_YJrfSrM8JFCr0FCtN02AyT3hp8YuSsDQ,5103
+reyserver/rfile.py,sha256=CH2uJbBNmBH9ISDirn1LWL5wsjGW5xjB9ZIrdc5UzL0,8864
+reyserver/rserver.py,sha256=0lCvaac7N-A25vbrNAbQKQoWFqvxMNlHtMfnoVoGX0I,8563
+reyserver-1.1.56.dist-info/METADATA,sha256=M5Ocw__l3_sN1Pso7TryMu2505S-B82fOJ7uevyOIN0,1713
+reyserver-1.1.56.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.56.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.56.dist-info/RECORD,,

reyserver-1.1.54.dist-info/RECORD

@@ -1,11 +0,0 @@
-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=jgjAkT1kxzVKB60xfWxZbnQJsehhcTBr24AclTYjc4g,5603
-reyserver/rclient.py,sha256=IWZ3smyIP0_YJrfSrM8JFCr0FCtN02AyT3hp8YuSsDQ,5103
-reyserver/rfile.py,sha256=bvuXOYO3UDM1jMiyNzQDz56_0ekZUEIRcfNFAhGgdUY,9010
-reyserver/rserver.py,sha256=EDIspT0uWhiWl7uIhRDJtcxRvZG96GaVNWYik7pprz4,8561
-reyserver-1.1.54.dist-info/METADATA,sha256=xajKdcgwZ5ajkYubVO_TXjA1dL1KY6xH_36zokahzbA,1689
-reyserver-1.1.54.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.54.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.54.dist-info/RECORD,,