psat-server-web 0.2.9__tar.gz → 0.3.1__tar.gz

{psat-server-web-0.2.9/psat_server_web.egg-info → psat-server-web-0.3.1}/PKG-INFO

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

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

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

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web/atlas/atlas/apiutils.py

@@ -9,7 +9,7 @@ from atlas.models import SherlockCrossmatches
 from atlas.models import TcsObjectComments
 from atlas.models import TcsCrossMatchesExternal
 from atlas.models import AtlasDetectionsddc
-from atlas.models import TcsVraProbabilities
+from atlas.models import TcsVraScores
 from django.forms.models import model_to_dict
 from .lightcurvequeries import *
 from .views import followupClassList
@@ -123,12 +123,12 @@ def getObjectList(request, listId, getCustomList = False, dateThreshold = None):
     return objectList
 
 
-def getVRAProbabilitiesList(request, objects = [], deprecated = False, dateThreshold = None):
+def getVRAScoresList(request, objects = [], debug = False, dateThreshold = None):
 
-    vraProbabilitiesList = []
+    vraScoresList = []
 
     # If we specify objects then ignore any thresholds. Deprecated flag is common to all objects.
-    # If you don't want a common deprecated flag, then request objects one at a time!
+    # If you don't want a common debug flag, then request objects one at a time!
     if len(objects) > 0:
         for objectid in objects:
             try:
