chore(storage): Add multiple storage handling [ADEV-222]

backend/api/admin/__init__.py

@@ -14,7 +14,7 @@
 )
 from .__utils__ import get_many_to_many
 from .annotation import *
-from .datasets import DatasetTypeAdmin, DatasetAdmin, DatasetFileAdmin
+from .data import *
 from .spectrogram import *
 
 

backend/api/admin/data/__init__.py

@@ -0,0 +1,2 @@
+"""Data related admin"""
+from .datasets import DatasetAdmin, DatasetFileAdmin, DatasetTypeAdmin

backend/api/admin/datasets.py → backend/api/admin/data/datasets.py

@@ -7,7 +7,7 @@
 from django.utils.html import format_html
 
 from backend.api.models import DatasetType, Dataset, DatasetFile
-from backend.api.serializers.dataset import SimpleSerializer
+from backend.utils.serializers import SimpleSerializer
 
 
 @admin.register(DatasetType)

backend/api/models/__init__.py

@@ -1,13 +1,9 @@
 """All Django models available"""
 
-from backend.api.models.datasets import (
-    DatasetType,
-    Dataset,
-    DatasetFile,
-)
 from backend.api.models.metadata import (
     AudioMetadatum,
     GeoMetadatum,
 )
 from .annotation import *
+from .data import *
 from .spectrogram import *

backend/api/models/annotation/campaign.py

@@ -11,7 +11,7 @@
 from backend.aplose.models import User
 from .confidence import ConfidenceIndicatorSet
 from .label import LabelSet, Label
-from ..datasets import DatasetFile
+from ..data import DatasetFile
 
 
 class AnnotationCampaignUsage(models.IntegerChoices):

backend/api/models/annotation/result.py

@@ -11,7 +11,7 @@
 from .confidence import ConfidenceIndicator
 from .detector import DetectorConfiguration
 from .label import Label
-from ..datasets import DatasetFile
+from ..data import DatasetFile
 
 
 class SignalTrend(models.TextChoices):

backend/api/models/annotation/tasks.py

@@ -6,7 +6,7 @@
 from django.db.models import QuerySet, Q, Subquery, Exists, OuterRef, Func, F
 
 from .campaign import AnnotationCampaign
-from ..datasets import DatasetFile
+from ..data import DatasetFile
 
 
 class AnnotationTask(models.Model):

backend/api/models/data/__init__.py

@@ -0,0 +1,2 @@
+"""Data related models"""
+from .datasets import Dataset, DatasetFile, DatasetType

backend/api/models/metadata.py

@@ -4,7 +4,7 @@
 from django.db.models.signals import post_delete
 from django.dispatch import receiver
 
-from backend.api.models.datasets import Dataset
+from .data import Dataset
 
 
 class FileSubtype(models.Model):

backend/api/models/spectrogram/configuration.py

@@ -1,8 +1,8 @@
 """Spectrogram model"""
 from django.db import models
 
-from ..datasets import Dataset
 from .scales import LinearScale, MultiLinearScale
+from ..data import Dataset
 
 
 class WindowType(models.Model):

backend/api/serializers/__init__.py

@@ -2,9 +2,6 @@
 DRF serializers module to be used in viewsets
 """
 
-from backend.api.serializers.dataset import (
-    DatasetSerializer,
-)
 from backend.api.serializers.label_set import LabelSetSerializer
 from .annotation import *
 from .data import *

backend/api/serializers/data/__init__.py

@@ -1,4 +1,5 @@
 """Annotation data serializers"""
-from .spectrogram_configuration import SpectrogramConfigurationSerializer
 from .audio_metadatum import AudioMetadatumSerializer
+from .dataset import DatasetSerializer
 from .file import DatasetFileSerializer
+from .spectrogram_configuration import SpectrogramConfigurationSerializer

backend/api/serializers/dataset.py → backend/api/serializers/data/dataset.py

@@ -5,7 +5,7 @@
 from backend.api.models import (
     Dataset,
 )
-from .data import SpectrogramConfigurationSerializer
+from .spectrogram_configuration import SpectrogramConfigurationSerializer
 
 # Serializers have too many false-positives on the following warnings:
 # pylint: disable=missing-function-docstring, abstract-method
@@ -38,11 +38,3 @@ class Meta:
         model = Dataset
         fields = DATASET_FIELDS
         depth = 1
-
-
-class SimpleSerializer(serializers.ModelSerializer):
-    """Serializer meant to output basic data"""
-
-    class Meta:
-        model = None
-        fields = "__all__"

backend/api/tests/views/annotation/result/import_results.py

@@ -271,7 +271,6 @@ def test_empty_point_no_end_frequency(self):
             url,
             f"{os.path.dirname(os.path.realpath(__file__))}/import_csv/point_annotation_no_end_frequency.csv",
         )
-        print("response", response.data)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(AnnotationResult.objects.count(), old_count + 1)
 

backend/api/tests/views/dataset/dataset_base.py

@@ -6,7 +6,7 @@
 from rest_framework.test import APITestCase
 
 from backend.api.models import Dataset
-from backend.api.serializers.dataset import DATASET_FIELDS
+from backend.api.serializers.data.dataset import DATASET_FIELDS
 
 IMPORT_FIXTURES = settings.FIXTURE_DIRS[0] / "list_to_import"
 
@@ -37,7 +37,6 @@ def test_list(self):
         """Dataset view 'list' returns correct list of datasets"""
         url = reverse("dataset-list")
         response = self.client.get(url)
-        print(response.data)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(len(response.data), Dataset.objects.count())
         self.assertEqual(

backend/api/tests/views/dataset/datawork_import.py

@@ -7,7 +7,7 @@
 
 from backend import settings
 from backend.api.models import Dataset
-from backend.api.serializers.dataset import DATASET_FIELDS
+from backend.api.serializers.data.dataset import DATASET_FIELDS
 
 IMPORT_FIXTURES = settings.FIXTURE_DIRS[1] / "dataset" / "list_to_import"
 URL = reverse("dataset-datawork-import")

backend/api/views/__init__.py

@@ -2,8 +2,7 @@
 DRF views module based on viewsets
 """
 
-from backend.api.views.label_set import LabelSetViewSet
 from backend.api.views.confidence_indicators import ConfidenceIndicatorSetViewSet
-from backend.api.views.dataset import DatasetViewSet
+from backend.api.views.label_set import LabelSetViewSet
 from .annotation import *
 from .data import *

backend/api/views/data/__init__.py

@@ -1,4 +1,5 @@
 """Data viewsets"""
-from .spectrogram_configuration import SpectrogramConfigurationViewSet
 from .audio_metadatum import AudioMetadatumViewSet
+from .dataset import DatasetViewSet
 from .file import DatasetFileViewSet
+from .spectrogram_configuration import SpectrogramConfigurationViewSet

backend/osmosewebsite/views/project.py

@@ -44,5 +44,4 @@ def deployments(self, request, pk):
             project_id=project.metadatax_project_id,
         )
         serializer = DeploymentSerializer(queryset, many=True)
-        print(serializer.data)
         return response.Response(serializer.data)

backend/utils/serializers.py

@@ -92,3 +92,11 @@ def to_internal_value(self, data):
         except (TypeError, ValueError):
             self.fail("invalid")
             return None
+
+
+class SimpleSerializer(serializers.ModelSerializer):
+    """Serializer meant to output basic data"""
+
+    class Meta:
+        model = None
+        fields = "__all__"