Skip to content

Commit

Permalink
fix: Update the session-download API to use POST with custom verb (#2635
Browse files Browse the repository at this point in the history
)
  • Loading branch information
achimnol authored Aug 3, 2024
1 parent 2b41d6d commit 4b72272
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 8 deletions.
1 change: 1 addition & 0 deletions changes/2635.fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a regression of #2483 in the session-download API used by the `backend.ai ssh` command
2 changes: 1 addition & 1 deletion src/ai/backend/client/func/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ async def download(
params["owner_access_key"] = self.owner_access_key
prefix = get_naming(api_session.get().api_version, "path")
rqst = Request(
"GET",
"POST",
f"/{prefix}/{self.name}/download",
params=params,
)
Expand Down
9 changes: 7 additions & 2 deletions src/ai/backend/manager/api/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,14 @@ class ServiceUnavailable(BackendError, web.HTTPServiceUnavailable):
error_title = "Serivce unavailable."


class QueryNotImplemented(BackendError, web.HTTPServiceUnavailable):
class NotImplementedAPI(BackendError, web.HTTPBadRequest):
error_type = "https://api.backend.ai/probs/not-implemented"
error_title = "This API query is not implemented."
error_title = "This API is not implemented."


class DeprecatedAPI(BackendError, web.HTTPBadRequest):
error_type = "https://api.backend.ai/probs/deprecated"
error_title = "This API is deprecated."


class InvalidAuthParameters(BackendError, web.HTTPBadRequest):
Expand Down
10 changes: 8 additions & 2 deletions src/ai/backend/manager/api/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
BaseResponseModel,
catch_unexpected,
check_api_params,
deprecated_stub,
get_access_key_scopes,
pydantic_params_api_handler,
undefined,
Expand Down Expand Up @@ -2302,6 +2303,9 @@ def create_app(
app["api_versions"] = (1, 2, 3, 4)
app["session.context"] = PrivateContext()
app["prefix"] = "session"
deprecated_get_stub = deprecated_stub(
"Use the HTTP POST method to invoke this API with parameters in the request body."
)
cors = aiohttp_cors.setup(app, defaults=default_cors_options)
cors.add(app.router.add_route("POST", "", create_from_params))
cors.add(app.router.add_route("POST", "/_/create", create_from_params))
Expand All @@ -2326,8 +2330,10 @@ def create_app(
cors.add(app.router.add_route("POST", "/{session_name}/complete", complete))
cors.add(app.router.add_route("POST", "/{session_name}/shutdown-service", shutdown_service))
cors.add(app.router.add_route("POST", "/{session_name}/upload", upload_files))
cors.add(app.router.add_route("GET", "/{session_name}/download", download_files))
cors.add(app.router.add_route("GET", "/{session_name}/download_single", download_single))
cors.add(app.router.add_route("GET", "/{session_name}/download", deprecated_get_stub))
cors.add(app.router.add_route("GET", "/{session_name}/download_single", deprecated_get_stub))
cors.add(app.router.add_route("POST", "/{session_name}/download", download_files))
cors.add(app.router.add_route("POST", "/{session_name}/download_single", download_single))
cors.add(app.router.add_route("GET", "/{session_name}/files", list_files))
cors.add(app.router.add_route("POST", "/{session_name}/start-service", start_service))
cors.add(app.router.add_route("POST", "/{session_name}/commit", commit_session))
Expand Down
14 changes: 11 additions & 3 deletions src/ai/backend/manager/api/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@
check_if_requester_is_eligible_to_act_as_target_user_uuid,
)
from .exceptions import (
DeprecatedAPI,
GenericForbidden,
InvalidAPIParameters,
QueryNotImplemented,
NotImplementedAPI,
)

if TYPE_CHECKING:
Expand Down Expand Up @@ -414,8 +415,15 @@ def get_handler_attr(request, key, default=None):
return default


async def not_impl_stub(request) -> web.Response:
raise QueryNotImplemented
async def not_impl_stub(request: web.Request) -> web.Response:
raise NotImplementedAPI


def deprecated_stub(msg: str) -> Callable[[web.Request], Awaitable[web.StreamResponse]]:
async def deprecated_stub_impl(request: web.Request) -> web.Response:
raise DeprecatedAPI(extra_msg=msg)

return deprecated_stub_impl


def chunked(iterable, n):
Expand Down

0 comments on commit 4b72272

Please sign in to comment.