reyserver 1.1.43__py3-none-any.whl → 1.1.45__py3-none-any.whl

reyserver/__init__.py

@@ -15,3 +15,6 @@ rclient : Client methods.
 rfile : File methods.
 rserver : Server methods.
 """
+
+
+from .rserver import Server

reyserver/rbase.py

@@ -12,18 +12,17 @@
 from typing import Sequence
 from inspect import iscoroutinefunction
 from contextlib import asynccontextmanager
-from fastapi import FastAPI, Depends
+from fastapi import FastAPI
+from reykit.rbase import CoroutineFunctionSimple, Base, ConfigMeta
 
-from reydb import DatabaseEngineAsync
-from reydb.rconn import DatabaseConnectionAsync
-from reydb.rorm import DatabaseORMSessionAsync
-from reykit.rbase import CoroutineFunctionSimple, Base, is_iterable
+from . import rserver
 
 
 __all__ = (
     'ServerBase',
-    'ServerAPI',
-    'create_lifespan'
+    'ServerConfig',
+    'create_lifespan',
+    'create_depend_sess'
 )
 
 
@@ -33,11 +32,14 @@ class ServerBase(Base):
     """
 
 
-class ServerAPI(ServerBase):
+class ServerConfig(ServerBase, metaclass=ConfigMeta):
     """
-    Server API type.
+    Config type.
     """
 
