psat-server-web 0.3.11__tar.gz → 0.3.13__tar.gz

{psat-server-web-0.3.11/psat_server_web.egg-info → psat-server-web-0.3.13}/PKG-INFO

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

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

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

{psat-server-web-0.3.11 → psat-server-web-0.3.13}/psat_server_web/atlas/atlas/apiutils.py

@@ -11,6 +11,7 @@ from atlas.models import TcsCrossMatchesExternal
 from atlas.models import AtlasDetectionsddc
 from atlas.models import TcsVraScores
 from atlas.models import TcsVraTodo
+from atlas.models import TcsObjectGroups
 from django.forms.models import model_to_dict
 from .lightcurvequeries import *
 from .views import followupClassList
@@ -185,3 +186,22 @@ def getVRATodoList(request, objects = [], dateThreshold = None, idThreshold = 0)
 
     return vraTodoList
 
+
+# 2024-05-07 KWS Added getVRATodoList
+def getCustomListObjects(request, objectid = None, objectgroupid = None):
+
+    customListObjects = []
+
+    if objectid is None and objectgroupid is not None:
+        querySet = TcsObjectGroups.objects.filter(object_group_id = objectgroupid)
+    elif objectid is not None and objectgroupid is None:
+        querySet = TcsObjectGroups.objects.filter(transient_object_id__id = objectid)
+    else:
+        querySet = TcsObjectGroups.objects.all()
+
+    if querySet is not None:
+        for row in querySet:
+            customListObjects.append(model_to_dict(row))
+
+    return customListObjects
+

{psat-server-web-0.3.11 → psat-server-web-0.3.13}/psat_server_web/atlas/atlasapi/serializers.py

@@ -11,12 +11,15 @@ import sys
 from atlas.apiutils import candidateddcApi, getObjectList
 from atlas.apiutils import getVRAScoresList
 from atlas.apiutils import getVRATodoList
+from atlas.apiutils import getCustomListObjects
 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]
@@ -307,3 +310,111 @@ class VRATodoListSerializer(serializers.Serializer):
         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.'
+
+        # 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
+
+# 2024-02-21 KWS Changed required to False for all three prob values.
+class TcsObjectGroupsDeleteSerializer(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 deleted.'
+
+        # 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.objects.get(transient_object_id__id = objectid, object_group_id = objectGroupId)
+        except ObjectDoesNotExist as e:
+            replyMessage = 'Object group ID does not exist or object ID does not exist.'
+            info = { "objectgroupid": objectGroupId, "objectid": objectid, "info": replyMessage }
+            return info
+
+        i = instance.delete()
+        #replyMessage = 'Duplicate row. Cannot add row.'
+
+        info = { "objectgroupid": objectid, "info": replyMessage }
+        return info
+
+class TcsObjectGroupsListSerializer(serializers.Serializer):
+    objectid = serializers.IntegerField(required=False, default=None)
+    objectgroupid = serializers.IntegerField(required=False, default=None)
+
+    def save(self):
+        objectid = self.validated_data['objectid']
+        objectGroupId = self.validated_data['objectgroupid']
+
+        request = self.context.get("request")
+
+        customListObjects = getCustomListObjects(request, objectid, objectGroupId)
+        return customListObjects
+

{psat-server-web-0.3.11 → psat-server-web-0.3.13}/psat_server_web/atlas/atlasapi/urls.py

@@ -11,5 +11,8 @@ urlpatterns = [
     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/objectgroupslist/',      views.TcsObjectGroupsListView.as_view()),
+    path('api/objectgroupsdelete/',    views.TcsObjectGroupsDeleteView.as_view()),
     path('api/auth-token/',            obtain_auth_token, name='auth_token'),
 ]

{psat-server-web-0.3.11 → psat-server-web-0.3.13}/psat_server_web/atlas/atlasapi/views.py

@@ -2,13 +2,14 @@ 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, TcsObjectGroupsDeleteSerializer, TcsObjectGroupsListSerializer
 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 atlas.models import TcsObjectGroups
 import sys
 
 def retcode(message):
@@ -144,4 +145,58 @@ class VRATodoListView(APIView):
             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)