@@ -137,16 +137,18 @@ def getVRAProbabilitiesList(request, objects = [], deprecated = False, dateThres
                 continue
 
             try:
-                vra = TcsVraProbabilities.objects.get(transient_object_id_id=oid, deprecated=deprecated)
-                vraProbabilitiesList.append(model_to_dict(vra))
+                querySet = TcsVraScores.objects.filter(transient_object_id_id=oid, debug=debug)
+                if querySet is not None:
+                    for vra in querySet:
+                        vraScoresList.append(model_to_dict(vra))
             except ObjectDoesNotExist as e:
                 # Silent fail. No objects returned if the object does not exist.
                 pass
     else:
-        querySet = TcsVraProbabilities.objects.filter(updated__gte=dateThreshold)
-        #querySet = TcsVraProbabilities.objects.all()
+        querySet = TcsVraScores.objects.filter(timestamp__gte=dateThreshold)
+        #querySet = TcsVraScores.objects.all()
         if querySet is not None:
             for vra in querySet:
-                vraProbabilitiesList.append(model_to_dict(vra))
+                vraScoresList.append(model_to_dict(vra))
 
-    return vraProbabilitiesList
+    return vraScoresList

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web/atlas/atlas/models.py

@@ -1238,20 +1238,20 @@ class AtlasHeatmaps(models.Model):
         unique_together = (('site', 'region'),)
 
 
-# 2024-01-17 KWS Added new tcs_vra_probabilities table for the Virtual Research Assistant.
-class TcsVraProbabilities(models.Model):
+# 2024-01-17 KWS Added new tcs_vra_scores table for the Virtual Research Assistant.
+class TcsVraScores(models.Model):
     id = models.BigAutoField(primary_key=True)
     transient_object_id = models.ForeignKey(AtlasDiffObjects, to_field='id', db_column='transient_object_id', on_delete=models.CASCADE)
     preal = models.FloatField(blank=True, null=True)
     pgal = models.FloatField(blank=True, null=True)
     pfast = models.FloatField(blank=True, null=True)
-    updated = models.DateTimeField()
-    deprecated = models.BooleanField(null=True, blank=True)
+    timestamp = models.DateTimeField()
+    apiusername = models.CharField(max_length=30, blank=True, null=True)
     username = models.CharField(max_length=30, blank=True, null=True)
+    debug = models.BooleanField(null=True, blank=True)
 
     class Meta:
         managed = False
-        db_table = 'tcs_vra_probabilities'
-        unique_together = (('transient_object_id', 'deprecated'),)
+        db_table = 'tcs_vra_scores'
 
 

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web/atlas/atlas/settings.py

@@ -98,6 +98,9 @@ NAMESERVER_MULTIPLIER = os.environ.get('DJANGO_NAMESERVER_MULTIPLIER')
 
 DUSTMAP_LOCATION = os.environ.get('DJANGO_DUSTMAP_LOCATION')
 
+# 2024-02-21 KWS Added new Virtual Research Assistant settings.
+VRA_ADD_ROW = True
+VRA_DEBUG = False
 
 # 2021-05-06 KWS New settings means that if we edit a static file we MUST rerun the collectstatic
 #                code to deploy the modified file.

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web/atlas/atlas/views.py

@@ -33,6 +33,9 @@ from atlas.models import TcsGravityEventAnnotations
 from atlas.models import SherlockClassifications
 from atlas.models import SherlockCrossmatches
 from atlas.models import TcsObjectComments
+# 2024-02-21 KWS Added TcsVraScores. This table will be populated
+#                as a result of user actions.
+from atlas.models import TcsVraScores
 # 2019-06-06 KWS Get the new diff stack forced photometry data
 from atlas.models import AtlasStackedForcedPhotometry
 from atlas.dbviews import *
@@ -1056,6 +1059,66 @@ def candidate(request, atlas_diff_objects_id):
 
     return render(request, 'atlas/candidate.html',{'transient' : transient, 'table': table, 'images': transient_images, 'form' : form, 'avg_coords': avgCoords, 'lcdata': lcData, 'lcdataforced': lcDataForced, 'lclimits': lcLimits, 'recurrencedata': recurrenceData, 'conesearchold': xmresults['oldDBXmList'], 'olddburl': xmresults['oldDBURL'], 'externalXMs': externalXMs, 'public': public, 'form_searchobject': formSearchObject, 'dbName': dbName, 'finderImages': finderImages, 'processingStatus': processingStatus, 'galactic': galactic, 'fpData': fpData, 'sc': sc, 'gw': gw, 'comments': existingComments})
 
+# 2024-02-21 KWS Added new addVraRow function which gets called every time a user decides to move an object
+def addVraRow(objectid, originalListId, destinationListId, username, settings):
+    """Add a row to the virtual research assistant table. Rules are as follows:
+       If object was trashed, set preal = 0.0 (user thinks it's not real)
+       If object is good, set preal = 1.0, pgal = 0.0 (user thinks it's extragalactic)
+       If object is attic or high proper motion star, set preal = 1.0, pgal = 0.0 (use thinks it's real, but probably galactic)
+       If object is possible, set preal = 0.5 (user doesn't know what to do with the object)
+       If object was recovered from garbage, set preal = pgal = pfast = None.
+
+    Args:
+        objectid:
+        originalListId:
+        destinationListId:
+        username:
+        settings:
+    """
+
+    preal = None
+    pgal = None
+    pfast = None
+    timestamp = datetime.datetime.now()
+
+    try:
+        debug = settings.VRA_DEBUG
+    except:
+        debug = True
+
+    if originalListId == destinationListId:
+        return
+
+    if destinationListId in [GOOD, ATTIC, HPMSTAR]:
+        preal = 1.0
+    elif destinationListId in [POSSIBLE]:
+        preal = 0.5
+    elif destinationListId in [GARBAGE]:
+        preal = 0.0
+
+    if destinationListId in [ATTIC, HPMSTAR]:
+        pgal = 1.0
+    elif destinationListId in [GOOD]:
+        pgal = 0.0
+
+    # If something is fished out of the trash to the eyeball list, the values of preal, pgal and pfast will be set to None.
+
+    data = {'transient_object_id_id': objectid,
+            'preal': preal,
+            'pgal': pgal,
+            'pfast': pfast,
+            'timestamp': timestamp,
+            'debug': debug,
+            'username': username}
+
+    instance = TcsVraScores(**data)
+    try:
+        i = instance.save()
+    except:
+        pass
+
+    return
+
 
 # 2017-06-16 KWS New DDC format candidate method
 @login_required
@@ -1401,6 +1464,9 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
 
                        objectComment.save()
 
+                   if settings.VRA_ADD_ROW:
+                       addVraRow(transient.id, originalListId, listId, request.user.username, settings)
+
                    # Register the object on TNS
                    # 2018-05-14 KWS If the previous list was also good (e.g. just adding a comment) don't send a message
                    #                to the TNS daemon.
@@ -3227,6 +3293,10 @@ def followupQuickView(request, listNumber):
                         if e[0] == 1062: # Duplicate Key error
                             pass # Do nothing - will eventually raise some errors on the form
 
+                    if settings.VRA_ADD_ROW:
+                        originalListId = transient.detection_list_id.id
+                        addVraRow(transient.id, originalListId, listId, request.user.username, settings)
+
 
     else:
         if objectName:
@@ -3835,6 +3905,10 @@ def followupQuickViewBootstrapPlotly(request, listNumber):
                         if e[0] == 1062: # Duplicate Key error
                             pass # Do nothing - will eventually raise some errors on the form
 
+                    if settings.VRA_ADD_ROW:
+                        originalListId = transient.detection_list_id.id
+                        addVraRow(transient.id, originalListId, listId, request.user.username, settings)
+
 
     else:
         if objectName:

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web/atlas/atlasapi/serializers.py

@@ -9,11 +9,11 @@ from gkutils.commonutils import coneSearchHTM, FULL, QUICK, COUNT, CAT_ID_RA_DEC
 from rest_framework import serializers
 import sys
 from atlas.apiutils import candidateddcApi, getObjectList
-from atlas.apiutils import getVRAProbabilitiesList
+from atlas.apiutils import getVRAScoresList
 from django.core.exceptions import ObjectDoesNotExist
 
 # 2024-01-29 KWS Need the model to do inserts.
-from atlas.models import TcsVraProbabilities
+from atlas.models import TcsVraScores
 from atlas.models import AtlasDiffObjects
 
 
@@ -129,12 +129,13 @@ class ObjectListSerializer(serializers.Serializer):
 
 
 # 2024-01-17 KWS Insert a VRA row for an object. For the time being do this one at a time.
-class VRAProbabilitiesSerializer(serializers.Serializer):
+# 2024-02-21 KWS Changed required to False for all three prob values.
+class VRAScoresSerializer(serializers.Serializer):
     objectid = serializers.IntegerField(required=True)
-    preal = serializers.FloatField(required=True)
-    pfast = serializers.FloatField(required=True)
-    pgal = serializers.FloatField(required=True)
-    deprecated = serializers.BooleanField(required=False, default=False)
+    preal = serializers.FloatField(required=False, default=None)
+    pfast = serializers.FloatField(required=False, default=None)
+    pgal = serializers.FloatField(required=False, default=None)
+    debug = serializers.BooleanField(required=False, default=False)
     insertdate = serializers.DateTimeField(required=False, default=None)
 
 
@@ -146,7 +147,7 @@ class VRAProbabilitiesSerializer(serializers.Serializer):
         pfast = self.validated_data['pfast']
         pgal = self.validated_data['pgal']
         insertdate = self.validated_data['insertdate']
-        deprecated = self.validated_data['deprecated']
+        debug = self.validated_data['debug']
 
         insertDate = None
         if insertdate is not None:
@@ -166,9 +167,9 @@ class VRAProbabilitiesSerializer(serializers.Serializer):
                 'preal': preal,
                 'pgal': pgal,
                 'pfast': pfast,
-                'updated': insertDate,
-                'deprecated': deprecated,
-                'username': userId}
+                'timestamp': insertDate,
+                'debug': debug,
+                'apiusername': userId}
 
         # Does the objectId actually exit - not allowed to comment on objects that don't exist!
         # This should really return a 404 message.
