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

{psat-server-web-0.3.0/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.3.0
+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.3.0 → 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,9 +123,9 @@ def getObjectList(request, listId, getCustomList = False, dateThreshold = None):
     return objectList
 
 
-def getVRAProbabilitiesList(request, objects = [], debug = 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 debug flag, then request objects one at a time!
@@ -137,18 +137,18 @@ def getVRAProbabilitiesList(request, objects = [], debug = False, dateThreshold
                 continue
 
             try:
-                querySet = TcsVraProbabilities.objects.filter(transient_object_id_id=oid, debug=debug)
+                querySet = TcsVraScores.objects.filter(transient_object_id_id=oid, debug=debug)
                 if querySet is not None:
                     for vra in querySet:
-                        vraProbabilitiesList.append(model_to_dict(vra))
+                        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(timestamp__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.3.0 → psat-server-web-0.3.1}/psat_server_web/atlas/atlas/models.py

@@ -1238,8 +1238,8 @@ 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)
@@ -1252,6 +1252,6 @@ class TcsVraProbabilities(models.Model):
 
     class Meta:
         managed = False
-        db_table = 'tcs_vra_probabilities'
+        db_table = 'tcs_vra_scores'
 
 

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

@@ -100,7 +100,7 @@ DUSTMAP_LOCATION = os.environ.get('DJANGO_DUSTMAP_LOCATION')
 
 # 2024-02-21 KWS Added new Virtual Research Assistant settings.
 VRA_ADD_ROW = True
-VRA_DEBUG = 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.3.0 → psat-server-web-0.3.1}/psat_server_web/atlas/atlas/views.py

@@ -33,9 +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 TcsVraProbabilities. This table will be populated
+# 2024-02-21 KWS Added TcsVraScores. This table will be populated
 #                as a result of user actions.
-from atlas.models import TcsVraProbabilities
+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 *
@@ -1111,7 +1111,7 @@ def addVraRow(objectid, originalListId, destinationListId, username, settings):
             'debug': debug,
             'username': username}
 
-    instance = TcsVraProbabilities(**data)
+    instance = TcsVraScores(**data)
     try:
         i = instance.save()
     except:

{psat-server-web-0.3.0 → 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,11 +129,12 @@ 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)
+    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)
 
@@ -182,7 +183,7 @@ class VRAProbabilitiesSerializer(serializers.Serializer):
         ## Does the VRA row exist?
         #vra = None
         #try:
-        #    vra = TcsVraProbabilities.objects.get(transient_object_id_id=objectid, debug=debug)
+        #    vra = TcsVraScores.objects.get(transient_object_id_id=objectid, debug=debug)
         
         #except ObjectDoesNotExist as e:
         #    # That's OK - we'll create a new object
@@ -191,7 +192,7 @@ class VRAProbabilitiesSerializer(serializers.Serializer):
         #if vra:
         #    instance = vra
         #else:
-        instance = TcsVraProbabilities(**data)
+        instance = TcsVraScores(**data)
         #try:
 
         #    if vra is not None:
@@ -211,7 +212,7 @@ class VRAProbabilitiesSerializer(serializers.Serializer):
 
 
 
-class VRAProbabilitiesListSerializer(serializers.Serializer):
+class VRAScoresListSerializer(serializers.Serializer):
     objects = serializers.CharField(required=False, default=None)
     debug = serializers.BooleanField(required=False, default=False)
     datethreshold = serializers.DateTimeField(required=False, default='1970-01-01')
@@ -229,6 +230,6 @@ class VRAProbabilitiesListSerializer(serializers.Serializer):
             for tok in objects.split(','):
                 olist.append(tok.strip())
 
-        vraProbabilitiesList = getVRAProbabilitiesList(request, objects = olist, debug = debug, dateThreshold = datethreshold)
-        return vraProbabilitiesList
+        vraScoresList = getVRAScoresList(request, objects = olist, debug = debug, dateThreshold = datethreshold)
+        return vraScoresList
 

{psat-server-web-0.3.0 → 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.3.0 → 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.3.0 → 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.0/psat_server_web/schema/tcs_vra_probabilities.sql → psat-server-web-0.3.1/psat_server_web/schema/tcs_vra_scores.sql

@@ -1,7 +1,7 @@
--- 2024-01-17 KWS New virtual research assistant probabilities table.
-drop table if exists `tcs_vra_probabilities`;
+-- 2024-01-17 KWS New virtual research assistant scores table.
+drop table if exists `tcs_vra_scores`;
 
-create table `tcs_vra_probabilities` (
+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,

{psat-server-web-0.3.0 → 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.3.0
+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.0 → 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.3.0/psat_server_web/__version__.py

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