+    server: 'rserver.Server'
+    'Server instance.'
+
 
 def create_lifespan(
     before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
@@ -86,34 +88,31 @@ def create_lifespan(
     return lifespan
 
 
-# def create_depend_conn(db: DatabaseEngineAsync):
-#     """
-#     Create dependencie function of asynchronous database connection.
+def create_depend_sess(database: str):
+    """
+    Create dependencie function of asynchronous database session.
 
-#     Parameters
-#     ----------
-#     db : Asynchronous database instance.
-#     """
+    Parameters
+    ----------
+    database : Database name.
 
+    Returns
+    -------
+    Dependencie function.
+    """
 
-#     @asynccontextmanager
-#     async def lifespan(app: FastAPI):
-#         """
-#         Server lifespan manager.
 
-#         Parameters
-#         ----------
-#         app : Server APP.
-#         """
+    async def depend_sess():
+        """
+        Dependencie function of asynchronous database session.
+        """
 
-#         # Before.
-#         for task in before:
-#             await task()
-#         yield
+        # Parameter.
+        engine = ServerConfig.server.db[database]
 
-#         # After.
-#         for task in after:
-#             await after()
+        # Context.
+        async with engine.orm.session() as sess:
+            yield sess
 
 
-#     return lifespan
+    return depend_sess

reyserver/rclient.py

@@ -9,7 +9,10 @@
 """
 
 
-from rbase import ServerBase
+from reykit.ros import File, get_md5
+from reykit.rnet import join_url, request
+
+from .rbase import ServerBase
 
 
 __all__ = (
@@ -36,7 +39,61 @@ class ServerClient(ServerBase):
         self.url = url
 
 
-    def upload_file(self): ...
+    def upload_file(
+        self,
+        source: str | bytes,
+        name: str | None = None,
+        note: str | None = None
+    ) -> int:
+        """
+        Upload file.
+
+        Parameters
+        ----------
+        source : File path or file bytes.
+        name : File name.
+            - `None`: Automatic set.
+                `parameter 'file' is 'str'`: Use path file name.
+                `parameter 'file' is 'bytes'`: No name.
+            - `str`: Use this name.
+        note : File note.
+
+        Returns
+        -------
+        File ID.
+        """
+
+        # Handle parameter.
+        url = join_url(self.url, 'file', 'upload')
+        match source:
+
+            ## File path.
+            case str():
+                file = File(source)
+                file_bytes = file.bytes
+                file_name = file.name_suffix
+
+            ## File bytes.
+            case bytes() | bytearray():
+                if type(source) == bytearray:
+                    source = bytes(source)
+                file_bytes = source
+                file_name = None
+
+        ## File name.
+        if name is not None:
+            file_name = name
+
+        # Upload.
+        data = {'name': file_name, 'note': note}
+        files = {'file': file_bytes}
+        response = request(url, data=data, files=files, check=True)
+
+        ## Extract.
+        response_json = response.json()
+        file_id = response_json['file_id']
+
+        return file_id
 
 
     def download_file(self): ...

reyserver/rfile.py

@@ -11,16 +11,16 @@
 
 from typing import Annotated
 from fastapi import APIRouter, Form, File, UploadFile, Depends
-from reydb import rorm, DatabaseEngineAsync
+from reydb import rorm
 from reykit.ros import FileStore, get_md5
 
-from .rbase import ServerAPI
+from .rbase import ServerConfig, create_depend_sess
 
 
 __all__ = (
     'DatabaseORMTableInfo',
     'DatabaseORMTableData',
-    'ServerAPIFile'
+    'build_file_db'
 )
 
 
@@ -50,232 +50,179 @@ class DatabaseORMTableData(rorm.Model, table=True):
     path: str = rorm.Field(rorm.types.VARCHAR(4095), not_null=True, comment='File disk storage path.')
 
 
-class ServerAPIFile(ServerAPI):
-    """
-    Server File API type.
-    Can create database used `self.build_db` method.
-    """
-
-
-    def __init__(
-        self,
-        db_engine: DatabaseEngineAsync,
-        path: str = 'file'
-    ) -> None:
-        """
-        Build instance attributes.
-
-        Parameters
-        ----------
-        db_engine : Asynchronous database instance.
-        path: File store directory.
-        """
-
-        # Build.
-        self.db_engine = db_engine
-        self.path = path
-
-        ## Router.
-        self.router = self.__create_router()
-
-        ## Build Database.
-        self.build_db()
-
-
-    async def depend_sess(self):
-        """
-        Dependencie function of asynchronous database session.
-        """
-
-        # Context.
-        async with self.db_engine.orm.session() as sess:
-            yield sess
-
-
-    def __create_router(self) -> APIRouter:
-        """
-        Add APIs to router.
-
-        Returns
-        -------
-        Router.
-        """
-
-        # Parameter.
-        router = APIRouter()
-
+file_router = APIRouter()
+depend_sess_file = create_depend_sess('file')
 
-        @router.post('/upload')
-        async def upload(
-            file: Annotated[UploadFile, File()],
-            note: Annotated[str, Form()],
-            sess: Annotated[rorm.DatabaseORMSessionAsync, Depends(self.depend_sess)]
-        ):
-            """
-            Upload file.
 
-            Parameters
-            ----------
-            file : File instance.
-            note : File note.
-            sess : Asynchronous database session.
-            """
-
-            # Handle parameter.
-            file_store = FileStore(self.path)
-            file_name = file.filename
-            file_bytes = await file.read()
-            file_md5 = get_md5(file_bytes)
-            file_size = len(file_bytes)
+@file_router.post('/upload')
+async def upload(
+    file: Annotated[UploadFile, File()],
+    name: Annotated[str, Form()],
+    note: Annotated[str, Form()],
+    sess: Annotated[rorm.DatabaseORMSessionAsync, Depends(depend_sess_file)]
+):
+    """
+    Upload file.
 
-            # Upload.
-            file_path = file_store.index(file_md5)
+    Parameters
+    ----------
+    file : File instance.
+    note : File note.
+    sess : Asynchronous database session.
+    """
 
-            ## Data.
-            if file_path is None:
-                file_path = file_store.store(file_bytes)
-                table_data = DatabaseORMTableData(
-                    md5=file_md5,
-                    size=file_size,
-                    path=file_path
-                )
-                await sess.add(table_data)
+    # Handle parameter.
+    file_store = FileStore(ServerConfig.server.api_file_dir)
+    file_bytes = await file.read()
+    file_md5 = get_md5(file_bytes)
+    file_size = len(file_bytes)
+
+    # Upload.
+    file_path = file_store.index(file_md5)
+
+    ## Data.
+    if file_path is None:
+        file_path = file_store.store(file_bytes)
+        table_data = DatabaseORMTableData(
+            md5=file_md5,
+            size=file_size,
+            path=file_path
+        )
+        await sess.add(table_data)
+
+    ## Information.
+    table_info = DatabaseORMTableInfo(
+        md5=file_md5,
+        name=name,
+        note=note
+    )
+    await sess.add(table_info)
+
+    # Get ID.
+    await sess.flush()
+    file_id = table_info.file_id
+
+    return {'file_id': file_id}
+
+
+def build_file_db() -> None:
+    """
+    Check and build `file` database tables.
+    """
 
-            ## Information.
-            table_info = DatabaseORMTableInfo(
-                md5=file_md5,
-                name=file_name,
-                note=note
+    # Set parameter.
+    engine = ServerConfig.server.db.file
+    database = engine.database
+
+    ## Table.
+    tables = [DatabaseORMTableInfo, DatabaseORMTableData]
+
+    ## View.
+    views = [
+        {
+            'path': 'data_info',
+            'select': (
+                'SELECT `b`.`last_time`, `a`.`md5`, `a`.`size`, `b`.`names`, `b`.`notes`\n'
+                f'FROM `{database}`.`data` AS `a`\n'
+                'LEFT JOIN (\n'
+                '    SELECT\n'
+                '        `md5`,\n'
+                "        GROUP_CONCAT(DISTINCT(`name`) ORDER BY `create_time` DESC SEPARATOR ' | ') AS `names`,\n"
+                "        GROUP_CONCAT(DISTINCT(`note`) ORDER BY `create_time` DESC SEPARATOR ' | ') AS `notes`,\n"
+                '        MAX(`create_time`) as `last_time`\n'
+                f'    FROM `{database}`.`info`\n'
+                '    GROUP BY `md5`\n'
+                '    ORDER BY `last_time` DESC\n'
+                ') AS `b`\n'
+                'ON `a`.`md5` = `b`.`md5`\n'
+                'ORDER BY `last_time` DESC'
             )
-            await sess.add(table_info)
-
-            # Get ID.
-            await sess.flush()
-            file_id = table_info.file_id
-
-            return {'file_id': file_id}
-
-
-        return router
-
-
-    def build_db(self) -> None:
-        """
-        Check and build database tables.
-        """
-
-        # Set parameter.
-        database = self.db_engine.database
-
-        ## Table.
-        tables = [DatabaseORMTableInfo, DatabaseORMTableData]
-
-        ## View.
-        views = [
-            {
-                'path': 'data_info',
-                'select': (
-                    'SELECT `b`.`last_time`, `a`.`md5`, `a`.`size`, `b`.`names`, `b`.`notes`\n'
-                    f'FROM `{database}`.`data` AS `a`\n'
-                    'LEFT JOIN (\n'
-                    '    SELECT\n'
-                    '        `md5`,\n'
-                    "        GROUP_CONCAT(DISTINCT(`name`) ORDER BY `create_time` DESC SEPARATOR ' | ') AS `names`,\n"
-                    "        GROUP_CONCAT(DISTINCT(`note`) ORDER BY `create_time` DESC SEPARATOR ' | ') AS `notes`,\n"
-                    '        MAX(`create_time`) as `last_time`\n'
-                    f'    FROM `{database}`.`info`\n'
-                    '    GROUP BY `md5`\n'
-                    '    ORDER BY `last_time` DESC\n'
-                    ') AS `b`\n'
-                    'ON `a`.`md5` = `b`.`md5`\n'
-                    'ORDER BY `last_time` DESC'
-                )
-            }
-        ]
-
-        ## View stats.
-        views_stats = [
-            {
-                'path': 'stats',
-                'items': [
-                    {
-                        'name': 'count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{database}`.`info`'
-                        ),
-                        'comment': 'File information count.'
-                    },
-                    {
-                        'name': 'past_day_count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{database}`.`info`\n'
-                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
-                        ),
-                        'comment': 'File information count in the past day.'
-                    },
-                    {
-                        'name': 'past_week_count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{database}`.`info`\n'
-                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
-                        ),
-                        'comment': 'File information count in the past week.'
-                    },
-                    {
-                        'name': 'past_month_count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{database}`.`info`\n'
-                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
-                        ),
-                        'comment': 'File information count in the past month.'
-                    },
-                    {
-                        'name': 'data_count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{database}`.`data`'
-                        ),
-                        'comment': 'File data unique count.'
-                    },
-                    {
-                        'name': 'total_size',
-                        'select': (
-                            'SELECT FORMAT(SUM(`size`), 0)\n'
-                            f'FROM `{database}`.`data`'
-                        ),
-                        'comment': 'File total byte size.'
-                    },
-                    {
-                        'name': 'avg_size',
-                        'select': (
-                            'SELECT FORMAT(AVG(`size`), 0)\n'
-                            f'FROM `{database}`.`data`'
-                        ),
-                        'comment': 'File average byte size.'
-                    },
-                    {
-                        'name': 'max_size',
-                        'select': (
-                            'SELECT FORMAT(MAX(`size`), 0)\n'
-                            f'FROM `{database}`.`data`'
-                        ),
-                        'comment': 'File maximum byte size.'
-                    },
-                    {
-                        'name': 'last_time',
-                        'select': (
-                            'SELECT MAX(`create_time`)\n'
-                            f'FROM `{database}`.`info`'
-                        ),
-                        'comment': 'File last record create time.'
-                    }
-                ]
-            }
-        ]
-
-        # Build.
-        self.db_engine.sync_database.build.build(tables=tables, views=views, views_stats=views_stats, skip=True)
+        }
+    ]
+
+    ## View stats.
+    views_stats = [
+        {
+            'path': 'stats',
+            'items': [
+                {
+                    'name': 'count',
+                    'select': (
+                        'SELECT COUNT(1)\n'
+                        f'FROM `{database}`.`info`'
+                    ),
+                    'comment': 'File information count.'
+                },
+                {
+                    'name': 'past_day_count',
+                    'select': (
+                        'SELECT COUNT(1)\n'
+                        f'FROM `{database}`.`info`\n'
+                        'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
+                    ),
+                    'comment': 'File information count in the past day.'
+                },
+                {
+                    'name': 'past_week_count',
+                    'select': (
+                        'SELECT COUNT(1)\n'
+                        f'FROM `{database}`.`info`\n'
+                        'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
+                    ),
+                    'comment': 'File information count in the past week.'
+                },
+                {
+                    'name': 'past_month_count',
+                    'select': (
+                        'SELECT COUNT(1)\n'
+                        f'FROM `{database}`.`info`\n'
+                        'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
+                    ),
+                    'comment': 'File information count in the past month.'
+                },
+                {
+                    'name': 'data_count',
+                    'select': (
+                        'SELECT COUNT(1)\n'
+                        f'FROM `{database}`.`data`'
+                    ),
+                    'comment': 'File data unique count.'
+                },
+                {
+                    'name': 'total_size',
+                    'select': (
+                        'SELECT FORMAT(SUM(`size`), 0)\n'
+                        f'FROM `{database}`.`data`'
+                    ),
+                    'comment': 'File total byte size.'
+                },
+                {
+                    'name': 'avg_size',
+                    'select': (
+                        'SELECT FORMAT(AVG(`size`), 0)\n'
+                        f'FROM `{database}`.`data`'
+                    ),
+                    'comment': 'File average byte size.'
+                },
+                {
+                    'name': 'max_size',
+                    'select': (
+                        'SELECT FORMAT(MAX(`size`), 0)\n'
+                        f'FROM `{database}`.`data`'
+                    ),
+                    'comment': 'File maximum byte size.'
+                },
+                {
+                    'name': 'last_time',
+                    'select': (
+                        'SELECT MAX(`create_time`)\n'
+                        f'FROM `{database}`.`info`'
+                    ),
+                    'comment': 'File last record create time.'
+                }
+            ]
+        }
+    ]
+
+    # Build.
+    engine.sync_engine.build.build(tables=tables, views=views, views_stats=views_stats, skip=True)

reyserver/rserver.py

@@ -9,18 +9,15 @@
 """
 
 
-from typing import Literal
+from collections.abc import Sequence
 from inspect import iscoroutinefunction
-from collections.abc import Sequence, Callable, Coroutine
+from uvicorn import run as uvicorn_run
 from fastapi import FastAPI, Depends
-from fastapi.middleware.gzip import GZipMiddleware
 from fastapi.staticfiles import StaticFiles
-from uvicorn import run as uvicorn_run
-from contextlib import asynccontextmanager
-from reykit.rbase import CoroutineFunctionSimple
+from reydb import DatabaseAsync
+from reykit.rbase import CoroutineFunctionSimple, Singleton, throw
 
-from .rbase import ServerBase, create_lifespan
-from .rfile import ServerAPIFile
+from .rbase import ServerBase, ServerConfig, create_lifespan
 
 
 __all__ = (
@@ -28,15 +25,17 @@ __all__ = (
 )
 
 
-class Server(ServerBase):
+class Server(ServerBase, Singleton):
     """
-    Server type.
+    Server type, singleton mode.
     Based on `fastapi` and `uvicorn` package.
+    Can view document api '/docs', '/redoc', '/openapi.json'.
     """
 
 
     def __init__(
         self,
+        db: DatabaseAsync,
         public: str | None = None,
         depend: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
         before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
@@ -49,15 +48,18 @@ class Server(ServerBase):
 
         Parameters
         ----------
+        db : Asynchronous database.
         public : Public directory.
         depend : Global api dependencies.
         before : Execute before server start.
         after : Execute after server end.
+        ssl_cert : SSL certificate file path.
+        ssl_key : SSL key file path.
         """
 
         # Parameter.
         if type(ssl_cert) != type(ssl_key):
-            raise
+            throw(AssertionError, ssl_cert, ssl_key)
         lifespan = create_lifespan(before, after)
         if depend is None:
             depend = ()
@@ -69,6 +71,8 @@ class Server(ServerBase):
         ]
 
         # Build.
+        ServerConfig.server = self
+        self.db = db
         self.ssl_cert = ssl_cert
         self.ssl_key = ssl_key
 
@@ -76,7 +80,7 @@ class Server(ServerBase):
         self.app = FastAPI(
             dependencies=depend,
             lifespan=lifespan,
-            debug=True
+            # debug=True
         )
 
         ## Static.
@@ -84,15 +88,15 @@ class Server(ServerBase):
             subapp = StaticFiles(directory=public, html=True)
             self.app.mount('/', subapp)
 
-        ## Middleware.
-        # self.app.add_middleware(GZipMiddleware)
-        # self.app.add_middleware(TrustedHostMiddleware)
-        # self.app.add_middleware(HTTPSRedirectMiddleware)
+        ## API.
+
+        ### File.
+        self.api_file_dir: str
 
 
     def run(self) -> None:
         """
-        Run.
+        Run server.
         """
 
         # Run.
@@ -110,7 +114,21 @@ class Server(ServerBase):
             return {'message': 'test'}
 
 
-    def add_api_file(self, db):
+    def add_api_file(self, file_dir: str = 'file') -> None:
+        """
+        Add file API.
+
+        Parameters
+        ----------
+        file_dir : File API store directory path.
+        prefix : File API path prefix.
+        """
+
+        from .rfile import file_router, build_file_db
+
+        # Build database.
+        build_file_db()
 
-        api = ServerAPIFile(db)
-        self.app.include_router(api.router, prefix='/file')
+        # Add.
+        self.api_file_dir = file_dir
+        self.app.include_router(file_router, prefix='/file')

{reyserver-1.1.43.dist-info → reyserver-1.1.45.dist-info}/METADATA

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

reyserver-1.1.45.dist-info/RECORD

@@ -0,0 +1,10 @@
+reyserver/__init__.py,sha256=JmDkcdP7oxmehE53rRRL_zhxmPinAbJRONpQp5qhsGI,340
+reyserver/rall.py,sha256=6vqacf9erEfVfK5sgGJMDXD1h4ebt5gDN7NrPdtELms,248
+reyserver/rbase.py,sha256=khBk6N0G33hstiisDWtz4Tdg1tvnFrGszOynBtnKxsI,2305
+reyserver/rclient.py,sha256=OjY_OEH_USrJK8TuCevXG6jNPVbM0lN-xMBozB7kSM8,2195
+reyserver/rfile.py,sha256=wf56tItty7Jbjcwvh1yMgcX2jlSSXAYbTDKnA5dI8Yw,7459
+reyserver/rserver.py,sha256=SfGs0W6StFtRtJ_UYI_avlL99euw7VvP55248mSOjLw,3387
+reyserver-1.1.45.dist-info/METADATA,sha256=N4nGN_EC1Czdd7Q5DIHr4mxM3NNiPQCgjDenIZJ25yg,1658
+reyserver-1.1.45.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.45.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.45.dist-info/RECORD,,

reyserver-1.1.43.dist-info/RECORD

@@ -1,10 +0,0 @@
-reyserver/__init__.py,sha256=pkrC_rbWwOScD1laT_5d_5qz1QZeLLu-qBqgWPqtvjI,307
-reyserver/rall.py,sha256=6vqacf9erEfVfK5sgGJMDXD1h4ebt5gDN7NrPdtELms,248
-reyserver/rbase.py,sha256=DYIQDlV7VOJHXgOExKP-I726nVoFSMWYDbf7UJWCMBQ,2402
-reyserver/rclient.py,sha256=QICmY52XSFTf16G-z0IsiO1jsXXWKIOdhpufYbfxkO0,641
-reyserver/rfile.py,sha256=8KOJcCBjNjgfma1Q_tTyWI6wGLUcfGlo1DkqTv2mZBE,9244
-reyserver/rserver.py,sha256=M9pNnZy6tENu8B0hphcsMA0nHI8lHlR6gKbZ6YAfYrM,2939
-reyserver-1.1.43.dist-info/METADATA,sha256=XjtSDclS4UBbXh55dn--OWtnQsg6ECH0HcI0JPyi2Ig,1658
-reyserver-1.1.43.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.43.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.43.dist-info/RECORD,,