Merge pull request #4 from wook3024/refactor/app-structure

Refactor app structure

Author: wook3024

Dockerfile

@@ -20,7 +20,7 @@ RUN pip install --upgrade pip && \
     pip install pip-tools
 RUN pip-sync requirements/prod.txt requirements/dev.txt
 
-RUN python3 -m grpc_tools.protoc -Iprotos --python_out=backend/grpc/ --grpc_python_out=backend/grpc/ protos/upload.proto
+RUN python3 -m grpc_tools.protoc -Ibackend/grpc --python_out=backend/grpc/protos/ --grpc_python_out=backend/grpc/protos backend/grpc/protos/upload.proto
 
 USER appuser
 

backend/grpc/grpc_client.py

@@ -7,8 +7,6 @@
 import upload_pb2
 import upload_pb2_grpc
 
-from backend.utils.utils import elapsed_time
-
 
 def run(image_path, data):
     with grpc.insecure_channel("localhost:50051") as channel:

protos/upload.proto renamed to backend/grpc/protos/upload.proto

@@ -13,4 +13,4 @@ message UploadImageRequest {
 
 message UploadImageReply {
     string url = 1;
-}
+}

backend/grpc/upload_pb2.py

@@ -15,10 +15,10 @@ def __init__(self, channel):
             channel: A grpc.Channel.
         """
         self.UploadImage = channel.unary_unary(
-                '/upload.Upload/UploadImage',
-                request_serializer=upload__pb2.UploadImageRequest.SerializeToString,
-                response_deserializer=upload__pb2.UploadImageReply.FromString,
-                )
+            "/upload.Upload/UploadImage",
+            request_serializer=upload__pb2.UploadImageRequest.SerializeToString,
+            response_deserializer=upload__pb2.UploadImageReply.FromString,
+        )
 
 
 class UploadServicer(object):
@@ -27,40 +27,53 @@ class UploadServicer(object):
     def UploadImage(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
+        context.set_details("Method not implemented!")
+        raise NotImplementedError("Method not implemented!")
 
 
 def add_UploadServicer_to_server(servicer, server):
     rpc_method_handlers = {
-            'UploadImage': grpc.unary_unary_rpc_method_handler(
-                    servicer.UploadImage,
-                    request_deserializer=upload__pb2.UploadImageRequest.FromString,
-                    response_serializer=upload__pb2.UploadImageReply.SerializeToString,
-            ),
+        "UploadImage": grpc.unary_unary_rpc_method_handler(
+            servicer.UploadImage,
+            request_deserializer=upload__pb2.UploadImageRequest.FromString,
+            response_serializer=upload__pb2.UploadImageReply.SerializeToString,
+        ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
-            'upload.Upload', rpc_method_handlers)
+        "upload.Upload", rpc_method_handlers
+    )
     server.add_generic_rpc_handlers((generic_handler,))
 
 
- # This class is part of an EXPERIMENTAL API.
+# This class is part of an EXPERIMENTAL API.
 class Upload(object):
     """Missing associated documentation comment in .proto file."""
 
     @staticmethod
-    def UploadImage(request,
+    def UploadImage(
+        request,
+        target,
+        options=(),
+        channel_credentials=None,
+        call_credentials=None,
+        insecure=False,
+        compression=None,
+        wait_for_ready=None,
+        timeout=None,
+        metadata=None,
+    ):
+        return grpc.experimental.unary_unary(
+            request,
             target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/upload.Upload/UploadImage',
+            "/upload.Upload/UploadImage",
             upload__pb2.UploadImageRequest.SerializeToString,
             upload__pb2.UploadImageReply.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+        )

backend/grpc/upload_pb2_grpc.py

@@ -4,7 +4,7 @@
 from fastapi import FastAPI, Request
 from fastapi.responses import ORJSONResponse
 
-from backend.rest.routes import index, upload, background_task
+from .routes import index, upload, background_task
 
 
 app = FastAPI(

backend/rest/main.py

@@ -1,4 +1,3 @@
-import time
 import argparse
 
 from httpx import Client

backend/rest/rest_client.py

@@ -13,8 +13,8 @@
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import ORJSONResponse
 
-from backend.rest import schemas
-from backend.worker import (
+from .. import schemas
+from ...worker import (
     save_image_task,
     default_multiprocessing_task,
     ray_multiprocessing_task,

backend/rest/routes/background_task.py

@@ -4,8 +4,8 @@
 from threading import Thread
 from fastapi.responses import ORJSONResponse
 
-from backend.utils.save import save_bytes_data
-from backend.rest import schemas
+from ...utils.save import save_bytes_data
+from .. import schemas
 
 
 router = APIRouter()

backend/rest/routes/upload.py

@@ -5,7 +5,7 @@
 from os import environ
 from celery import Celery
 
-from backend.utils.save import save_image_data
+from .utils.save import save_image_data
 
 
 num_logical_cpus = psutil.cpu_count(logical=False)