Merge pull request #11 from whdalsrnt/master

Refactor File Manager

Author: whdalsrnt

pkg/pip_requirements.txt

@@ -1 +1,2 @@
 spaceone-api
+python-multipart

src/setup.py

@@ -26,6 +26,6 @@
     author_email="[email protected]",
     license="Apache License 2.0",
     packages=find_packages(),
-    install_requires=["spaceone-core", "spaceone-api"],
+    install_requires=["spaceone-core", "spaceone-api", "python-multipart"],
     zip_safe=False,
 )

src/spaceone/file_manager/conf/global_conf.py

@@ -1,3 +1,5 @@
+REST_TITLE = "REST API for File Manager"
+
 DATABASE_AUTO_CREATE_INDEX = True
 DATABASES = {
     "default": {

src/spaceone/file_manager/conf/router_conf.py

@@ -0,0 +1,8 @@
+ROUTER = [
+    {
+        "router_path": "spaceone.file_manager.interface.rest.files:router",
+        "router_options": {
+            "prefix": "/files",
+        },
+    },
+]

src/spaceone/file_manager/error/custom.py

@@ -3,7 +3,3 @@
 
 class ERROR_NOT_DEFINED_FILE_BACKEND(ERROR_BASE):
     _message = "File backend not defined. (backend = {backend})"
-
-
-class ERROR_FILE_UPLOAD_STATE(ERROR_INVALID_ARGUMENT):
-    _message = "The file has not been uploaded yet. (state = PENDING)"

src/spaceone/file_manager/handler/encrypt_mutation_handler.py

@@ -1,60 +1,38 @@
 from spaceone.api.file_manager.v1 import file_pb2, file_pb2_grpc
 from spaceone.core.pygrpc import BaseAPI
 from spaceone.file_manager.service.file_service import FileService
-from spaceone.file_manager.info.file_info import *
-from spaceone.file_manager.info.common_info import *
 
 
 class File(BaseAPI, file_pb2_grpc.FileServicer):
     pb2 = file_pb2
     pb2_grpc = file_pb2_grpc
 
-    def add(self, request, context):
-        params, metadata = self.parse_request(request, context)
-
-        with self.locator.get_service(FileService, metadata) as file_service:
-            file_vo, upload_url, upload_options = file_service.add(params)
-            return self.locator.get_info(
-                FileInfo, file_vo, upload_url=upload_url, upload_options=upload_options
-            )
-
     def update(self, request, context):
         params, metadata = self.parse_request(request, context)
-
-        with self.locator.get_service(FileService, metadata) as file_service:
-            return self.locator.get_info(FileInfo, file_service.update(params))
+        file_svc = FileService(metadata)
+        response: dict = file_svc.update(params)
+        return self.dict_to_message(response)
 
     def delete(self, request, context):
         params, metadata = self.parse_request(request, context)
-
-        with self.locator.get_service(FileService, metadata) as file_service:
-            file_service.delete(params)
-            return self.locator.get_info(EmptyInfo)
-
-    def get_download_url(self, request, context):
-        params, metadata = self.parse_request(request, context)
-
-        with self.locator.get_service(FileService, metadata) as file_service:
-            file_vo, download_url = file_service.get_download_url(params)
-            return self.locator.get_info(FileInfo, file_vo, download_url=download_url)
+        file_svc = FileService(metadata)
+        file_svc.delete(params)
+        return self.empty()
 
     def get(self, request, context):
         params, metadata = self.parse_request(request, context)
-
-        with self.locator.get_service(FileService, metadata) as file_service:
-            return self.locator.get_info(FileInfo, file_service.get(params))
+        file_svc = FileService(metadata)
+        response: dict = file_svc.get(params)
+        return self.dict_to_message(response)
 
     def list(self, request, context):
         params, metadata = self.parse_request(request, context)
-
-        with self.locator.get_service(FileService, metadata) as file_service:
-            file_vos, total_count = file_service.list(params)
-            return self.locator.get_info(
-                FilesInfo, file_vos, total_count, minimal=self.get_minimal(params)
-            )
+        file_svc = FileService(metadata)
+        response: dict = file_svc.list(params)
+        return self.dict_to_message(response)
 
     def stat(self, request, context):
         params, metadata = self.parse_request(request, context)
-
-        with self.locator.get_service(FileService, metadata) as file_service:
-            return self.locator.get_info(StatisticsInfo, file_service.stat(params))
+        file_svc = FileService(metadata)
+        response: dict = file_svc.stat(params)
+        return self.dict_to_message(response)

src/spaceone/file_manager/info/__init__.py

@@ -0,0 +1,67 @@
+import logging
+
+from fastapi import Request, Depends, File, UploadFile
+from fastapi.concurrency import run_in_threadpool
+from fastapi_utils.cbv import cbv
+from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+from fastapi_utils.inferring_router import InferringRouter
+from spaceone.core.fastapi.api import BaseAPI, exception_handler
+from spaceone.file_manager.manager.file_connector_manager import FileConnectorManager
+
+from spaceone.file_manager.service.file_service import FileService
+
+_LOGGER = logging.getLogger(__name__)
+_AUTH_SCHEME = HTTPBearer(auto_error=False)
+
+router = InferringRouter(include_in_schema=False)
+
+
+@cbv(router)
+class Files(BaseAPI):
+    token: HTTPAuthorizationCredentials = Depends(_AUTH_SCHEME)
+    service = "file-manager"
+
+    @router.post("/public/upload")
+    @exception_handler
+    async def upload_public_file(self, request: Request, file: UploadFile = File(...)):
+        metadata = {
+            "token": self.token.credentials,
+        }
+
+        params = {
+            "name": file.filename,
+            "resource_group": "SYSTEM",
+        }
+
+        file_svc = FileService(metadata)
+        response: dict = await run_in_threadpool(file_svc.add, params)
+
+        file_id = response.get("file_id")
+
+        file_conn_mgr = FileConnectorManager()
+        # Update File
+        # file_id = file_vo.file_id
+
+        return response
+
+    @router.get("/public/{file_id}")
+    @exception_handler
+    async def download_public_file(self, request: Request, file_id: str):
+        metadata = {
+            "token": self.token.credentials,
+        }
+
+        params = {
+            "file_id": file_id,
+        }
+
+        file_svc = FileService(metadata)
+        response: dict = await run_in_threadpool(file_svc.get, params)
+
+        file_id = response.get("file_id")
+
+        file_conn_mgr = FileConnectorManager()
+        # Update File
+        # file_id = file_vo.file_id
+
+        return response