psat-server-web 0.5.2__tar.gz → 0.5.4__tar.gz

{psat_server_web-0.5.2/psat_server_web.egg-info → psat_server_web-0.5.4}/PKG-INFO

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

psat_server_web-0.5.4/psat_server_web/__version__.py

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

{psat_server_web-0.5.2 → psat_server_web-0.5.4}/psat_server_web/atlas/atlas/dbviews.py

@@ -456,6 +456,32 @@ class WebViewFollowupTransients11(WebViewAbstractFollowup):
         managed = False
         db_table = 'atlas_v_followup11'
 
+class WebViewFollowupTransients12(WebViewAbstractFollowup):
+    """WebViewFollowupTransients12.
+    """
+
+
+    class Meta(WebViewAbstractFollowup.Meta):
+        """Meta.
+        """
+
+        managed = False
+        db_table = 'atlas_v_followup12'
+
+
+class WebViewFollowupTransients13(WebViewAbstractFollowup):
+    """WebViewFollowupTransients13.
+    """
+
+
+    class Meta(WebViewAbstractFollowup.Meta):
+        """Meta.
+        """
+
+        managed = False
+        db_table = 'atlas_v_followup13'
+
+
 class WebViewFollowupTransientsGeneric(WebViewAbstractFollowup):
     """WebViewFollowupTransientsGeneric.
     """

{psat_server_web-0.5.2 → psat_server_web-0.5.4}/psat_server_web/atlas/atlas/views.py

@@ -195,7 +195,7 @@ class TcsDetectionListsForm(forms.Form):
 
     name = forms.CharField()
 
