Add a method postDriveMounted to mount the drive and successfully mount a drive. Try to get the content of this drive.

Author: HaudinFlorence

jupyter_drives/base.py

@@ -34,6 +34,7 @@ class DrivesConfig(Configurable):
         help="The secret access key for the bucket.",
     )
 
+
     region_name = Unicode(
         "eu-north-1",
         config = True, 

jupyter_drives/handlers.py

@@ -59,7 +59,7 @@ async def get(self):
     async def post(self):
         body = self.get_json_body()
         result = await self._manager.mount_drive(**body)
-        self.finish(json.dump(result.message))
+        self.finish(result["message"])
 
 class ContentsJupyterDrivesHandler(JupyterDrivesAPIHandler):
     """
@@ -97,6 +97,7 @@ def setup_handlers(web_app: tornado.web.Application, config: traitlets.config.Co
 
     provider = DrivesConfig(config=config).provider
     entry_point = MANAGERS.get(provider)
+    
     if entry_point is None:
         log.error(f"JupyterDrives Manager: No manager defined for provider '{provider}'.")
         raise NotImplementedError()
@@ -128,7 +129,8 @@ def setup_handlers(web_app: tornado.web.Application, config: traitlets.config.Co
             for pattern, handler in handlers_with_path
         ]
     )
-
+   
+   
     log.debug(f"Jupyter-Drives Handlers: {drives_handlers}")
 
     web_app.add_handlers(host_pattern, drives_handlers)

jupyter_drives/managers/s3.py

@@ -93,7 +93,7 @@ async def mount_drive(self, drive_name):
             )
 
             # checking if the drive wasn't mounted already
-            if self.s3_content_managers[drive_name] is None:
+            if drive_name not in self.s3_content_managers or self.s3_content_managers[drive_name] is None:
                 self.s3_content_managers[drive_name] = s3_contents_manager
 
                 response = {

src/handler.ts

@@ -20,7 +20,6 @@ export async function requestAPI<T>(
     'jupyter-drives', // API Namespace
     endPoint
   );
-
   let response: Response;
   try {
     response = await ServerConnection.makeRequest(requestUrl, init, settings);

src/index.ts

@@ -17,12 +17,15 @@ import {
 } from '@jupyterlab/apputils';
 
 import { SidePanel } from '@jupyterlab/ui-components';
-
 import { IBucket } from './s3requests';
 import { Dialog, ICommandPalette, showDialog } from '@jupyterlab/apputils';
 import { DriveListModel, DriveListView } from './drivelistmanager';
 import { addJupyterLabThemeChangeListener } from '@jupyter/web-components';
-import { getDriveContent, getDrivesList } from './s3requests';
+import {
+  getDriveContents,
+  getDrivesList,
+  postDriveMounted
+} from './s3requests';
 
 /**
  * The class name added to the filebrowser filterbox node.
@@ -40,13 +43,14 @@ function buildMountedDriveNameList(driveList: Drive[]): string[] {
   return driveNameList;
 }
 
-const s3AvailableBuckets2 = await getDrivesList();
-console.log('List of buckets is:', s3AvailableBuckets2);
+const s3AvailableBuckets = await getDrivesList();
+console.log('List of buckets is:', s3AvailableBuckets);
 const driveName = 'jupyter-drive-bucket1';
 const path = 'examples';
-const driveContent = await getDriveContent(driveName, path);
+await postDriveMounted(driveName);
+const driveContent = await getDriveContents(driveName, path);
 console.log('driveContent:', driveContent);
-const s3AvailableBuckets1: IBucket[] = [
+/*const s3AvailableBuckets1: IBucket[] = [
   {
     creation_date: '2023-12-15T13:27:57.000Z',
     name: 'jupyterDriveBucket1',
@@ -82,25 +86,13 @@ const s3AvailableBuckets1: IBucket[] = [
     region: 'us-east-1',
     status: 'active'
   }
-];
+];*/
 
 namespace CommandIDs {
   export const openDrivesDialog = 'drives:open-drives-dialog';
   export const removeDriveBrowser = 'drives:remove-drive-browser';
 }
 
-/**
- * Initialization data for the @jupyter/drives extension.
- */
-const plugin: JupyterFrontEndPlugin<void> = {
-  id: '@jupyter/drives:plugin',
-  description: 'A Jupyter extension to support drives in the backend.',
-  autoStart: true,
-  activate: (app: JupyterFrontEnd) => {
-    console.log('JupyterLab extension @jupyter/drives is activated!');
-  }
-};
-/*const s3BucketsList: IBucket[] = await getDrivesList();*/
 /*async*/ function createDrivesList(bucketList: IBucket[]) {
   const S3Drives: Drive[] = [];
   bucketList.forEach(item => {
@@ -182,7 +174,7 @@ export /*async */ function activateAddDrivesPlugin(
   addJupyterLabThemeChangeListener();
   const selectedDrivesModelMap = new Map<Drive[], DriveListModel>();
   let selectedDrives: Drive[] = [];
-  const availableDrives = createDrivesList(s3AvailableBuckets1);
+  const availableDrives = createDrivesList(s3AvailableBuckets);
   let driveListModel = selectedDrivesModelMap.get(selectedDrives);
   const mountedDriveNameList: string[] =
     buildMountedDriveNameList(selectedDrives);

src/s3requests.ts

@@ -1,4 +1,5 @@
 import { requestAPI } from './handler';
+import { Contents } from '@jupyterlab/services';
 
 export interface IBucket {
   name: string;
@@ -14,8 +15,18 @@ export async function getDrivesList() {
   });
 }
 
-export async function getDriveContent(driveName: string, path: string) {
-  return await requestAPI<Array<IBucket>>('drives/' + driveName + '/' + path, {
-    method: 'GET'
+export async function postDriveMounted(driveName: string) {
+  await requestAPI<any>('drives', {
+    method: 'POST',
+    body: `{"drive_name":"${driveName}"}`
   });
 }
+
+export async function getDriveContents(driveName: string, path: string) {
+  return await requestAPI<Contents.IModel>(
+    'drives' + '/' + driveName + '/' + path,
+    {
+      method: 'GET'
+    }
+  );
+}