psat-server-web 0.3.19__tar.gz → 0.3.21__tar.gz

{psat_server_web-0.3.19/psat_server_web.egg-info → psat_server_web-0.3.21}/PKG-INFO

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

psat_server_web-0.3.21/psat_server_web/__version__.py

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

{psat_server_web-0.3.19 → psat_server_web-0.3.21}/psat_server_web/atlas/atlas/views.py

@@ -1126,7 +1126,7 @@ def addVraRow(objectid, originalListId, destinationListId, username, settings):
 
         # 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:
+        if vraTodoRow and destinationListId not in [POSSIBLE]:
             vraTodoRow.delete()
     except Exception as e:
         sys.stderr.write("\n%s\n" % str(e))

psat_server_web-0.3.21/psat_server_web/atlas/atlasapi/permissions.py

@@ -0,0 +1,13 @@
+from rest_framework.permissions import BasePermission, SAFE_METHODS
+
+class IsApprovedUser(BasePermission):
+    def has_permission(self, request, view):
+        # Allow all safe methods (GET, OPTIONS, HEAD)
+        if request.method in SAFE_METHODS:
+            return True
+        
+        # Only allow POST if the user is authenticated, active, and staff
+        return (request.user 
+                and request.user.is_authenticated 
+                and request.user.is_active 
+                and request.user.is_staff)

{psat_server_web-0.3.19 → psat_server_web-0.3.21}/psat_server_web/atlas/atlasapi/serializers.py

@@ -530,3 +530,61 @@ class ExternalCrossmatchesListSerializer(serializers.Serializer):
         externalCrossmatchesList = getExternalCrossmatchesList(request, externalObjects = olist)
         return externalCrossmatchesList
 
