Merge branch 'feat/apply-default-filters' of https://github.com/RolnickLab/antenna into feat/apply-default-filters

Author: mohamedelabbas1996

ami/jobs/models.py

@@ -131,8 +131,6 @@ def add_stage(self, name: str, key: str | None = None) -> JobProgressStageDetail
     def get_stage(self, stage_key: str) -> JobProgressStageDetail:
         for stage in self.stages:
             if stage.key == stage_key:
-                if stage.name == stage.key:
-                    raise ValueError(f"Job stage with key '{stage_key}' has no name")
                 return stage
         raise ValueError(f"Job stage with key '{stage_key}' not found in progress")
 
@@ -211,6 +209,12 @@ def default_job_progress() -> JobProgress:
 
 
 def default_ml_job_progress() -> JobProgress:
+    """
+    Default stages for an ML Job.
+
+    @TODO add this to the get_default_progress() method of the
+    MLJob class, or delete it. Currently unused.
+    """
     return JobProgress(
         summary=JobProgressSummary(status=JobState.CREATED, progress=0),
         stages=[
@@ -689,8 +693,8 @@ class Job(BaseModel):
     finished_at = models.DateTimeField(null=True, blank=True)
     # @TODO can we use an Enum or Pydantic model for status?
     status = models.CharField(max_length=255, default=JobState.CREATED.name, choices=JobState.choices())
-    progress: JobProgress = SchemaField(JobProgress, default=default_job_progress())
-    logs: JobLogs = SchemaField(JobLogs, default=JobLogs())
+    progress: JobProgress = SchemaField(JobProgress, default=default_job_progress)
+    logs: JobLogs = SchemaField(JobLogs, default=JobLogs)
     params = models.JSONField(null=True, blank=True)
     result = models.JSONField(null=True, blank=True)
     task_id = models.CharField(max_length=255, null=True, blank=True)
@@ -781,7 +785,7 @@ def setup(self, save=True):
         """
         Setup the job by creating the job stages.
         """
-        self.progress = self.progress or default_job_progress
+        self.progress = self.progress or self.get_default_progress()
 
         if self.delay:
             delay_stage = self.progress.add_stage("Delay")
@@ -941,7 +945,7 @@ def get_custom_user_permissions(self, user) -> list[str]:
         return list(custom_perms)
 
     @classmethod
-    def default_progress(cls) -> JobProgress:
+    def get_default_progress(cls) -> JobProgress:
         """Return the progress of each stage of this job as a dictionary"""
         return default_job_progress()
 

ami/main/migrations/0071_alter_project_options.py

@@ -0,0 +1,58 @@
+# Generated by Django 4.2.10 on 2025-09-03 16:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("main", "0070_alter_project_feature_flags"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="project",
+            options={
+                "ordering": ["-priority", "created_at"],
+                "permissions": [
+                    ("create_identification", "Can create identifications"),
+                    ("update_identification", "Can update identifications"),
+                    ("delete_identification", "Can delete identifications"),
+                    ("create_job", "Can create a job"),
+                    ("update_job", "Can update a job"),
+                    ("run_ml_job", "Can run/retry/cancel ML jobs"),
+                    ("run_populate_captures_collection_job", "Can run/retry/cancel Populate Collection jobs"),
+                    ("run_data_storage_sync_job", "Can run/retry/cancel Data Storage Sync jobs"),
+                    ("run_data_export_job", "Can run/retry/cancel Data Export jobs"),
+                    ("run_single_image_ml_job", "Can process a single capture"),
+                    ("delete_job", "Can delete a job"),
+                    ("create_deployment", "Can create a deployment"),
+                    ("delete_deployment", "Can delete a deployment"),
+                    ("update_deployment", "Can update a deployment"),
+                    ("sync_deployment", "Can sync images to a deployment"),
+                    ("create_sourceimagecollection", "Can create a collection"),
+                    ("update_sourceimagecollection", "Can update a collection"),
+                    ("delete_sourceimagecollection", "Can delete a collection"),
+                    ("populate_sourceimagecollection", "Can populate a collection"),
+                    ("create_sourceimage", "Can create a source image"),
+                    ("update_sourceimage", "Can update a source image"),
+                    ("delete_sourceimage", "Can delete a source image"),
+                    ("star_sourceimage", "Can star a source image"),
+                    ("create_sourceimageupload", "Can create a source image upload"),
+                    ("update_sourceimageupload", "Can update a source image upload"),
+                    ("delete_sourceimageupload", "Can delete a source image upload"),
+                    ("create_s3storagesource", "Can create storage"),
+                    ("delete_s3storagesource", "Can delete storage"),
+                    ("update_s3storagesource", "Can update storage"),
+                    ("test_s3storagesource", "Can test storage connection"),
+                    ("create_site", "Can create a site"),
+                    ("delete_site", "Can delete a site"),
+                    ("update_site", "Can update a site"),
+                    ("create_device", "Can create a device"),
+                    ("delete_device", "Can delete a device"),
+                    ("update_device", "Can update a device"),
+                    ("view_private_data", "Can view private data"),
+                    ("trigger_exports", "Can trigger data exports"),
+                ],
+            },
+        ),
+    ]

