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

reyserver/rbase.py

@@ -13,10 +13,9 @@ from typing import Sequence
 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 reykit.rbase import CoroutineFunctionSimple, Base, ConfigMeta
 
-import rserver
+from . import rserver
 
 
 __all__ = (

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

@@ -57,6 +57,7 @@ depend_sess_file = create_depend_sess('file')
 @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)]
 ):
@@ -72,7 +73,6 @@ async def upload(
 
     # 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)
@@ -93,7 +93,7 @@ async def upload(
     ## Information.
     table_info = DatabaseORMTableInfo(
         md5=file_md5,
-        name=file_name,
+        name=name,
         note=note
     )
     await sess.add(table_info)
@@ -105,7 +105,7 @@ async def upload(
     return {'file_id': file_id}
 
 
-def build_file_db(self) -> None:
+def build_file_db() -> None:
     """
     Check and build `file` database tables.
     """

reyserver/rserver.py

@@ -80,7 +80,7 @@ class Server(ServerBase, Singleton):
         self.app = FastAPI(
             dependencies=depend,
             lifespan=lifespan,
-            debug=True
+            # debug=True
         )
 
         ## Static.
@@ -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='/file')

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reyserver
-Version: 1.1.44
+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.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,,