@@ -179,47 +180,47 @@ class VRAProbabilitiesSerializer(serializers.Serializer):
             info = { "objectid": objectid, "info": replyMessage }
             return info
 
-        # Does the VRA row exist?
-        vra = None
-        try:
-            vra = TcsVraProbabilities.objects.get(transient_object_id_id=objectid, deprecated=deprecated)
+        ## Does the VRA row exist?
+        #vra = None
+        #try:
+        #    vra = TcsVraScores.objects.get(transient_object_id_id=objectid, debug=debug)
         
-        except ObjectDoesNotExist as e:
-            # That's OK - we'll create a new object
-            pass
+        #except ObjectDoesNotExist as e:
+        #    # That's OK - we'll create a new object
+        #    pass
         
-        if vra:
-            instance = vra
-        else:
-            instance = TcsVraProbabilities(**data)
-        try:
-
-            if vra is not None:
-                instance.preal = preal
-                instance.pfast = pfast
-                instance.pgal = pgal
-                instance.updated = insertDate
-                i = instance.save()
-            else:
-                i = instance.save()
-
-        except IntegrityError as e:
-            replyMessage = 'Duplicate row. Cannot add row.'
+        #if vra:
+        #    instance = vra
+        #else:
+        instance = TcsVraScores(**data)
+        #try:
+
+        #    if vra is not None:
+        #        instance.preal = preal
+        #        instance.pfast = pfast
+        #        instance.pgal = pgal
+        #        instance.timestamp = insertDate
+        #        i = instance.save()
+        #    else:
+        i = instance.save()
+
+        #except IntegrityError as e:
+        #    replyMessage = 'Duplicate row. Cannot add row.'
 
         info = { "objectid": objectid, "info": replyMessage }
         return info
 
 
 