ami/main/models.py

@@ -320,6 +320,7 @@ class Permissions:
         CREATE_DEPLOYMENT = "create_deployment"
         DELETE_DEPLOYMENT = "delete_deployment"
         UPDATE_DEPLOYMENT = "update_deployment"
+        SYNC_DEPLOYMENT = "sync_deployment"
 
         # Collection permissions
         CREATE_COLLECTION = "create_sourceimagecollection"
@@ -341,6 +342,7 @@ class Permissions:
         CREATE_STORAGE = "create_s3storagesource"
         DELETE_STORAGE = "delete_s3storagesource"
         UPDATE_STORAGE = "update_s3storagesource"
+        TEST_STORAGE = "test_s3storagesource"
 
         # Site permissions
         CREATE_SITE = "create_site"
@@ -379,6 +381,7 @@ class Meta:
             ("create_deployment", "Can create a deployment"),
             ("delete_deployment", "Can delete a deployment"),
             ("update_deployment", "Can update a deployment"),
+            ("sync_deployment", "Can sync images to a deployment"),
             # Collection permissions
             ("create_sourceimagecollection", "Can create a collection"),
             ("update_sourceimagecollection", "Can update a collection"),
@@ -397,6 +400,7 @@ class Meta:
             ("create_s3storagesource", "Can create storage"),
             ("delete_s3storagesource", "Can delete storage"),
             ("update_s3storagesource", "Can update storage"),
+            ("test_s3storagesource", "Can test storage connection"),
             # Site permissions
             ("create_site", "Can create a site"),
             ("delete_site", "Can delete a site"),

ami/main/tests.py

@@ -1283,7 +1283,7 @@ def setUp(self) -> None:
             "project_manager": {
                 "project": {"create": False, "update": True, "delete": True},
                 "collection": {"create": True, "update": True, "delete": True, "populate": True},
-                "storage": {"create": True, "update": True, "delete": True},
+                "storage": {"create": True, "update": True, "delete": True, "test": True},
                 "sourceimage": {"create": True, "update": True, "delete": True},
                 "sourceimageupload": {"create": True, "update": True, "delete": True},
                 "site": {"create": True, "update": True, "delete": True},

ami/users/roles.py

@@ -105,9 +105,11 @@ class ProjectManager(Role):
             Project.Permissions.CREATE_STORAGE,
             Project.Permissions.UPDATE_STORAGE,
             Project.Permissions.DELETE_STORAGE,
+            Project.Permissions.TEST_STORAGE,
             Project.Permissions.CREATE_DEPLOYMENT,
             Project.Permissions.UPDATE_DEPLOYMENT,
             Project.Permissions.DELETE_DEPLOYMENT,
+            Project.Permissions.SYNC_DEPLOYMENT,
             Project.Permissions.CREATE_SITE,
             Project.Permissions.UPDATE_SITE,
             Project.Permissions.DELETE_SITE,