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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.5.8
+Version: 0.5.10
 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.7
+Requires-Dist: gkutils>=0.3.8
 Requires-Dist: requests
 Requires-Dist: lasair
 Requires-Dist: dustmaps

psat_server_web-0.5.10/psat_server_web/__version__.py

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

{psat_server_web-0.5.8 → psat_server_web-0.5.10}/psat_server_web/ps1/psdb/helpers.py

@@ -12,6 +12,15 @@ import sys
 
 SHOW_LC_DATA_LIMIT = 50
 
+CONESEARCHLISTS = ['psdb_web_v_followup_bad_presentation',
+                   'psdb_web_v_followup_conf_presentation',
+                   'psdb_web_v_followup_good_presentation',
+                   'psdb_web_v_followup_poss_presentation',
+                   'psdb_web_v_followup_pend_presentation',
+                   'psdb_web_v_followup_attic_presentation',
+                   'psdb_web_v_followup_zoo_presentation',
+                   'psdb_web_v_followup_tbd_presentation',
+                   'psdb_web_v_followup_fast_presentation']
 
 def processSearchForm(searchText, getAssociatedData = False, getNonDets = False, getNearbyObjects = False):
     """processSearchForm.
@@ -60,15 +69,38 @@ def processSearchForm(searchText, getAssociatedData = False, getNonDets = False,
             results = list(set([x.id for x in q]))
     else:
          # It must be a coordinate or a match failure
+         tableToSearch = 'tcs_transient_objects'
          coords = getCoordsAndSearchRadius(searchText)
          if coords:
              searchRadius = 4.0
              if coords['radius']:
                  searchRadius = float(coords['radius'])
-                 if searchRadius > 99.0:
-                      searchRadius = 99.0
-
-             message, xmObjects = coneSearchHTM(coords['ra'], coords['dec'], searchRadius, 'tcs_transient_objects', queryType = FULL, conn = connection, django = True)
+                 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 = 'psdb_web_v_followup_all_with_eyeball_and_garbage_presentation'
+                     else:
+                         sys.stderr.write("\nDETECTION LIST ID = %s\n" % str(detectionlistid))
+                         try:
+                             detectionlistid = int(coords['detectionlist'])
+                             if detectionlistid > 8 or detectionlistid < 0:
+                                 tableToSearch = 'psdb_web_v_followup_all_with_eyeball_and_garbage_presentation'
+                             else:
+                                 tableToSearch = CONESEARCHLISTS[detectionlistid]
+                         except ValueError as e:
+                             # The value wasn't an integer. Shouldn't happen if regex is doing its job.
+                             tableToSearch = 'psdb_web_v_followup_all_with_eyeball_and_garbage_presentation'
+
+             except KeyError as e:
+                 # The 'detectionlist' key is not implemented yet
+                 tableToSearch = 'tcs_transient_objects'
+
+
+             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.8 → psat_server_web-0.5.10}/psat_server_web/ps1/sql/create_web_views.sql

@@ -56,8 +56,10 @@ order by image_filename desc;
 
 -- 2020-02-20 KWS New views that include zooniverse score.
 -- 2020-09-30 KWS Added htm16ID so the views can be cone searched.
+-- 2025-03-31 KWS Added tcs_images_id to all the views so that when searching by view
+--                the crossmatch code continues to work OK.
 create or replace view psdb_web_v_followup_all_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -85,6 +87,7 @@ create or replace view psdb_web_v_followup_all_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -98,10 +101,53 @@ inner join tcs_cmf_metadata m
        and detection_list_id != 4
 ;
 
+-- 2025-03-31 KWS Added view of everything that's passed through the eyeball list, including garbage.
+create or replace view psdb_web_v_followup_all_with_eyeball_and_garbage_presentation as
+    select o.followup_id `rank`,
+           o.id,
+           substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
+           o.local_designation,
+           o.ps1_designation,
+           o.other_designation,
+           o.ra_psf,
+           o.dec_psf,
+           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.classification_confidence,
+           o.confidence_factor,
+           s.external_crossmatches,
+           s.discovery_target,
+           z.score zooniverse_score,
+           o.xt,
+           o.tcs_images_id,
+           o.htm16ID
+      from tcs_transient_objects o
+inner join tcs_cmf_metadata m
+        on (o.tcs_cmf_metadata_id = m.id)
+ left join tcs_latest_object_stats s
+        on (o.id = s.id)
+ left join tcs_zooniverse_scores z
+        on (o.id = z.transient_object_id)
+     where detection_list_id is not null
+       and detection_list_id >= 0
+;
+
 
 -- BAD objects
 create or replace view psdb_web_v_followup_bad_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -129,6 +175,7 @@ create or replace view psdb_web_v_followup_bad_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -143,7 +190,7 @@ inner join tcs_cmf_metadata m
 
 -- CONFIRMED objects
 create or replace view psdb_web_v_followup_conf_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -171,6 +218,7 @@ create or replace view psdb_web_v_followup_conf_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -185,7 +233,7 @@ inner join tcs_cmf_metadata m
 
 -- GOOD objects
 create or replace view psdb_web_v_followup_good_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -213,6 +261,7 @@ create or replace view psdb_web_v_followup_good_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -227,7 +276,7 @@ inner join tcs_cmf_metadata m
 
 -- POSSIBLE objects
 create or replace view psdb_web_v_followup_poss_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -255,6 +304,7 @@ create or replace view psdb_web_v_followup_poss_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -269,7 +319,7 @@ inner join tcs_cmf_metadata m
 
 -- PENDING (EYEBALL) objects
 create or replace view psdb_web_v_followup_pend_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -297,6 +347,7 @@ create or replace view psdb_web_v_followup_pend_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -311,7 +362,7 @@ inner join tcs_cmf_metadata m
 
 -- ATTIC objects
 create or replace view psdb_web_v_followup_attic_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -339,6 +390,7 @@ create or replace view psdb_web_v_followup_attic_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -353,7 +405,7 @@ inner join tcs_cmf_metadata m
 
 -- ZOO objects
 create or replace view psdb_web_v_followup_zoo_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -381,6 +433,7 @@ create or replace view psdb_web_v_followup_zoo_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -396,7 +449,7 @@ inner join tcs_cmf_metadata m
 -- TBD objects
 -- 2019-07-16 KWS Created two new views in particular for a Fast Track List.
 create or replace view psdb_web_v_followup_tbd_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -424,6 +477,7 @@ create or replace view psdb_web_v_followup_tbd_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -438,7 +492,7 @@ inner join tcs_cmf_metadata m
 
 -- FAST objects
 create or replace view psdb_web_v_followup_fast_presentation as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,
@@ -466,6 +520,7 @@ create or replace view psdb_web_v_followup_fast_presentation as
            s.discovery_target,
            z.score zooniverse_score,
            o.xt,
+           o.tcs_images_id,
            o.htm16ID
       from tcs_transient_objects o
 inner join tcs_cmf_metadata m
@@ -481,7 +536,7 @@ inner join tcs_cmf_metadata m
 
 -- 2011-04-14 KWS User Defined Lists
 create or replace view psdb_web_v_followup_userdefined as
-    select o.followup_id rank,
+    select o.followup_id `rank`,
            o.id,
            substr(m.filename, 1, instr(m.filename,'.')-1) survey_field,
            o.local_designation,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.5.8
+Version: 0.5.10
 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.7
+Requires-Dist: gkutils>=0.3.8
 Requires-Dist: requests
 Requires-Dist: lasair
 Requires-Dist: dustmaps

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

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

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

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

psat_server_web-0.5.8/psat_server_web/__version__.py

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