feat: in tests, always group images after creating them, and DRY it up

Author: mihow

ami/main/tests.py

@@ -66,8 +66,8 @@ def test_grouping(self):
     def test_pruning_empty_events(self):
         from ami.main.models import delete_empty_events
 
-        create_captures(deployment=self.deployment)
-        events = group_images_into_events(deployment=self.deployment)
+        captures = create_captures(deployment=self.deployment)
+        events = Event.objects.filter(captures__in=captures).distinct()
 
         for event in events:
             event.captures.all().delete()
@@ -83,8 +83,8 @@ def test_setting_image_dimensions(self):
 
         image_width, image_height = 100, 100
 
-        create_captures(deployment=self.deployment)
-        events = group_images_into_events(deployment=self.deployment)
+        captures = create_captures(deployment=self.deployment)
+        events = Event.objects.filter(captures__in=captures).distinct()
 
         for event in events:
             first_image = event.captures.first()
@@ -125,7 +125,6 @@ class TestEvents(TestCase):
     def setUp(self) -> None:
         project, deployment = setup_test_project()
         create_captures(deployment=deployment, num_nights=2, images_per_night=5)
-        group_images_into_events(deployment=deployment)
         self.project = project
         self.deployment = deployment
         return super().setUp()
@@ -200,7 +199,7 @@ def setUp(self) -> None:
         self.deployment = Deployment.objects.create(name="Test Deployment", project=self.project_one)
 
         create_captures(deployment=self.deployment)
-        group_images_into_events(deployment=self.deployment)
+        self.deployment.save(regroup_async=False)  # Ensure events are grouped immediately
         create_taxa(project=self.project_one)
         create_taxa(project=self.project_two)
         create_occurrences(deployment=self.deployment, num=1)
@@ -244,7 +243,6 @@ def setUp(self) -> None:
         self.deployment = Deployment.objects.create(name="Test Deployment", project=self.project_one)
 
         create_captures(deployment=self.deployment, num_nights=2, images_per_night=10, interval_minutes=1)
-        group_images_into_events(deployment=self.deployment)
 
         return super().setUp()
 
@@ -402,8 +400,6 @@ def test_common_combined_deployment_ids(self):
         # Create captures for each deployment
         create_captures(deployment=deployment_two, num_nights=2, images_per_night=10, interval_minutes=1)
         create_captures(deployment=deployment_three, num_nights=2, images_per_night=10, interval_minutes=1)
-        group_images_into_events(deployment=deployment_two)
-        group_images_into_events(deployment=deployment_three)
 
         # Verify that we have images from the deployments
         assert deployment_two.captures.count() > 0
@@ -593,8 +589,6 @@ def setUp(self) -> None:
         print(f"Deployment Two: {deployment_two.pk}")
         create_captures(deployment=deployment_one)
         create_captures(deployment=deployment_two)
-        group_images_into_events(deployment=deployment_one)
-        group_images_into_events(deployment=deployment_two)
         create_occurrences(deployment=deployment_one, num=5)
         create_occurrences(deployment=deployment_two, num=5)
         self.project_one = project_one
@@ -725,7 +719,6 @@ def setUp(self) -> None:
         project, deployment = setup_test_project()
         create_taxa(project=project)
         create_captures(deployment=deployment)
-        group_images_into_events(deployment=deployment)
         create_occurrences(deployment=deployment, num=5)
         self.project = project
         self.user = User.objects.create_user(  # type: ignore
@@ -790,7 +783,6 @@ def setUp(self) -> None:
         create_captures(
             deployment=deployment, subdir=self.other_subdir, num_nights=1, images_per_night=self.images_per_dir
         )
-        group_images_into_events(deployment=deployment)
         self.project = project
         self.deployment = deployment
         return super().setUp()
@@ -834,9 +826,8 @@ def setUp(self) -> None:
             project, deployment = setup_test_project(reuse=False)
             create_taxa(project=project)
             create_captures(deployment=deployment)
-            group_images_into_events(deployment=deployment)
             create_occurrences(deployment=deployment, num=5)
-        self.project_ids = [project.id for project in Project.objects.all()]
+        self.project_ids = [project.pk for project in Project.objects.all()]
 
         self.user = User.objects.create_user(  # type: ignore
             email="testuser@insectai.org",
@@ -1205,7 +1196,6 @@ def _create_project(self, owner):
         self.deployment = Deployment.objects.create(name="Test Deployment", project=self.project)
         S3StorageSource.objects.create(name="New source", project=self.project, bucket="Test Bucket")
         create_captures(deployment=self.deployment)
-        group_images_into_events(deployment=self.deployment)
         create_taxa(project=self.project)
         create_occurrences(deployment=self.deployment, num=1)
         self._create_job()

ami/tests/fixtures/main.py

@@ -136,6 +136,7 @@ def create_captures(
     images_per_night: int = 3,
     interval_minutes: int = 10,
     subdir: str = "test",
+    update_deployment: bool = True,
 ):
     # Create some images over a few monitoring nights
     first_night = datetime.datetime.now()
@@ -159,6 +160,10 @@ def create_captures(
     )
     collection.images.set(created)
 
+    if update_deployment:
+        # This should only be set to False when manually testing grouping images into events
+        deployment.save(update_calculated_fields=True, regroup_async=False)
+
     return created