-class VRAProbabilitiesListSerializer(serializers.Serializer):
+class VRAScoresListSerializer(serializers.Serializer):
     objects = serializers.CharField(required=False, default=None)
-    deprecated = serializers.BooleanField(required=False, default=False)
+    debug = serializers.BooleanField(required=False, default=False)
     datethreshold = serializers.DateTimeField(required=False, default='1970-01-01')
 
     def save(self):
         objects = self.validated_data['objects']
         datethreshold = self.validated_data['datethreshold']
-        deprecated = self.validated_data['deprecated']
+        debug = self.validated_data['debug']
 
         request = self.context.get("request")
 
@@ -229,6 +230,6 @@ class VRAProbabilitiesListSerializer(serializers.Serializer):
             for tok in objects.split(','):
                 olist.append(tok.strip())
 
-        vraProbabilitiesList = getVRAProbabilitiesList(request, objects = olist, deprecated = deprecated, dateThreshold = datethreshold)
-        return vraProbabilitiesList
+        vraScoresList = getVRAScoresList(request, objects = olist, debug = debug, dateThreshold = datethreshold)
+        return vraScoresList
 

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web/atlas/atlasapi/urls.py

@@ -7,7 +7,7 @@ urlpatterns = [
     path('api/cone/',                  views.ConeView.as_view()),
     path('api/objects/',               views.ObjectsView.as_view()),
     path('api/objectlist/',            views.ObjectListView.as_view()),
-    path('api/vraprobabilities/',      views.VRAProbabilitiesView.as_view()),
-    path('api/vraprobabilitieslist/',  views.VRAProbabilitiesListView.as_view()),
+    path('api/vrascores/',             views.VRAScoresView.as_view()),
+    path('api/vrascoreslist/',         views.VRAScoresListView.as_view()),
     path('api/auth-token/',            obtain_auth_token, name='auth_token'),
 ]

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web/atlas/atlasapi/views.py

@@ -2,13 +2,13 @@ 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, VRAProbabilitiesSerializer, VRAProbabilitiesListSerializer
+from .serializers import ConeSerializer, ObjectsSerializer, ObjectListSerializer, VRAScoresSerializer, VRAScoresListSerializer
 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 TcsVraProbabilities
+from atlas.models import TcsVraScores
 import sys
 
 def retcode(message):
@@ -72,7 +72,7 @@ class ObjectListView(APIView):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
-class VRAProbabilitiesView(APIView):
+class VRAScoresView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
     permission_classes = [IsAuthenticated]
 
