Merge branch 'develop-ui' into develop-backend-changes

.env.example

@@ -1,3 +1,8 @@
 djangosk=django-insecure-y&pp1if&0y)pxtmqf_@o1br(&-6mrxv**f5%&73d@d51kscvg!
 POSTGRES_PASSWORD=valhub
-POSTGRES_USER=valhub
+POSTGRES_USER=valhub
+admin_username=admin
+admin_password=admin
+admin_email=[email protected]
+DOCKER_HOST_VOLUME_DATA_DIR="<path-to-repository>/<repo-name>/workers/current_evaluation/data"
+DOCKER_HOST_VOLUME_RESULTS_DIR="<path-to-repository>/<repo-name>/workers/current_evaluation/results"

docker-compose.yml

@@ -129,9 +129,9 @@ services:
       - ./workers/tmp:/tmp
       - ./workers/requirements.txt:/root/worker/requirements.txt
       - ./workers/src:/root/worker/src
-      - type: bind
-        source: ~/.aws
-        target: /root/.aws
+      # - type: bind
+      #   source: ~/.aws
+      #   target: /root/.aws
     restart: unless-stopped
     develop:
       watch:

ec2/config.json

@@ -1,5 +1,5 @@
 {
-    "category_name": "Time Shift Analysis",
+    "category_name": "Quick Dev TS",
     "function_name": "detect_time_shifts",
     "comparison_type": "time_series",
     "performance_metrics": [

valhub/submissions/migrations/0008_auto_20240730_1750.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.16 on 2024-07-30 17:50
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("submissions", "0007_alter_submission_result"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="submission",
+            name="mae",
+        ),
+        migrations.AlterField(
+            model_name="submission",
+            name="data_requirements",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(max_length=100),
+                blank=True,
+                default=list,
+                size=None,
+            ),
+        ),
+    ]

valhub/submissions/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.contrib.postgres.fields import ArrayField
 
 from analyses.models import Analysis
 from base.utils import RandomFileName
@@ -47,7 +48,9 @@ class Submission(models.Model):
     alt_name = models.TextField(null=True, blank=True, default="")
     # mrt - mean run time
     mrt = models.FloatField(null=True, blank=True)
-    data_requirements = models.TextField(null=True, blank=True)
+    data_requirements = ArrayField(
+        models.CharField(max_length=100), blank=True, default=list
+    )
     archived = models.BooleanField(default=False)
     python_version = models.DecimalField(
         max_digits=4,

valhub/submissions/serializers.py

@@ -135,22 +135,35 @@ def to_representation(self, instance):
             "username": instance.created_by.username,
         }
 
-        # Attempt to load the stringified array from the text field
-        try:
-            data_requirements = json.loads(instance.data_requirements)
-            # Ensure that the loaded object is a list
-            if not isinstance(data_requirements, list):
-                raise ValueError(
-                    "Loaded object is not a list"
-                )  # Include a message with the ValueError
-        except (ValueError, TypeError) as e:
-            logger.error(
-                f"Failed to parse data_requirements for submission {instance.submission_id}: {e}"
-            )
-            logger.error(f"With a value of {instance.data_requirements}")
-            data_requirements = (
-                []
-            )  # Default to an empty list if any error occurs
-
-        data["data_requirements"] = data_requirements
+        return data
+
+
+class SubmissionPrivateReportSerializer(serializers.ModelSerializer):
+    """
+    Serialize the private report of Submission Model.
+    """
+
+    class Meta:
+        model = Submission
+        fields = (
+            "submission_id",
+            "result",
+            "mrt",
+            "data_requirements",
+            "submitted_at",
+            "alt_name",
+            "archived",
+            "python_version",
+            "worker_version",
+        )
+
+    def to_representation(self, instance):
+        data = super(
+            SubmissionPrivateReportSerializer, self
+        ).to_representation(instance)
+        data["created_by"] = {
+            "uuid": instance.created_by.uuid,
+            "username": instance.created_by.username,
+        }
+
         return data

valhub/submissions/views.py

@@ -33,7 +33,11 @@
 from .models import Submission
 from urllib.parse import urljoin
 
-from .serializers import SubmissionSerializer, SubmissionDetailSerializer
+from .serializers import (
+    SubmissionSerializer,
+    SubmissionDetailSerializer,
+    SubmissionPrivateReportSerializer,
+)
 from .models import Submission
 
 
@@ -273,6 +277,11 @@ def update_submission_result(request: Request, submission_id: str):
             response_data = {"error": f"{field} is required"}
             return Response(response_data, status=status.HTTP_400_BAD_REQUEST)
 
+    # Validate that function_parameters is a list
+    if not isinstance(results["function_parameters"], list):
+        response_data = {"error": "function_parameters must be a list"}
+        return Response(response_data, status=status.HTTP_400_BAD_REQUEST)
+
     logging.info(f"results = {results}")
     submission.mrt = float(results["mean_run_time"])
     submission.data_requirements = results["function_parameters"]
@@ -375,6 +384,9 @@ def leaderboard_update(request: Request):
             submission.mrt = float(mrt)
 
         if data_requirements is not None:
+            if isinstance(data_requirements, str):
+                # Convert the string to a list of strings
+                data_requirements = [data_requirements]
             submission.data_requirements = data_requirements
 
         submission.save()
@@ -543,6 +555,9 @@ def get_submission_results(request: Request, submission_id: str):
     # set returns
     logging.info(f"setting returns")
     ret["marimo_url"] = file_urls
+    ret["submission_details"] = SubmissionPrivateReportSerializer(
+        submission
+    ).data
 
     return JsonResponse(ret, status=status.HTTP_200_OK)
 

valhub/system_metadata/migrations/0002_alter_systemmetadata_dc_capacity.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2024-07-30 17:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("system_metadata", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="systemmetadata",
+            name="dc_capacity",
+            field=models.FloatField(default=0.0),
+        ),
+    ]