psat-server-web 0.7.2__tar.gz → 0.7.4__tar.gz

{psat_server_web-0.7.2/psat_server_web.egg-info → psat_server_web-0.7.4}/PKG-INFO

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

psat_server_web-0.7.4/psat_server_web/__version__.py

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

{psat_server_web-0.7.2 → psat_server_web-0.7.4}/psat_server_web/ps1/generate_mod_wsgi_apachectl.sh

@@ -26,7 +26,6 @@
 #
 # export DJANGO_SURVEY_FIELD='3P'
 # 
-# export DJANGO_LASAIR_TOKEN=''
 # export DJANGO_DISPLAY_AGNS=''
 # export DJANGO_DUSTMAP_LOCATION=''
 #
@@ -37,6 +36,10 @@
 # export DJANGO_ATLAS_TOKEN=''
 # export DJANGO_ATLAS_BASE_URL=''
 
+# DJANGO_LASAIR_DESCRIPTIONS='Comma,Separated,Descriptions'
+# DJANGO_LASAIR_BASE_URLS='https://baseurl1.com/,https://baseurl2.com/,https://baseurl3.com/'
+# DJANGO_LASAIR_TOKENS='aaa','bbb','ccc'
+
 # DJANGO_PANSTARRS_DESCRIPTIONS='Comma,Separated,Descriptions'
 # DJANGO_PANSTARRS_BASE_URLS='https://baseurl1.com/,https://baseurl2.com/,https://baseurl3.com/'
 # DJANGO_PANSTARRS_TOKENS='aaa','bbb','ccc'

{psat_server_web-0.7.2 → psat_server_web-0.7.4}/psat_server_web/ps1/psdb/settings.py

@@ -99,7 +99,11 @@ USE_L10N = True
 
 USE_TZ = True
 
-LASAIR_TOKEN = os.environ.get('DJANGO_LASAIR_TOKEN')
+# Lasair API. Info is comma separated. We will loop through the cone searches.
+LASAIR_DESCRIPTIONS = [s for s in os.environ.get('DJANGO_LASAIR_DESCRIPTIONS', '').split(',') if s]
+LASAIR_BASE_URLS = [s for s in os.environ.get('DJANGO_LASAIR_BASE_URLS', '').split(',') if s]
+LASAIR_TOKENS = [s for s in os.environ.get('DJANGO_LASAIR_TOKENS', '').split(',') if s]
+
 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')

{psat_server_web-0.7.2 → psat_server_web-0.7.4}/psat_server_web/ps1/psdb/views.py

@@ -805,27 +805,39 @@ def candidateflot(request, tcs_transient_objects_id):
 
     # 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)
+    # 2026-02-02 KWS Refactored the Lasair crossmatch code to use a list of Lasair endpoints
+    #                so that we can crossmatch against lasair-ztf and lasair-lsst.
+    lasairCrossmatches = []
+    if len(settings.LASAIR_TOKENS) > 0 and len(settings.LASAIR_TOKENS) == len(settings.LASAIR_BASE_URLS) and len(settings.LASAIR_TOKENS) == len(settings.LASAIR_DESCRIPTIONS):
+        for i in range(len(settings.LASAIR_TOKENS)):
+            L = lasair(settings.LASAIR_TOKENS[i], endpoint = settings.LASAIR_BASE_URLS[i] + '/api/', timeout = 2.0)
+            try:
+                lx = L.cone(avgCoords['ra'], avgCoords['dec'], 1.0, requestType='all')
+                # Bit of a hack - LSST returns a dictionary. The equivalent value to ZTF is in the "objects" key.
+                if "LSST" in settings.LASAIR_DESCRIPTIONS[i]:
+                    lx = lx['objects']
+                if len(lx) > 0:
+                    lasairCrossmatches.append({'description': settings.LASAIR_DESCRIPTIONS[i], 'crossmatches': lx, 'baseurl': settings.LASAIR_BASE_URLS[i]})
+            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))
+            except KeyError as e:
+                sys.stderr.write('KeyError - Description must contain either ZTF or LSST.\n')
+                sys.stderr.write('%s\n' % str(e))
+                lasairCrossmatches = []
+
 
