reyserver 1.1.44__py3-none-any.whl → 1.1.46__py3-none-any.whl

reyserver/rbase.py

@@ -9,19 +9,21 @@
 """
 
 
-from typing import Sequence
+from typing import Sequence, Literal
 from inspect import iscoroutinefunction
 from contextlib import asynccontextmanager
-from fastapi import FastAPI
-from reydb import DatabaseAsync
-from reykit.rbase import CoroutineFunctionSimple, Base, ConfigMeta, throw
+from fastapi import FastAPI, HTTPException, status
+from reykit.rbase import CoroutineFunctionSimple, Base, ConfigMeta, Exit
 
-import rserver
+from . import rserver
 
 
 __all__ = (
     'ServerBase',
     'ServerConfig',
+    'ServerExit',
+    'ServerExitHTTP',
+    'ServerExitHTTP404',
     'create_lifespan',
     'create_depend_sess'
 )
@@ -42,6 +44,41 @@ class ServerConfig(ServerBase, metaclass=ConfigMeta):
     'Server instance.'
 
 
+class ServerExit(ServerBase, Exit):
+    """
+    Server exit type.
+    """
+
+
+class ServerExitHTTP(ServerExit, HTTPException):
+    """
+    Server HTTP exit type.
+    """
+
+    status_code: int
+
+
+    def __init__(self, text: str | None = None):
+        """
+        Build instance attributes.
+
+        Parameters
+        ----------
+        text : Explain text.
+        """
+
+        # Super.
+        super().__init__(self.status_code, text)
+
+
+class ServerExitHTTP404(ServerExitHTTP):
+    """
+    Server HTTP 404 exit type.
+    """
+
+    status_code = status.HTTP_404_NOT_FOUND
+
+
 def create_lifespan(
     before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
     after: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
@@ -89,13 +126,16 @@ def create_lifespan(
     return lifespan
 
 
-def create_depend_sess(database: str):
+def create_depend_db(database: str, mode: Literal['sess', 'conn']):
     """
-    Create dependencie function of asynchronous database session.
+    Create dependencie function of asynchronous database.
 
     Parameters
     ----------
     database : Database name.
+    mode : Mode.
+        - `Literl['sess']`: Create ORM session instance.
+        - `Literl['conn']`: Create connection instance.
 
     Returns
     -------
@@ -103,17 +143,21 @@ def create_depend_sess(database: str):
     """
 
 
-    async def depend_sess():
+    async def depend():
         """
-        Dependencie function of asynchronous database session.
+        Dependencie function of asynchronous database.
         """
 
         # Parameter.
         engine = ServerConfig.server.db[database]
 
         # Context.
-        async with engine.orm.session() as sess:
-            yield sess
+        if mode == 'sess':
+            async with engine.orm.session() as sess:
+                yield sess
+        elif mode == 'conn':
+            async with engine.connect() as conn:
+                yield conn
 
 
-    return depend_sess
+    return depend

reyserver/rclient.py

@@ -9,6 +9,9 @@
 """
 
 
+from reykit.ros import File, get_md5
+from reykit.rnet import join_url, request
+
 from .rbase import ServerBase
 
 
@@ -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

