reyserver 1.1.41__py3-none-any.whl → 1.1.42__py3-none-any.whl

reyserver/__init__.py

@@ -11,6 +11,7 @@ Modules
 -------
 rall : All methods.
 rbase : Base methods.
+rclient : Client methods.
 rfile : File methods.
 rserver : Server methods.
 """

reyserver/rall.py

@@ -10,5 +10,6 @@
 
 
 from .rbase import *
+from .rclient import *
 from .rfile import *
 from .rserver import *

reyserver/rbase.py

@@ -12,14 +12,18 @@
 from typing import Sequence
 from inspect import iscoroutinefunction
 from contextlib import asynccontextmanager
-from fastapi import FastAPI
+from fastapi import FastAPI, Depends
+
+from reydb import DatabaseAsync
+from reydb.rconn import DatabaseConnectionAsync
+from reydb.rorm import DatabaseORMSessionAsync
 from reykit.rbase import CoroutineFunctionSimple, Base, is_iterable
 
 
 __all__ = (
     'ServerBase',
     'ServerAPI',
-    'generate_lifespan'
+    'create_lifespan'
 )
 
 
@@ -35,12 +39,12 @@ class ServerAPI(ServerBase):
     """
 
 
-def generate_lifespan(
+def create_lifespan(
     before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
     after: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
 ):
     """
-    Generate function of lifespan manager.
+    Create function of lifespan manager.
 
     Parameters
     ----------
@@ -58,7 +62,7 @@ def generate_lifespan(
     elif iscoroutinefunction(after):
         after = (after,)
 
-    # Define.
+
     @asynccontextmanager
     async def lifespan(app: FastAPI):
         """
@@ -80,3 +84,36 @@ def generate_lifespan(
 
 
     return lifespan
+
+
+# def create_depend_conn(db: DatabaseAsync):
+#     """
+#     Create dependencie function of asynchronous database connection.
+
+#     Parameters
+#     ----------
+#     db : Asynchronous database instance.
+#     """
+
+
+#     @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/rclient.py

@@ -0,0 +1,45 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@Time    : 2025-10-09 00:02:09
+@Author  : Rey
+@Contact : reyxbo@163.com
+@Explain : Client methods.
+"""
+
+
+from rbase import ServerBase
+
+
+__all__ = (
+    'ServerClient',
+)
+
+
+class ServerClient(ServerBase):
+    """
+    Server client type.
+    """
+
+
+    def __init__(self, url: str) -> None:
+        """
+        Build instance attributes.
+
+        Parameters
+        ----------
+        url : Server url.
+        """
+
+        # Build.
+        self.url = url
+
+
+    def upload_file(self): ...
+
+
+    def download_file(self): ...
+
+
+    def index_file(self): ...

reyserver/rfile.py

@@ -9,24 +9,21 @@
 """
 
 
-from fastapi import APIRouter
+from typing import Annotated
+from fastapi import APIRouter, Form, File, UploadFile, Depends
 from reydb import rorm, DatabaseAsync
+from reykit.ros import FileStore, get_md5
 
-from . import rserver
 from .rbase import ServerAPI
 
 
 __all__ = (
-    'file_router',
     'DatabaseORMTableInfo',
     'DatabaseORMTableData',
-    'build_file_db'
+    'ServerAPIFile'
 )
 
 
-file_router = APIRouter()
-
-
 class DatabaseORMTableInfo(rorm.Model, table=True):
     """
     Database `info` table ORM model.
@@ -35,7 +32,7 @@ class DatabaseORMTableInfo(rorm.Model, table=True):
     __name__ = 'info'
     __comment__ = 'File information table.'
     create_time: rorm.Datetime = rorm.Field(field_default=':create_time', not_null=True, index_n=True, comment='Record create time.')
-    field_id: int = rorm.Field(rorm.types_mysql.MEDIUMINT(unsigned=True), key_auto=True, comment='File self increase ID.')
+    file_id: int = rorm.Field(rorm.types_mysql.MEDIUMINT(unsigned=True), key_auto=True, comment='File self increase ID.')
     md5: str = rorm.Field(rorm.types.CHAR(32), not_null=True, index_n=True, comment='File MD5.')
     name: str = rorm.Field(rorm.types.VARCHAR(260), index_n=True, comment='File name.')
     note: str = rorm.Field(rorm.types.VARCHAR(500), comment='File note.')
@@ -53,218 +50,232 @@ class DatabaseORMTableData(rorm.Model, table=True):
     path: str = rorm.Field(rorm.types.VARCHAR(4095), not_null=True, comment='File disk storage path.')
 
 
-def build_file_db(db: DatabaseAsync) -> None:
+class ServerAPIFile(ServerAPI):
     """
-    Check and build all standard databases and tables, by `self.db_names`.
-
-    Parameters
-    db : Asynchronous database instance.
+    Server File API type.
+    Can create database used `self.build_db` method.
     """
 
-    # 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:
+    def __init__(
+        self,
+        db: DatabaseAsync,
+        path: str = 'file'
+    ) -> None:
+        """
+        Build instance attributes.
+
+        Parameters
+        ----------
+        db : Asynchronous database instance.
+        path: File store directory.
+        """
+
+        # Build.
+        self.db = db
+        self.path = path
+
+        ## Router.
+        self.router = self.__create_router()
+
+        ## Build Database.
+        self.build_db()
 
-        ## 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
+    async def depend_sess(self):
+        """
+        Dependencie function of asynchronous database session.
+        """
+
+        # Context.
+        async with self.db.orm.session() as sess:
+            yield sess
+
+
+    def __create_router(self) -> APIRouter:
+        """
+        Add APIs to router.
+
+        Returns
+        -------
+        Router.
+        """
+
+        # Parameter.
+        router = APIRouter()
+
+
+        @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_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
-    )
-
-    # Get ID.
-    file_id = conn.insert_id
-
-    # Commit.
-    conn.commit()
-
-    return file_id
+            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=file_name,
+                note=note
+            )
+            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.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.sync_database.build.build(tables=tables, views=views, views_stats=views_stats, skip=True)

reyserver/rserver.py

@@ -19,7 +19,8 @@ from uvicorn import run as uvicorn_run
 from contextlib import asynccontextmanager
 from reykit.rbase import CoroutineFunctionSimple
 
-from .rbase import ServerBase, generate_lifespan
+from .rbase import ServerBase, create_lifespan
+from .rfile import ServerAPIFile
 
 
 __all__ = (
@@ -57,11 +58,13 @@ class Server(ServerBase):
         # Parameter.
         if type(ssl_cert) != type(ssl_key):
             raise
-        lifespan = generate_lifespan(before, after)
-        if iscoroutinefunction(depend):
+        lifespan = create_lifespan(before, after)
+        if depend is None:
+            depend = ()
+        elif iscoroutinefunction(depend):
             depend = (depend,)
-        dependencies = [
-            Depends(depend)
+        depend = [
+            Depends(task)
             for task in depend
         ]
 
@@ -71,8 +74,9 @@ class Server(ServerBase):
 
         ## App.
         self.app = FastAPI(
-            dependencies=dependencies,
-            lifespan=lifespan
+            dependencies=depend,
+            lifespan=lifespan,
+            debug=True
         )
 
         ## Static.
@@ -81,7 +85,7 @@ class Server(ServerBase):
             self.app.mount('/', subapp)
 
         ## Middleware.
-        self.app.add_middleware(GZipMiddleware)
+        # self.app.add_middleware(GZipMiddleware)
         # self.app.add_middleware(TrustedHostMiddleware)
         # self.app.add_middleware(HTTPSRedirectMiddleware)
 
@@ -99,4 +103,14 @@ class Server(ServerBase):
         )
 
 
-    def add_api_file(self): ...
+    def add_api_base(self):
+
+        @self.app.get('/test')
+        async def test():
+            return {'message': 'test'}
+
+
+    def add_api_file(self, db):
+
+        api = ServerAPIFile(db)
+        self.app.include_router(api.router, prefix='/file')

{reyserver-1.1.41.dist-info → reyserver-1.1.42.dist-info}/METADATA

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

reyserver-1.1.42.dist-info/RECORD

@@ -0,0 +1,10 @@
+reyserver/__init__.py,sha256=Zlfm-fsoVNYvVunQwy-ANR6ITAzksCgZzyHazAttXN4,316
+reyserver/rall.py,sha256=wXhh90tEIqOyM_o2hXs6jWJrRM-B97uHsswhsg4vav0,257
+reyserver/rbase.py,sha256=v06MgTGPYYx5KVoYPHr2OSIaYpDULggZF1eGZFzrO90,2399
+reyserver/rclient.py,sha256=B6HOKyTz7kk6IfjuY0Yu-RlvWHRuWXd4zs1cxXud6pk,650
+reyserver/rfile.py,sha256=sGGGcgzIBnvL45_6WFgH473Jtc_NfyR7ll_b4BiSKRI,9192
+reyserver/rserver.py,sha256=hMUdILnIUPtqwj7IX022lLsPKAmwppG3_4wOzHfZxDQ,2948
+reyserver-1.1.42.dist-info/METADATA,sha256=yT9vTRzQI6XpkUqKSvXRYrwjyQ4f57kWKrNLpwT88vc,1658
+reyserver-1.1.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.42.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.42.dist-info/RECORD,,

reyserver/rdb.py

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

reyserver-1.1.41.dist-info/RECORD

@@ -1,10 +0,0 @@
-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=y6GY_G0KYwUqMNVmjs9pu75xNf20uUXRudjbY7c5PTw,201
-reyserver/rfile.py,sha256=8UqyP12MbMaP-fSCO0a0PxmHyXV49KjM2YvcGaK_BPI,8191
-reyserver/rserver.py,sha256=97v4zlrjHQcsuCdIdY-wRUGnYrJYdi9rmkCZI1ZRzGw,2620
-reyserver-1.1.41.dist-info/METADATA,sha256=jVS4d9pHHGkUxHAngUIwUTSkRy9hb5zaFlYYBHG9WcU,1658
-reyserver-1.1.41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.41.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.41.dist-info/RECORD,,