jupyter extension - report correct directory when downloading datums (#…

…9827) backport of #9822 [INT-1183](https://pachyderm.atlassian.net/browse/INT-1183) [INT-1183]: https://pachyderm.atlassian.net/browse/INT-1183?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [INT-1183]: https://pachyderm.atlassian.net/browse/INT-1183?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [INT-1183]: https://pachyderm.atlassian.net/browse/INT-1183?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ Co-authored-by: Kevin Yang <kevin.yang@hpe.com>
pachyderm · Mar 12, 2024 · 48db8ad · 48db8ad
1 parent 24194a8
commit 48db8ad
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/jupyter-extension/jupyterlab_pachyderm/handlers.py b/jupyter-extension/jupyterlab_pachyderm/handlers.py
@@ -269,8 +269,8 @@ class DatumDownloadHandler(BaseHandler):
     @tornado.web.authenticated
     async def put(self):
         try:
-            self.datum_manager.download()
-            self.finish()
+            path = self.datum_manager.download()
+            self.finish(json.dumps({"path": path}))
         except ValueError as e:
             get_logger().error(f"Invalid datum download: {e}")
             raise tornado.web.HTTPError(

diff --git a/jupyter-extension/jupyterlab_pachyderm/pfs_manager.py b/jupyter-extension/jupyterlab_pachyderm/pfs_manager.py
@@ -650,6 +650,7 @@ def download(self):
 
             shutil.rmtree(self._download_dir, ignore_errors=True)
             self._download_dir = download_dir
+            return PFS_MOUNT_DIR
         except Exception as e:
             shutil.rmtree(download_dir, ignore_errors=True)
             raise e

diff --git a/jupyter-extension/src/plugins/mount/components/Datum/hooks/useDatum.tsx b/jupyter-extension/src/plugins/mount/components/Datum/hooks/useDatum.tsx
@@ -8,6 +8,7 @@ import {requestAPI} from '../../../../../handler';
 import {
   CrossInputSpec,
   CurrentDatumResponse,
+  DownloadPath,
   ListMountsResponse,
   MountDatumResponse,
   PfsInput,
@@ -203,12 +204,13 @@ export const useDatum = (
 
     try {
       // TODO: receiving a 500 response shows success message
-      const res = await requestAPI<any>('datums/_download', 'PUT');
+      const res = await requestAPI<DownloadPath>('datums/_download', 'PUT');
+      console.log('setting message');
+      setErrorMessage('Datum downloaded to ' + res.path);
     } catch (e) {
       setErrorMessage('Error downloading datum: ' + e);
       console.log(e);
     }
-    setErrorMessage('Datum downloaded to /pfs');
     setLoading(false);
   };
 

diff --git a/jupyter-extension/src/plugins/mount/types.ts b/jupyter-extension/src/plugins/mount/types.ts
@@ -54,6 +54,10 @@ export type CurrentDatumResponse = {
   all_datums_received: boolean;
 };
 
+export type DownloadPath = {
+  path: string;
+};
+
 export type MountDatumResponse = {
   id: string;
   idx: number;