-GARBAGE, FOLLOWUP, GOOD, POSSIBLE, EYEBALL, ATTIC, STAR, AGN, FASTEYE, MOVERS, SMCLMC, HPMSTAR = list(range(12))
+GARBAGE, FOLLOWUP, GOOD, POSSIBLE, EYEBALL, ATTIC, STAR, AGN, FASTEYE, MOVERS, SMCLMC, HPMSTAR, GALCAND, DUPLICATES = list(range(14))
 
 OBJECT_LISTS = {
     'Garbage': GARBAGE,
@@ -210,6 +210,8 @@ OBJECT_LISTS = {
     'Movers': MOVERS,
     'SMCLMC': SMCLMC,
     'HPMStar': HPMSTAR,
+    'GalCand': GALCAND,
+    'Duplicates': DUPLICATES,
     'DoNothing': -1
 }
 
@@ -1094,7 +1096,7 @@ def addVraRow(objectid, originalListId, destinationListId, username, settings):
     if originalListId == destinationListId:
         return
 
-    if destinationListId in [GOOD, ATTIC, FOLLOWUP]:
+    if destinationListId in [GOOD, ATTIC, FOLLOWUP, DUPLICATES]:
         preal = 1.0
     elif destinationListId in [POSSIBLE]:
         preal = 0.5
@@ -1103,7 +1105,7 @@ def addVraRow(objectid, originalListId, destinationListId, username, settings):
 
     if destinationListId in [ATTIC, HPMSTAR]:
         pgal = 1.0
-    elif destinationListId in [GOOD, FOLLOWUP]:
+    elif destinationListId in [GOOD, FOLLOWUP, DUPLICATES]:
         pgal = 0.0
 
     if destinationListId in [FOLLOWUP]:
@@ -1461,20 +1463,24 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
                        request.session['error'] = "WARNING: Please add a comment before promoting to the Followup Targets list, so other users know why it is there!"
                        redirect_to = "../../error/"
                        return HttpResponseRedirect(redirect_to)
-                   if originalListId in [EYEBALL, FASTEYE, SMCLMC, STAR, HPMSTAR, AGN, MOVERS] and (listId == POSSIBLE) and comments.strip() == '':
+                   if originalListId in [EYEBALL, FASTEYE, SMCLMC, STAR, HPMSTAR, AGN, MOVERS, GALCAND] and (listId == POSSIBLE) and comments.strip() == '':
                        # Did the user add any comments? Ah, ah, ah - blank comments not allowed!
                        request.session['error'] = "WARNING: Please add a comment before promoting to the Possible list, so other users know why it is there!"
                        redirect_to = "../../error/"
                        return HttpResponseRedirect(redirect_to)
-                   if (originalListId == EYEBALL or originalListId == POSSIBLE or originalListId == ATTIC or originalListId == STAR or originalListId == FASTEYE or originalListId == SMCLMC or originalListId == HPMSTAR) and (listId == GOOD or listId == FOLLOWUP):
+                   if originalListId in [EYEBALL, FASTEYE, POSSIBLE, ATTIC, STAR, SMCLMC, HPMSTAR, GALCAND] and listId in [GOOD, FOLLOWUP]:
                        # Is there an object already in the good or confirmed lists within 2.0 arcsec?
                        message, goodObjects = coneSearchHTM(transient.ra, transient.dec, 2.0, 'atlas_v_followup2', queryType = FULL, conn = connection, django = True)
                        message, confirmedObjects = coneSearchHTM(transient.ra, transient.dec, 2.0, 'atlas_v_followup1', queryType = FULL, conn = connection, django = True)
                        if len(goodObjects) > 0 or len(confirmedObjects) > 0:
                            # Object is already in the good or confirmed lists. Please move to attic.
-                           request.session['error'] = "WARNING: Duplicate object is already in the Good List. Please go back and move this to the Attic or Garbage."
-                           redirect_to = "../../error/"
-                           return HttpResponseRedirect(redirect_to)
+                           # TODO: Add code to actually move the object to the duplicates list.
+                           listId = DUPLICATES
+
+
+                           #request.session['error'] = "WARNING: Duplicate object is already in the Good List. The object has been added to the Duplicates List."
+                           #redirect_to = "../../error/"
+                           #return HttpResponseRedirect(redirect_to)
 
                    # 2018-09-28 KWS Ok - we really need to stop updates happening if processing status is not
                    #                set correctly.
@@ -1548,6 +1554,11 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
                         except ObjectDoesNotExist as e:
                             # Just in case someone else has already deleted the object before 'Submit' button pressed.
                             pass
+                # 2025-01-29 KWS Redirect to an error page.
+                if listId == DUPLICATES:
+                    request.session['error'] = "Duplicate object is already in the Good List. The object has been added to the Duplicates List."
+                    redirect_to = "../../error/"
+                    return HttpResponseRedirect(redirect_to)
 
                 if previousURL and (previousURL.find('/followup/') >= 0 or previousURL.find('/userlist/') >= 0 or previousURL.find('/crossmatch') >= 0 or previousURL.find('/followup_quickview/') >= 0 or previousURL.find('/externalcrossmatches/') > 0 or previousURL.find('/userlist_quickview/') > 0 or previousURL.find('/followup_quickview_bs/') >= 0):
                     redirect_to = previousURL
@@ -1595,7 +1606,7 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
             form.fields['promote_demote'].choices = ATTIC_POST_PROMOTION_CHOICES
         elif listId == STAR or listId == HPMSTAR:
             form.fields['promote_demote'].choices = STAR_POST_PROMOTION_CHOICES
-        elif listId == GARBAGE:
+        elif listId == GARBAGE or listId == DUPLICATES:
             form.fields['promote_demote'].choices = GARBAGE_CHOICES
         else:
             form.fields['promote_demote'].choices = FOLLOWUP_POST_PROMOTION_CHOICES
@@ -2488,7 +2499,9 @@ followupClassList = [WebViewFollowupTransients0,
                      WebViewFollowupTransients8,
                      WebViewFollowupTransients9,
                      WebViewFollowupTransients10,
-                     WebViewFollowupTransients11]
+                     WebViewFollowupTransients11,
+                     WebViewFollowupTransients12,
+                     WebViewFollowupTransients13]
 
 
 @login_required

{psat_server_web-0.5.2 → psat_server_web-0.5.4}/psat_server_web/atlas/generate_mod_wsgi_apachectl.sh

@@ -35,6 +35,8 @@
 # export DJANGO_PANSTARRS_BASE_URL=''
 # export API_TOKEN_EXPIRY=''
 
+# export DJANGO_DEBUG='True'
+
 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
 
 export APACHEPATH="/tmp/atlas"

{psat_server_web-0.5.2 → psat_server_web-0.5.4}/psat_server_web/atlas/sql/create_web_views.sql

