Enabled outputs for failed jobs (#270)

* Enabled outputs for failed jobs

* Removed new status, enabled outputs for failed jobs

* Ran eslint

* Removed redundant value

Author: 3coins

jupyter_scheduler/executors.py

@@ -56,6 +56,8 @@ def process(self):
         self.before_start()
         try:
             self.execute()
+        except CellExecutionError as e:
+            self.on_failure(e)
         except Exception as e:
             self.on_failure(e)
         else:
@@ -135,7 +137,7 @@ def execute(self):
         try:
             ep.preprocess(nb)
         except CellExecutionError as e:
-            pass
+            raise e
         finally:
             for output_format in job.output_formats:
                 cls = nbconvert.get_exporter(output_format)

jupyter_scheduler/job_files_manager.py

@@ -7,7 +7,6 @@
 from jupyter_server.utils import ensure_async
 
 from jupyter_scheduler.scheduler import BaseScheduler
-from jupyter_scheduler.utils import resolve_path
 
 
 class JobFilesManager:
@@ -71,9 +70,12 @@ def download_tar(self, archive_format: str = "tar"):
             with tarfile.open(fileobj=f, mode=read_mode) as tar:
                 filepaths = self.generate_filepaths()
                 for input_filepath, output_filepath in filepaths:
-                    input_file = tar.extractfile(member=input_filepath)
-                    with fsspec.open(output_filepath, mode="wb") as output_file:
-                        output_file.write(input_file.read())
+                    try:
+                        input_file = tar.extractfile(member=input_filepath)
+                        with fsspec.open(output_filepath, mode="wb") as output_file:
+                            output_file.write(input_file.read())
+                    except Exception as e:
+                        pass
 
     def download(self):
         if not self.staging_paths:
@@ -86,6 +88,9 @@ def download(self):
         else:
             filepaths = self.generate_filepaths()
             for input_filepath, output_filepath in filepaths:
-                with fsspec.open(input_filepath) as input_file:
-                    with fsspec.open(output_filepath, mode="wb") as output_file:
-                        output_file.write(input_file.read())
+                try:
+                    with fsspec.open(input_filepath) as input_file:
+                        with fsspec.open(output_filepath, mode="wb") as output_file:
+                            output_file.write(input_file.read())
+                except Exception as e:
+                    pass

src/components/job-row.tsx

@@ -51,7 +51,7 @@ function JobFiles(props: {
   job: Scheduler.IDescribeJob;
   app: JupyterFrontEnd;
 }): JSX.Element | null {
-  if (props.job.status !== 'COMPLETED') {
+  if (!(props.job.status === 'COMPLETED' || props.job.status === 'FAILED')) {
     return null;
   }
 
@@ -111,7 +111,12 @@ export function buildJobRow(
   );
 
   const cellContents: React.ReactNode[] = [
-    <Link onClick={() => showDetailView(job.job_id)}>{job.name}</Link>,
+    <Link
+      onClick={() => showDetailView(job.job_id)}
+      title={`Open detail view for "${job.name}"`}
+    >
+      {job.name}
+    </Link>,
     inputFile ? (
       <JobFileLink app={app} jobFile={inputFile}>
         {job.input_filename}
@@ -120,9 +125,10 @@ export function buildJobRow(
       job.input_filename
     ),
     <>
-      {!job.downloaded && job.status === 'COMPLETED' && (
-        <DownloadFilesButton app={app} job={job} reload={reload} />
-      )}
+      {!job.downloaded &&
+        (job.status === 'COMPLETED' || job.status === 'FAILED') && (
+          <DownloadFilesButton app={app} job={job} reload={reload} />
+        )}
       <JobFiles job={job} app={app} />
     </>,
     <Timestamp job={job} />,

src/mainviews/detail-view/job-detail.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { JupyterFrontEnd } from '@jupyterlab/application';
 
@@ -7,7 +7,7 @@ import {
   ConfirmDialogStopButton
 } from '../../components/confirm-dialog-buttons';
 import { JobFileLink } from '../../components/job-file-link';
-import { SchedulerService } from '../../handler';
+import { Scheduler, SchedulerService } from '../../handler';
 import { useTranslator } from '../../hooks';
 import { ICreateJobModel, IJobDetailModel, JobsView } from '../../model';
 import { Scheduler as SchedulerTokens } from '../../tokens';
@@ -65,6 +65,31 @@ export function JobDetail(props: IJobDetailProps): JSX.Element {
 
   const ss = new SchedulerService({});
 
+  const translateStatus = useCallback(
+    (status: Scheduler.Status) => {
+      // This may look inefficient, but it's intended to call the `trans` function
+      // with distinct, static values, so that code analyzers can pick up all the
+      // needed source strings.
+      switch (status) {
+        case 'CREATED':
+          return trans.__('Created');
+        case 'QUEUED':
+          return trans.__('Queued');
+        case 'COMPLETED':
+          return trans.__('Completed');
+        case 'FAILED':
+          return trans.__('Failed');
+        case 'IN_PROGRESS':
+          return trans.__('In progress');
+        case 'STOPPED':
+          return trans.__('Stopped');
+        case 'STOPPING':
+          return trans.__('Stopping');
+      }
+    },
+    [trans]
+  );
+
   const handleDeleteJob = async () => {
     await ss.deleteJob(props.model.jobId ?? '');
     props.setJobsView(JobsView.ListJobs);
@@ -90,15 +115,17 @@ export function JobDetail(props: IJobDetailProps): JSX.Element {
 
   const ButtonBar = (
     <Stack direction="row" gap={2} justifyContent="flex-end" flexWrap={'wrap'}>
-      {props.model.downloaded === false && props.model.status === 'COMPLETED' && (
-        <Button
-          variant="outlined"
-          onClick={downloadFiles}
-          disabled={downloading}
-        >
-          {trans.__('Download Job Files')}
-        </Button>
-      )}
+      {props.model.downloaded === false &&
+        (props.model.status === 'COMPLETED' ||
+          props.model.status === 'FAILED') && (
+          <Button
+            variant="outlined"
+            onClick={downloadFiles}
+            disabled={downloading}
+          >
+            {trans.__('Download Job Files')}
+          </Button>
+        )}
       {props.model.status === 'IN_PROGRESS' && (
         <ConfirmDialogStopButton
           handleStop={handleStopJob}
@@ -140,7 +167,10 @@ export function JobDetail(props: IJobDetailProps): JSX.Element {
       }
     ],
     [
-      { value: props.model.status ?? '', label: trans.__('Status') },
+      {
+        value: translateStatus(props.model.status!),
+        label: trans.__('Status')
+      },
       {
         value: timestampLocalize(props.model.createTime ?? ''),
         label: trans.__('Created at')
@@ -165,7 +195,7 @@ export function JobDetail(props: IJobDetailProps): JSX.Element {
   ];
 
   const hasOutputs =
-    props.model.status === 'COMPLETED' &&
+    (props.model.status === 'COMPLETED' || props.model.status === 'FAILED') &&
     props.model.job_files.some(
       jobFile => jobFile.file_format !== 'input' && jobFile.file_path
     );