Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vdk-jupyter: fix bug for failed requests and improve error handling #2916

Merged
merged 6 commits into from
Nov 20, 2023
Merged

vdk-jupyter: fix bug for failed requests and improve error handling #2916

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16d7e09
vdk-jupyter: fix bug for failed requests and improve error handling
yonitoo Nov 17, 2023
399b04f
Merge branch 'main' into topic/ysalambashev/vdk-jupyter-fix-task-runn…
yonitoo Nov 20, 2023
6304e25
vdk-jupyter: add task runner test to verify it works after failure
yonitoo Nov 20, 2023
33a9b12
vdk-jupyter: add frontend test to verify the error message is shown
yonitoo Nov 20, 2023
ea67e92
Merge branch 'main' into topic/ysalambashev/vdk-jupyter-fix-task-runn…
yonitoo Nov 20, 2023
e0f0b20
Merge branch 'main' into topic/ysalambashev/vdk-jupyter-fix-task-runn…
yonitoo Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions projects/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/src/serverRequests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,13 @@ const pollForTaskCompletion = async (
`taskStatus?taskId=${taskId}`,
{ method: 'GET' }
);
if (
result.task_id === taskId &&
(result.status === 'completed' || result.error)
) {
return result;
if (result.task_id === taskId) {
if (result.status !== 'running') {
if (result.status === 'failed') {
showError(result.error);
}
return result;
}
}
} catch (error) {
showError(error);
Expand Down Expand Up @@ -151,10 +153,14 @@ export async function jobRunRequest(): Promise<jobRequestResult> {

const taskId = extractTaskIdFromMessage(initialResponse.message);
const finalResult = await pollForTaskCompletion(taskId);
return {
message: finalResult.message as string,
isSuccessful: !finalResult.error
};
if (finalResult.error) {
return { message: finalResult.error, isSuccessful: false };
} else {
return {
message: finalResult.message as string,
isSuccessful: true
};
}
} catch (error) {
showError(error);
return { message: '', isSuccessful: false };
Expand Down Expand Up @@ -191,10 +197,14 @@ export async function jobRequest(endPoint: string): Promise<jobRequestResult> {

const taskId = extractTaskIdFromMessage(initialResponse.message);
const finalResult = await pollForTaskCompletion(taskId);
return {
message: finalResult.message as string,
isSuccessful: !finalResult.error
};
if (finalResult.error) {
return { message: finalResult.error, isSuccessful: false };
} else {
return {
message: finalResult.message as string,
isSuccessful: true
};
}
} catch (error) {
showError(error);
return { message: '', isSuccessful: false };
Expand Down
154 changes: 86 additions & 68 deletions ...cts/vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk_jupyterlab_extension/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,23 @@ def get(self):
self.set_status(400)
self.finish(json.dumps({"error": "taskId not provided."}))
return
current_status = task_runner.get_status()
if current_status["task_id"] != task_id:
self.finish(
json.dumps(
{
"status": "failed",
"message": "Mismatched taskId.",
"error": f"Requested status for {task_id} but currently processing {current_status['task_id']}",
}
try:
current_status = task_runner.get_status()
if current_status["task_id"] != task_id:
self.finish(
json.dumps(
{
"status": "failed",
"message": "Mismatched taskId.",
"error": f"Requested status for {task_id} but currently processing {current_status['task_id']}",
}
)
)
)
return
return

self.finish(json.dumps(current_status))
self.finish(json.dumps(current_status))
except Exception as e:
self.finish(json.dumps({"message": f"{e}", "error": "true"}))


class LoadJobDataHandler(APIHandler):
Expand Down Expand Up @@ -114,18 +117,21 @@ class RunJobHandler(APIHandler):
@tornado.web.authenticated
def post(self):
input_data = self.get_json_body()
task_id = task_runner.start_task(
"RUN",
lambda: VdkUI.run_job(
input_data[VdkOption.PATH.value],
input_data[VdkOption.ARGUMENTS.value],
),
)
try:
task_id = task_runner.start_task(
"RUN",
lambda: VdkUI.run_job(
input_data[VdkOption.PATH.value],
input_data[VdkOption.ARGUMENTS.value],
),
)

if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("RUN"))
if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("RUN"))
except Exception as e:
self.finish(json.dumps({"message": f"{e}", "error": "true"}))


class DownloadJobHandler(APIHandler):
Expand All @@ -140,19 +146,22 @@ class DownloadJobHandler(APIHandler):
@tornado.web.authenticated
def post(self):
input_data = self.get_json_body()
task_id = task_runner.start_task(
"DOWNLOAD",
lambda: VdkUI.download_job(
input_data[VdkOption.NAME.value],
input_data[VdkOption.TEAM.value],
input_data[VdkOption.PATH.value],
),
)
try:
task_id = task_runner.start_task(
"DOWNLOAD",
lambda: VdkUI.download_job(
input_data[VdkOption.NAME.value],
input_data[VdkOption.TEAM.value],
input_data[VdkOption.PATH.value],
),
)

if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("DOWNLOAD"))
if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("DOWNLOAD"))
except Exception as e:
self.finish(json.dumps({"message": f"{e}", "error": "true"}))


