iterate on public bucket functionality

Author: DenisaCG

jupyter_drives/manager.py

@@ -52,6 +52,7 @@ def __init__(self, config: traitlets.config.Config) -> None:
         self._content_managers = {}
         self._max_files_listed = 1025
         self._drives = None
+        self._external_drives = []
 
         # instate fsspec file system
         self._file_system = fsspec.filesystem(self._config.provider, asynchronous=True)
@@ -178,7 +179,7 @@ async def list_drives(self):
         """
         data = []
         if self._config.access_key_id and self._config.secret_access_key:
-            if self._drives is None:
+            if self._drives is None and len(self._external_drives) == 0:
                raise tornado.web.HTTPError(
                 status_code= httpx.codes.NOT_IMPLEMENTED,
                 reason="Listing drives not supported for given provider.",
@@ -187,17 +188,7 @@ async def list_drives(self):
             results = []
             for drive in self._drives:
                 try:
-                    if hasattr(drive, 'is_public'):
-                        results.append({
-                            "name": drive.url,
-                            "region": self._config.region_name,
-                            "creationDate": datetime.datetime.now(),
-                            "mounted": False if result.name not in self._content_managers else True,
-                            "provider": self._config.provider
-                        })
-                    else:
-                        results += drive.list_containers()
-                    
+                    results += drive.list_containers()                    
                 except Exception as e:
                     raise tornado.web.HTTPError(
                         status_code=httpx.codes.BAD_REQUEST,
@@ -214,6 +205,23 @@ async def list_drives(self):
                         "provider": self._config.provider
                     }
                 )
+            
+            if len(self._external_drives) != 0:
+                for drive in self._external_drives:
+                    try:
+                        data.append({
+                            "name": drive['url'],
+                            "region": self._config.region_name,
+                            "creationDate": datetime.now().isoformat(timespec='milliseconds').replace('+00:00', 'Z'),
+                            "mounted": False if result.name not in self._content_managers else True,
+                            "provider": self._config.provider
+                        })
+                    except Exception as e:
+                        raise tornado.web.HTTPError(
+                            status_code=httpx.codes.BAD_REQUEST,
+                            reason=f"The following error occured when listing drives: {e}",
+                        )
+                
         else:
             raise tornado.web.HTTPError(
             status_code= httpx.codes.BAD_REQUEST,
@@ -645,9 +653,7 @@ async def add_public_drive(self, drive_url):
                 "is_public": True,
                 "url": drive_url
             };
-            print('ADDED PUBLIC DRIVE: ', drive)
-            self._drives.append(drive);
-            print(self._drives)
+            self._external_drives.append(drive);
         except Exception as e:
             raise tornado.web.HTTPError(
             status_code= httpx.codes.BAD_REQUEST,

src/plugins/driveBrowserPlugin.ts

@@ -440,7 +440,7 @@ namespace Private {
           ]
         }).then(result => {
           if (result.value) {
-            drive.addPublicDrive(result.value[0]);
+            drive.addPublicDrive(result.value);
           }
         });
       },