reyserver 1.1.37__py3-none-any.whl → 1.1.39__py3-none-any.whl

reyserver/rbase.py

@@ -9,12 +9,17 @@
 """
 
 
-from reykit.rbase import Base
+from typing import Sequence
+from inspect import iscoroutinefunction
+from contextlib import asynccontextmanager
+from fastapi import FastAPI
+from reykit.rbase import CoroutineFunctionSimple, Base, is_iterable
 
 
 __all__ = (
     'ServerBase',
-    'ServerAPI'
+    'ServerAPI',
+    'generate_lifespan'
 )
 
 
@@ -28,3 +33,50 @@ class ServerAPI(ServerBase):
     """
     Server API type.
     """
+
+
+def generate_lifespan(
+    before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
+    after: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
+):
+    """
+    Generate function of lifespan manager.
+
+    Parameters
+    ----------
+    before : Execute before server start.
+    after : Execute after server end.
+    """
+
+    # Parameter.
+    if before is None:
+        before = ()
+    elif iscoroutinefunction(before):
+        before = (before,)
+    if after is None:
+        after = ()
+    elif iscoroutinefunction(after):
+        after = (after,)
+
+    # Define.
+    @asynccontextmanager
+    async def lifespan(app: FastAPI):
+        """
+        Server lifespan manager.
+
+        Parameters
+        ----------
+        app : Server APP.
+        """
+
+        # Before.
+        for task in before:
+            await task()
+        yield
+
+        # After.
+        for task in after:
+            await after()
+
+
+    return lifespan

reyserver/rdb.py

@@ -0,0 +1,11 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@Time    : 2025-10-07 18:03:06
+@Author  : Rey
+@Contact : reyxbo@163.com
+@Explain : Database methods.
+"""
+
+

reyserver/rfile.py

@@ -5,45 +5,32 @@
 @Time    : 2025-10-06 18:23:51
 @Author  : Rey
 @Contact : reyxbo@163.com
-@Explain : File methods.
+@Explain : File methods. Can create database used `self.build_db` function.
 """
 
 
 from fastapi import APIRouter
 from reydb import rorm
+from reydb.rdb import DatabaseAsync
 
 from . import rserver
 from .rbase import ServerAPI
 
 
 __all__ = (
-    'ServerAPIFile',
+    'file_router',
+    'DatabaseORMTableInfo',
+    'DatabaseORMTableData',
+    'build_file_db'
 )
 
 
-# class ServerAPIFile(ServerAPI):
-#     """
-#     Server File API type.
-#     """
-
-
-#     def __init__(self, server: 'rserver.Server') -> None:
-#         """
-#         Build instance attributes.
-
-#         Parameters
-#         ----------
-#         server : Server instance.
-#         """
-
-#         # Build.
-#         self.server = server
-
+file_router = APIRouter()
 
 
 class DatabaseORMTableInfo(rorm.Model, table=True):
     """
-    Database `info` table model.
+    Database `info` table ORM model.
     """
 
     __name__ = 'info'
@@ -57,7 +44,7 @@ class DatabaseORMTableInfo(rorm.Model, table=True):
 
 class DatabaseORMTableData(rorm.Model, table=True):
     """
-    Database `data` table model.
+    Database `data` table ORM model.
     """
 
     __name__ = 'data'
@@ -67,13 +54,218 @@ class DatabaseORMTableData(rorm.Model, table=True):
     path: str = rorm.Field(rorm.types.VARCHAR(4095), not_null=True, comment='File disk storage path.')
 
 
