Refactor ModelComponent to use a MC-standard image cache progress object

Author: mitchnegus

src/firewheel/control/model_component.py

@@ -24,6 +24,11 @@ class ModelComponent:
     This class defines a Model Component which is the building block
     for FIREWHEEL experiments.
     """
+    image_cache_progress = Progress(
+        TextColumn("[yellow]{task.description} This may take a while."),
+        SpinnerColumn(spinner_name="line"),
+        TimeElapsedColumn(),
+    )
 
     def __init__(
         self,
@@ -567,38 +572,31 @@ def _upload_images(self):
                 # the image in the FileStore, then we should check the MD5 sums. If the
                 # MD5 sums differ, than we need to re-upload the image.
                 if upload_date is None:
-                    with Progress(
-                        TextColumn(
-                            f"[yellow]Adding {end_path} to cache. This may take a while."
-                        ),
-                        SpinnerColumn(spinner_name="line"),
-                        TimeElapsedColumn(),
-                    ) as progress:
-                        progress.add_task(description="upload_image")
-                        self.image_store.add_image_file(path)
+                    self._add_image_to_store(
+                        path, description=f"Adding {end_path} to cache."
+                    )
                     ret_val.append("no_date")
                 elif last_modified_date != upload_date:
                     # If date is different then hash it
                     disk_hash = hash_file(path)
                     store_hash = self.image_store.get_file_hash(os.path.basename(path))
                     # If hashes differ upload new image
                     if disk_hash != store_hash:
-                        with Progress(
-                            TextColumn(
-                                f"[yellow]Updating {end_path} in cache. This may take a while."
-                            ),
-                            SpinnerColumn(spinner_name="line"),
-                            TimeElapsedColumn(),
-                        ) as progress:
-                            progress.add_task(description="upload_image")
-                        self.image_store.add_image_file(path)
+                        self._add_image_to_store(
+                            path, description=f"Updating {end_path} in cache."
+                        )
                         ret_val.append("new_hash")
                     else:
                         ret_val.append("same_hash")
                 else:
                     ret_val.append(False)
         return ret_val
 
+    def _add_image_to_store(self, path, description):
+        with self.image_cache_progress as progress:
+            update_cache = progress.add_task(description=description)
+            self.image_store.add_image_file(path)
+
     def set_dependency_graph_id(self, new_id):
         """
         Set the dependency graph ID.