@@ -80,7 +80,7 @@ class VRAProbabilitiesView(APIView):
         return Response({"Error": "GET is not implemented for this service."})
 
     def post(self, request, format=None):
-        serializer = VRAProbabilitiesSerializer(data=request.data, context={'request': request})
+        serializer = VRAScoresSerializer(data=request.data, context={'request': request})
 
         if serializer.is_valid():
             message = serializer.save()
@@ -89,19 +89,19 @@ class VRAProbabilitiesView(APIView):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
-class VRAProbabilitiesListView(APIView):
+class VRAScoresListView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
     permission_classes = [IsAuthenticated]
 
     def get(self, request):
-        serializer = VRAProbabilitiesListSerializer(data=request.GET, context={'request': request})
+        serializer = VRAScoresListSerializer(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 = VRAProbabilitiesListSerializer(data=request.data, context={'request': request})
+        serializer = VRAScoresListSerializer(data=request.data, context={'request': request})
         if serializer.is_valid():
             message = serializer.save()
             return Response(message, status=retcode(message))

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web/schema/create_schema.sql

@@ -95,4 +95,4 @@ source mjdnow.sql;
 source tcs_gravity_alerts.sql;
 
 -- 2024-01-17 KWS Added new tcs_vra_probabilities table.
-source tcs_vra_probabilities.sql;
+source tcs_vra_scores.sql;

psat-server-web-0.3.1/psat_server_web/schema/tcs_vra_scores.sql

@@ -0,0 +1,16 @@
+-- 2024-01-17 KWS New virtual research assistant scores table.
+drop table if exists `tcs_vra_scores`;
+
+create table `tcs_vra_scores` (
+`id` bigint unsigned not null auto_increment,  -- autoincrementing detection id
+`transient_object_id` bigint(20) unsigned NOT NULL,
+`preal` float,
+`pgal` float,
+`pfast` float,
+`timestamp` timestamp not null default current_timestamp,
+`apiusername` varchar(30) default null,
+`username` varchar(30) default null,
+`debug` bool not null default false,
+primary key `idx_pk_id` (`id`),
+key `idx_transient_object_id` (`transient_object_id`)
+) engine=InnoDB;

{psat-server-web-0.2.9 → psat-server-web-0.3.1/psat_server_web.egg-info}/PKG-INFO

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

{psat-server-web-0.2.9 → psat-server-web-0.3.1}/psat_server_web.egg-info/SOURCES.txt

@@ -422,7 +422,7 @@ psat_server_web/schema/tcs_tns_requests.sql
 psat_server_web/schema/tcs_tphot_detections.sql
 psat_server_web/schema/tcs_transient_objects.sql
 psat_server_web/schema/tcs_transient_reobservations.sql
-psat_server_web/schema/tcs_vra_probabilities.sql
+psat_server_web/schema/tcs_vra_scores.sql
 psat_server_web/schema/tcs_zoo_requests.sql
 psat_server_web/schema/tcs_zooniverse_scores.sql
 psat_server_web/schema/types_gaia_dr2_cassandra.txt

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

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

psat-server-web-0.2.9/psat_server_web/schema/tcs_vra_probabilities.sql

@@ -1,16 +0,0 @@
--- 2024-01-17 KWS New virtual research assistant probabilities table.
-drop table if exists `tcs_vra_probabilities`;
-
-create table `tcs_vra_probabilities` (
-`id` bigint unsigned not null auto_increment,  -- autoincrementing detection id
-`transient_object_id` bigint(20) unsigned NOT NULL,
-`preal` float,
-`pgal` float,
-`pfast` float,
-`updated` timestamp not null default current_timestamp,
-`deprecated` bool not null default false,
-`username` varchar(30) default null,
-primary key `idx_pk_id` (`id`),
-key `idx_transient_object_id` (`transient_object_id`),
-unique key `idx_transient_object_id_deprecated` (`transient_object_id`, `deprecated`)
-) engine=InnoDB;