+
+class TcsObjectGroupsListView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        serializer = TcsObjectGroupsListSerializer(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 = TcsObjectGroupsListSerializer(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 TcsObjectGroupsDeleteView(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 = TcsObjectGroupsDeleteSerializer(data=request.data, context={'request': request})
+    
+        if serializer.is_valid():
+            message = serializer.save()
+    
+        if "deleted" in message:
+            return Response(message, status=status.HTTP_204_NO_CONTENT)
+        elif "does not exist" in message:
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        else:
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 

psat-server-web-0.3.13/psat_server_web/schema/atlas_detectionsnnc.sql

@@ -0,0 +1,47 @@
+CREATE TABLE `atlas_detectionsnnc` (
+`id` bigint unsigned not null auto_increment,     -- autoincrementing detection id
+`atlas_metadata_id` bigint(20) unsigned NOT NULL, -- a reference to the input file and other information (OBS data)
+`atlas_object_id` bigint(20) unsigned NOT NULL,   -- a reference to the unique object which tags this object
+`detection_id` bigint(20) unsigned,               -- reference to the ddc detection ID
+`det_id` int unsigned not null,                   -- the internal id of the detection (unique per file)
+`ra` double, 
+`dec` double, 
+`mag` float, 
+`dmag` float, 
+`x` float, 
+`y` float, 
+`elong` float, 
+`minor` float, 
+`phi` float, 
+`det` tinyint, 
+`chin` float, 
+`real` float, 
+`var` float, 
+`lin` float, 
+`flaw` float, 
+`cr` float, 
+`prat` float, 
+`mrat` float, 
+`tail` float, 
+`tphi` smallint unsigned, 
+`lphi` smallint unsigned, 
+`flg` smallint unsigned, 
+`wpflux` float, 
+`dwpflx` float, 
+`grp` smallint unsigned, 
+`nnc_id` varchar(30), 
+`date_modified` datetime,            -- when was the detection modified?
+`image_group_id` bigint unsigned,    -- a reference to the group of images that refers to this detection
+`quality_threshold_pass` bool,       -- does this detection pass some specified cuts?
+`deprecated` bool,                   -- option to ignore this detection
+`realbogus_factor` float,            -- machine learning real/bogus value
+`htm16ID` bigint unsigned,
+`date_inserted` datetime NOT NULL,   -- when was the detection inserted?
+PRIMARY KEY `key_id` (`id`),
+KEY `idx_atlas_object_id` (`atlas_object_id`),
+KEY `idx_atlas_metadata_id` (`atlas_metadata_id`),
+KEY `idx_detection_id` (`detection_id`),
+KEY `idx_htm16ID` (`htm16ID`),
+KEY `idx_date_inserted` (`date_inserted`),
+KEY `idx_ra_dec` (`ra`,`dec`)
+) ENGINE=InnoDB;

{psat-server-web-0.3.11 → psat-server-web-0.3.13}/psat_server_web/schema/create_schema.sql

@@ -99,3 +99,6 @@ source tcs_vra_scores.sql;
 
 -- 2024-04-16 KWS Added new tcs_vra_todo table.
 source tcs_vra_todo.sql;
+
+-- 2024-05-14 KWS Added new atlas_detectionsnnc table.
+source atlas_detectionsnnc.sql;

{psat-server-web-0.3.11 → psat-server-web-0.3.13/psat_server_web.egg-info}/PKG-INFO

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

{psat-server-web-0.3.11 → psat-server-web-0.3.13}/psat_server_web.egg-info/SOURCES.txt

@@ -347,6 +347,7 @@ psat_server_web/ps1/templates/psdb/userdefinedlists.html
 psat_server_web/ps1/templates/psdb/userdefinedlists_bs.html
 psat_server_web/schema/atlas_detections.sql
 psat_server_web/schema/atlas_detectionsddc.sql
+psat_server_web/schema/atlas_detectionsnnc.sql
 psat_server_web/schema/atlas_diff_detections.sql
 psat_server_web/schema/atlas_diff_logs.sql
 psat_server_web/schema/atlas_diff_moments.sql

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

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