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

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

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

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

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

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

@@ -10,6 +10,7 @@ from atlas.models import TcsObjectComments
 from atlas.models import TcsCrossMatchesExternal
 from atlas.models import AtlasDetectionsddc
 from atlas.models import TcsVraScores
+from atlas.models import TcsVraTodo
 from django.forms.models import model_to_dict
 from .lightcurvequeries import *
 from .views import followupClassList
@@ -152,3 +153,35 @@ def getVRAScoresList(request, objects = [], debug = False, dateThreshold = None,
                 vraScoresList.append(model_to_dict(vra))
 
     return vraScoresList
+
+
+# 2024-05-07 KWS Added getVRATodoList
+def getVRATodoList(request, objects = [], dateThreshold = None, idThreshold = 0):
+
+    vraTodoList = []
+
+    # 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 = TcsVraTodo.objects.filter(transient_object_id_id=oid)
+                if querySet is not None:
+                    for vra in querySet:
+                        vraTodoList.append(model_to_dict(vra))
+            except ObjectDoesNotExist as e:
+                # Silent fail. No objects returned if the object does not exist.
+                pass
+    else:
+        querySet = TcsVraTodo.objects.filter(pk__gte=idThreshold).filter(timestamp__gte=dateThreshold)
+        #querySet = TcsVraTodo.objects.all()
+        if querySet is not None:
+            for vra in querySet:
+                vraTodoList.append(model_to_dict(vra))
+
+    return vraTodoList
+

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

@@ -10,12 +10,15 @@ from rest_framework import serializers
 import sys
 from atlas.apiutils import candidateddcApi, getObjectList
 from atlas.apiutils import getVRAScoresList
+from atlas.apiutils import getVRATodoList
 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
+from atlas.models import TcsObjectGroups
+from atlas.models import TcsObjectGroupDefinitions
 
 
 #CAT_ID_RA_DEC_COLS['objects'] = [['objectId', 'ramean', 'decmean'], 1018]
@@ -284,4 +287,75 @@ class VRATodoSerializer(serializers.Serializer):
         return info
 
 
+class VRATodoListSerializer(serializers.Serializer):
+    objects = serializers.CharField(required=False, default=None)
+    datethreshold = serializers.DateTimeField(required=False, default='1970-01-01')
+    idthreshold = serializers.IntegerField(required=False, default=0)
+
+    def save(self):
+        objects = self.validated_data['objects']
+        datethreshold = self.validated_data['datethreshold']
+        idthreshold = self.validated_data['idthreshold']
+
+        request = self.context.get("request")
+
+        olist = []
+
+        if objects is not None:
+            for tok in objects.split(','):
+                olist.append(tok.strip())
+
+        vraTodoList = getVRATodoList(request, objects = olist, dateThreshold = datethreshold, idThreshold = idthreshold)
+        return vraTodoList
+
+
+# 2024-02-21 KWS Changed required to False for all three prob values.
+class TcsObjectGroupsSerializer(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 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}
+
+        # 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(**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 = { "objectgroupid": objectid, "info": replyMessage }
+        return info
 

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

@@ -10,5 +10,7 @@ urlpatterns = [
     path('api/vrascores/',             views.VRAScoresView.as_view()),
     path('api/vrascoreslist/',         views.VRAScoresListView.as_view()),
     path('api/vratodo/',               views.VRATodoView.as_view()),
+    path('api/vratodolist/',           views.VRATodoListView.as_view()),
+    path('api/objectgroups/',          views.TcsObjectGroupsView.as_view()),
     path('api/auth-token/',            obtain_auth_token, name='auth_token'),
 ]

{psat-server-web-0.3.10 → psat-server-web-0.3.12}/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, VRATodoSerializer
+from .serializers import ConeSerializer, ObjectsSerializer, ObjectListSerializer, VRAScoresSerializer, VRAScoresListSerializer, VRATodoSerializer, VRATodoListSerializer, TcsObjectGroupsSerializer
 from rest_framework.authentication import TokenAuthentication
 from rest_framework.permissions import IsAuthenticated
 from .query_auth import QueryAuthentication
@@ -125,5 +125,37 @@ class VRATodoView(APIView):
             return Response(message, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
             
+# 2024-05-07 KWS Added VRATodoListView.
+class VRATodoListView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        serializer = VRATodoListSerializer(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 = VRATodoListSerializer(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 TcsObjectGroupsView(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 = TcsObjectGroupsSerializer(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.10 → psat-server-web-0.3.12/psat_server_web.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.3.10
+Version: 0.3.12
 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-0.3.12}/psat_server_web.egg-info/SOURCES.txt

@@ -209,6 +209,7 @@ psat_server_web/ps1/site_media/images/panstarrs1_o3_logo.jpg
 psat_server_web/ps1/site_media/images/panstarrs2_logo.jpg
 psat_server_web/ps1/site_media/images/panstarrs2_o3_logo.jpg
 psat_server_web/ps1/site_media/images/panstarrs_logo.jpg
+psat_server_web/ps1/site_media/images/panstarrs_logo_o4.jpg
 psat_server_web/ps1/site_media/images/panstarrs_logo_original.jpg
 psat_server_web/ps1/site_media/images/panstarrs_logo_yse.jpg
 psat_server_web/ps1/site_media/images/panstarrs_logo_yse_stack.jpg

{psat-server-web-0.3.10 → psat-server-web-0.3.12}/psat_server_web.egg-info/requires.txt

@@ -3,6 +3,7 @@ mysqlclient
 django<4.2
 django_tables2
 djangorestframework
+mod-wsgi
 pyyaml
 docopt
 python-dotenv

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

@@ -31,6 +31,7 @@ setup(
           'django<4.2',
           'django_tables2',
           'djangorestframework',
+          'mod-wsgi',
           'pyyaml',
           'docopt',
           'python-dotenv',

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

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