Raise exception if referenced hd5 file not found

Author: isikhar

src/dlstbx/services/s3echo_collector.py

@@ -72,14 +72,10 @@ def on_start(self, rw, header, message):
             response_info = update_dcid_info_file(
                 minio_client, bucket_name, dcid, 0, rpid, self.log
             )
-            try:
-                image_files = iris.get_image_files(images, self.log)
-                s3echo_upload_files.update(
-                    {name: (dcid, pth) for name, pth in image_files.items()}
-                )
-            except Exception as err:
-                self.log.exception("Error uploading image files to S3 Echo")
-                raise err
+            image_files = iris.get_image_files(images, self.log)
+            s3echo_upload_files.update(
+                {name: (dcid, pth) for name, pth in image_files.items()}
+            )
             if not response_info:
                 self.log.debug("Sending message to upload endpoint")
                 rw.send_to(
@@ -93,23 +89,19 @@ def on_start(self, rw, header, message):
                 response_info = update_dcid_info_file(
                     minio_client, bucket_name, dcid, 0, rpid, self.log
                 )
-                try:
-                    image_files = iris.get_related_images_files_from_h5(
-                        image_master_file, self.log
-                    )
-                    s3echo_upload_files.update(
-                        {name: (dcid, pth) for name, pth in image_files.items()}
+                image_files = iris.get_related_images_files_from_h5(
+                    image_master_file, self.log
+                )
+                s3echo_upload_files.update(
+                    {name: (dcid, pth) for name, pth in image_files.items()}
+                )
+                if not response_info:
+                    self.log.debug("Sending message to upload endpoint")
+                    rw.send_to(
+                        "upload",
+                        {"s3echo_upload": {dcid: image_files}},
+                        transaction=txn,
                     )
-                    if not response_info:
-                        self.log.debug("Sending message to upload endpoint")
-                        rw.send_to(
-                            "upload",
-                            {"s3echo_upload": {dcid: image_files}},
-                            transaction=txn,
-                        )
-                except Exception as err:
-                    self.log.exception("Error uploading image files to S3 Echo")
-                    raise err
             rw.environment.update({"s3echo_upload": s3echo_upload_files})
             self.log.debug("Sending message to watch endpoint")
             rw.send_to("watch", message, transaction=txn)

src/dlstbx/util/iris.py

@@ -119,10 +119,9 @@ def get_image_files(images, logger):
 
 def get_related_images_files_from_h5(h5_file, logger):
     file_list = {}
-    try:
-        related = set(find_all_references(h5_file))
-    except (ValueError, KeyError):
-        logger.error(f"Could not find files related to {h5_file}", exc_info=True)
+    related = set(find_all_references(h5_file))
+    if not related:
+        raise ValueError(f"No related image files found for {h5_file}")
     image_pattern = str(h5_file).split("master")[0] + "*"
     related.union(glob.glob(image_pattern))
     for filepath in sorted(related):