psat-server-web 0.3.22__tar.gz → 0.4.1__tar.gz

{psat_server_web-0.3.22/psat_server_web.egg-info → psat_server_web-0.4.1}/PKG-INFO

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

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/__init__.py

@@ -1,2 +1,3 @@
 from . import atlas
 from . import ps1
+from . import common

psat_server_web-0.4.1/psat_server_web/__version__.py

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

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/atlas/atlas/settings.py

@@ -95,6 +95,9 @@ LASAIR_TOKEN = os.environ.get('DJANGO_LASAIR_TOKEN')
 NAMESERVER_TOKEN = os.environ.get('DJANGO_NAMESERVER_TOKEN')
 NAMESERVER_API_URL = os.environ.get('DJANGO_NAMESERVER_API_URL')
 NAMESERVER_MULTIPLIER = os.environ.get('DJANGO_NAMESERVER_MULTIPLIER')
+# Introduce Pan-STARRS API
+PANSTARRS_TOKEN = os.environ.get('DJANGO_PANSTARRS_TOKEN')
+PANSTARRS_BASE_URL = os.environ.get('DJANGO_PANSTARRS_BASE_URL')
 
 DUSTMAP_LOCATION = os.environ.get('DJANGO_DUSTMAP_LOCATION')
 

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/atlas/atlas/views.py

@@ -1148,34 +1148,9 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
     from django.db import connection
     import sys
 
-    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
-    from lasair import LasairError, lasair_client as lasair
-
     transient = get_object_or_404(AtlasDiffObjects, pk=atlas_diff_objects_id)
 
-    token = settings.LASAIR_TOKEN
-    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
-    #                version v0.0.5+. This should help if Lasair goes offline for any
-    #                reason. But extra (Requests)ConnectionError catch needed.
-    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
 