+# 2024-09-24 KWS Added new serializer to updated the detection_list_id of an object in order
+#                to be able to "snooze" and "unsnooze" it. We'll use the possible list as
+#                snooze list.
+class ObjectDetectionListSerializer(serializers.Serializer):
+    objectid = serializers.IntegerField(required=True)
+    # Only allow the object list to be updated
+    objectlist = serializers.IntegerField(required=True)
+    # Updates the date_modified field for an object too.
+    insertdate = serializers.DateTimeField(required=False, default=None)
+
+    import sys
+
+    def save(self):
+
+        from django.conf import settings
+        objectid = self.validated_data['objectid']
+        objectlist = self.validated_data['objectlist']
+        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 = {'detection_list_id_id': objectlist,
+                'date_modified': 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:
+            for key, value in data.items():
+                sys.stderr.write("\nkey=%s\n" % key)
+                sys.stderr.write("\nvalue=%s\n" % value)
+                if key=='detection_list_id_id' and value not in (3,4):
+                    replyMessage = 'Error updating row.'
+                    info = { "objectid": objectid, "info": replyMessage }
+                    return info
+                else:
+                    setattr(transient, key, value)
+            transient.save()
+
+        except IntegrityError as e:
+            replyMessage = 'Error updating row.'
+
+        info = { "objectid": objectid, "info": replyMessage }
+        return info
+

{psat_server_web-0.3.19 → psat_server_web-0.3.21}/psat_server_web/atlas/atlasapi/urls.py

@@ -17,5 +17,6 @@ urlpatterns = [
     path('api/vrarank/',               views.VRARankView.as_view()),
     path('api/vraranklist/',           views.VRARankListView.as_view()),
     path('api/externalxmlist/',        views.ExternalCrossmatchesListView.as_view()),
+    path('api/objectdetectionlist/',   views.ObjectDetectionListView.as_view()),
     path('api/auth-token/',            obtain_auth_token, name='auth_token'),
 ]

{psat_server_web-0.3.19 → psat_server_web-0.3.21}/psat_server_web/atlas/atlasapi/views.py

@@ -1,16 +1,19 @@
+import sys
+
 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, TcsObjectGroupsDeleteSerializer, TcsObjectGroupsListSerializer, VRARankSerializer, VRARankListSerializer, ExternalCrossmatchesListSerializer
 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 django.core.exceptions import ObjectDoesNotExist
+
 from atlas.models import TcsObjectGroups
-import sys
+from atlas.models import TcsVraScores
+from .serializers import ConeSerializer, ObjectsSerializer, ObjectListSerializer, VRAScoresSerializer, VRAScoresListSerializer, VRATodoSerializer, VRATodoListSerializer, TcsObjectGroupsSerializer, TcsObjectGroupsDeleteSerializer, TcsObjectGroupsListSerializer, VRARankSerializer, VRARankListSerializer, ExternalCrossmatchesListSerializer, ObjectDetectionListSerializer
+from .query_auth import QueryAuthentication
+from .permissions import IsApprovedUser
 
 def retcode(message):
     if 'error' in message: return status.HTTP_400_BAD_REQUEST
@@ -18,7 +21,7 @@ def retcode(message):
 
 class ConeView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         serializer = ConeSerializer(data=request.GET, context={'request': request})
@@ -37,7 +40,7 @@ class ConeView(APIView):
 
 class ObjectsView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         serializer = ObjectsSerializer(data=request.GET, context={'request': request})
@@ -56,7 +59,7 @@ class ObjectsView(APIView):
 
 class ObjectListView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         serializer = ObjectListSerializer(data=request.GET, context={'request': request})
@@ -75,7 +78,7 @@ class ObjectListView(APIView):
 
 class VRAScoresView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         return Response({"Error": "GET is not implemented for this service."})
@@ -92,7 +95,7 @@ class VRAScoresView(APIView):
 
 class VRAScoresListView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         serializer = VRAScoresListSerializer(data=request.GET, context={'request': request})
@@ -112,7 +115,7 @@ class VRAScoresListView(APIView):
 #                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]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         return Response({"Error": "GET is not implemented for this service."})
@@ -129,7 +132,7 @@ class VRATodoView(APIView):
 # 2024-05-07 KWS Added VRATodoListView.
 class VRATodoListView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         serializer = VRATodoListSerializer(data=request.GET, context={'request': request})
@@ -147,7 +150,7 @@ class VRATodoListView(APIView):
 
 class TcsObjectGroupsView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         return Response({"Error": "GET is not implemented for this service."})
@@ -163,7 +166,7 @@ class TcsObjectGroupsView(APIView):
 
 class TcsObjectGroupsListView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         serializer = TcsObjectGroupsListSerializer(data=request.GET, context={'request': request})
@@ -182,7 +185,7 @@ class TcsObjectGroupsListView(APIView):
 
 class TcsObjectGroupsDeleteView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         return Response({"Error": "GET is not implemented for this service."})
@@ -205,7 +208,7 @@ class TcsObjectGroupsDeleteView(APIView):
 #                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]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         return Response({"Error": "GET is not implemented for this service."})
@@ -222,7 +225,7 @@ class VRARankView(APIView):
 # 2024-05-22 KWS Added VRARankListView.
 class VRARankListView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         serializer = VRARankListSerializer(data=request.GET, context={'request': request})
@@ -238,11 +241,11 @@ class VRARankListView(APIView):
             return Response(message, status=retcode(message))
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-            
-# 2024-05-22 KWS Added ExternalCrossmatchesListView.
+
+# 2024-09-24 KWS Added ExternalCrossmatchesListView.
 class ExternalCrossmatchesListView(APIView):
     authentication_classes = [TokenAuthentication, QueryAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
 
     def get(self, request):
         serializer = ExternalCrossmatchesListSerializer(data=request.GET, context={'request': request})
@@ -258,3 +261,23 @@ class ExternalCrossmatchesListView(APIView):
             return Response(message, status=retcode(message))
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
+
+# 2024-09-24 KWS Added ExternalCrossmatchesListView.
+class ObjectDetectionListView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
+
+    def get(self, request):
+        serializer = ObjectDetectionListSerializer(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 = ObjectDetectionListSerializer(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.21/psat_server_web/atlas/cow_backup.txt

@@ -0,0 +1,29 @@
+                    id: 1161600211221604900
+          detection_id: 4239712975
+                    ra: 244.00092
+                   dec: 22.26801
+               htm16ID: 56641707361
+               jtindex: 91
+             images_id: 3774159
+         date_inserted: 2018-06-16 16:14:04
+         date_modified: 2020-01-17 16:16:53
+      processing_flags: 5832
+            updated_by: owen.mcbrien
+      realbogus_factor: 0.964187
+         current_trend: fading 02.28 (o-o)
+    observation_status: SN Ic-BL
+ object_classification: 16
+     followup_priority: NULL
+ external_reference_id: NULL
+           followup_id: 18489540
+     detection_list_id: 2
+    followup_flag_date: 2018-06-16 00:00:00
+          survey_field: ATLAS
+      followup_counter: 11245
+     atlas_designation: ATLAS18qqn
+     other_designation: 2018cow
+        local_comments: NULL
+           ndetections: NULL
+      zooniverse_score: 0.999258
+sherlockClassification: SN
+

psat_server_web-0.3.21/psat_server_web/atlas/generate_mod_wsgi_apachectl.sh

@@ -0,0 +1,71 @@
+#!/bin/bash
+# Create a setup script and immediately start the apache instance.  Our URL prefix
+# is specified by the --mount-point setting.  We need to specify a PYTHONPATH before
+# starting the apache instance. Run this script from THIS directory.
+# 
+# REQUIREMENTS:
+# Write a file in ~/.config/django/django_env_$CONDA_DEFAULT_ENV (e.g. atlas)
+# The contents of this file should be as follows:
+# export DJANGO_SECRET_KEY=''
+# 
+# export DJANGO_MYSQL_DBUSER=''
+# export DJANGO_MYSQL_DBPASS=''
+# export DJANGO_MYSQL_DBNAME=''
+# export DJANGO_MYSQL_DBHOST=''
+# export DJANGO_MYSQL_DBPORT=''
+# 
+# export DJANGO_TNS_DAEMON_PORT=''
+# export DJANGO_TNS_DAEMON_SERVER=''
+# export DJANGO_MPC_DAEMON_PORT=''
+# export DJANGO_MPC_DAEMON_SERVER=''
+# export DJANGO_NAME_DAEMON_PORT=''
+# export DJANGO_NAME_DAEMON_SERVER=''
+# 
+# export WSGI_PORT=''
+# export WSGI_PREFIX=''
+#
+# export DJANGO_LASAIR_TOKEN=''
+# export DJANGO_DUSTMAP_LOCATION=''
+#
+# export DJANGO_NAMESERVER_API_URL=''
+# export DJANGO_NAMESERVER_TOKEN=''
+# export DJANGO_NAMESERVER_MULTIPLIER=10000000
+
+
+if [ -f ~/.config/django/django_env_$CONDA_DEFAULT_ENV ]; then chmod 600 ~/.config/django/django_env_$CONDA_DEFAULT_ENV; source ~/.config/django/django_env_$CONDA_DEFAULT_ENV; fi
+
+export APACHEPATH="/tmp/atlas"
+
+if [ $DJANGO_MYSQL_DBNAME ]
+then
+    export APACHEPATH=/tmp/$DJANGO_MYSQL_DBNAME
+fi
+
+export PORT=8086
+if [ $WSGI_PORT ]
+then
+    export PORT=$WSGI_PORT
+fi
+
+export PREFIX=/atlastransients
+if [ $WSGI_PREFIX ]
+then
+    export PREFIX=$WSGI_PREFIX
+fi
+
+if [ -f $APACHEPATH/apachectl ]; then
+    echo "Stopping Apache if already running"
+    $APACHEPATH/apachectl stop
+    sleep 1
+    # wait a second to make sure the port is released
+else
+    echo "Creating directory $APACHEPATH"
+    mkdir -p APACHEPATH
+fi
+
+CMD="mod_wsgi-express setup-server --working-directory atlas --url-alias $PREFIX/static static --url-alias $PREFIX/media media --application-type module atlas.wsgi --server-root $APACHEPATH --port $PORT --mount-point $PREFIX"
+echo $CMD
+$CMD
+
+export PYTHONPATH=$(pwd)
+$APACHEPATH/apachectl start

{psat_server_web-0.3.19 → psat_server_web-0.3.21}/psat_server_web/atlas/sql/create_web_views.sql

@@ -524,7 +524,44 @@ create or replace view atlas_v_followupall as select o.followup_id rank,
        and detection_list_id != 4
 ;
 
-
+-- 2024-07-26 KWS Added another "all" view that includes garbage and eyeball
+create or replace view atlas_v_followupall_with_junk as select o.followup_id rank,
+           o.id,
+           o.atlas_designation,
+           o.other_designation,
+           o.ra,
+           o.`dec`,
+           s.ra_avg,
+           s.dec_avg,
+           o.object_classification,
+           o.sherlockClassification,
+           o.followup_flag_date,
+           o.observation_status,
+           o.current_trend,
+           s.earliest_mjd,
+           s.earliest_mag,
+           s.earliest_filter,
+           s.latest_mjd,
+           s.latest_mag,
+           s.latest_filter,
+           s.catalogue,
+           s.catalogue_object_id,
+           s.separation,
+           o.realbogus_factor,
+           o.zooniverse_score,
+           o.date_modified,
+           s.external_crossmatches,
+           s.discovery_target,
+           s.rms,
+           o.htm16ID,
+           o.detection_list_id,
+           o.images_id
+      from atlas_diff_objects o
+ left join tcs_latest_object_stats s
+        on (o.id = s.id)
+     where followup_id is not null
+       and detection_list_id is not null
+;
 
 create or replace view atlas_v_followup_userdefined as
     select o.followup_id rank,

{psat_server_web-0.3.19 → psat_server_web-0.3.21/psat_server_web.egg-info}/PKG-INFO

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

{psat_server_web-0.3.19 → psat_server_web-0.3.21}/psat_server_web.egg-info/SOURCES.txt

@@ -13,7 +13,9 @@ psat_server_web.egg-info/requires.txt
 psat_server_web.egg-info/top_level.txt
 psat_server_web/atlas/.DS_Store
 psat_server_web/atlas/__init__.py
+psat_server_web/atlas/cow_backup.txt
 psat_server_web/atlas/generate_mod_wsgi_apachectl.sh
+psat_server_web/atlas/generate_mod_wsgi_apachectl_test.sh
 psat_server_web/atlas/manage.py
 psat_server_web/atlas/test.py
 psat_server_web/atlas/atlas/__init__.py
@@ -35,6 +37,7 @@ psat_server_web/atlas/atlas/wsgi.atlas.conf
 psat_server_web/atlas/atlas/wsgi.py
 psat_server_web/atlas/atlas/wsgi_apache_example.conf
 psat_server_web/atlas/atlasapi/apps.py
+psat_server_web/atlas/atlasapi/permissions.py
 psat_server_web/atlas/atlasapi/query_auth.py
 psat_server_web/atlas/atlasapi/serializers.py
 psat_server_web/atlas/atlasapi/urls.py

psat_server_web-0.3.19/psat_server_web/__version__.py

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