Merge remote-tracking branch 'mhmdk0/webui-new-design' into webui-new-design

Author: mhmdk0

cli/medperf/commands/association/utils.py

@@ -53,17 +53,6 @@ def filter_latest_associations(associations, experiment_key, component_key):
     return latest_associations
 
 
-def get_last_component(associations, experiment_key):
-    associations.sort(key=lambda assoc: parse_datetime(assoc["created_at"]))
-    experiments_component = {}
-    for assoc in associations:
-        experiment_id = assoc[experiment_key]
-        experiments_component[experiment_id] = assoc
-
-    experiments_component = list(experiments_component.values())
-    return experiments_component
-
-
 def get_experiment_associations(
     experiment_id: int,
     experiment_type: str,
@@ -131,10 +120,6 @@ def _post_process_associtations(
 ):
 
     assocs = filter_latest_associations(associations, experiment_type, component_type)
-    if component_type == "aggregator":
-        # an experiment should only have one aggregator
-        assocs = get_last_component(assocs, experiment_type)
-
     if approval_status:
         approval_status = approval_status.upper()
         assocs = [

cli/medperf/commands/training/set_aggregator.py

@@ -53,6 +53,6 @@ def submit(self):
         self.approved = self.approved or approval_prompt(msg)
 
         if self.approved:
-            self.comms.set_training_exp_aggregator(self.training_exp_id, body)
+            self.comms.update_training_exp(self.training_exp_id, body)
             return
         raise CleanExit("Aggregator setting cancelled")

cli/medperf/commands/training/submit.py

@@ -30,7 +30,7 @@ def run(cls, training_exp_info: dict):
             ui.text = "Getting FL admin Container"
             submission.get_fl_admin_mlcube()
             ui.print("> Completed retrieving FL Container")
-            ui.text = "Getting aggregator Container"
+            ui.text = "Checking if an aggregator is provided"
             submission.get_aggregator()
             ui.text = "Submitting TrainingExp to MedPerf"
             updated_benchmark_body = submission.submit()

cli/medperf/comms/rest.py

@@ -880,17 +880,6 @@ def associate_training_dataset(self, data_uid: int, training_exp_id: int):
         error_msg = "Could not associate dataset to training_exp"
         return self.__post(url, json=data, error_msg=error_msg)
 
-    def set_training_exp_aggregator(self, training_exp_id: int, data: dict):
-        """Set the aggregator for a training experiment.
-
-        Args:
-            training_exp_id (int): Training experiment UID
-            aggregator_id (int): Aggregator UID
-        """
-        url = f"{self.server_url}/training/{training_exp_id}/"
-        error_msg = "Could not set aggregator on training experiment"
-        return self.__put(url, json=data, error_msg=error_msg)
-
     # updates associations
     def update_benchmark_dataset_association(
         self, benchmark_uid: int, dataset_uid: int, data: str

cli/medperf/tests/commands/association/test_utils.py

@@ -133,42 +133,3 @@ def test_3_latest_associations():
     assert sorted(result, key=lambda x: (x["component"], x["experiment"])) == sorted(
         expected, key=lambda x: (x["component"], x["experiment"])
     )
-
-
-def test_1_last_component():
-    # Arrange
-    associations = [
-        {"created_at": "2025-04-16 17:38:33", "component": 1, "experiment": 2},
-        {"created_at": "2025-04-16 17:34:33", "component": 1, "experiment": 2},
-        {"created_at": "2025-04-16 17:32:33", "component": 2, "experiment": 2},
-    ]
-    expected = [associations[0]]
-
-    # Act
-    result = utils.get_last_component(associations, "experiment")
-
-    # Assert
-    # sort them in some way
-    assert sorted(result, key=lambda x: (x["component"], x["experiment"])) == sorted(
-        expected, key=lambda x: (x["component"], x["experiment"])
-    )
-
-
-def test_2_last_component():
-    # Arrange
-    associations = [
-        {"created_at": "2025-04-16 17:38:33", "component": 1, "experiment": 2},
-        {"created_at": "2025-04-16 17:34:33", "component": 1, "experiment": 2},
-        {"created_at": "2025-04-17 17:32:33", "component": 2, "experiment": 2},
-        {"created_at": "2025-04-16 17:32:33", "component": 2, "experiment": 3},
-    ]
-    expected = [associations[2], associations[3]]
-
-    # Act
-    result = utils.get_last_component(associations, "experiment")
-
-    # Assert
-    # sort them in some way
-    assert sorted(result, key=lambda x: (x["component"], x["experiment"])) == sorted(
-        expected, key=lambda x: (x["component"], x["experiment"])
-    )

server/aggregator/views.py

@@ -5,7 +5,7 @@
 
 from .models import Aggregator
 from .serializers import AggregatorSerializer
-from training.serializers import WriteTrainingExperimentSerializer
+from training.serializers import ReadTrainingExperimentSerializer
 from drf_spectacular.utils import extend_schema
 
 
@@ -35,7 +35,7 @@ def post(self, request, format=None):
 
 
 class AggregatorTrainingExperimentList(GenericAPIView):
-    serializer_class = WriteTrainingExperimentSerializer
+    serializer_class = ReadTrainingExperimentSerializer
     queryset = ""
 
     def get_object(self, pk):
@@ -52,7 +52,7 @@ def get(self, request, pk, format=None):
         aggregator = self.get_object(pk)
         training_exps = aggregator.training_experiments.all()
         training_exps = self.paginate_queryset(training_exps)
-        serializer = WriteTrainingExperimentSerializer(training_exps, many=True)
+        serializer = ReadTrainingExperimentSerializer(training_exps, many=True)
         return self.get_paginated_response(serializer.data)
 
 

server/aggregator_association/__init__.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class AggregatorAssociationConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'aggregator_association'

server/aggregator_association/apps.py

@@ -0,0 +1,65 @@
+# Generated by Django 4.2.11 on 2024-04-29 13:21
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ("aggregator", "0001_initial"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ExperimentAggregator",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("metadata", models.JSONField(default=dict)),
+                (
+                    "approval_status",
+                    models.CharField(
+                        choices=[
+                            ("PENDING", "PENDING"),
+                            ("APPROVED", "APPROVED"),
+                            ("REJECTED", "REJECTED"),
+                        ],
+                        default="PENDING",
+                        max_length=100,
+                    ),
+                ),
+                ("approved_at", models.DateTimeField(blank=True, null=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("modified_at", models.DateTimeField(auto_now=True)),
+                (
+                    "aggregator",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="aggregator.aggregator",
+                    ),
+                ),
+                (
+                    "initiated_by",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["created_at"],
+            },
+        ),
+    ]

server/aggregator_association/migrations/0001_initial.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.11 on 2024-04-29 13:21
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ("training", "0001_initial"),
+        ("aggregator_association", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="experimentaggregator",
+            name="training_exp",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to="training.trainingexperiment",
+            ),
+        ),
+    ]