psat-server-web 0.3.8__tar.gz → 0.3.10__tar.gz

{psat-server-web-0.3.8/psat_server_web.egg-info → psat-server-web-0.3.10}/PKG-INFO

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

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

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

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/psat_server_web/atlas/atlas/helpers.py

@@ -67,8 +67,8 @@ def processSearchForm(searchText, getAssociatedData = False, ddc = False, getNon
              searchRadius = 4.0
              if coords['radius']:
                  searchRadius = float(coords['radius'])
-                 if searchRadius > 99.0:
-                      searchRadius = 99.0
+                 if searchRadius > 300.0:
+                      searchRadius = 300.0
          
              message, xmObjects = coneSearchHTM(coords['ra'], coords['dec'], searchRadius, 'atlas_diff_objects', queryType = FULL, conn = connection, django = True)
              for xm in xmObjects:

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/psat_server_web/atlas/atlas/models.py

@@ -1255,3 +1255,13 @@ class TcsVraScores(models.Model):
         db_table = 'tcs_vra_scores'
 
 
+# 2024-04-16 KWS Added new tcs_vra_scores table for the Virtual Research Assistant.
+class TcsVraTodo(models.Model):
+    transient_object_id = models.ForeignKey(AtlasDiffObjects, to_field='id', db_column='transient_object_id', on_delete=models.CASCADE, primary_key=True)
+    timestamp = models.DateTimeField()
+
+    class Meta:
+        managed = False
+        db_table = 'tcs_vra_todo'
+
+

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/psat_server_web/atlas/atlas/views.py

@@ -36,6 +36,8 @@ 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
+# 2024-04-16 KWS Added TcsVraTodo. Remove entry from this table if a human has made a decision about an object.
+from atlas.models import TcsVraTodo
 # 2019-06-06 KWS Get the new diff stack forced photometry data
 from atlas.models import AtlasStackedForcedPhotometry
 from atlas.dbviews import *
@@ -1078,6 +1080,7 @@ def addVraRow(objectid, originalListId, destinationListId, username, settings):
         settings:
     """
 
+    import sys
     preal = None
     pgal = None
     pfast = None
@@ -1120,7 +1123,13 @@ def addVraRow(objectid, originalListId, destinationListId, username, settings):
     instance = TcsVraScores(**data)
     try:
         i = instance.save()
-    except:
+
+        # 2024-04-16 KWS Added code to remove the object from the tcs_vra_todo table if it exists.
+        vraTodoRow = TcsVraTodo.objects.get(pk=objectid)
+        if vraTodoRow:
+            vraTodoRow.delete()
+    except Exception as e:
+        sys.stderr.write("\n%s\n" % str(e))
         pass
 
     return

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/psat_server_web/atlas/atlasapi/serializers.py

@@ -15,6 +15,7 @@ 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 AtlasDiffObjects
+from atlas.models import TcsVraTodo
 
 
 #CAT_ID_RA_DEC_COLS['objects'] = [['objectId', 'ramean', 'decmean'], 1018]
@@ -235,3 +236,52 @@ class VRAScoresListSerializer(serializers.Serializer):
         vraScoresList = getVRAScoresList(request, objects = olist, debug = debug, dateThreshold = datethreshold, idThreshold = idthreshold)
         return vraScoresList
 
+
+# 2024-02-21 KWS Changed required to False for all three prob values.
+class VRATodoSerializer(serializers.Serializer):
+    objectid = serializers.IntegerField(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']
+
+        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,
+                '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 = TcsVraTodo(**data)
+            i = instance.save(force_insert=True)
+            # NOTE: Inserting an object by setting the primary key actually REPLACES the object. Do we want this behaviour??
+            #       The integrity error below never happens because I've now set the model with primary_key=True.
+            #       To fix this I've added force_insert = True above.
+        except IntegrityError as e:
+            replyMessage = 'Duplicate row. Cannot add row.'
+
+        info = { "objectid": objectid, "info": replyMessage }
+        return info
+
+
+

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/psat_server_web/atlas/atlasapi/urls.py

@@ -9,5 +9,6 @@ urlpatterns = [
     path('api/objectlist/',            views.ObjectListView.as_view()),
     path('api/vrascores/',             views.VRAScoresView.as_view()),
     path('api/vrascoreslist/',         views.VRAScoresListView.as_view()),
+    path('api/vratodo/',               views.VRATodoView.as_view()),
     path('api/auth-token/',            obtain_auth_token, name='auth_token'),
 ]

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/psat_server_web/atlas/atlasapi/views.py

@@ -2,7 +2,7 @@ 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
+from .serializers import ConeSerializer, ObjectsSerializer, ObjectListSerializer, VRAScoresSerializer, VRAScoresListSerializer, VRATodoSerializer
 from rest_framework.authentication import TokenAuthentication
 from rest_framework.permissions import IsAuthenticated
 from .query_auth import QueryAuthentication
@@ -107,3 +107,23 @@ class VRAScoresListView(APIView):
             return Response(message, status=retcode(message))
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
+# 2024-04-16 KWS Added VRATodoView. 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 VRATodoView(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 = VRATodoSerializer(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)
+            
+
+

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/psat_server_web/schema/create_schema.sql

@@ -96,3 +96,6 @@ source tcs_gravity_alerts.sql;
 
 -- 2024-01-17 KWS Added new tcs_vra_probabilities table.
 source tcs_vra_scores.sql;
+
+-- 2024-04-16 KWS Added new tcs_vra_todo table.
+source tcs_vra_todo.sql;

psat-server-web-0.3.10/psat_server_web/schema/sherlock_triggers_atlas.sql

@@ -0,0 +1,19 @@
+DELIMITER $$
+CREATE TRIGGER `sherlock_classifications_AFTER_INSERT` AFTER INSERT ON `sherlock_classifications` FOR EACH ROW
+BEGIN
+    update `atlas_diff_objects` set `sherlockClassification` = new.classification
+                        where `id`  = new.transient_object_id;
+END;
+$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE TRIGGER `sherlock_classifications_BEFORE_INSERT` BEFORE INSERT ON `sherlock_classifications` FOR EACH ROW
+BEGIN
+    IF new.classification = "ORPHAN" THEN
+        SET new.annotation = "The transient location is not matched against any known catalogued source", new.summary = "No catalogued match";
+    END IF;
+END;
+$$
+DELIMITER ;
+

psat-server-web-0.3.10/psat_server_web/schema/sherlock_triggers_ps1.sql

@@ -0,0 +1,19 @@
+DELIMITER $$
+CREATE TRIGGER `sherlock_classifications_AFTER_INSERT` AFTER INSERT ON `sherlock_classifications` FOR EACH ROW
+BEGIN
+    update `tcs_transient_objects` set `sherlockClassification` = new.classification
+                        where `id`  = new.transient_object_id;
+END;
+$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE TRIGGER `sherlock_classifications_BEFORE_INSERT` BEFORE INSERT ON `sherlock_classifications` FOR EACH ROW
+BEGIN
+    IF new.classification = "ORPHAN" THEN
+        SET new.annotation = "The transient location is not matched against any known catalogued source", new.summary = "No catalogued match";
+    END IF;
+END;
+$$
+DELIMITER ;
+

psat-server-web-0.3.10/psat_server_web/schema/tcs_vra_todo.sql

@@ -0,0 +1,8 @@
+-- 2024-01-17 KWS New virtual research assistant scores table.
+drop table if exists `tcs_vra_todo`;
+
+create table `tcs_vra_todo` (
+`transient_object_id` bigint(20) NOT NULL,
+`timestamp` timestamp not null default current_timestamp,
+primary key `idx_transient_object_id` (`transient_object_id`)
+) engine=InnoDB;

{psat-server-web-0.3.8 → psat-server-web-0.3.10/psat_server_web.egg-info}/PKG-INFO

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

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/psat_server_web.egg-info/SOURCES.txt

@@ -375,6 +375,8 @@ psat_server_web/schema/setup_database.py
 psat_server_web/schema/setup_database_utils.py
 psat_server_web/schema/sherlock_classifications.sql
 psat_server_web/schema/sherlock_crossmatches.sql
+psat_server_web/schema/sherlock_triggers_atlas.sql
+psat_server_web/schema/sherlock_triggers_ps1.sql
 psat_server_web/schema/tcs_cat_gaia_dr1.sql
 psat_server_web/schema/tcs_cat_gaia_dr2.sql
 psat_server_web/schema/tcs_cat_gaia_dr2_cassandra.cql
@@ -423,6 +425,7 @@ 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_scores.sql
+psat_server_web/schema/tcs_vra_todo.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.8 → psat-server-web-0.3.10}/psat_server_web.egg-info/requires.txt

@@ -7,7 +7,7 @@ pyyaml
 docopt
 python-dotenv
 gkhtm
-gkutils>=0.3.0
+gkutils>=0.3.2
 requests
 lasair
 dustmaps

{psat-server-web-0.3.8 → psat-server-web-0.3.10}/setup.py

@@ -35,7 +35,7 @@ setup(
           'docopt',
           'python-dotenv',
           'gkhtm',
-          'gkutils>=0.3.0',
+          'gkutils>=0.3.2',
           'requests',
           'lasair',
           'dustmaps',

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

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