@@ -9,18 +9,28 @@
 """
 
 
-from typing import Annotated
-from fastapi import APIRouter, Form, File, UploadFile, Depends
+from fastapi import (
+    APIRouter,
+    Depends,
+    Path,
+    Form,
+    File,
+    UploadFile
+)
+from fastapi.responses import FileResponse
 from reydb import rorm
+from reydb.rorm import DatabaseORMSessionAsync
+from reydb.rconn import DatabaseConnectionAsync
 from reykit.ros import FileStore, get_md5
 
-from .rbase import ServerConfig, create_depend_sess
+from .rbase import ServerConfig, ServerExitHTTP404, create_depend_db
 
 
 __all__ = (
     'DatabaseORMTableInfo',
     'DatabaseORMTableData',
-    'build_file_db'
+    'build_file_db',
+    'file_router'
 )
 
 
@@ -50,62 +60,7 @@ class DatabaseORMTableData(rorm.Model, table=True):
     path: str = rorm.Field(rorm.types.VARCHAR(4095), not_null=True, comment='File disk storage path.')
 
 
-file_router = APIRouter()
-depend_sess_file = create_depend_sess('file')
-
-
-@file_router.post('/upload')
-async def upload(
-    file: Annotated[UploadFile, File()],
-    note: Annotated[str, Form()],
-    sess: Annotated[rorm.DatabaseORMSessionAsync, Depends(depend_sess_file)]
-):
-    """
-    Upload file.
-
-    Parameters
-    ----------
-    file : File instance.
-    note : File note.
-    sess : Asynchronous database session.
-    """
-
-    # Handle parameter.
-    file_store = FileStore(ServerConfig.server.api_file_dir)
-    file_name = file.filename
-    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=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}
-
-
-def build_file_db(self) -> None:
+def build_file_db() -> None:
     """
     Check and build `file` database tables.
     """
@@ -226,3 +181,104 @@ def build_file_db(self) -> None:
 
     # Build.
     engine.sync_engine.build.build(tables=tables, views=views, views_stats=views_stats, skip=True)
+
+
+file_router = APIRouter()
+depend_file_sess = create_depend_db('file', 'sess')
+depend_file_conn = create_depend_db('file', 'conn')
+
+
+@file_router.post('/')
+async def upload_file(
+    file: UploadFile = File(),
+    name: str = Form(None),
+    note: str = Form(None),
+    sess: rorm.DatabaseORMSessionAsync = Depends(depend_file_sess)
+) -> dict:
+    """
+    Upload file.
+
+    Parameters
+    ----------
+    file : File instance.
+    note : File note.
+    """
+
+    # 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}
+
+
+@file_router.get('/{file_id}/download')
+async def download_file(
+    file_id: int = Path(),
+    conn: DatabaseConnectionAsync = Depends(depend_file_conn)
+) -> FileResponse:
+    """
+    Download file.
+
+    Parameters
+    ----------
+    file_id : File ID.
+    """
+
+    # Search.
+    sql = (
+        'SELECT `name`, (\n'
+        '    SELECT `path`\n'
+        f'    FROM `{conn.engine.database}`.`data`\n'
+        f'    WHERE `md5` = `info`.`md5`\n'
+        '    LIMIT 1\n'
+        ') AS `path`\n'
+        f'FROM `{conn.engine.database}`.`info`\n'
+        'WHERE `file_id` = :file_id\n'
+        'LIMIT 1'
+    )
+    result = await conn.execute(sql, file_id=file_id)
+
+    # Check.
+    if result.empty:
+        text = "file ID '%s' not exist" % file_id
+        raise ServerExitHTTP404(text)
+    file_name, file_path = result.first()
+
+    # Response.
+    response = FileResponse(file_path, filename=file_name)
+
+    return response
+
+
+@file_router.get('/{file_id}')
+async def get_file_info(
+    file_id: int = Path(),
+    sess: DatabaseConnectionAsync = Depends(depend_file_sess)
+) -> dict: ...

reyserver/rserver.py

@@ -114,7 +114,7 @@ class Server(ServerBase, Singleton):
             return {'message': 'test'}
 
 
-    def add_api_file(self, file_dir: str = 'file', prefix='/file') -> None:
+    def add_api_file(self, file_dir: str = 'file') -> None:
         """
         Add file API.
 
@@ -131,4 +131,4 @@ class Server(ServerBase, Singleton):
 
         # Add.
         self.api_file_dir = file_dir
-        self.app.include_router(file_router, prefix=prefix)
+        self.app.include_router(file_router, prefix='/files', tags=['file'])

{reyserver-1.1.44.dist-info → reyserver-1.1.46.dist-info}/METADATA

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

reyserver-1.1.46.dist-info/RECORD

@@ -0,0 +1,10 @@
+reyserver/__init__.py,sha256=JmDkcdP7oxmehE53rRRL_zhxmPinAbJRONpQp5qhsGI,340
+reyserver/rall.py,sha256=6vqacf9erEfVfK5sgGJMDXD1h4ebt5gDN7NrPdtELms,248
+reyserver/rbase.py,sha256=6mfTSuVzJGTK6Ch0HNlN0bmKIkPMLUlUAAE_EGt-1uo,3298
+reyserver/rclient.py,sha256=OjY_OEH_USrJK8TuCevXG6jNPVbM0lN-xMBozB7kSM8,2195
+reyserver/rfile.py,sha256=pA1LdHjBDJwj7S2k7cemwsHO19Oo0bHtkX_r79RBlJA,8770
+reyserver/rserver.py,sha256=lsOr_fhiAukQhLHfqH1OfZByuUEzjFoJtqLI7BoNxvI,3401
+reyserver-1.1.46.dist-info/METADATA,sha256=3E8xJWPt5S6j3piVBeuAbFSXzqbTHq6hhrEp5EJ0YLg,1658
+reyserver-1.1.46.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.46.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.46.dist-info/RECORD,,

reyserver-1.1.44.dist-info/RECORD

@@ -1,10 +0,0 @@
-reyserver/__init__.py,sha256=JmDkcdP7oxmehE53rRRL_zhxmPinAbJRONpQp5qhsGI,340
-reyserver/rall.py,sha256=6vqacf9erEfVfK5sgGJMDXD1h4ebt5gDN7NrPdtELms,248
-reyserver/rbase.py,sha256=PXqgNMVZfy8JEziX_GlMNAel_usmwN7s9ssJEJXdTRM,2338
-reyserver/rclient.py,sha256=rrqTPT_Y8zY9KIoPALKcIFUADg8HTa2YH9782tfGp3c,642
-reyserver/rfile.py,sha256=JhHQSvJRa4Hq3qsHCE_UwoS0QPHtk7mw60KcC0YFe8E,7464
-reyserver/rserver.py,sha256=sbuCkCF1-B2ZcYctapU3PrcqyLaETcumgipA_vYhGgQ,3400
-reyserver-1.1.44.dist-info/METADATA,sha256=GJ4qp0xSxiku6Yp9FZrkaY-qQxCfVHuG_JM0RKfZJIc,1658
-reyserver-1.1.44.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.44.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.44.dist-info/RECORD,,