fix mount drives and refresh drive content managers

Author: gogakoreli

jupyter_drives/manager.py

@@ -89,6 +89,7 @@ def _drives_refresh_callback(self):
         self._config.load_credentials()
         self._initialize_s3_file_system()
         self._initialize_drives()
+        self._initialize_content_managers()
 
     def _initialize_s3_file_system(self):
         # initiate aiobotocore session if we are dealing with S3 drives
@@ -116,6 +117,43 @@ def _initialize_drives(self):
             GCSDrive = get_driver(Provider.GOOGLE_STORAGE)
             self._drives = [GCSDrive(self._config.access_key_id, self._config.secret_access_key)] # verfiy credentials needed
 
+    def _initialize_content_managers(self):
+        for drive_name, content_manager in self._content_managers.items():
+            self._initialize_content_manager(drive_name, content_manager["provider"], content_manager["location"])
+
+    def _initialize_content_manager(self, drive_name, provider, region=None):
+        try:
+            if provider == 's3':
+                if self._config.session_token is None:
+                    configuration = {
+                        "aws_access_key_id": self._config.access_key_id,
+                        "aws_secret_access_key": self._config.secret_access_key,
+                        "aws_region": region,
+                    }
+                else:
+                    configuration = {
+                        "aws_access_key_id": self._config.access_key_id,
+                        "aws_secret_access_key": self._config.secret_access_key,
+                        "aws_session_token": self._config.session_token,
+                        "aws_region": region,
+                    }
+                store = obs.store.S3Store.from_url("s3://" + drive_name + "/", config = configuration)
+            elif provider == 'gcs':
+                store = obs.store.GCSStore.from_url("gs://" + drive_name + "/", config = {}) # add gcs config
+            elif provider == 'http':
+                store = obs.store.HTTPStore.from_url(drive_name, client_options = {}) # add http client config
+
+            self._content_managers[drive_name] = {
+                "store": store,
+                "location": region,
+                "provider": provider,
+            }
+        except Exception as e:
+            raise tornado.web.HTTPError(
+                status_code=httpx.codes.BAD_REQUEST,
+                reason=f"The following error occured when initializing the content manager: {e}",
+            )
+
     def set_listing_limit(self, new_limit):
         """Set new limit for listing.
 
@@ -183,42 +221,10 @@ async def mount_drive(self, drive_name, provider):
         Args:
             drive_name: name of drive to mount
         """
-        try: 
-            # check if content manager doesn't already exist
-            if drive_name not in self._content_managers or self._content_managers[drive_name] is None:
-                if provider == 's3':
-                    # get region of drive
-                    region = await self._get_drive_location(drive_name)
-                    if self._config.session_token is None:
-                        configuration = {
-                            "aws_access_key_id": self._config.access_key_id,
-                            "aws_secret_access_key": self._config.secret_access_key,
-                            "aws_region": region
-                            }
-                    else:
-                        configuration = {
-                            "aws_access_key_id": self._config.access_key_id,
-                            "aws_secret_access_key": self._config.secret_access_key,
-                            "aws_session_token": self._config.session_token,
-                            "aws_region": region
-                            }
-                    store = obs.store.S3Store.from_url("s3://" + drive_name + "/", config = configuration)
-                elif provider == 'gcs':
-                    store = obs.store.GCSStore.from_url("gs://" + drive_name + "/", config = {}) # add gcs config
-                elif provider == 'http':
-                    store = obs.store.HTTPStore.from_url(drive_name, client_options = {}) # add http client config
-                
-                self._content_managers[drive_name] = {
-                    "store": store,
-                    "location": region
-                }
-
-            else:
-                raise tornado.web.HTTPError(
-                status_code= httpx.codes.CONFLICT,
-                reason= "Drive already mounted."
-                )
-                
+        try:
+            if provider == 's3':
+                region = await self._get_drive_location(drive_name)
+            self._initialize_content_manager(drive_name, provider, region)
         except Exception as e:
             raise tornado.web.HTTPError(
             status_code= httpx.codes.BAD_REQUEST,

src/contents.ts

@@ -230,10 +230,11 @@ export class Drive implements Contents.IDrive {
       // when accessed the first time, mount drive
       if (currentDrive.mounted === false) {
         try {
-          await mountDrive(localPath, {
+          const driveName = currentDrive.name;
+          await mountDrive(driveName, {
             provider: currentDrive.provider
           });
-          this._drivesList.filter(x => x.name === localPath)[0].mounted = true;
+          this._drivesList.filter(x => x.name === driveName)[0].mounted = true;
         } catch (e) {
           // it will give an error if drive is already mounted
         }