feat: ExperimentUpload objects output, better format and filters

viewer/filters.py

@@ -8,6 +8,7 @@
     CanonSiteConf,
     Compound,
     Experiment,
+    ExperimentUpload,
     Pose,
     QuatAssembly,
     SiteObservation,
@@ -125,3 +126,9 @@ class AssemblyFilter(TargetFilterMixin):
     class Meta:
         model = QuatAssembly
         fields = ("target",)
+
+
+class ExperimentUploadFilter(filters.FilterSet):
+    class Meta:
+        model = ExperimentUpload
+        fields = ("target", "project", "data_version_major", "data_version_minor")

viewer/serializers.py

@@ -895,9 +895,25 @@ class Meta:
 
 
 class TargetExperimentReadSerializer(ValidateProjectMixin, serializers.ModelSerializer):
+    tarball = serializers.CharField()
+
     class Meta:
         model = models.ExperimentUpload
-        fields = '__all__'
+        fields = (
+            'target',
+            'project',
+            'tarball',
+            'commit_datetime',
+            'committer',
+            'task_id',
+            'neighbourhood_transforms',
+            'conformer_site_transforms',
+            'reference_structure_transforms',
+            'upload_data_dir',
+            'upload_version',
+            'data_version_major',
+            'data_version_minor',
+        )
 
 
 class TargetExperimentWriteSerializer(serializers.ModelSerializer):

viewer/views.py

@@ -17,6 +17,9 @@
 from dateutil.parser import parse
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from django.db.models import F, Value
+from django.db.models.fields import CharField
+from django.db.models.functions import Concat
 from django.http import FileResponse, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
@@ -1834,10 +1837,23 @@ def create(self, request, *args, **kwargs):
 
 
 class ExperimentUploadView(ISPyBSafeQuerySet):
-    queryset = models.ExperimentUpload.objects.all()
+    queryset = models.ExperimentUpload.objects.annotate(
+        tarball=Concat(
+            Value(settings.TARGET_LOADER_MEDIA_DIRECTORY),
+            Value('/'),
+            F('target__zip_archive'),
+            Value('/'),
+            F('file'),
+            output_field=CharField(),
+        ),
+    ).order_by(
+        'project',
+        'target__title',
+        'upload_version',
+    )
     serializer_class = serializers.TargetExperimentReadSerializer
     permission_class = [permissions.IsAuthenticated]
-    filterset_fields = ("target", "project")
+    filterset_class = filters.ExperimentUploadFilter
     filter_permissions = "target__project"
     http_method_names = ('get',)