class ConvertJobHandler(APIHandler):
Expand All @@ -164,15 +173,18 @@ class ConvertJobHandler(APIHandler):
@tornado.web.authenticated
def post(self):
input_data = self.get_json_body()
task_id = task_runner.start_task(
"CONVERTJOBTONOTEBOOK",
lambda: VdkUI.convert_job(input_data[VdkOption.PATH.value]),
)
try:
task_id = task_runner.start_task(
"CONVERTJOBTONOTEBOOK",
lambda: VdkUI.convert_job(input_data[VdkOption.PATH.value]),
)

if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("CONVERTJOBTONOTEBOOK"))
if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("CONVERTJOBTONOTEBOOK"))
except Exception as e:
self.finish(json.dumps({"message": f"{e}", "error": "true"}))


class CreateJobHandler(APIHandler):
Expand All @@ -188,19 +200,22 @@ class CreateJobHandler(APIHandler):
@tornado.web.authenticated
def post(self):
input_data = self.get_json_body()
task_id = task_runner.start_task(
"CREATE",
lambda: VdkUI.create_job(
input_data[VdkOption.NAME.value],
input_data[VdkOption.TEAM.value],
input_data[VdkOption.PATH.value],
),
)
try:
task_id = task_runner.start_task(
"CREATE",
lambda: VdkUI.create_job(
input_data[VdkOption.NAME.value],
input_data[VdkOption.TEAM.value],
input_data[VdkOption.PATH.value],
),
)

if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("CREATE"))
if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("CREATE"))
except Exception as e:
self.finish(json.dumps({"message": f"{e}", "error": "true"}))


class CreateDeploymentHandler(APIHandler):
Expand All @@ -215,20 +230,23 @@ class CreateDeploymentHandler(APIHandler):
@tornado.web.authenticated
def post(self):
input_data = self.get_json_body()
task_id = task_runner.start_task(
"DEPLOY",
lambda: VdkUI.create_deployment(
input_data[VdkOption.NAME.value],
input_data[VdkOption.TEAM.value],
input_data[VdkOption.PATH.value],
input_data[VdkOption.DEPLOYMENT_REASON.value],
),
)
try:
task_id = task_runner.start_task(
"DEPLOY",
lambda: VdkUI.create_deployment(
input_data[VdkOption.NAME.value],
input_data[VdkOption.TEAM.value],
input_data[VdkOption.PATH.value],
input_data[VdkOption.DEPLOYMENT_REASON.value],
),
)

if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("DEPLOY"))
if task_id:
self.finish(task_start_response_success(task_id))
else:
self.finish(task_start_response_failure("DEPLOY"))
except Exception as e:
self.finish(json.dumps({"message": f"{e}", "error": "true"}))


class GetNotebookInfoHandler(APIHandler):
Expand Down
8 changes: 4 additions & 4 deletions .../vdk-plugins/vdk-jupyter/vdk-jupyterlab-extension/vdk_jupyterlab_extension/task_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def start_task(self, task_type, task_handler):
"""
task_id = f"{task_type}-{str(uuid.uuid4())}"
with self.lock:
if self.__task_status["status"] not in ["idle", "completed"]:
if self.__task_status["status"] not in ["idle", "completed", "failed"]:
return None

self.__task_status = {
Expand All @@ -51,9 +51,9 @@ def start_task(self, task_type, task_handler):
"error": None,
}

thread = threading.Thread(target=self._run_task, args=(task_handler,))
thread.start()
return task_id
thread = threading.Thread(target=self._run_task, args=(task_handler,))
thread.start()
return task_id

def get_status(self):
"""
Expand Down