Skip to content

Commit 5dfe8e3

Browse files
fix imports
1 parent 08e4cd5 commit 5dfe8e3

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

services/web/server/src/simcore_service_webserver/api_keys/_exceptions_handlers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from servicelib.aiohttp import status
2-
from simcore_service_webserver.api_keys.errors import ApiKeyNotFoundError
32

43
from ..exception_handling import (
54
ExceptionToHttpErrorMap,
65
HttpErrorInfo,
76
exception_handling_decorator,
87
to_exceptions_handlers_map,
98
)
9+
from .errors import ApiKeyNotFoundError
1010

1111
_TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
1212
ApiKeyNotFoundError: HttpErrorInfo(

services/web/server/src/simcore_service_webserver/api_keys/_rest.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@
1616
parse_request_body_as,
1717
parse_request_path_parameters_as,
1818
)
19-
from simcore_service_webserver.api_keys import _service
20-
from simcore_service_webserver.api_keys._exceptions_handlers import (
21-
handle_plugin_requests_exceptions,
22-
)
23-
from simcore_service_webserver.api_keys._models import ApiKey
2419

2520
from .._meta import API_VTAG
2621
from ..login.decorators import login_required
2722
from ..models import RequestContext
2823
from ..security.decorators import permission_required
2924
from ..utils_aiohttp import envelope_json_response
25+
from . import _service
26+
from ._exceptions_handlers import handle_plugin_requests_exceptions
27+
from ._models import ApiKey
3028

3129
_logger = logging.getLogger(__name__)
3230

services/web/server/src/simcore_service_webserver/api_keys/_rpc.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
from models_library.rpc_auth_api_keys import ApiKeyGet
88
from models_library.users import UserID
99
from servicelib.rabbitmq import RPCRouter
10-
from simcore_service_webserver.api_keys import _service
11-
from simcore_service_webserver.api_keys._models import ApiKey
12-
from simcore_service_webserver.api_keys.errors import ApiKeyNotFoundError
13-
from simcore_service_webserver.rabbitmq import get_rabbitmq_rpc_server
10+
11+
from ..rabbitmq import get_rabbitmq_rpc_server
12+
from . import _service
13+
from ._models import ApiKey
14+
from .errors import ApiKeyNotFoundError
1415

1516
router = RPCRouter()
1617

services/web/server/src/simcore_service_webserver/api_keys/_service.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
from models_library.products import ProductName
88
from models_library.users import UserID
99
from servicelib.utils_secrets import generate_token_secret_key
10-
from simcore_service_webserver.api_keys import _repository
11-
from simcore_service_webserver.api_keys._models import ApiKey
12-
from simcore_service_webserver.api_keys.errors import ApiKeyNotFoundError
10+
11+
from . import _repository
12+
from ._models import ApiKey
13+
from .errors import ApiKeyNotFoundError
1314

1415
_PUNCTUATION_REGEX = re.compile(
1516
pattern="[" + re.escape(string.punctuation.replace("_", "")) + "]"

services/web/server/src/simcore_service_webserver/api_keys/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
from aiohttp import web
44
from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
5-
from simcore_service_webserver.api_keys import _rest, _rpc
65

76
from .._constants import APP_SETTINGS_KEY
87
from ..db.plugin import setup_db
98
from ..products.plugin import setup_products
109
from ..rabbitmq import setup_rabbitmq
1110
from ..rest.plugin import setup_rest
11+
from . import _rest, _rpc
1212

1313
_logger = logging.getLogger(__name__)
1414

0 commit comments

Comments
 (0)