Rework object creation

readux_ingest_ecds/models.py

@@ -176,6 +176,7 @@ def open_metadata(self):
 
     def create_canvases(self):
         Canvas = get_iiif_models()['Canvas']
+        new_canvases = []
         images = None
         with open(self.trigger_file, 'r') as t_file:
             images = t_file.read().splitlines()
@@ -193,15 +194,17 @@ def create_canvases(self):
             except IndexError:
                 ocr_file_path = None
 
-            Canvas.objects.get_or_create(
+            new_canvases.append(Canvas(
                 manifest=self.manifest,
                 image_server=self.image_server,
                 pid=canvas_pid,
                 ocr_file_path=ocr_file_path,
                 position=position,
                 width=width,
                 height=height
-            )
+            ))
+
+        Canvas.objects.bulk_create(new_canvases)
 
         upload_trigger_file(self.trigger_file)
 

readux_ingest_ecds/services/ocr_services.py

@@ -491,4 +491,3 @@ def add_ocr_to_canvases(manifest):
             new_ocr_annotations += add_ocr_annotations(canvas, ocr)
 
     OCR.objects.bulk_create(new_ocr_annotations)
-    list(map(lambda canvas: canvas.save(), manifest.canvas_set.all()))

readux_ingest_ecds/tasks.py

@@ -59,6 +59,7 @@ def on_failure(self, exc, task_id, args, kwargs, einfo):
         ingest = Local.objects.get(id=args[0])
         LOGGER.info(f'FAIL!!! {ingest.manifest.pid}')
         send_email_on_failure(bundle=ingest.bundle.name, creator=ingest.creator, exception=str(exc))
+        ingest.manifest.save()
         ingest.delete()
 
 app = Celery('readux_ingest_ecds', result_extended=True)