Update the get method of the Drive class to be able to browser into subfolders.

Author: HaudinFlorence

jupyter_drives/base.py

@@ -54,8 +54,6 @@ class DrivesConfig(Configurable):
         help="Custom path of file where credentials are located. Extension automatically checks jupyter_notebook_config.py or directly in ~/.aws/credentials for AWS CLI users."
     )
 
-    custom_credentials_path = '~/.jupyter/jupyter-notebook-config.py'
-  
     @default("api_base_url")
     def set_default_api_base_url(self):
         # for AWS S3 drives
@@ -80,9 +78,6 @@ def __init__(self, **kwargs):
     def _load_credentials(self):
         # check if credentials were already set in jupyter_notebook_config.py
         if self.access_key_id is not None and self.secret_access_key is not None:
-            print('WE GOT KEYS FROM CONFIG FILE')
-            print('access_key:', self.access_key_id)
-            print('secret_key:', self.secret_access_key)
             return
 
         # check if user provided custom path for credentials extraction
@@ -93,10 +88,7 @@ def _load_credentials(self):
         # if not, try to load credentials from AWS CLI
         aws_credentials_path = "~/.aws/credentials" #add read me about credentials path in windows: https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html
         if os.path_exists(aws_credentials_path):
-            print('WE WILL USE THE AWS CREDENTIALS SET WITH AWSCLI')
             self.access_key_id, self.secret_access_key, self.session_token = self._extract_credentials_from_file(aws_credentials_path)
-            print('access_key:', self.access_key_id)
-            print('secret_key:', self.secret_access_key)
             return
 
     def _extract_credentials_from_file(self, file_path):

jupyter_drives/handlers.py

@@ -60,9 +60,7 @@ async def get(self):
     async def post(self):
         body = self.get_json_body()
         result = await self._manager.mount_drive(**body)