-    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
@@ -946,7 +958,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, 'lcdataforcedinput': lcDataForcedInput, 'lcdataforcedfluxinput': lcDataForcedFluxInput, 'colourdata': colourData, 'colourplotlimits': colourPlotLimits, 'colourdataforced': colourDataForced, 'colourdataforcedInput': colourDataForcedInput, '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, 'panstarrsCrossmatches': panstarrsCrossmatches})
+    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, 'lcdataforcedinput': lcDataForcedInput, 'lcdataforcedfluxinput': lcDataForcedFluxInput, 'colourdata': colourData, 'colourplotlimits': colourPlotLimits, 'colourdataforced': colourDataForced, 'colourdataforcedInput': colourDataForcedInput, '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, 'lasairCrossmatches': lasairCrossmatches, 'atlasCrossmatches': atlasCrossmatches, 'atlasBaseURL': settings.ATLAS_BASE_URL, 'displayagns': settings.DISPLAY_AGNS, 'panstarrsCrossmatches': panstarrsCrossmatches})
 
 
 

{psat_server_web-0.7.2 → psat_server_web-0.7.4}/psat_server_web/ps1/psdbapi/serializers.py

@@ -79,7 +79,7 @@ class ConeSerializer(serializers.Serializer):
                 info = {}
         if requestType == "all":
             for row in results:
-                objectList.append({"object": row[1]["id"], "separation": row[0], "objectname": row[1]["ps1_designation"]})
+                objectList.append({"object": row[1]["id"], "separation": row[0], "objectname": row[1]["ps1_designation"], "ra": row[1]["ra_psf"], "dec": row[1]["dec_psf"]})
             info = objectList
         if requestType == "count":
             info = {'count': len(results)}

{psat_server_web-0.7.2 → psat_server_web-0.7.4}/psat_server_web/ps1/templates/psdb/candidate_plotly.html

@@ -500,25 +500,30 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
         {% endfor %}        
         {% endif %}
 
-        {% if lasairZTFCrossmatches %}
+        <!-- 2026-02-02 Lasair Crossmatches START. -->
+
+        {% if lasairCrossmatches %}
+        {% for l in lasairCrossmatches %}
+
         <div class="col-lg-12 col-md-12 col-sm-12">
-          <span class="parameter-label">Lasair ZTF Crossmatches: </span>
+          <span class="parameter-label">{{ l.description }} Crossmatches: </span>
         </div>
 
-        {% for row in lasairZTFCrossmatches %}
+        {% for row in l.crossmatches %}
         <div class="col-lg-12 col-md-12 col-sm-12">
-          <h3><a href="https://lasair-ztf.lsst.ac.uk/objects/{{ row.object }}/">{{ row.object }}</a></h3>
+          <h3><a href="{{ l.baseurl }}/objects/{{ row.object }}/">{{ row.object }}</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 %}
 
         {% endfor %}
         {% endif %}
 
+        <!-- 2026-02-02 Lasair Crossmatches END. -->
+
         {% if atlasCrossmatches %}
         <div class="col-lg-12 col-md-12 col-sm-12">
           <span class="parameter-label">ATLAS Crossmatches: </span>
@@ -538,6 +543,8 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
         {% endfor %}
         {% endif %}
 
+        <!-- 2026-02-02 Pan-STARRS Crossmatches START. -->
+
         {% if panstarrsCrossmatches %}
         {% for p in panstarrsCrossmatches %}
 
@@ -558,6 +565,7 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
         {% endfor %}
         {% endif %}
 
+        <!-- 2026-02-02 Pan-STARRS Crossmatches END. -->
 
         {% if tnsXMs %}
         <div class="col-lg-12 col-md-12 col-sm-12">

{psat_server_web-0.7.2 → psat_server_web-0.7.4/psat_server_web.egg-info}/PKG-INFO

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

psat_server_web-0.7.2/psat_server_web/__version__.py

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