Skip to content

Commit 3f3c8d8

Browse files
committed
feat: implement REST exception handling and computation routes in DirectorV2 controller
1 parent f836f15 commit 3f3c8d8

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from . import rest

services/web/server/src/simcore_service_webserver/director_v2/_rest_exceptions.py renamed to services/web/server/src/simcore_service_webserver/director_v2/_controller/_rest_exceptions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
from servicelib.aiohttp.web_exceptions_extension import get_http_error_class_or_none
55
from simcore_service_webserver.director_v2.exceptions import DirectorServiceError
66

7-
from ..exception_handling import (
7+
from ...exception_handling import (
88
ExceptionHandlersMap,
99
ExceptionToHttpErrorMap,
1010
HttpErrorInfo,
1111
exception_handling_decorator,
1212
to_exceptions_handlers_map,
1313
)
14-
from ..users.exceptions import UserDefaultWalletNotFoundError
15-
from ..wallets.errors import WalletNotEnoughCreditsError
14+
from ...users.exceptions import UserDefaultWalletNotFoundError
15+
from ...wallets.errors import WalletNotEnoughCreditsError
1616

1717
_exceptions_handlers_map: ExceptionHandlersMap = {}
1818

services/web/server/src/simcore_service_webserver/director_v2/_rest.py renamed to services/web/server/src/simcore_service_webserver/director_v2/_controller/rest.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
)
2626
from servicelib.request_keys import RQT_USERID_KEY
2727

28-
from .._meta import API_VTAG as VTAG
29-
from ..login.decorators import login_required
30-
from ..models import RequestContext
31-
from ..products import products_web
32-
from ..security.decorators import permission_required
33-
from ..utils_aiohttp import envelope_json_response
34-
from . import _client, _service
35-
from ._abc import CommitID, get_project_run_policy
28+
from ..._meta import API_VTAG as VTAG
29+
from ...login.decorators import login_required
30+
from ...models import RequestContext
31+
from ...products import products_web
32+
from ...security.decorators import permission_required
33+
from ...utils_aiohttp import envelope_json_response
34+
from .. import _client, _service
35+
from .._abc import CommitID, get_project_run_policy
3636
from ._rest_exceptions import handle_rest_requests_exceptions
3737

3838
_logger = logging.getLogger(__name__)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
)
1010

1111
from ..rest.plugin import setup_rest
12-
from . import _client, _rest
12+
from . import _client, _controller
1313
from ._abc import set_project_run_policy
1414
from ._utils import DefaultProjectRunPolicy
1515

@@ -34,7 +34,7 @@ def setup_director_v2(app: web.Application):
3434

3535
if is_setup_completed(setup_rest.metadata()["module_name"], app):
3636
set_project_run_policy(app, DefaultProjectRunPolicy())
37-
app.router.add_routes(_rest.routes)
37+
app.router.add_routes(_controller.rest.routes)
3838

3939
else:
4040
_logger.warning(

0 commit comments

Comments
 (0)