-        print('result:', result)
-        self.finish(json.dump(result))
-        #self.finish(result)
+        self.finish(result["message"])
 
 class ContentsJupyterDrivesHandler(JupyterDrivesAPIHandler):
     """
@@ -74,9 +72,7 @@ def initialize(self, logger: logging.Logger, manager: JupyterDrivesManager):
     @tornado.web.authenticated
     async def get(self, path: str = "", drive: str = ""):
         result = await self._manager.get_contents(drive, path)
-        print("result:", result)
         self.finish(result)
-      
 
     @tornado.web.authenticated
     async def post(self, path: str = "", drive: str = ""):

jupyter_drives/managers/s3.py

@@ -83,21 +83,22 @@ async def mount_drive(self, drive_name):
         Args:
             S3ContentsManager
         '''
-        print('In mount drive:' )
+       
         try :
             s3_contents_manager = S3ContentsManager(
-                access_key = self._config.access_key_id,
+                access_key_id = self._config.access_key_id,
                 secret_access_key = self._config.secret_access_key,
                 endpoint_url = self._config.api_base_url,
                 bucket = drive_name
             )
+   
             # checking if the drive wasn't mounted already
             if drive_name not in self.s3_content_managers or self.s3_content_managers[drive_name] is None:
 
                 # dealing with long-term credentials (access key, secret key)
                 if self._config.session_token is None:
                     s3_contents_manager = S3ContentsManager(
-                    access_key = self._config.access_key_id,
+                    access_key_id = self._config.access_key_id,
                     secret_access_key = self._config.secret_access_key,
                     endpoint_url = self._config.api_base_url,
                     bucket = drive_name
@@ -106,7 +107,7 @@ async def mount_drive(self, drive_name):
                 # dealing with short-term credentials (access key, secret key, session token)
                 else:
                     s3_contents_manager = S3ContentsManager(
-                    access_key = self._config.access_key_id,
+                    access_key_id = self._config.access_key_id,
                     secret_access_key = self._config.secret_access_key,
                     session_token = self._config.session_token,
                     endpoint_url = self._config.api_base_url,
@@ -126,7 +127,6 @@ async def mount_drive(self, drive_name):
         except Exception as e:
             response = {"code": 400, "message": e}
 
-        print('RESPONSE IN MOUNT_DRIVE:', response)
         return response
 
     async def unmount_drive(self, drive_name):
@@ -160,7 +160,6 @@ async def get_contents(self, drive_name, path = ""):
         try:
             if drive_name in self.s3_content_managers:
                 contents = self.s3_content_managers[drive_name].fs.ls(path)
-                print('contents:', contents)
                 code = 200
                 response["contents"] = contents
             else:

src/contents.ts

@@ -317,32 +317,48 @@ export class Drive implements Contents.IDrive {
     localPath: string,
     options?: Contents.IFetchOptions
   ): Promise<Contents.IModel> {
+    let relativePath = '';
+    if (localPath !== '') {
+      if (localPath.includes(this.name)) {
+        relativePath = localPath.split(this.name + '/')[1];
+      } else {
+        relativePath = localPath;
+      }
+    }
+
     postDriveMounted(this.name);
-    const response = await getDriveContents(this.name, localPath);
+    const response = await getDriveContents(this.name, relativePath);
     let fileExtension: string = '';
     const driveBrowserContents: Array<object> = [];
     const driveContents: Array<string> = response['contents'];
     driveContents.forEach(content => {
-      fileExtension = content.split('.')[1];
-      driveBrowserContents.push({
-        name: content,
-        path: this.name + '/' + content,
-        last_modified: '',
-        created: '',
-        content: null,
-        format: null,
-        mimetype: fileExtension === 'txt' ? 'text/plain' : '',
-        size: undefined,
-        writable: true,
-        type:
-          fileExtension === 'txt'
-            ? 'txt'
-            : fileExtension === 'ipynb'
-              ? 'notebook'
-              : 'directory'
-      });
+      const levels = content.split('/');
+      const path = this.name + '/' + content;
+      if (levels[levels.length - 1] !== '') {
+        const itemName = levels[levels.length - 1];
+        fileExtension = content.split('.')[1];
+        driveBrowserContents.push({
+          name: itemName,
+          path: path,
+          last_modified: '',
+          created: '',
+          content: null,
+          format: null,
+          mimetype: fileExtension === 'txt' ? 'text/plain' : '',
+          size: undefined,
+          writable: true,
+          type:
+            fileExtension === 'txt'
+              ? 'txt'
+              : fileExtension === 'ipynb'
+                ? 'notebook'
+                : 'directory'
+        });
+      }
     });
-    const drivePath: Contents.IModel = {
+    //}
+
+    const driveBrowserContentsModel: Contents.IModel = {
       name: this.name,
       path: this.name,
       last_modified: '',
@@ -355,8 +371,8 @@ export class Drive implements Contents.IDrive {
       type: 'directory'
     };
 
-    Contents.validateContentsModel(drivePath);
-    return drivePath;
+    Contents.validateContentsModel(driveBrowserContentsModel);
+    return driveBrowserContentsModel;
   }
 
   /**

src/index.ts

@@ -41,7 +41,6 @@ namespace CommandIDs {
 async function createDrivesList() {
   const response = await getDrivesList();
   const bucketList: Array<IBucket> = response['data'];
-  console.log('bucketList:', bucketList);
   const S3Drives: Drive[] = [];
   bucketList.forEach(item => {
     const drive = new Drive();
@@ -64,7 +63,7 @@ export function camelCaseToDashedCase(name: string) {
 
 function restoreDriveName(id: string) {
   const list1 = id.split('-file-');
-  let driveName = list1[0];
+  const driveName = list1[0];
   return driveName;
 }
 

src/s3requests.ts

@@ -22,10 +22,7 @@ export async function postDriveMounted(driveName: string) {
 }
 
 export async function getDriveContents(driveName: string, path: string) {
-  return await requestAPI<any>(
-    'drives' + '/' + driveName + '/' + path,
-    {
-      method: 'GET'
-    }
-  );
+  return await requestAPI<any>('drives' + '/' + driveName + '/' + path, {
+    method: 'GET'
+  });
 }