From b042832df685312cd02bd73563d8b69fc2d43ab3 Mon Sep 17 00:00:00 2001 From: OhMaley Date: Tue, 11 Jun 2024 17:29:49 -0400 Subject: [PATCH 1/4] Add a Bundles tab in Resources view --- src/apps/api/views/datasets.py | 16 +- .../riot/competitions/bundle_management.tag | 149 ++++++++++++++++++ src/static/riot/management.tag | 4 + 3 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 src/static/riot/competitions/bundle_management.tag diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py index 2175b9dc0..a3cb316a8 100644 --- a/src/apps/api/views/datasets.py +++ b/src/apps/api/views/datasets.py @@ -26,6 +26,8 @@ class DataViewSet(ModelViewSet): def get_queryset(self): + exclude_bundle = True + if self.request.method == 'GET': # filters @@ -40,6 +42,9 @@ def get_queryset(self): # _type = dataset if called from datasets and programs tab to filter datasets and programs is_dataset = self.request.query_params.get('_type', '') == 'dataset' + # _type = dataset if called from datasets and programs tab to filter datasets and programs + is_bundle = self.request.query_params.get('_type', '') == 'bundle' + # get queryset qs = self.queryset @@ -50,6 +55,11 @@ def get_queryset(self): # filter datasets and programs if is_dataset: qs = qs.filter(~Q(type=Data.SUBMISSION)) + + # filter bundles + if is_bundle: + qs = qs.filter(Q(type=Data.COMPETITION_BUNDLE)) + exclude_bundle = False # public filter check if is_public: @@ -58,7 +68,7 @@ def get_queryset(self): qs = qs.filter(Q(created_by=self.request.user)) # if GET is called but provided no filters, fall back to default behaviour - if (not is_submission) and (not is_dataset) and (not is_public): + if (not is_submission) and (not is_dataset) and (not is_bundle) and (not is_public): qs = self.queryset qs = qs.filter(Q(is_public=True) | Q(created_by=self.request.user)) @@ -66,7 +76,9 @@ def get_queryset(self): qs = self.queryset qs = qs.filter(Q(is_public=True) | Q(created_by=self.request.user)) - qs = qs.exclude(Q(type=Data.COMPETITION_BUNDLE) | Q(name__isnull=True)) + if exclude_bundle: + qs = qs.exclude(Q(type=Data.COMPETITION_BUNDLE)) + qs = qs.exclude(Q(name__isnull=True)) qs = qs.select_related('created_by').order_by('-created_when') diff --git a/src/static/riot/competitions/bundle_management.tag b/src/static/riot/competitions/bundle_management.tag new file mode 100644 index 000000000..2d35be19e --- /dev/null +++ b/src/static/riot/competitions/bundle_management.tag @@ -0,0 +1,149 @@ + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
File NameSizeUploaded
{ dataset.name }{ format_file_size(dataset.file_size) }{ timeSince(Date.parse(dataset.created_when)) } ago
+ No Datasets Yet! +
+ +
+ + + + \ No newline at end of file diff --git a/src/static/riot/management.tag b/src/static/riot/management.tag index 904093abf..7e0d3a549 100644 --- a/src/static/riot/management.tag +++ b/src/static/riot/management.tag @@ -4,6 +4,7 @@
Submissions
Datasets and programs
+
Bundles
Tasks
@@ -19,6 +20,9 @@
+
+ +
From 9e7ae0b97b2ecce0e9c94fe0b2a38e1a9c2ecc65 Mon Sep 17 00:00:00 2001 From: OhMaley Date: Wed, 12 Jun 2024 16:29:18 -0400 Subject: [PATCH 2/4] add dump single and multiple deletion mechanism --- src/apps/api/serializers/datasets.py | 3 +- src/apps/api/views/datasets.py | 6 +- src/apps/datasets/models.py | 5 ++ .../riot/competitions/bundle_management.tag | 60 +++++++++++++++++++ 4 files changed, 68 insertions(+), 6 deletions(-) diff --git a/src/apps/api/serializers/datasets.py b/src/apps/api/serializers/datasets.py index 7543afe54..9cb9722b9 100644 --- a/src/apps/api/serializers/datasets.py +++ b/src/apps/api/serializers/datasets.py @@ -26,7 +26,7 @@ class Meta: 'was_created_by_competition', 'competition', 'file_name', - + 'is_dump', ) read_only_fields = ( 'key', @@ -98,6 +98,7 @@ class Meta: 'file_size', 'competition', 'file_name', + 'is_dump' ) def get_competition(self, obj): diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py index a3cb316a8..75314f523 100644 --- a/src/apps/api/views/datasets.py +++ b/src/apps/api/views/datasets.py @@ -26,8 +26,6 @@ class DataViewSet(ModelViewSet): def get_queryset(self): - exclude_bundle = True - if self.request.method == 'GET': # filters @@ -55,11 +53,11 @@ def get_queryset(self): # filter datasets and programs if is_dataset: qs = qs.filter(~Q(type=Data.SUBMISSION)) + qs = qs.exclude(Q(type=Data.COMPETITION_BUNDLE)) # filter bundles if is_bundle: qs = qs.filter(Q(type=Data.COMPETITION_BUNDLE)) - exclude_bundle = False # public filter check if is_public: @@ -76,8 +74,6 @@ def get_queryset(self): qs = self.queryset qs = qs.filter(Q(is_public=True) | Q(created_by=self.request.user)) - if exclude_bundle: - qs = qs.exclude(Q(type=Data.COMPETITION_BUNDLE)) qs = qs.exclude(Q(name__isnull=True)) qs = qs.select_related('created_by').order_by('-created_when') diff --git a/src/apps/datasets/models.py b/src/apps/datasets/models.py index 597de0309..ea181bc24 100644 --- a/src/apps/datasets/models.py +++ b/src/apps/datasets/models.py @@ -106,6 +106,11 @@ def in_use(self): ).values('pk', 'title').distinct() return competitions_in_use + @property + def is_dump(self): + from competitions.models import CompetitionDump + return CompetitionDump.objects.filter(dataset=self).exists() + def __str__(self): return f'{self.name}({self.id})' diff --git a/src/static/riot/competitions/bundle_management.tag b/src/static/riot/competitions/bundle_management.tag index 2d35be19e..83c9dcdc4 100644 --- a/src/static/riot/competitions/bundle_management.tag +++ b/src/static/riot/competitions/bundle_management.tag @@ -4,6 +4,10 @@
+ @@ -12,6 +16,8 @@ + + @@ -20,6 +26,17 @@ + + + @@ -22,17 +23,24 @@ - + +
File Name Size UploadedDelete?
{ dataset.name } { format_file_size(dataset.file_size) } { timeSince(Date.parse(dataset.created_when)) } ago + + +
+ + +
+
@@ -56,6 +73,7 @@ ---------------------------------------------------------------------*/ self.datasets = [] + self.marked_datasets = [] self.page = 1 self.one("mount", function () { @@ -117,6 +135,48 @@ }) } + self.delete_dataset = function (dataset, e) { + if (confirm(`Are you sure you want to delete '${dataset.name}'?`)) { + CODALAB.api.delete_dataset(dataset.id) + .done(function () { + self.update_datasets() + toastr.success("Dataset deleted successfully!") + CODALAB.events.trigger('reload_quota_cleanup') + }) + .fail(function (response) { + toastr.error(response.responseJSON['error']) + }) + } + event.stopPropagation() + } + + self.delete_datasets = function () { + if (confirm(`Are you sure you want to delete multiple datasets?`)) { + CODALAB.api.delete_datasets(self.marked_datasets) + .done(function () { + self.update_datasets() + toastr.success("Dataset deleted successfully!") + self.marked_datasets = [] + CODALAB.events.trigger('reload_quota_cleanup') + }) + .fail(function (response) { + for (e in response.responseJSON) { + toastr.error(`${e}: '${response.responseJSON[e]}'`) + } + }) + } + event.stopPropagation() + } + + self.mark_dataset_for_deletion = function(dataset, e) { + if (e.target.checked) { + self.marked_datasets.push(dataset.id) + } + else { + self.marked_datasets.splice(self.marked_datasets.indexOf(dataset.id), 1) + } + } + // Function to format file size self.format_file_size = function(file_size) { // parse file size from string to float From 4c3ee262ecbe6dd31f01412e97dee19e01cede1a Mon Sep 17 00:00:00 2001 From: OhMaley Date: Wed, 26 Jun 2024 15:39:37 -0400 Subject: [PATCH 3/4] add competition title in bundle name + add competition link in bundle resource tab --- src/apps/api/serializers/datasets.py | 27 +++++-- src/apps/competitions/tasks.py | 2 + src/apps/datasets/models.py | 5 -- .../riot/competitions/bundle_management.tag | 70 ++++++++++++++++++- 4 files changed, 92 insertions(+), 12 deletions(-) diff --git a/src/apps/api/serializers/datasets.py b/src/apps/api/serializers/datasets.py index 9cb9722b9..127f97478 100644 --- a/src/apps/api/serializers/datasets.py +++ b/src/apps/api/serializers/datasets.py @@ -3,6 +3,7 @@ from api.mixins import DefaultUserCreateMixin from datasets.models import Data, DataGroup +from competitions.models import CompetitionCreationTaskStatus, CompetitionDump class DataSerializer(DefaultUserCreateMixin, serializers.ModelSerializer): @@ -26,7 +27,7 @@ class Meta: 'was_created_by_competition', 'competition', 'file_name', - 'is_dump', + ) read_only_fields = ( 'key', @@ -98,17 +99,35 @@ class Meta: 'file_size', 'competition', 'file_name', - 'is_dump' ) def get_competition(self, obj): - - # return competition dict with id and title if available if obj.competition: + # Submission return { "id": obj.competition.id, "title": obj.competition.title, } + else: + competition = None + try: + # Check if it is a bundle + competition = CompetitionCreationTaskStatus.objects.get(dataset=obj).resulting_competition + except CompetitionCreationTaskStatus.DoesNotExist: + competition = None + if not competition: + # Check if it is a dump + try: + competition = CompetitionDump.objects.get(dataset=obj).competition + except CompetitionDump.DoesNotExist: + competition = None + + if competition: + return { + "id": competition.id, + "title": competition.title + } + return None def get_owner_display_name(self, instance): diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py index facc8041b..dfdfbaad0 100644 --- a/src/apps/competitions/tasks.py +++ b/src/apps/competitions/tasks.py @@ -408,6 +408,8 @@ def _get_error_string(error_dict): # call again, to make sure phases get sent to chahub competition.save() logger.info("Competition saved!") + status.dataset.name += f" - {competition.title}" + status.dataset.save() except CompetitionUnpackingException as e: # We want to catch well handled exceptions and display them to the user diff --git a/src/apps/datasets/models.py b/src/apps/datasets/models.py index ea181bc24..597de0309 100644 --- a/src/apps/datasets/models.py +++ b/src/apps/datasets/models.py @@ -106,11 +106,6 @@ def in_use(self): ).values('pk', 'title').distinct() return competitions_in_use - @property - def is_dump(self): - from competitions.models import CompetitionDump - return CompetitionDump.objects.filter(dataset=self).exists() - def __str__(self): return f'{self.name}({self.id})' diff --git a/src/static/riot/competitions/bundle_management.tag b/src/static/riot/competitions/bundle_management.tag index 83c9dcdc4..78372fee3 100644 --- a/src/static/riot/competitions/bundle_management.tag +++ b/src/static/riot/competitions/bundle_management.tag @@ -14,6 +14,7 @@
File NameBenchmark Size Uploaded Delete?
{ dataset.name } +
+ {dataset.competition.title} +
+ 		{ format_file_size(dataset.file_size) } { timeSince(Date.parse(dataset.created_when)) } ago - -
+
@@ -65,6 +73,51 @@
+ +
+
+ {selected_row.name} +
+
+

Details

+ + + + + + + + + + + + + + + +
KeyCreated ByCreated
{selected_row.key}{selected_row.owner_display_name}{pretty_date(selected_row.created_when)}
+ +
Description:
+
+ {selected_row.description} +
+ +
Used by: +
+
+ {comp.title} +
+
+
+
+
+ + Download File + + +
+
+