Merge branch 'main' into feat/advanced-collection-filters-2

Author: mihow

ami/main/migrations/0060_alter_sourceimagecollection_method.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.10 on 2025-07-08 16:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("main", "0059_alter_project_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sourceimagecollection",
+            name="method",
+            field=models.CharField(
+                choices=[
+                    ("common_combined", "common_combined"),
+                    ("random", "random"),
+                    ("stratified_random", "stratified_random"),
+                    ("interval", "interval"),
+                    ("manual", "manual"),
+                    ("starred", "starred"),
+                    ("random_from_each_event", "random_from_each_event"),
+                    ("last_and_random_from_each_event", "last_and_random_from_each_event"),
+                    ("greatest_file_size_from_each_event", "greatest_file_size_from_each_event"),
+                    ("detections_only", "detections_only"),
+                    ("full", "full"),
+                ],
+                default="common_combined",
+                max_length=255,
+            ),
+        ),
+    ]

ami/main/models.py

@@ -610,6 +610,9 @@ def sync_captures(self, batch_size=1000, regroup_events_per_batch=False, job: "J
             job.progress.add_stage("Update deployment cache")
             job.update_progress()
 
+        # Regroup source images  if needed
+        if deployment_event_needs_update(deployment):
+            group_images_into_events(deployment)
         self.save()
         self.update_calculated_fields(save=True)
 
@@ -1091,6 +1094,23 @@ def group_images_into_events(
     return events
 
 
+def deployment_event_needs_update(deployment: Deployment) -> bool:
+    """
+    Returns True if there are any SourceImages in the deployment
+    that haven't been assigned to an `Event`.
+
+    Note: This does not detect if images were deleted from the deployment
+    after being grouped. We currently have limited support for image deletion,
+    so handling that is out of scope for this check.
+    """
+
+    ungrouped_images_exist = SourceImage.objects.filter(deployment=deployment, event__isnull=True).exists()
+
+    logger.debug(f"Deployment {deployment.pk}: ungrouped images exist = {ungrouped_images_exist}")
+
+    return ungrouped_images_exist
+
+
 def delete_empty_events(deployment: Deployment, dry_run=False):
     """
     Delete events that have no images, occurrences or other related records.

ami/main/tests.py

@@ -30,6 +30,7 @@
 )
 from ami.ml.models.pipeline import Pipeline
 from ami.tests.fixtures.main import create_captures, create_occurrences, create_taxa, setup_test_project
+from ami.tests.fixtures.storage import populate_bucket
 from ami.users.models import User
 from ami.users.roles import BasicMember, Identifier, ProjectManager
 
@@ -1572,3 +1573,56 @@ def test_project_manager_permissions_(self):
         self._test_sourceimageupload_permissions(
             user=self.project_manager, permission_map=self.PERMISSIONS_MAPS["project_manager"]["sourceimageupload"]
         )
+
+
+class TestDeploymentSyncCreatesEvents(TestCase):
+    def test_sync_creates_events_and_updates_counts(self):
+        # Set up a new project and deployment with test data
+        project, deployment = setup_test_project(reuse=False)
+
+        # Populate the object store with image data
+        assert deployment.data_source is not None
+        populate_bucket(
+            config=deployment.data_source.config,
+            subdir=f"deployment_{deployment.pk}",
+            skip_existing=False,
+        )
+
+        # Sync captures
+        deployment.sync_captures()
+
+        # Refresh and check results
+        deployment.refresh_from_db()
+        initial_events = Event.objects.filter(deployment=deployment)
+        initial_events_count = initial_events.count()
+
+        # Assertions
+        self.assertTrue(initial_events.exists(), "Expected events to be created")
+        self.assertEqual(
+            deployment.events_count, initial_events.count(), "Deployment events_count should match actual events"
+        )
+        # Simulate new images added to object store
+        populate_bucket(
+            config=deployment.data_source.config,
+            subdir=f"deployment_{deployment.pk}",
+            skip_existing=False,
+            num_nights=2,
+            images_per_day=5,
+            minutes_interval=120,
+        )
+
+        # Sync again
+        deployment.sync_captures()
+        deployment.refresh_from_db()
+        updated_events = Event.objects.filter(deployment=deployment)
+
+        # Assertions for second sync
+        self.assertGreater(
+            updated_events.count(), initial_events_count, "New events should be created after adding new images"
+        )
+        self.assertEqual(
+            deployment.events_count,
+            updated_events.count(),
+            "Deployment events_count should reflect updated event count",
+        )
+        logger.info(f"Initial events count: {initial_events_count}, Updated events count: {updated_events.count()}")