refactor

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/api_keys/_controller/__init__.py

@@ -17,14 +17,14 @@
     parse_request_path_parameters_as,
 )
 
-from .._meta import API_VTAG
-from ..login.decorators import login_required
-from ..models import RequestContext
-from ..security.decorators import permission_required
-from ..utils_aiohttp import envelope_json_response
-from . import _service
-from ._controller_rest_exceptions import handle_plugin_requests_exceptions
-from .models import ApiKey
+from ..._meta import API_VTAG
+from ...login.decorators import login_required
+from ...models import RequestContext
+from ...security.decorators import permission_required
+from ...utils_aiohttp import envelope_json_response
+from .. import _service
+from ..models import ApiKey
+from .rest_exceptions import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/api_keys/_controller_rest.py renamed to services/web/server/src/simcore_service_webserver/api_keys/_controller/rest.py

@@ -1,12 +1,12 @@
 from servicelib.aiohttp import status
 
-from ..exception_handling import (
+from ...exception_handling import (
     ExceptionToHttpErrorMap,
     HttpErrorInfo,
     exception_handling_decorator,
     to_exceptions_handlers_map,
 )
-from .errors import ApiKeyDuplicatedDisplayNameError, ApiKeyNotFoundError
+from ..errors import ApiKeyDuplicatedDisplayNameError, ApiKeyNotFoundError
 
 _TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
     ApiKeyDuplicatedDisplayNameError: HttpErrorInfo(

services/web/server/src/simcore_service_webserver/api_keys/_controller_rest_exceptions.py renamed to services/web/server/src/simcore_service_webserver/api_keys/_controller/rest_exceptions.py

@@ -7,10 +7,10 @@
 from models_library.users import UserID
 from servicelib.rabbitmq import RPCRouter
 
-from ..rabbitmq import get_rabbitmq_rpc_server
-from . import _service
-from .errors import ApiKeyNotFoundError
-from .models import ApiKey
+from ...rabbitmq import get_rabbitmq_rpc_server
+from .. import _service
+from ..errors import ApiKeyNotFoundError
+from ..models import ApiKey
 
 router = RPCRouter()
 

services/web/server/src/simcore_service_webserver/api_keys/_controller_rpc.py renamed to services/web/server/src/simcore_service_webserver/api_keys/_controller/rpc.py

@@ -8,7 +8,7 @@
 from ..products.plugin import setup_products
 from ..rabbitmq import setup_rabbitmq
 from ..rest.plugin import setup_rest
-from . import _controller_rest, _controller_rpc
+from ._controller import rest, rpc
 
 _logger = logging.getLogger(__name__)
 
@@ -26,9 +26,9 @@ def setup_api_keys(app: web.Application):
 
     # http api
     setup_rest(app)
-    app.router.add_routes(_controller_rest.routes)
+    app.router.add_routes(rest.routes)
 
     # rpc api
     setup_rabbitmq(app)
     if app[APP_SETTINGS_KEY].WEBSERVER_RABBITMQ:
-        app.on_startup.append(_controller_rpc.register_rpc_routes_on_startup)
+        app.on_startup.append(rpc.register_rpc_routes_on_startup)