fix: Improved target experiment file handling

Author: Alan Christie

viewer/target_loader.py

@@ -1737,11 +1737,17 @@ def load_target(
                 archive.extractall(target_loader.raw_data)
                 msg = f"Data extraction complete: {data_bundle}"
                 logger.info("%s%s", target_loader.report.task_id, msg)
-        except FileNotFoundError as exc:
-            msg = f"{data_bundle} file does not exist"
-            logger.exception("%s%s", target_loader.report.task_id, msg)
-            target_loader.experiment_upload.message = exc.args[0]
-            raise FileNotFoundError(msg) from exc
+        except Exception as exc:
+            # Handle _any_ underlying problem with the file.
+            logger.error('Got an exception opening the file: %s', str(exc))
+            target_loader.report.log(
+                Level.FATAL,
+                f"Decompression of '{bundle_filename}' has failed. Is it a Target Experiment file?",
+            )
+            target_loader.report.final(
+                f"Failed to decompress '{target_loader.data_bundle}'", success=False
+            )
+            return
 
         target_loader.report.log(Level.INFO, f"Decompressed '{bundle_filename}'")
 
@@ -1760,23 +1766,23 @@ def load_target(
             # Any problem with the underlying data is transmitted in the report.
             logger.debug(exc, exc_info=True)
             target_loader.report.final(
-                f"Uploading {target_loader.data_bundle} failed", success=False
+                f"Failed to process '{target_loader.data_bundle}'", success=False
             )
             return
-
         else:
-            # Move the uploaded file to its final location
-            target_loader.abs_final_path.mkdir(parents=True)
-            target_loader.raw_data.rename(target_loader.abs_final_path)
-            Path(target_loader.bundle_path).rename(
-                target_loader.abs_final_path.parent.joinpath(target_loader.data_bundle)
-            )
+            _move_and_save_target(target_loader)
 
-            set_directory_permissions(target_loader.abs_final_path, 0o755)
 
-            target_loader.report.final(
-                f"{target_loader.data_bundle} uploaded successfully"
-            )
-            target_loader.experiment_upload.message = target_loader.report.json()
+def _move_and_save_target(target_loader):
+    # Move the uploaded file to its final location
+    target_loader.abs_final_path.mkdir(parents=True)
+    target_loader.raw_data.rename(target_loader.abs_final_path)
+    Path(target_loader.bundle_path).rename(
+        target_loader.abs_final_path.parent.joinpath(target_loader.data_bundle)
+    )
+
+    set_directory_permissions(target_loader.abs_final_path, 0o755)
 
-            target_loader.experiment_upload.save()
+    target_loader.report.final(f"{target_loader.data_bundle} uploaded successfully")
+    target_loader.experiment_upload.message = target_loader.report.json()
+    target_loader.experiment_upload.save()

viewer/views.py

@@ -1552,11 +1552,13 @@ def create(self, request, *args, **kwargs):
             if not user.is_authenticated:
                 return redirect(settings.LOGIN_URL)
             else:
-                if target_access_string not in self.get_proposals_for_user(user):
+                if target_access_string not in self.get_proposals_for_user(
+                    user, restrict_to_membership=True
+                ):
                     return Response(
                         {
                             "target_access_string": [
-                                f"You are not authorized to upload data to {target_access_string}"
+                                f"You are not authorized to upload data to '{target_access_string}'"
                             ]
                         },
                         status=status.HTTP_403_FORBIDDEN,