Djones slurm

.github/workflows/continuous-integration.yml

@@ -19,6 +19,7 @@ jobs:
         run: |
           touch env/.env.dev
           bash run/get_fsps_files.sh
+          bash run/get_sbi_files.sh
           bash run/blast.run.sh ci
       - uses: codecov/codecov-action@v3
         with:

.readthedocs.yml

@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.8"
+    python: "3.11"
   apt_packages:
     - libcurl4-openssl-dev
     - libssl-dev

app/Dockerfile

@@ -1,16 +1,18 @@
-FROM python:3.8
+FROM python:3.11
 ENV PYTHONUNBUFFERED 1
 
 RUN apt-get update
-RUN apt-get install ffmpeg libsm6 libxext6 gfortran libhealpix-cxx-dev -y
+RUN apt-get install ffmpeg libsm6 libxext6 gfortran libhealpix-cxx-dev libhdf5-serial-dev netcdf-bin libnetcdf-dev -y
 
 COPY ./requirements.txt /requirements.txt
-RUN pip install -r /requirements.txt
+RUN pip install -r /requirements.txt --no-cache-dir
 
 COPY ./debug/debug_ipython.py /root/.ipython/profile_default/startup/
 
 RUN mkdir /app
-RUN mkdir /cutout_cdn
+RUN mkdir /data
+RUN mkdir /data/cutout_cdn
+RUN mkdir /data/sed_output
 RUN mkdir /ghost_output
 RUN mkdir /fsps
 

app/api/serializers.py

@@ -12,66 +12,73 @@ def to_representation(self, value):
 class TransientSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.Transient