@@ -482,6 +482,82 @@ create or replace view atlas_v_followup11 as select o.followup_id rank,
        and detection_list_id = '11'
 ;
 
+-- 2025-01-29 KWS Added new lists 12 and 13 (GalCand and Duplicates)
+create or replace view atlas_v_followup12 as select o.followup_id rank,
+           o.id,
+           o.atlas_designation,
+           o.other_designation,
+           o.ra,
+           o.`dec`,
+           s.ra_avg,
+           s.dec_avg,
+           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.realbogus_factor,
+           o.zooniverse_score,
+           o.date_modified,
+           s.external_crossmatches,
+           s.discovery_target,
+           s.rms,
+           o.htm16ID,
+           o.detection_list_id,
+           o.images_id
+      from atlas_diff_objects o
+ left join tcs_latest_object_stats s
+        on (o.id = s.id)
+     where followup_id is not null
+       and detection_list_id = '12'
+;
+
+create or replace view atlas_v_followup13 as select o.followup_id rank,
+           o.id,
+           o.atlas_designation,
+           o.other_designation,
+           o.ra,
+           o.`dec`,
+           s.ra_avg,
+           s.dec_avg,
+           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.realbogus_factor,
+           o.zooniverse_score,
+           o.date_modified,
+           s.external_crossmatches,
+           s.discovery_target,
+           s.rms,
+           o.htm16ID,
+           o.detection_list_id,
+           o.images_id
+      from atlas_diff_objects o
+ left join tcs_latest_object_stats s
+        on (o.id = s.id)
+     where followup_id is not null
+       and detection_list_id = '13'
+;
 
 
 create or replace view atlas_v_followupall as select o.followup_id rank,

psat_server_web-0.5.4/psat_server_web/atlas/tcs_detection_lists.sql

@@ -0,0 +1,53 @@
+/*M!999999\- enable the sandbox mode */ 
+-- MariaDB dump 10.19  Distrib 10.6.20-MariaDB, for osx10.20 (arm64)
+--
+-- Host: localhost    Database: atlas
+-- ------------------------------------------------------
+-- Server version	10.6.20-MariaDB
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `tcs_detection_lists`
+--
+
+DROP TABLE IF EXISTS `tcs_detection_lists`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tcs_detection_lists` (
+  `id` smallint(5) unsigned NOT NULL,
+  `name` varchar(20) NOT NULL,
+  `description` varchar(80) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `tcs_detection_lists`
+--
+
+LOCK TABLES `tcs_detection_lists` WRITE;
+/*!40000 ALTER TABLE `tcs_detection_lists` DISABLE KEYS */;
+INSERT INTO `tcs_detection_lists` VALUES (0,'garbage','Bad Candidates'),(1,'followup','Followup Targets'),(2,'good','Good Candidates'),(3,'possible','Possible Candidates'),(4,'extragalcand','Extragalactic Eyeball Candidates'),(5,'attic','Attic'),(6,'stars','Stars'),(7,'agn','Known AGNs'),(8,'fasttrack','Fast Track Eyeball List'),(9,'movers','Movers'),(10,'SMC/LMC','Objects near SMC or LMC'),(11,'hpmstars','High Proper Motion Stars'),(12,'galcand','Galactic Eyeball Candidates'),(13,'duplicates','Duplicates');
+/*!40000 ALTER TABLE `tcs_detection_lists` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2025-01-29 12:20:10

{psat_server_web-0.5.2 → psat_server_web-0.5.4/psat_server_web.egg-info}/PKG-INFO

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

{psat_server_web-0.5.2 → psat_server_web-0.5.4}/psat_server_web.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ psat_server_web/atlas/django-default.log
 psat_server_web/atlas/generate_mod_wsgi_apachectl.sh
 psat_server_web/atlas/generate_mod_wsgi_apachectl_test.sh
 psat_server_web/atlas/manage.py
+psat_server_web/atlas/tcs_detection_lists.sql
 psat_server_web/atlas/test.py
 psat_server_web/atlas/accounts/admin.py
 psat_server_web/atlas/accounts/apps.py

psat_server_web-0.5.2/psat_server_web/__version__.py

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