-    lasairZTFCrossmatches = None
-
-    # If Lasair connectivity problems arise, comment out the following 4 lines.
-    try:
-        lasairZTFCrossmatches = L.cone(transient.ra, transient.dec, 2.0, requestType='all')
-    except RequestsConnectionError as e:
-        # If the API URL is incorrect or times out we will get a connection error.
-        sys.stderr.write('Lasair API Connection Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except RequestsConnectionTimeoutError as e:
-        # If the API times out, we will get a timeout error.
-        sys.stderr.write('Lasair API Timeout Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except LasairError as e:
-        sys.stderr.write('Lasair Error\n')
-        sys.stderr.write('%s\n' % str(e))
-        
     # 2015-11-17 KWS Get the processing status. If it's not 2, what is it?
     processingStatusData = TcsProcessingStatus.objects.all().exclude(status = 2)
     processingStatus = None
@@ -1317,6 +1292,54 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
     if detectionList:
         listId = detectionList.id
 
+    # 2024-10-18 KWS Moved to down below where the average coordinates are calculated so we can use them.
+    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
+    from lasair import LasairError, lasair_client as lasair
+
+    token = settings.LASAIR_TOKEN
+    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
+    #                version v0.0.5+. This should help if Lasair goes offline for any
+    #                reason. But extra (Requests)ConnectionError catch needed.
+    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
+
+    lasairZTFCrossmatches = None
+
+    # If Lasair connectivity problems arise, comment out the following 4 lines.
+    try:
+        lasairZTFCrossmatches = L.cone(avgCoords['ra'], avgCoords['dec'], 2.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('Lasair API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('Lasair API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except LasairError as e:
+        sys.stderr.write('Lasair Error\n')
+        sys.stderr.write('%s\n' % str(e))
+        
+    # 2024-10-15 KWS Talk to the ATLAS API. Are there any ATLAS objects nearby?
+    sys.path.append('../../common')
+    from psat_api_client import PSATAPIError, psat_client as psat
+    
+    P = psat(settings.PANSTARRS_TOKEN, endpoint = settings.PANSTARRS_BASE_URL + '/api/', timeout = 2.0)
+
+    panstarrsCrossmatches = None
+    try:           
+        panstarrsCrossmatches = P.cone(avgCoords['ra'], avgCoords['dec'], 1.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('Pan-STARRS API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('Pan-STARRS API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except PSATAPIError as e:
+        sys.stderr.write('Pan-STARRS Error\n')
+        sys.stderr.write('%s\n' % str(e))
+
     # Dummy form initialisation
     formSearchObject = SearchForObjectForm()
     form = PromoteAndCommentsForm()
@@ -1635,7 +1658,7 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
 
     recurrenceData = [recurrencePlotData, recurrencePlotLabels, averageObjectCoords, rmsScatter]
 
-    return render(request, 'atlas/' + template_name,{'transient' : transient, 'table': table, 'images': transient_images, 'form' : form, 'avg_coords': avgCoords, 'lcdata': lcData, 'lcdataforced': lcDataForced, 'lcdataforcedflux': lcDataForcedFlux, 'lcdataforcedstackflux': lcDataForcedStackFlux, 'lclimits': lcLimits, 'recurrencedata': recurrenceData, 'conesearchold': xmresults['oldDBXmList'], 'olddburl': xmresults['oldDBURL'], 'externalXMs': externalXMs, 'tnsXMs': tnsXMs, 'public': public, 'form_searchobject': formSearchObject, 'dbName': dbName, 'finderImages': finderImages, 'processingStatus': processingStatus, 'galactic': galactic, 'fpData': fpData, 'sc': sc, 'gw': gw, 'comments': existingComments, 'sx': sx, 'lasairZTFCrossmatches': lasairZTFCrossmatches})
+    return render(request, 'atlas/' + template_name,{'transient' : transient, 'table': table, 'images': transient_images, 'form' : form, 'avg_coords': avgCoords, 'lcdata': lcData, 'lcdataforced': lcDataForced, 'lcdataforcedflux': lcDataForcedFlux, 'lcdataforcedstackflux': lcDataForcedStackFlux, 'lclimits': lcLimits, 'recurrencedata': recurrenceData, 'conesearchold': xmresults['oldDBXmList'], 'olddburl': xmresults['oldDBURL'], 'externalXMs': externalXMs, 'tnsXMs': tnsXMs, 'public': public, 'form_searchobject': formSearchObject, 'dbName': dbName, 'finderImages': finderImages, 'processingStatus': processingStatus, 'galactic': galactic, 'fpData': fpData, 'sc': sc, 'gw': gw, 'comments': existingComments, 'sx': sx, 'lasairZTFCrossmatches': lasairZTFCrossmatches, 'panstarrsCrossmatches': panstarrsCrossmatches, 'panstarrsBaseURL': settings.PANSTARRS_BASE_URL})
 
 
 def lightcurveplain(request, tcs_transient_objects_id):

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/atlas/atlasapi/serializers.py

@@ -70,19 +70,20 @@ class ConeSerializer(serializers.Serializer):
         separation = None
 
         objectList = []
-        if len(results) > 0:
-            if requestType == "nearest":
+        if requestType == "nearest":
+            if len(results) > 0:
                 obj = results[0][1]['id']
                 separation = results[0][0]
-                info = {"object": obj, "separation": separation}
-            elif requestType == "all":
-                for row in results:
-                    objectList.append({"object": row[1]["id"], "separation": row[0]})
-                info = objectList
-            elif requestType == "count":
-                info = {'count': len(results)}
+                objName = results[0][1]['atlas_designation']
+                info = {"object": obj, "separation": separation, "objectname": objName}
             else:
-                info = {"error": "Invalid request type"}
+                info = {}
+        if requestType == "all":
+            for row in results:
+                objectList.append({"object": row[1]["id"], "separation": row[0], "objectname": row[1]["atlas_designation"]})
+            info = objectList
+        if requestType == "count":
+            info = {'count': len(results)}
 
         return info
 

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/atlas/generate_mod_wsgi_apachectl.sh

@@ -30,6 +30,9 @@
 # export DJANGO_NAMESERVER_API_URL=''
 # export DJANGO_NAMESERVER_TOKEN=''
 # export DJANGO_NAMESERVER_MULTIPLIER=10000000
+#
+# export DJANGO_PANSTARRS_TOKEN=''
+# export DJANGO_PANSTARRS_BASE_URL=''
 
 
 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

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/atlas/templates/atlas/candidate_plotly.html

@@ -463,6 +463,26 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
         {% endfor %}        
         {% endif %}
 
+        {% if panstarrsCrossmatches %}
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <span class="parameter-label">Pan-STARRS (All Sky) Crossmatches: </span>
+        </div>
+
+        {% for row in panstarrsCrossmatches %}
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <h3><a href="{{ panstarrsBaseURL }}/psdb/candidate/{{ row.object }}/">{% if row.objectname %}{{ row.objectname }}{% else %}PS Object{% endif %}</a></h3>
+        </div>
+
+        {% if row.separation %}
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <span class="parameter-value">Offset = {{ row.separation|floatformat:"2" }}"</span>
+        </div>
+        {% endif %}
+
+        {% endfor %}
+        {% endif %}
+
+
         {% if tnsXMs %}
         <div class="col-lg-12 col-md-12 col-sm-12">
           <span class="parameter-label">TNS Crossmatch: </span>

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/atlas/templates/atlas/index_bs_celestial.html

@@ -44,6 +44,7 @@ ATLAS is a quadruple 0.5m telescope system with two units in Hawaii (Haleakala a
 var config = { 
   projection: "aitoff", 
   transform: "equatorial",
+  zoomextend: 100,
   center: null,
   datapath: "{{ STATIC_URL }}/js/celestial/data/",
   stars: { show: false, colors: false, names: false, size: 5 },

psat_server_web-0.4.1/psat_server_web/common/psat_api_client.py

@@ -0,0 +1,110 @@
+""" Pan-STARRS API
+
+This class enables programmatic access to the Pan-STARRS and ATLAS databases
+
+Args:
+    token (string): The Calls are throttled by the Pan-STARRS server, by use of an 
+    'authorization token', as described in the api documentation above. 
+    There is a free token listed there, but it is throttled at 10 calls per hour. 
+    Once a user has an account at the Lasair webserver, they can get their own token
+    allowing 100 calls per hour, or request to be a power user, with infinite usage.
+
+    cache (string): Results can be cached on a local filesystem, by providing 
+    the name of a writable directory. If the same calls are made repeatedly, 
+    this will be much more efficient.
+"""
+import os, sys
+import requests
+import json
+import hashlib
+
+class PSATAPIError(Exception):
+    def __init__(self, message):
+        self.message = message
+
+class psat_client():
+    def __init__(self, token, cache=None, endpoint=None, timeout=60.0):
+        self.headers = { 'Authorization': 'Token %s' % token }
+        self.endpoint = endpoint
+        self.timeout = timeout
+        self.cache = cache
+        if cache and not os.path.isdir(cache):
+            message = 'Cache directory "%s" does not exist' % cache
+            raise PSATAPIError(message)
+
+    def fetch_from_server(self, method, input):
+        url = '%s/%s/' % (self.endpoint, method)
+        try:
+            r = requests.post(url, data=input, headers=self.headers, timeout=self.timeout)
+        except requests.exceptions.ReadTimeout:
+            raise PSATAPIError('Request timed out')
+
+        if r.status_code == 200:
+            try:
+                result = r.json()
+            except:
+                result = {'error': 'Cannot parse Json %s' % r.text}
+        elif r.status_code == 400:
+            message = 'Bad Request:' + r.text
+            raise PSATAPIError(message)
+        elif r.status_code == 401:
+            message = 'Unauthorized'
+            raise PSATAPIError(message)
+        elif r.status_code == 429:
+            message = 'Request limit exceeded. Either wait an hour, or see API documentation to increase your limits.'
+            raise PSATAPIError(message)
+        elif r.status_code == 500:
+            message = 'Internal Server Error' + r.text
+            raise PSATAPIError(message)
+        else:
+            message = 'HTTP return code %d for\n' % r.status_code
+            message += url
+            raise PSATAPIError(message)
+        return result
+
+    def hash_it(self, input):
+        s = json.dumps(input)
+        h = hashlib.md5(s.encode())
+        return h.hexdigest()
+
+    def fetch(self, method, input):
+        if self.cache:
+            cached_file = '%s/%s.json' % (self.cache, self.hash_it(method +'/'+ str(input)))
+            try:
+                result_txt = open(cached_file).read()
+                result = json.loads(result_txt)
+                return result
+            except:
+                pass
+
+        result = self.fetch_from_server(method, input)
+
+        if 'error' in result:
+            return result
+
+        if self.cache:
+            f = open(cached_file, 'w')
+            result_txt = json.dumps(result, indent=2)
+            f.write(result_txt)
+            f.close()
+
+        return result
+
+    def cone(self, ra, dec, radius=5, requestType='all'):
+        """ Run a cone search on the Lasair database.
+        Args:
+            ra (float): Right Ascension in decimal degrees
+            dec (float): Declination in decimal degrees
+            radius (float): cone radius in arcseconds (default is 5)
+            requestType: Can be 'all' to return all objects in the cone
+                Can be 'nearest', only the nearest object within the cone
+                Can be 'count', the number of objects within the cone
+
+        Returns a dictionary with:
+            objectId: The ID of the nearest object
+            separation: the separation in arcseconds
+        """
+        input = {'ra':ra, 'dec':dec, 'radius':radius, 'requestType':requestType}
+        result = self.fetch('cone', input)
+        return result
+

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/ps1/generate_mod_wsgi_apachectl.sh

@@ -33,6 +33,9 @@
 # export DJANGO_NAMESERVER_API_URL=''
 # export DJANGO_NAMESERVER_TOKEN=''
 # export DJANGO_NAMESERVER_MULTIPLIER=10000000
+#
+# export DJANGO_ATLAS_TOKEN=''
+# export DJANGO_ATLAS_BASE_URL=''
 
 
 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

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/ps1/psdb/models.py

@@ -953,7 +953,8 @@ class TcsGravityAlerts(models.Model):
     creator = models.CharField(max_length=30, blank=True, null=True)
     group = models.CharField(max_length=100, blank=True, null=True)
     pipeline = models.CharField(max_length=100, blank=True, null=True)
-    map_iteration = models.CharField(max_length=100, blank=True, null=True, unique=True)
+    #map_iteration = models.CharField(max_length=100, blank=True, null=True, unique=True)
+    map_iteration = models.CharField(max_length=100, blank=True, null=True)
     alert_map = models.CharField(db_column='map', max_length=400, blank=True, null=True)
     dateadded = models.DateTimeField(db_column='dateAdded', blank=True, null=True)  # Field name made lowercase.
     datelastmodified = models.DateTimeField(db_column='dateLastModified', blank=True, null=True)  # Field name made lowercase.

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/ps1/psdb/settings.py

@@ -103,6 +103,9 @@ LASAIR_TOKEN = os.environ.get('DJANGO_LASAIR_TOKEN')
 NAMESERVER_TOKEN = os.environ.get('DJANGO_NAMESERVER_TOKEN')
 NAMESERVER_API_URL = os.environ.get('DJANGO_NAMESERVER_API_URL')
 NAMESERVER_MULTIPLIER = os.environ.get('DJANGO_NAMESERVER_MULTIPLIER')
+# Introduce ATLAS API
+ATLAS_TOKEN = os.environ.get('DJANGO_ATLAS_TOKEN')
+ATLAS_BASE_URL = os.environ.get('DJANGO_ATLAS_BASE_URL')
 
 DISPLAY_AGNS = os.environ.get('DJANGO_DISPLAY_AGNS') in ('true', '1', 't', 'True', 'TRUE', 'T')
 

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web/ps1/psdb/views.py

@@ -376,33 +376,8 @@ def candidateflot(request, tcs_transient_objects_id):
     #                the short term.  May consider doing it longer term.
     from django.db import connection
 
-    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
-    from lasair import LasairError, lasair_client as lasair
-
     transient = get_object_or_404(TcsTransientObjects, pk=tcs_transient_objects_id)
 
-    token = settings.LASAIR_TOKEN
-    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
-    #                version v0.0.5+. This should help if Lasair goes offline for any
-    #                reason. But extra (Requests)ConnectionError catch needed.
-    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
-
-    lasairZTFCrossmatches = None
-    try:
-        lasairZTFCrossmatches = L.cone(transient.ra_psf, transient.dec_psf, 2.0, requestType='all')
-    except RequestsConnectionError as e:
-        # If the API URL is incorrect or times out we will get a connection error.
-        sys.stderr.write('Lasair API Connection Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except RequestsConnectionTimeoutError as e:
-        # If the API times out, we will get a timeout error.
-        sys.stderr.write('Lasair API Timeout Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except LasairError as e:
-        sys.stderr.write('Lasair Error\n')
-        sys.stderr.write('%s\n' % str(e))
-        
-
     # 2015-11-17 KWS Get the processing status. If it's not 2, what is it?
     processingStatusData = TcsProcessingStatus.objects.all().exclude(status = 2)
     processingStatus = None
@@ -811,6 +786,53 @@ def candidateflot(request, tcs_transient_objects_id):
 
     galactic = transform([avgCoords['ra'], avgCoords['dec']], J2000toGalactic)
 
+    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
+    from lasair import LasairError, lasair_client as lasair
+
+    # 2024-10-18 KWS Moved the code down to after the average RA and Dec are calculated
+    #                so we don't need to calculate it twice.
+    token = settings.LASAIR_TOKEN
+    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
+    #                version v0.0.5+. This should help if Lasair goes offline for any
+    #                reason. But extra (Requests)ConnectionError catch needed.
+    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
+
+    lasairZTFCrossmatches = None
+    try:
+        lasairZTFCrossmatches = L.cone(avgCoords['ra'], avgCoords['dec'], 2.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('Lasair API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('Lasair API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except LasairError as e:
+        sys.stderr.write('Lasair Error\n')
+        sys.stderr.write('%s\n' % str(e))
+        
+    # 2024-10-15 KWS Talk to the ATLAS API. Are there any ATLAS objects nearby?
+    sys.path.append('../../common')
+    from psat_api_client import PSATAPIError, psat_client as psat
+
+    A = psat(settings.ATLAS_TOKEN, endpoint = settings.ATLAS_BASE_URL + '/api/', timeout = 2.0)
+
+    atlasCrossmatches = None
+    try:
+        atlasCrossmatches = A.cone(avgCoords['ra'], avgCoords['dec'], 1.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('ATLAS API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('ATLAS API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except PSATAPIError as e:
+        sys.stderr.write('ATLAS Error\n')
+        sys.stderr.write('%s\n' % str(e))
+
 
     coneSearchRadius = 4.0   # arcsec
 
@@ -912,7 +934,7 @@ def candidateflot(request, tcs_transient_objects_id):
     # 2011-04-04 KWS Add the user defined list to the objects passed to the web page.
     # 2013-10-24 KWS Added context_instance=RequestContext(request) to the render_to_response call.
     #                If not included, the specified template won't understand STATIC_URL.
-    return render(request, 'psdb/candidate_plotly.html',{'transient' : transient, 'table' : table, 'images' : transient_images, 'form' : form, 'crossmatches' : crossmatches, 'userList': userListQuerySet, 'cfaMatch': cfaMatch, 'conesearchresults': xmList, 'avg_coords': avgCoords, 'lcdata': lcData, 'lclimits': lcLimits, 'lcdataforced': lcDataForced, 'lcdataforcedflux': lcDataForcedFlux, 'colourdata': colourData, 'colourplotlimits': colourPlotLimits, 'colourdataforced': colourDataForced, 'recurrencedata': recurrenceData, 'conesearchold': oldDBXmList, 'olddburl': oldDBURL, 'externalXMs': externalXMs, 'tnsXMs': tnsXMs, 'public': public, 'form_searchobject': formSearchObject, 'dbName': dbName, 'finderImages': finderImages, 'processingStatus': processingStatus, 'galactic': galactic, 'comments': existingComments, 'sc': sc, 'gw': gw, 'citizens': z, 'sx': sx, 'lasairZTFCrossmatches': lasairZTFCrossmatches, 'displayagns': settings.DISPLAY_AGNS})
+    return render(request, 'psdb/candidate_plotly.html',{'transient' : transient, 'table' : table, 'images' : transient_images, 'form' : form, 'crossmatches' : crossmatches, 'userList': userListQuerySet, 'cfaMatch': cfaMatch, 'conesearchresults': xmList, 'avg_coords': avgCoords, 'lcdata': lcData, 'lclimits': lcLimits, 'lcdataforced': lcDataForced, 'lcdataforcedflux': lcDataForcedFlux, 'colourdata': colourData, 'colourplotlimits': colourPlotLimits, 'colourdataforced': colourDataForced, 'recurrencedata': recurrenceData, 'conesearchold': oldDBXmList, 'olddburl': oldDBURL, 'externalXMs': externalXMs, 'tnsXMs': tnsXMs, 'public': public, 'form_searchobject': formSearchObject, 'dbName': dbName, 'finderImages': finderImages, 'processingStatus': processingStatus, 'galactic': galactic, 'comments': existingComments, 'sc': sc, 'gw': gw, 'citizens': z, 'sx': sx, 'lasairZTFCrossmatches': lasairZTFCrossmatches, 'atlasCrossmatches': atlasCrossmatches, 'atlasBaseURL': settings.ATLAS_BASE_URL, 'displayagns': settings.DISPLAY_AGNS})
 
 
 

psat_server_web-0.4.1/psat_server_web/ps1/psdbapi/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.22 → psat_server_web-0.4.1}/psat_server_web/ps1/psdbapi/serializers.py

@@ -69,19 +69,20 @@ class ConeSerializer(serializers.Serializer):
         separation = None
 
         objectList = []
-        if len(results) > 0:
-            if requestType == "nearest":
+        if requestType == "nearest":
+            if len(results) > 0:
                 obj = results[0][1]['id']
                 separation = results[0][0]
-                info = {"object": obj, "separation": separation}
-            elif requestType == "all":
-                for row in results:
-                    objectList.append({"object": row[1]["id"], "separation": row[0]})
-                info = objectList
-            elif requestType == "count":
-                info = {'count': len(results)}
+                objName = results[0][1]['ps1_designation']
+                info = {"object": obj, "separation": separation, "objectname": objName}
             else:
-                info = {"error": "Invalid request type"}
+                info = {}
+        if requestType == "all":
+            for row in results:
+                objectList.append({"object": row[1]["id"], "separation": row[0], "objectname": row[1]["ps1_designation"]})
+            info = objectList
+        if requestType == "count":
+            info = {'count': len(results)}
 
         return info
 

psat_server_web-0.4.1/psat_server_web/ps1/psdbapi/urls.py

@@ -0,0 +1,9 @@
+from django.urls import include, path
+from rest_framework import routers
+from rest_framework.authtoken.views import obtain_auth_token
+from . import views
+
+urlpatterns = [
+    path('api/cone/',                  views.ConeView.as_view()),
+    path('api/auth-token/',            obtain_auth_token, name='auth_token'),
+]

psat_server_web-0.4.1/psat_server_web/ps1/psdbapi/views.py

@@ -0,0 +1,36 @@
+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
+from rest_framework.authentication import TokenAuthentication
+from rest_framework.permissions import IsAuthenticated
+from .query_auth import QueryAuthentication
+# 2024-10-15 KWS Added Jack's permissions code.
+from .permissions import IsApprovedUser
+from django.core.exceptions import ObjectDoesNotExist
+import sys
+
+def retcode(message):
+    if 'error' in message: return status.HTTP_400_BAD_REQUEST
+    else:                  return status.HTTP_200_OK
+
+# 2024-10-15 KWS Introduced the first API call for Pan-STARRS. Cone searching.
+class ConeView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated&IsApprovedUser]
+
+    def get(self, request):
+        serializer = ConeSerializer(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 = ConeSerializer(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.22 → psat_server_web-0.4.1}/psat_server_web/ps1/templates/psdb/candidate_plotly.html

@@ -474,6 +474,25 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
         {% endfor %}
         {% endif %}
 
+        {% if atlasCrossmatches %}
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <span class="parameter-label">ATLAS Crossmatches: </span>
+        </div>
+
+        {% for row in atlasCrossmatches %}
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <h3><a href="{{ atlasBaseURL }}/candidate/{{ row.object }}/">{% if row.objectname %}{{ row.objectname }}{% else %}ATLAS object{% endif %}</a></h3>
+        </div>
+
+        {% if row.separation %}
+        <div class="col-lg-12 col-md-12 col-sm-12">
+          <span class="parameter-value">Offset = {{ row.separation|floatformat:"2" }}"</span>
+        </div>
+        {% endif %}
+
+        {% endfor %}
+        {% endif %}
+
         {% if tnsXMs %}
         <div class="col-lg-12 col-md-12 col-sm-12">
           <span class="parameter-label">TNS Crossmatch: </span>

{psat_server_web-0.3.22 → psat_server_web-0.4.1/psat_server_web.egg-info}/PKG-INFO

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

{psat_server_web-0.3.22 → psat_server_web-0.4.1}/psat_server_web.egg-info/SOURCES.txt

@@ -158,6 +158,8 @@ psat_server_web/atlas/templates/atlas/summary.csv
 psat_server_web/atlas/templates/atlas/userdefinedlists.html
 psat_server_web/atlas/templates/atlas/userdefinedlists_bs.html
 psat_server_web/atlas/templates/atlas/visibility.txt
+psat_server_web/common/__init__.py
+psat_server_web/common/psat_api_client.py
 psat_server_web/config/wsgi.conf.template
 psat_server_web/ps1/__init__.py
 psat_server_web/ps1/createUsers.py
@@ -180,6 +182,7 @@ psat_server_web/ps1/psdb/views.py
 psat_server_web/ps1/psdb/wsgi.py
 psat_server_web/ps1/psdb/wsgi_apache_example.conf
 psat_server_web/ps1/psdbapi/apps.py
+psat_server_web/ps1/psdbapi/permissions.py
 psat_server_web/ps1/psdbapi/query_auth.py
 psat_server_web/ps1/psdbapi/serializers.py
 psat_server_web/ps1/psdbapi/urls.py

psat_server_web-0.3.22/psat_server_web/__version__.py

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

psat_server_web-0.3.22/psat_server_web/ps1/psdbapi/urls.py

@@ -1,20 +0,0 @@
-from django.urls import include, path
-from rest_framework import routers
-from rest_framework.authtoken.views import obtain_auth_token
-from . import views
-
-urlpatterns = [
-    path('api/cone/',                  views.ConeView.as_view()),
-#    path('api/objects/',               views.ObjectsView.as_view()),
-#    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/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/vrarank/',               views.VRARankView.as_view()),
-#    path('api/vraranklist/',           views.VRARankListView.as_view()),
-    path('api/auth-token/',            obtain_auth_token, name='auth_token'),
-]