-        fields = [
-            "name",
-            "ra_deg",
-            "dec_deg",
-            "public_timestamp",
-            "redshift",
-            "milkyway_dust_reddening",
-            "spectroscopic_class",
+        depth = 1
+        exclude = [
+            "tns_id",
+            "tns_prefix",
+            "tasks_initialized",
             "photometric_class",
             "processing_status",
         ]
 
 
-class HostSerializer(serializers.ModelSerializer):
+class HostSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = models.Host
+        depth = 1
         fields = ["name", "ra_deg", "dec_deg", "redshift", "milkyway_dust_reddening"]
 
 
 class ApertureSerializer(serializers.ModelSerializer):
-    cutout = CutoutField(read_only=True)
-
     class Meta:
         model = models.Aperture
-        fields = [
-            "ra_deg",
-            "dec_deg",
-            "orientation_deg",
-            "semi_major_axis_arcsec",
-            "semi_minor_axis_arcsec",
-            "cutout",
-        ]
+        depth = 1
+        fields = "__all__"
 
 
 class AperturePhotometrySerializer(serializers.ModelSerializer):
     class Meta:
         model = models.AperturePhotometry
-        fields = ["flux", "flux_error", "magnitude", "magnitude_error", "is_validated"]
+        depth = 1
+        fields = "__all__"
 
 
 class SEDFittingResultSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.SEDFittingResult
+        depth = 1
+        exclude = ["log_tau_16", "log_tau_50", "log_tau_84", "posterior"]
+
+
+class CutoutSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.Cutout
+        depth = 1
+        exclude = ["fits"]
+
+
+class FilterSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.Filter
+        depth = 1
         fields = [
-            "log_mass_16",
-            "log_mass_50",
-            "log_mass_84",
-            "log_sfr_16",
-            "log_sfr_50",
-            "log_sfr_84",
-            "log_ssfr_16",
-            "log_ssfr_50",
-            "log_sfr_84",
-            "log_ssfr_16",
-            "log_ssfr_50",
-            "log_ssfr_84",
-            "log_age_16",
-            "log_age_50",
-            "log_age_84",
-            "log_tau_16",
-            "log_tau_50",
-            "log_tau_84",
+            "name",
+            "pixel_size_arcsec",
+            "image_fwhm_arcsec",
+            "wavelength_eff_angstrom",
+            "ab_offset",
         ]
+
+
+class TaskRegisterSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.TaskRegister
+        depth = 1
+        fields = "__all__"
+
+
+class TaskSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.Task
+        depth = 1
+        fields = ["name"]

app/api/tests/test_api.py

@@ -42,7 +42,7 @@ def test_transient_get(self):
         self.assertTrue(data["global_aperture_dec_deg"] == 10.03586)
         self.assertTrue(data["global_aperture_semi_major_axis_arcsec"] == 0.4)
         self.assertTrue(data["global_aperture_semi_minor_axis_arcsec"] == 0.5)
-        self.assertTrue(data["global_aperture_cutout"] == "2MASS_J")
+        self.assertTrue(data["global_aperture_cutout"]["name"] == "2022testone_2MASS_J")
 
         self.assertTrue(data["transient_name"] == "2022testone")
         self.assertTrue(data["host_name"] == "PSO J080624.103+010209.859")
@@ -59,9 +59,6 @@ def test_transient_get(self):
         self.assertTrue(data["local_aperture_host_log_age_16"] == 1.0)
         self.assertTrue(data["local_aperture_host_log_age_50"] == 0.1)
         self.assertTrue(data["local_aperture_host_log_age_84"] == 5.0)
-        self.assertTrue(data["local_aperture_host_log_tau_16"] == 1.0)
-        self.assertTrue(data["local_aperture_host_log_tau_50"] == 5.0)
-        self.assertTrue(data["local_aperture_host_log_tau_84"] == 60)
 
         self.assertTrue(data["global_aperture_host_log_mass_16"] == 1.0)
         self.assertTrue(data["global_aperture_host_log_mass_50"] == 2.0)
@@ -75,9 +72,6 @@ def test_transient_get(self):
         self.assertTrue(data["global_aperture_host_log_age_16"] == 1.0)
         self.assertTrue(data["global_aperture_host_log_age_50"] == 0.1)
         self.assertTrue(data["global_aperture_host_log_age_84"] == 5.0)
-        self.assertTrue(data["global_aperture_host_log_tau_16"] == 1.0)
-        self.assertTrue(data["global_aperture_host_log_tau_50"] == 5.0)
-        self.assertTrue(data["global_aperture_host_log_tau_84"] == 60)
 
         self.assertTrue(request.status_code == 200)
 

app/api/tests/test_datamodel.py

@@ -70,7 +70,7 @@ def test_aperture_build(self):
         self.assertTrue(data["global_aperture_dec_deg"] == 10.03586)
         self.assertTrue(data["global_aperture_semi_major_axis_arcsec"] == 0.4)
         self.assertTrue(data["global_aperture_semi_minor_axis_arcsec"] == 0.5)
-        self.assertTrue(data["global_aperture_cutout"] == "2MASS_J")
+        self.assertTrue(data["global_aperture_cutout"]["name"] == "2022testone_2MASS_J")
 
     def test_sed_fitting_result_build(self):
         sed_fit = sed_fit_component("2022testone")
@@ -87,9 +87,6 @@ def test_sed_fitting_result_build(self):
         self.assertTrue(data["local_aperture_host_log_age_16"] == 1.0)
         self.assertTrue(data["local_aperture_host_log_age_50"] == 0.1)
         self.assertTrue(data["local_aperture_host_log_age_84"] == 5.0)
-        self.assertTrue(data["local_aperture_host_log_tau_16"] == 1.0)
-        self.assertTrue(data["local_aperture_host_log_tau_50"] == 5.0)
-        self.assertTrue(data["local_aperture_host_log_tau_84"] == 60)
 
         self.assertTrue(data["global_aperture_host_log_mass_16"] == 1.0)
         self.assertTrue(data["global_aperture_host_log_mass_50"] == 2.0)
@@ -103,9 +100,6 @@ def test_sed_fitting_result_build(self):
         self.assertTrue(data["global_aperture_host_log_age_16"] == 1.0)
         self.assertTrue(data["global_aperture_host_log_age_50"] == 0.1)
         self.assertTrue(data["global_aperture_host_log_age_84"] == 5.0)
-        self.assertTrue(data["global_aperture_host_log_tau_16"] == 1.0)
-        self.assertTrue(data["global_aperture_host_log_tau_50"] == 5.0)
-        self.assertTrue(data["global_aperture_host_log_tau_84"] == 60)
 
 
 class DataModelComponentTests(TestCase):

app/api/views.py

@@ -1,16 +1,167 @@
 import itertools
 
+import django_filters
 from astropy.coordinates import SkyCoord
+from django_filters.rest_framework import DjangoFilterBackend
+from host.models import *
 from host.models import Transient
+from rest_framework import generics
 from rest_framework import status
+from rest_framework import viewsets
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from . import datamodel
+from . import serializers
 from .components import data_model_components
 
 
+### Filter Sets ###
+class TransientFilter(django_filters.FilterSet):
+
+    redshift_lte = django_filters.NumberFilter(field_name="redshift", lookup_expr="lte")
+    redshift_gte = django_filters.NumberFilter(field_name="redshift", lookup_expr="gte")
+
+    class Meta:
+        model = Transient
+        fields = ("name",)
+
+
+### Filter Sets ###
+class HostFilter(django_filters.FilterSet):
+
+    redshift_lte = django_filters.NumberFilter(field_name="redshift", lookup_expr="lte")
+    redshift_gte = django_filters.NumberFilter(field_name="redshift", lookup_expr="gte")
+    photometric_redshift_lte = django_filters.NumberFilter(
+        field_name="photometric_redshift", lookup_expr="lte"
+    )
+    photometric_redshift_gte = django_filters.NumberFilter(
+        field_name="photometric_redshift", lookup_expr="gte"
+    )
+
+    class Meta:
+        model = Host
+        fields = ("name",)
+
+
+class ApertureFilter(django_filters.FilterSet):
+    transient = django_filters.Filter(field_name="transient__name")
+
+    class Meta:
+        model = Aperture
+        fields = ()
+
+
+class TaskRegisterFilter(django_filters.FilterSet):
+
+    transient = django_filters.Filter(field_name="transient__name")
+    status = django_filters.Filter(field_name="status__message")
+    task = django_filters.Filter(field_name="task__name")
+
+    class Meta:
+        model = TaskRegister
+        fields = ()
+
+
+class FilterFilter(django_filters.FilterSet):
+    class Meta:
+        model = Filter
+        fields = ("name",)
+
+
+class CutoutFilter(django_filters.FilterSet):
+
+    filter = django_filters.Filter(field_name="filter__name")
+    transient = django_filters.Filter(field_name="transient__name")
+
+    class Meta:
+        model = Cutout
+        fields = ("name",)
+
+
+class AperturePhotometryFilter(django_filters.FilterSet):
+
+    filter = django_filters.Filter(field_name="filter__name")
+    transient = django_filters.Filter(field_name="transient__name")
+
+    class Meta:
+        model = AperturePhotometry
+        fields = ()
+
+
+class SEDFittingResultFilter(django_filters.FilterSet):
+
+    transient = django_filters.Filter(field_name="transient__name")
+    aperture_type = django_filters.Filter(field_name="aperture__type")
+
+    class Meta:
+        model = SEDFittingResult
+        fields = ()
+
+
+### ViewSets ###
+class TransientViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = Transient.objects.all()
+    serializer_class = serializers.TransientSerializer
+    filter_backends = [DjangoFilterBackend]
+    filterset_class = TransientFilter
+
+
+class ApertureViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = Aperture.objects.all()
+    serializer_class = serializers.ApertureSerializer
+    filter_backends = (DjangoFilterBackend,)
+    filterset_class = ApertureFilter
+
+
+class CutoutViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = Cutout.objects.all()
+    serializer_class = serializers.CutoutSerializer
+    filter_backends = (DjangoFilterBackend,)
+    filterset_class = CutoutFilter
+
+
+class FilterViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = Filter.objects.all()
+    serializer_class = serializers.FilterSerializer
+    filter_backends = (DjangoFilterBackend,)
+    filterset_class = FilterFilter
+
+
+class AperturePhotometryViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = AperturePhotometry.objects.all()
+    serializer_class = serializers.AperturePhotometrySerializer
+    filter_backends = (DjangoFilterBackend,)
+    filterset_class = AperturePhotometryFilter
+
+
+class SEDFittingResultViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = SEDFittingResult.objects.all()
+    serializer_class = serializers.SEDFittingResultSerializer
+    filter_backends = (DjangoFilterBackend,)
+    filterset_class = SEDFittingResultFilter
+
+
+class TaskRegisterViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = TaskRegister.objects.all()
+    serializer_class = serializers.TaskRegisterSerializer
+    filter_backends = (DjangoFilterBackend,)
+    filterset_class = TaskRegisterFilter
+
+
+class TaskViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = Task.objects.all()
+    serializer_class = serializers.TaskSerializer
+
+
+class HostViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = Host.objects.all()
+    serializer_class = serializers.HostSerializer
+    filter_backends = (DjangoFilterBackend,)
+    filterset_class = HostFilter
+
+
 def transient_exists(transient_name: str) -> bool:
     """
     Checks if a transient exists in the database.