psat-server-web 0.3.12__tar.gz → 0.3.14__tar.gz

{psat-server-web-0.3.12/psat_server_web.egg-info → psat-server-web-0.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.3.12
+Version: 0.3.14
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken

psat-server-web-0.3.14/psat_server_web/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.3.14'

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/atlas/apiutils.py

@@ -11,6 +11,8 @@ from atlas.models import TcsCrossMatchesExternal
 from atlas.models import AtlasDetectionsddc
 from atlas.models import TcsVraScores
 from atlas.models import TcsVraTodo
+from atlas.models import TcsObjectGroups
+from atlas.models import TcsVraRank
 from django.forms.models import model_to_dict
 from .lightcurvequeries import *
 from .views import followupClassList
@@ -185,3 +187,51 @@ def getVRATodoList(request, objects = [], dateThreshold = None, idThreshold = 0)
 
     return vraTodoList
 
+
+# 2024-05-20 KWS Added getCustomListObjects
+def getCustomListObjects(request, objectid = None, objectgroupid = None):
+
+    customListObjects = []
+
+    if objectid is None and objectgroupid is not None:
+        querySet = TcsObjectGroups.objects.filter(object_group_id = objectgroupid)
+    elif objectid is not None and objectgroupid is None:
+        querySet = TcsObjectGroups.objects.filter(transient_object_id__id = objectid)
+    else:
+        querySet = TcsObjectGroups.objects.all()
+
+    if querySet is not None:
+        for row in querySet:
+            customListObjects.append(model_to_dict(row))
+
+    return customListObjects
+
+# 2024-05-07 KWS Added getVRARankList
+def getVRARankList(request, objects = [], dateThreshold = None, idThreshold = 0):
+
+    vraRankList = []
+
+    # If we specify objects then ignore any thresholds. Deprecated flag is common to all objects.
+    if len(objects) > 0:
+        for objectid in objects:
+            try:
+                oid = int(objectid)
+            except ValueError as e:
+                continue
+
+            try:
+                querySet = TcsVraRank.objects.filter(transient_object_id_id=oid)
+                if querySet is not None:
+                    for vra in querySet:
+                        vraRankList.append(model_to_dict(vra))
+            except ObjectDoesNotExist as e:
+                # Silent fail. No objects returned if the object does not exist.
+                pass
+    else:
+        querySet = TcsVraRank.objects.filter(pk__gte=idThreshold).filter(timestamp__gte=dateThreshold)
+        #querySet = TcsVraRank.objects.all()
+        if querySet is not None:
+            for vra in querySet:
+                vraRankList.append(model_to_dict(vra))
+
+    return vraRankList

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/atlas/dbviews.py

@@ -133,7 +133,7 @@ class FollowupRaw(models.Model):
     catalogue = models.CharField(max_length=60, db_column='catalogue')
     catalogue_object_id = models.CharField(max_length=30, db_column='catalogue_object_id')
     separation = models.FloatField(db_column='separation')
-    realbogus_factor = models.FloatField(db_column='realbogus_factor')
+    vra = models.FloatField(db_column='realbogus_factor')
     rb_pix = models.FloatField(db_column='zooniverse_score')
     date_modified = models.FloatField(db_column='date_modified')
     external_crossmatches = models.CharField(max_length=1500, db_column='external_crossmatches')
@@ -199,7 +199,7 @@ class WebViewAbstractFollowup(models.Model):
     catalogue = models.CharField(max_length=60, db_column='catalogue')
     catalogue_object_id = models.CharField(max_length=30, db_column='catalogue_object_id')
     separation = models.FloatField(db_column='separation')
-    realbogus_factor = models.FloatField(db_column='realbogus_factor')
+    vra = models.FloatField(db_column='realbogus_factor')
     rb_pix = models.FloatField(db_column='zooniverse_score')
     date_modified = models.FloatField(db_column='date_modified')
     external_crossmatches = models.CharField(max_length=1500, db_column='external_crossmatches')
@@ -464,7 +464,7 @@ class WebViewAbstractUserDefined(models.Model):
     # Extra columns for the user defined object list table
     object_group_id = models.IntegerField(db_column='object_group_id')
     detection_list_id = models.ForeignKey(TcsDetectionLists, null=True, to_field='id', db_column='detection_list_id', on_delete=models.CASCADE)
-    realbogus_factor = models.FloatField(db_column='realbogus_factor')
+    vra = models.FloatField(db_column='realbogus_factor')
     rb_pix = models.FloatField(db_column='zooniverse_score')
     date_modified = models.DateTimeField(db_column='date_modified')
     external_crossmatches = models.CharField(max_length=1500, db_column='external_crossmatches')

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/atlas/helpers.py

@@ -331,23 +331,24 @@ def filterGetParameters(request, queryFilter, prefix = ''):
 
 
     # 2021-11-19 KWS Added realbogus_factor
-    realBogus = None
-    realBogusParameter = 'realbogus_factor'
+    # 2024-05-21 KWS Changed to vra
+    VRA = None
+    VRAParameter = 'vra'
     for suffix in ['__lt', '__lte', '__gt', '__gte', '']:
-        realBogusParameter = 'realbogus_factor' + suffix
-        realBogus = request.GET.get(realBogusParameter)
-        if realBogus is not None:
+        VRAParameter = 'vra' + suffix
+        VRA = request.GET.get(VRAParameter)
+        if VRA is not None:
             break
 
     try:
-        realBogus = float(realBogus)
+        VRA = float(VRA)
     except ValueError as e:
-        realBogus = None
+        VRA = None
     except TypeError as e:
-        realBogus = None
+        VRA = None
 
-    if realBogus:
-        queryFilter[prefix + realBogusParameter] = realBogus
+    if VRA:
+        queryFilter[prefix + VRAParameter] = VRA
 
 
     otherDesignation = None

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/atlas/models.py

@@ -208,7 +208,7 @@ class AtlasDiffObjects(models.Model):
     current_trend = models.CharField(max_length=40, blank=True)
     local_comments = models.CharField(max_length=765, blank=True)
     ndetections = models.IntegerField(blank=True, null=True)
-    realbogus_factor = models.FloatField(blank=True, null=True)
+    vra = models.FloatField(blank=True, null=True, db_column='realbogus_factor')
     rb_pix = models.FloatField(blank=True, null=True, db_column='zooniverse_score')
 
     class Meta:
@@ -1265,3 +1265,13 @@ class TcsVraTodo(models.Model):
         db_table = 'tcs_vra_todo'
 
 
+# 2024-04-16 KWS Added new tcs_vra_scores table for the Virtual Research Assistant.
+class TcsVraRank(models.Model):
+    transient_object_id = models.ForeignKey(AtlasDiffObjects, to_field='id', db_column='transient_object_id', on_delete=models.CASCADE, primary_key=True)
+    rank = models.FloatField(blank=True, null=True)
+    timestamp = models.DateTimeField()
+
+    class Meta:
+        managed = False
+        db_table = 'tcs_vra_rank'
+

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/atlas/views.py

@@ -420,8 +420,8 @@ class WebViewUserDefinedTable(tables2.Table):
     separation = tables2.Column(visible=False, verbose_name="Separation (arcsec)")
     object_group_id = tables2.Column(visible=False)
     detection_list_id = tables2.Column(accessor='detection_list_id.name', verbose_name="List")
-    realbogus_factor = tables2.Column(verbose_name="RB Factor")
-    rb_pix = tables2.Column(verbose_name="RB Factor 2")
+    vra = tables2.Column(verbose_name="VRA")
+    rb_pix = tables2.Column(verbose_name="RB Pix")
     date_modified = tables2.Column(visible=False)
     external_crossmatches = tables2.Column(verbose_name="External Crossmatches")
     discovery_target = tables2.Column(visible=False)
@@ -481,8 +481,8 @@ class WebViewUserDefinedTable(tables2.Table):
         object_definition = getFlagDefs(value, FLAGS, delimiter = ' ')
         return object_definition
 
-    def render_realbogus_factor(self, value):
-        """render_realbogus_factor.
+    def render_vra(self, value):
+        """render_vra.
 
         Args:
             value:
@@ -2138,8 +2138,8 @@ class FollowupRawTable(tables2.Table):
     catalogue_object_id = tables2.Column(visible=False, verbose_name="Nearest Object")
     followup_flag_date = tables2.Column(verbose_name="Flag Date")
     separation = tables2.Column(visible=False, verbose_name="Separation (arcsec)")
-    realbogus_factor = tables2.Column(verbose_name="RB Factor")
-    rb_pix = tables2.Column(verbose_name="RB Factor 2")
+    vra = tables2.Column(verbose_name="VRA")
+    rb_pix = tables2.Column(verbose_name="RB Pix")
 #    external_crossmatches = tables2.Column(verbose_name="External Crossmatches", sortable=False)
     external_crossmatches = tables2.Column(verbose_name="External Crossmatches")
     discovery_target = tables2.Column(visible=False)
@@ -2347,8 +2347,8 @@ class WebViewFollowupTransientsTable(tables2.Table):
     catalogue_object_id = tables2.Column(visible=False, verbose_name="Nearest Object")
     followup_flag_date = tables2.Column(verbose_name="Flag Date")
     separation = tables2.Column(visible=False, verbose_name="Separation (arcsec)")
-    realbogus_factor = tables2.Column(verbose_name="RB Factor")
-    rb_pix = tables2.Column(verbose_name="RB Factor 2")
+    vra = tables2.Column(verbose_name="VRA")
+    rb_pix = tables2.Column(verbose_name="RB Pix")
     date_modified = tables2.Column(visible=False)
     external_crossmatches = tables2.Column(verbose_name="External Crossmatches")
     discovery_target = tables2.Column(visible=False)
@@ -2392,8 +2392,8 @@ class WebViewFollowupTransientsTable(tables2.Table):
         object_definition = getFlagDefs(value, FLAGS, delimiter = ' ')
         return object_definition
 
-    def render_realbogus_factor(self, value):
-        """render_realbogus_factor.
+    def render_vra(self, value):
+        """render_vra.
 
         Args:
             value:
@@ -2600,8 +2600,8 @@ class TcsLatestObjectStatsTable(tables2.Table):
     observation_status = tables2.Column(accessor="id.observation_status", verbose_name="Spectral Type", default='')
     object_classification = tables2.Column(visible=False, accessor="id.object_classification", verbose_name="Machine Classification")
     followup_flag_date = tables2.Column(accessor="id.followup_flag_date", verbose_name="Flag Date")
-    realbogus_factor = tables2.Column(accessor="id.realbogus_factor", verbose_name="RB Factor")
-    rb_pix = tables2.Column(accessor="id.rb_pix", verbose_name="RB Factor 2")
+    vra = tables2.Column(accessor="id.vra", verbose_name="VRA")
+    rb_pix = tables2.Column(accessor="id.rb_pix", verbose_name="RB Pix")
     date_modified = tables2.Column(accessor="id.date_modified", verbose_name="Date Modified")
     target = tables2.Column(accessor="id.images_id.target", default='')
     ref = tables2.Column(accessor="id.images_id.ref", default='')
@@ -2639,8 +2639,8 @@ class TcsLatestObjectStatsTable(tables2.Table):
         object_definition = getFlagDefs(value, FLAGS, delimiter = ' ')
         return object_definition
 
-    def render_realbogus_factor(self, value):
-        """render_realbogus_factor.
+    def render_vra(self, value):
+        """render_vra.
 
         Args:
             value:
@@ -2929,8 +2929,8 @@ class AtlasDiffObjectsTable(tables2.Table):
 
     date_modified = tables2.Column(accessor="date_modified", visible=False)
     mjd_obs = tables2.Column(accessor='images_id__mjd_obs', verbose_name='Recent Triplet MJD', visible = False)
-    realbogus_factor = tables2.Column(accessor='realbogus_factor', verbose_name='RB (DEW)')
-    rb_pix = tables2.Column(accessor="rb_pix", verbose_name='RB (TF)')
+    vra = tables2.Column(accessor='vra', verbose_name='VRA')
+    rb_pix = tables2.Column(accessor="rb_pix", verbose_name='RB Pix')
     detection_list_id = tables2.Column(accessor="detection_list_id", visible=False)
 
     # Added these methods in place of using @property
@@ -2954,8 +2954,8 @@ class AtlasDiffObjectsTable(tables2.Table):
         dec_in_sex = dec_to_sex (value)
         return dec_in_sex
 
-    def render_realbogus_factor(self, value):
-        """render_realbogus_factor.
+    def render_vra(self, value):
+        """render_vra.
 
         Args:
             value:
@@ -3113,7 +3113,7 @@ class AtlasDiffObjectsTablePublic(AtlasDiffObjectsTable):
     """
 
     current_trend = tables2.Column(accessor='current_trend', verbose_name='Trend', visible=False)
-    realbogus_factor = tables2.Column(accessor='realbogus_factor', verbose_name='RB Factor', visible=False)
+    vra = tables2.Column(accessor='vra', verbose_name='VRA', visible=False)
 
 
 

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/atlasapi/serializers.py

@@ -11,6 +11,8 @@ import sys
 from atlas.apiutils import candidateddcApi, getObjectList
 from atlas.apiutils import getVRAScoresList
 from atlas.apiutils import getVRATodoList
+from atlas.apiutils import getCustomListObjects
+from atlas.apiutils import getVRARankList
 from django.core.exceptions import ObjectDoesNotExist
 
 # 2024-01-29 KWS Need the model to do inserts.
@@ -19,7 +21,7 @@ from atlas.models import AtlasDiffObjects
 from atlas.models import TcsVraTodo
 from atlas.models import TcsObjectGroups
 from atlas.models import TcsObjectGroupDefinitions
-
+from atlas.models import TcsVraRank
 
 #CAT_ID_RA_DEC_COLS['objects'] = [['objectId', 'ramean', 'decmean'], 1018]
 
@@ -320,13 +322,10 @@ class TcsObjectGroupsSerializer(serializers.Serializer):
 
         from django.conf import settings
         objectid = self.validated_data['objectid']
-        objectGroupId = self.validated_data['objectGroupId']
+        objectGroupId = self.validated_data['objectgroupid']
 
         replyMessage = 'Row created.'
 
-        if not insertDate:
-            insertDate = datetime.now()
-
         # This is what gets inserted into the database.
         data = {'transient_object_id_id': objectid,
                 'object_group_id': objectGroupId}
@@ -359,3 +358,137 @@ class TcsObjectGroupsSerializer(serializers.Serializer):
         info = { "objectgroupid": objectid, "info": replyMessage }
         return info
 
+# 2024-02-21 KWS Changed required to False for all three prob values.
+class TcsObjectGroupsDeleteSerializer(serializers.Serializer):
+    objectid = serializers.IntegerField(required=True)
+    objectgroupid = serializers.IntegerField(required=True)
+
+    import sys
+
+    def save(self):
+
+        from django.conf import settings
+        objectid = self.validated_data['objectid']
+        objectGroupId = self.validated_data['objectgroupid']
+
+        replyMessage = 'Row deleted.'
+
+        # This is what gets inserted into the database.
+        data = {'transient_object_id_id': objectid,
+                'object_group_id': objectGroupId}
+
+        # Does the objectId actually exit - not allowed to comment on objects that don't exist!
+        # This should really return a 404 message.
+        try:
+            transient = AtlasDiffObjects.objects.get(pk=objectid)
+        except ObjectDoesNotExist as e:
+            replyMessage = 'Object does not exist.'
+            info = { "objectid": objectid, "info": replyMessage }
+            return info
+
+        try:
+            group = TcsObjectGroupDefinitions.objects.get(pk=objectGroupId)
+        except ObjectDoesNotExist as e:
+            replyMessage = 'Object group ID does not exist.'
+            info = { "objectgroupid": objectGroupId, "info": replyMessage }
+            return info
+
+        try:
+            instance = TcsObjectGroups.objects.get(transient_object_id__id = objectid, object_group_id = objectGroupId)
+        except ObjectDoesNotExist as e:
+            replyMessage = 'Object group ID does not exist or object ID does not exist.'
+            info = { "objectgroupid": objectGroupId, "objectid": objectid, "info": replyMessage }
+            return info
+
+        i = instance.delete()
+        #replyMessage = 'Duplicate row. Cannot add row.'
+
+        info = { "objectgroupid": objectid, "info": replyMessage }
+        return info
+
+class TcsObjectGroupsListSerializer(serializers.Serializer):
+    objectid = serializers.IntegerField(required=False, default=None)
+    objectgroupid = serializers.IntegerField(required=False, default=None)
+
+    def save(self):
+        objectid = self.validated_data['objectid']
+        objectGroupId = self.validated_data['objectgroupid']
+
+        request = self.context.get("request")
+
+        customListObjects = getCustomListObjects(request, objectid, objectGroupId)
+        return customListObjects
+
+
+# 2024-05-22 KWS Added VRARank and VRARankList Serializers.
+class VRARankSerializer(serializers.Serializer):
+    objectid = serializers.IntegerField(required=True)
+    rank = serializers.FloatField(required=True)
+    insertdate = serializers.DateTimeField(required=False, default=None)
+
+    import sys
+
+    def save(self):
+
+        from django.conf import settings
+        objectid = self.validated_data['objectid']
+        insertdate = self.validated_data['insertdate']
+        rank = self.validated_data['rank']
+
+        insertDate = None
+        if insertdate is not None:
+            insertDate = self.validated_data['insertdate']
+
+        replyMessage = 'Row created.'
+
+        if not insertDate:
+            insertDate = datetime.now()
+
+        data = {'transient_object_id_id': objectid,
+                'rank': rank,
+                'timestamp': insertDate}
+
+        # Does the objectId actually exit - not allowed to comment on objects that don't exist!
+        # This should really return a 404 message.
+        try:
+            transient = AtlasDiffObjects.objects.get(pk=objectid)
+        except ObjectDoesNotExist as e:
+            replyMessage = 'Object does not exist.'
+            info = { "objectid": objectid, "info": replyMessage }
+            return info
+
+        try:
+            instance = TcsVraRank(**data)
+            # Do not use force_insert=True here. We really want to update any existing row
+            # or insert if the row doesn't exist.
+            i = instance.save()
+
+        except IntegrityError as e:
+            # Should never happen!
+            sys.stderr.write(str(e))
+            replyMessage = 'Duplicate row. Cannot add row.'
+
+        info = { "objectid": objectid, "info": replyMessage }
+        return info
+
+
+class VRARankListSerializer(serializers.Serializer):
+    objects = serializers.CharField(required=False, default=None)
+    datethreshold = serializers.DateTimeField(required=False, default='1970-01-01')
+
+    def save(self):
+        objects = self.validated_data['objects']
+        datethreshold = self.validated_data['datethreshold']
+
+        request = self.context.get("request")
+
+        olist = []
+
+        if objects is not None:
+            for tok in objects.split(','):
+                olist.append(tok.strip())
+
+        vraRankList = getVRARankList(request, objects = olist, dateThreshold = datethreshold)
+        return vraRankList
+
+

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/atlasapi/urls.py

@@ -12,5 +12,9 @@ urlpatterns = [
     path('api/vratodo/',               views.VRATodoView.as_view()),
     path('api/vratodolist/',           views.VRATodoListView.as_view()),
     path('api/objectgroups/',          views.TcsObjectGroupsView.as_view()),
+    path('api/objectgroupslist/',      views.TcsObjectGroupsListView.as_view()),
+    path('api/objectgroupsdelete/',    views.TcsObjectGroupsDeleteView.as_view()),
+    path('api/vrarank/',               views.VRARankView.as_view()),
+    path('api/vraranklist/',           views.VRARankListView.as_view()),
     path('api/auth-token/',            obtain_auth_token, name='auth_token'),
 ]

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/atlasapi/views.py

@@ -2,13 +2,14 @@ from django.shortcuts import get_object_or_404, render
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework import status
-from .serializers import ConeSerializer, ObjectsSerializer, ObjectListSerializer, VRAScoresSerializer, VRAScoresListSerializer, VRATodoSerializer, VRATodoListSerializer, TcsObjectGroupsSerializer
+from .serializers import ConeSerializer, ObjectsSerializer, ObjectListSerializer, VRAScoresSerializer, VRAScoresListSerializer, VRATodoSerializer, VRATodoListSerializer, TcsObjectGroupsSerializer, TcsObjectGroupsDeleteSerializer, TcsObjectGroupsListSerializer, VRARankSerializer, VRARankListSerializer
 from rest_framework.authentication import TokenAuthentication
 from rest_framework.permissions import IsAuthenticated
 from .query_auth import QueryAuthentication
 from django.core.exceptions import ObjectDoesNotExist
 # 2024-01-29 KWS Need the model to do inserts.
 from atlas.models import TcsVraScores
+from atlas.models import TcsObjectGroups
 import sys
 
 def retcode(message):
@@ -159,3 +160,81 @@ class TcsObjectGroupsView(APIView):
     
             return Response(message, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+class TcsObjectGroupsListView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        serializer = TcsObjectGroupsListSerializer(data=request.GET, context={'request': request})
+        if serializer.is_valid():
+            message = serializer.save()
+            return Response(message, status=retcode(message))
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def post(self, request, format=None):
+        serializer = TcsObjectGroupsListSerializer(data=request.data, context={'request': request})
+        if serializer.is_valid():
+            message = serializer.save()
+            return Response(message, status=retcode(message))
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+
+class TcsObjectGroupsDeleteView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        return Response({"Error": "GET is not implemented for this service."})
+
+    def post(self, request, format=None):
+        serializer = TcsObjectGroupsDeleteSerializer(data=request.data, context={'request': request})
+    
+        if serializer.is_valid():
+            message = serializer.save()
+    
+        if "deleted" in message['info']:
+            # No point returning the message info. 204s will drop the message content anyway.
+            return Response(status=status.HTTP_204_NO_CONTENT)
+        elif "does not exist" in message['info']:
+            return Response(message, status=status.HTTP_400_BAD_REQUEST)
+        else:
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+# 2024-05-22 KWS Added VRARankView. NOTE: Add code to read the reply message and generate a sensible HTTP response
+#                appropriate to the circumstances. E.g. if object is not found generate a 404, etc.
+class VRARankView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        return Response({"Error": "GET is not implemented for this service."})
+
+    def post(self, request, format=None):
+        serializer = VRARankSerializer(data=request.data, context={'request': request})
+    
+        if serializer.is_valid():
+            message = serializer.save()
+    
+            return Response(message, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+            
+# 2024-05-22 KWS Added VRARankListView.
+class VRARankListView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        serializer = VRARankListSerializer(data=request.GET, context={'request': request})
+        if serializer.is_valid():
+            message = serializer.save()
+            return Response(message, status=retcode(message))
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def post(self, request, format=None):
+        serializer = VRARankListSerializer(data=request.data, context={'request': request})
+        if serializer.is_valid():
+            message = serializer.save()
+            return Response(message, status=retcode(message))
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/templates/atlas/candidate_plotly.html

@@ -386,13 +386,13 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
         </div>
         {% endif %}
 
-        {% if transient.realbogus_factor or transient.rb_pix %}
+        {% if transient.vra or transient.rb_pix %}
         <div class="col-lg-12 col-md-12 col-sm-12">
         <span class="parameter-label">Realbogus Factors</span>
         </div>
     
         <div class="col-lg-12 col-md-12 col-sm-12">
-        <span class="parameter-value">{% if transient.realbogus_factor %}{{ transient.realbogus_factor|floatformat:"2" }} (DEW){% endif %} {% if transient.rb_pix %}{{ transient.rb_pix|floatformat:"2" }} (TF){% endif %}</span>
+        <span class="parameter-value">{% if transient.vra %}{{ transient.vra|floatformat:"2" }} (VRA){% endif %} {% if transient.rb_pix %}{{ transient.rb_pix|floatformat:"2" }} (RB Pix){% endif %}</span>
         </div>
         {% endif %}
 

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/templates/atlas/candidate_plotly_test.html

@@ -381,13 +381,13 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
         </div>
         {% endif %}
 
-        {% if transient.realbogus_factor or transient.rb_pix %}
+        {% if transient.vra or transient.rb_pix %}
         <div class="col-lg-12 col-md-12 col-sm-12">
         <span class="parameter-label">Realbogus Factors</span>
         </div>
     
         <div class="col-lg-12 col-md-12 col-sm-12">
-        <span class="parameter-value">{% if transient.realbogus_factor %}{{ transient.realbogus_factor|floatformat:"2" }} (DEW){% endif %} {% if transient.rb_pix %}{{ transient.rb_pix|floatformat:"2" }} (TF){% endif %}</span>
+        <span class="parameter-value">{% if transient.vra %}{{ transient.vra|floatformat:"2" }} (VRA){% endif %} {% if transient.rb_pix %}{{ transient.rb_pix|floatformat:"2" }} (RB Pix){% endif %}</span>
         </div>
         {% endif %}
 

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/templates/atlas/followup_quickview.html

@@ -192,7 +192,7 @@
   <td><img id="stampimages" src="{{ STATIC_URL }}images/data/{{ dbname }}/{{ row.data.images_id.whole_mjd }}/{{ row.data.images_id.diff }}.jpeg" alt="triplet" title="{{ image.pss_filename }}" onerror="this.src='{{ STATIC_URL }}images/image_not_available.jpeg';" height="200" /></td>
   {% endif %}
 {% if not public %}
-  <td>{{ row.data.realbogus_factor|floatformat:2 }}</td>
+  <td>{{ row.data.vra|floatformat:2 }}</td>
   <td>{{ row.data.rb_pix|floatformat:2 }}</td>
 {% endif %}
   <td>{{ row.data.images_id.mjd_obs|floatformat:5 }}</td>

{psat-server-web-0.3.12 → psat-server-web-0.3.14}/psat_server_web/atlas/templates/atlas/search_results_plotly.html

@@ -243,7 +243,7 @@ jslimitsglobal["#flot-lightcurve{{row.id}}"] = jslclimits;
     </div>
     </div>
     {% endif %}
-    {% if row.realbogus_factor or row.rb_pix %}
+    {% if row.vra or row.rb_pix %}
     <div class="row parameter-label">
     <div class="col-lg-12 col-md-12 col-sm-12">
     <span class="parameter-label">Realbogus Factors</span>
@@ -252,7 +252,7 @@ jslimitsglobal["#flot-lightcurve{{row.id}}"] = jslclimits;
 
     <div class="row parameter-value">
     <div class="col-lg-12 col-md-12 col-sm-12">
-    <span class="parameter-value">{{ row.realbogus_factor|floatformat:"2" }} (DEW) {{ row.rb_pix|floatformat:"2" }} (TF)</span>
+    <span class="parameter-value">{{ row.vra|floatformat:"2" }} (VRA) {{ row.rb_pix|floatformat:"2" }} (RB Pix)</span>
     </div>
     </div>
     {% endif %}

psat-server-web-0.3.14/psat_server_web/schema/atlas_detectionsnnc.sql

@@ -0,0 +1,47 @@
+CREATE TABLE `atlas_detectionsnnc` (
+`id` bigint unsigned not null auto_increment,     -- autoincrementing detection id
+`atlas_metadata_id` bigint(20) unsigned NOT NULL, -- a reference to the input file and other information (OBS data)
+`atlas_object_id` bigint(20) unsigned NOT NULL,   -- a reference to the unique object which tags this object
+`detection_id` bigint(20) unsigned,               -- reference to the ddc detection ID
+`det_id` int unsigned not null,                   -- the internal id of the detection (unique per file)
+`ra` double, 
+`dec` double, 
+`mag` float, 
+`dmag` float, 
+`x` float, 
+`y` float, 
+`elong` float, 
+`minor` float, 
+`phi` float, 
+`det` tinyint, 
+`chin` float, 
+`real` float, 
+`var` float, 
+`lin` float, 
+`flaw` float, 
+`cr` float, 
+`prat` float, 
+`mrat` float, 
+`tail` float, 
+`tphi` smallint unsigned, 
+`lphi` smallint unsigned, 
+`flg` smallint unsigned, 
+`wpflux` float, 
+`dwpflx` float, 
+`grp` smallint unsigned, 
+`nnc_id` varchar(30), 
+`date_modified` datetime,            -- when was the detection modified?
+`image_group_id` bigint unsigned,    -- a reference to the group of images that refers to this detection
+`quality_threshold_pass` bool,       -- does this detection pass some specified cuts?
+`deprecated` bool,                   -- option to ignore this detection
+`realbogus_factor` float,            -- machine learning real/bogus value
+`htm16ID` bigint unsigned,
+`date_inserted` datetime NOT NULL,   -- when was the detection inserted?
+PRIMARY KEY `key_id` (`id`),
+KEY `idx_atlas_object_id` (`atlas_object_id`),
+KEY `idx_atlas_metadata_id` (`atlas_metadata_id`),
+KEY `idx_detection_id` (`detection_id`),
+KEY `idx_htm16ID` (`htm16ID`),
+KEY `idx_date_inserted` (`date_inserted`),
+KEY `idx_ra_dec` (`ra`,`dec`)
+) ENGINE=InnoDB;