-router = APIRouter()
+def build_file_db(db: DatabaseAsync) -> None:
+    """
+    Check and build all standard databases and tables, by `self.db_names`.
+
+    Parameters
+    db : Asynchronous database instance.
+    """
+
+    # Set parameter.
+    database = db.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.
+    db.build.build(tables=tables, views=views, views_stats=views_stats)
+
+
+@file_router.post('/upload')
+def upload(
+    source: 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.
+    conn = self.db.connect()
+    match source:
+
+        ## File path.
+        case str():
+            file = File(source)
+            file_bytes = file.bytes
+            file_md5 = get_md5(file_bytes)
+            file_name = file.name_suffix
+
+        ## File bytes.
+        case bytes() | bytearray():
+            if type(source) == bytearray:
+                source = bytes(source)
+            file_bytes = source
+            file_md5 = get_md5(file_bytes)
+            file_name = None
+
+    ## File name.
+    if name is not None:
+        file_name = name
+
+    ## File size.
+    file_size = len(file_bytes)
+
+    # Exist.
+    exist = conn.execute.exist(
+        (self.db_names['file'], self.db_names['file.data']),
+        '`md5` = :file_md5',
+        file_md5=file_md5
+    )
+
+    # Upload.
 
+    ## Data.
+    if not exist:
+        data = {
+            'md5': file_md5,
+            'size': file_size,
+            'bytes': file_bytes
+        }
+        conn.execute.insert(
+            (self.db_names['file'], self.db_names['file.data']),
+            data,
+            'ignore'
+        )
 
+    ## Information.
+    data = {
+        'md5': file_md5,
+        'name': file_name,
+        'note': note
+    }
+    conn.execute.insert(
+        (self.db_names['file'], self.db_names['file.information']),
+        data
+    )
 
-@router.get('/{file_id}')
-def get_file_info(): ...
+    # Get ID.
+    file_id = conn.insert_id
 
-@router.get('/{}/bytes')
-def get_file_bytes(): ...
+    # Commit.
+    conn.commit()
 
+    return file_id

reyserver/rserver.py

@@ -10,15 +10,16 @@
 
 
 from typing import Literal
+from inspect import iscoroutinefunction
 from collections.abc import Sequence, Callable, Coroutine
-from fastapi import FastAPI
+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 .rbase import ServerBase
-from .rfile import ServerAPIFile
+from .rbase import ServerBase, generate_lifespan
 
 
 __all__ = (
@@ -49,31 +50,43 @@ class Server(ServerBase):
         ----------
         public : Public directory.
         depend : Global api dependencies.
-        before : Before 
+        before : Execute before server start.
+        after : Execute after server end.
         """
 
         # Parameter.
         if type(ssl_cert) != type(ssl_key):
             raise
+        lifespan = generate_lifespan(before, after)
+        if iscoroutinefunction(depend):
+            depend = (depend,)
+        dependencies = [
+            Depends(depend)
+            for task in depend
+        ]
 
         # Build.
-        self.app = FastAPI()
-        # self.index = Folder(public) + 'index.html'
         self.ssl_cert = ssl_cert
         self.ssl_key = ssl_key
 
-        ## Middleware.
-        self.app.add_middleware(GZipMiddleware)
-        # self.app.add_middleware(TrustedHostMiddleware)
-        # self.app.add_middleware(HTTPSRedirectMiddleware)
+        ## App.
+        self.app = FastAPI(
+            dependencies=dependencies,
+            lifespan=lifespan
+        )
 
         ## Static.
         if public is not None:
             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)
+
 
-    def run(self):
+    def run(self) -> None:
         """
         Run.
         """
@@ -86,23 +99,26 @@ class Server(ServerBase):
         )
 
 
-    def add_api_all(self):
+    # def add_api_all(self) -> None:
+    #     """
+    #     Add all API.
+    #     """
 
-        self.add_api_all()
+    #     self.add_api_all()
 
 
-    def add_api_base(self):
+    # def add_api_base(self):
 
-        # @self.app.get('/')
-        # def index():
-        #     file_bytes = File(self.index).bytes
-        #     response = HTMLResponse(file_bytes)
-        #     return response
+    #     # @self.app.get('/')
+    #     # def index():
+    #     #     file_bytes = File(self.index).bytes
+    #     #     response = HTMLResponse(file_bytes)
+    #     #     return response
 
 
-        @self.app.get('/test')
-        def test():
-            return {'message': 'test'}
+    #     @self.app.get('/test')
+    #     def test():
+    #         return {'message': 'test'}
 
 
     def add_api_file(self): ...

{reyserver-1.1.37.dist-info → reyserver-1.1.39.dist-info}/METADATA

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

reyserver-1.1.39.dist-info/RECORD

@@ -0,0 +1,10 @@
+reyserver/__init__.py,sha256=ZNzM6wBvBSXe1LgV40ZJ1WIAbejWNYGl8x22dmt8C60,289
+reyserver/rall.py,sha256=F-vUJIf5DgP0FXI0pdTrEeEiMtN-g81_yTo4ibUL9xk,233
+reyserver/rbase.py,sha256=EVLCkX2xdPNdPwkRnZ2ZSjM7kctnMoQ_FSlSNHSZt2E,1630
+reyserver/rdb.py,sha256=dfM3alvIII_eDgSCYhGfmQH7kh6eYsDmz4DaprYy9c8,170
+reyserver/rfile.py,sha256=P3i1wa2JYsgNFrm0pDCsDN_zFo_Xpv4XigePotVzn8s,8213
+reyserver/rserver.py,sha256=e-AFB75511HTOf7XjWerCNq86-QEm_2C81psMrldxls,3085
+reyserver-1.1.39.dist-info/METADATA,sha256=EgXGwkne3cVZIovlCdQEjTngnnpWIjWVY35AO89_TTA,1549
+reyserver-1.1.39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.39.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.39.dist-info/RECORD,,

reyserver-1.1.37.dist-info/RECORD

@@ -1,9 +0,0 @@
-reyserver/__init__.py,sha256=ZNzM6wBvBSXe1LgV40ZJ1WIAbejWNYGl8x22dmt8C60,289
-reyserver/rall.py,sha256=F-vUJIf5DgP0FXI0pdTrEeEiMtN-g81_yTo4ibUL9xk,233
-reyserver/rbase.py,sha256=TtCmqjofwKkE0vdOIc5WhWxbgAUd8pFgx26-VON11yA,397
-reyserver/rfile.py,sha256=j4-X1WJPhiYXLvojMUBVEitlPTlSTKWgIb4uJSeMK6k,1989
-reyserver/rserver.py,sha256=PopXz0gu1c36FRgrpvT13BWFCOVwctb-JAlcFmocdjI,2580
-reyserver-1.1.37.dist-info/METADATA,sha256=DO6G-zowwi8w6vI74KWig-jtL6Zsz3hsrjZQ-j5ioQM,1549
-reyserver-1.1.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.37.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.37.dist-info/RECORD,,