psat-server-web 0.5.7__tar.gz → 0.5.8__tar.gz

{psat_server_web-0.5.7/psat_server_web.egg-info → psat_server_web-0.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.5.7
+Version: 0.5.8
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken
@@ -23,7 +23,7 @@ Requires-Dist: pyyaml
 Requires-Dist: docopt
 Requires-Dist: python-dotenv
 Requires-Dist: gkhtm
-Requires-Dist: gkutils>=0.3.2
+Requires-Dist: gkutils>=0.3.7
 Requires-Dist: requests
 Requires-Dist: lasair
 Requires-Dist: dustmaps

psat_server_web-0.5.8/psat_server_web/__version__.py

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

{psat_server_web-0.5.7 → psat_server_web-0.5.8}/psat_server_web/atlas/atlas/helpers.py

@@ -12,6 +12,11 @@ from .lightcurvequeries import getLCData, getRecurrenceDataForPlotting
 
 SHOW_LC_DATA_LIMIT = 50
 
+CONESEARCHLISTNUMBER = 14
+CONESEARCHLISTS = ['atlas_v_followup' + str(x) for x in range(CONESEARCHLISTNUMBER)]
+
+# 2025-03-28 KWS Added functionality to search by specified list as well as the general objects table. Note that this requires
+#                gkutils >= 0.3.6.
 def processSearchForm(searchText, getAssociatedData = False, ddc = False, getNonDets = False, getNearbyObjects = False):
     """processSearchForm.
 
@@ -62,6 +67,7 @@ def processSearchForm(searchText, getAssociatedData = False, ddc = False, getNon
         #    results = AtlasDiffObjects.objects.filter(Q(atlas_designation__isnull = False) & (Q(atlas_designation__startswith = 'ATLAS' + name) | Q(other_designation__startswith = '20' + name)))
     else:
          # It must be a coordinate or a match failure
+         tableToSearch = 'atlas_diff_objects'
          coords = getCoordsAndSearchRadius(searchText)
          if coords:
              searchRadius = 4.0
@@ -69,8 +75,29 @@ def processSearchForm(searchText, getAssociatedData = False, ddc = False, getNon
                  searchRadius = float(coords['radius'])
                  if searchRadius > 300.0:
                       searchRadius = 300.0
+             try:
+                 if coords['detectionlist']:
+                     # Restrict the cone search to a specified list
+                     detectionlistid = coords['detectionlist']
+                     if detectionlistid == 'all':
+                         tableToSearch = 'atlas_v_followupall_with_junk'
+                     else:
+                         sys.stderr.write("\nDETECTION LIST ID = %s\n" % str(detectionlistid))
+                         try:
+                             detectionlistid = int(coords['detectionlist'])
+                             if detectionlistid > 14 or detectionlistid < 0:
+                                 tableToSearch = 'atlas_v_followupall_with_junk'
+                             else:
+                                 tableToSearch = CONESEARCHLISTS[detectionlistid]
+                         except ValueError as e:
+                             # The value wasn't an integer. Shouldn't happen if regex is doing its job.
+                             tableToSearch = 'atlas_v_followupall_with_junk'
+                                 
+             except KeyError as e:
+                 # The 'detectionlist' key is not implemented yet
+                 tableToSearch = 'atlas_diff_objects'
          
-             message, xmObjects = coneSearchHTM(coords['ra'], coords['dec'], searchRadius, 'atlas_diff_objects', queryType = FULL, conn = connection, django = True)
+             message, xmObjects = coneSearchHTM(coords['ra'], coords['dec'], searchRadius, tableToSearch, queryType = FULL, conn = connection, django = True)
              for xm in xmObjects:
                  dictRow = xm[1]
                  dictRow.update({'xmseparation': xm[0]})

{psat_server_web-0.5.7 → psat_server_web-0.5.8/psat_server_web.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.5.7
+Version: 0.5.8
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken
@@ -23,7 +23,7 @@ Requires-Dist: pyyaml
 Requires-Dist: docopt
 Requires-Dist: python-dotenv
 Requires-Dist: gkhtm
-Requires-Dist: gkutils>=0.3.2
+Requires-Dist: gkutils>=0.3.7
 Requires-Dist: requests
 Requires-Dist: lasair
 Requires-Dist: dustmaps

{psat_server_web-0.5.7 → psat_server_web-0.5.8}/psat_server_web.egg-info/requires.txt

@@ -8,7 +8,7 @@ pyyaml
 docopt
 python-dotenv
 gkhtm
-gkutils>=0.3.2
+gkutils>=0.3.7
 requests
 lasair
 dustmaps

{psat_server_web-0.5.7 → psat_server_web-0.5.8}/setup.py

@@ -39,7 +39,7 @@ setup(
           'docopt',
           'python-dotenv',
           'gkhtm',
-          'gkutils>=0.3.2',
+          'gkutils>=0.3.7',
           'requests',
           'lasair',
           'dustmaps',

psat_server_web-0.5.7/psat_server_web/__version__.py

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