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

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

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

psat_server_web-0.5.5/psat_server_web/__version__.py

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

{psat_server_web-0.5.4 → psat_server_web-0.5.5}/psat_server_web/atlas/atlas/models.py

@@ -1249,7 +1249,7 @@ class TcsVraScores(models.Model):
     pfast = models.FloatField(blank=True, null=True)
     rank = models.FloatField(blank=True, null=True)
     rank_alt1 = models.FloatField(blank=True, null=True)
-    rank_alt2 = models.FloatField(blank=True, null=True)
+    is_gal_cand = models.SmallIntegerField(blank=True, null=True, default=None)
     timestamp = models.DateTimeField()
     apiusername = models.CharField(max_length=30, blank=True, null=True)
     username = models.CharField(max_length=30, blank=True, null=True)
@@ -1275,7 +1275,7 @@ class TcsVraRank(models.Model):
     transient_object_id = models.ForeignKey(AtlasDiffObjects, to_field='id', db_column='transient_object_id', on_delete=models.CASCADE, primary_key=True)
     rank = models.FloatField(blank=True, null=True)
     rank_alt1 = models.FloatField(blank=True, null=True)
-    rank_alt2 = models.FloatField(blank=True, null=True)
+    is_gal_cand = models.SmallIntegerField(blank=True, null=True)
     timestamp = models.DateTimeField()
 
     class Meta:

{psat_server_web-0.5.4 → psat_server_web-0.5.5}/psat_server_web/atlas/atlasapi/serializers.py

@@ -147,7 +147,7 @@ class VRAScoresSerializer(serializers.Serializer):
     # 2024-08-14 KWS Added 3 new values to the form for Rank.
     rank = serializers.FloatField(required=False, default=None)
     rank_alt1 = serializers.FloatField(required=False, default=None)
-    rank_alt2 = serializers.FloatField(required=False, default=None)
+    is_gal_cand = serializers.IntegerField(required=False, default=None)
     debug = serializers.BooleanField(required=False, default=False)
     insertdate = serializers.DateTimeField(required=False, default=None)
 
@@ -161,7 +161,7 @@ class VRAScoresSerializer(serializers.Serializer):
         pfast = self.validated_data['pfast']
         rank = self.validated_data['rank']
         rank_alt1 = self.validated_data['rank_alt1']
-        rank_alt2 = self.validated_data['rank_alt2']
+        is_gal_cand = self.validated_data['is_gal_cand']
         insertdate = self.validated_data['insertdate']
         debug = self.validated_data['debug']
 
@@ -185,7 +185,7 @@ class VRAScoresSerializer(serializers.Serializer):
                 'pfast': pfast,
                 'rank': rank,
                 'rank_alt1': rank_alt1,
-                'rank_alt2': rank_alt2,
+                'is_gal_cand': is_gal_cand,
                 'timestamp': insertDate,
                 'debug': debug,
                 'apiusername': userId}
@@ -438,7 +438,7 @@ class VRARankSerializer(serializers.Serializer):
     objectid = serializers.IntegerField(required=True)
     rank = serializers.FloatField(required=True)
     rank_alt1 = serializers.FloatField(required=False, default=None)
-    rank_alt2= serializers.FloatField(required=False, default=None)
+    is_gal_cand = serializers.IntegerField(required=False, default=None)
     insertdate = serializers.DateTimeField(required=False, default=None)
 
     import sys
@@ -450,7 +450,7 @@ class VRARankSerializer(serializers.Serializer):
         insertdate = self.validated_data['insertdate']
         rank = self.validated_data['rank']
         rank_alt1 = self.validated_data['rank_alt1']
-        rank_alt2 = self.validated_data['rank_alt2']
+        is_gal_cand = self.validated_data['is_gal_cand']
 
         insertDate = None
         if insertdate is not None:
@@ -464,7 +464,7 @@ class VRARankSerializer(serializers.Serializer):
         data = {'transient_object_id_id': objectid,
                 'rank': rank,
                 'rank_alt1': rank_alt1,
-                'rank_alt2': rank_alt2,
+                'is_gal_cand': is_gal_cand,
                 'timestamp': insertDate}
 
         # Does the objectId actually exit - not allowed to comment on objects that don't exist!
@@ -575,7 +575,7 @@ class ObjectDetectionListSerializer(serializers.Serializer):
             for key, value in data.items():
                 sys.stderr.write("\nkey=%s\n" % key)
                 sys.stderr.write("\nvalue=%s\n" % value)
-                if key=='detection_list_id_id' and value not in (3,4):
+                if key=='detection_list_id_id' and value not in (3,4,12):
                     replyMessage = 'Error updating row.'
                     info = { "objectid": objectid, "info": replyMessage }
                     return info

{psat_server_web-0.5.4 → psat_server_web-0.5.5}/psat_server_web/schema/tcs_vra_rank.sql

@@ -4,6 +4,8 @@ drop table if exists `tcs_vra_rank`;
 create table `tcs_vra_rank` (
 `transient_object_id` bigint(20) NOT NULL,
 `rank` float NOT NULL,
+`rank_alt1` float NOT NULL,
+`is_gal_cand` bool NOT NULL,
 `timestamp` timestamp not null default current_timestamp,
 primary key `idx_transient_object_id` (`transient_object_id`)
 ) engine=InnoDB;

{psat_server_web-0.5.4 → psat_server_web-0.5.5}/psat_server_web/schema/tcs_vra_scores.sql

@@ -9,7 +9,7 @@ create table `tcs_vra_scores` (
 `pfast` float,
 `rank` float,
 `rank_alt1` float,
-`rank_alt2` float,
+`is_gal_cand` bool,
 `timestamp` timestamp not null default current_timestamp,
 `apiusername` varchar(30) default null,
 `username` varchar(30) default null,

psat_server_web-0.5.5/psat_server_web/schema/update_tcs_vra_rank_20250130.sql

@@ -0,0 +1,4 @@
+alter table tcs_vra_rank
+change column `rank_alt2` `is_gal_cand` bool
+;
+

psat_server_web-0.5.5/psat_server_web/schema/update_tcs_vra_scores_20250130.sql

@@ -0,0 +1,3 @@
+alter table tcs_vra_scores
+change column `rank_alt2` `is_gal_cand` bool
+;

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.5.4
+Version: 0.5.5
 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-0.5.5}/psat_server_web.egg-info/SOURCES.txt

@@ -467,5 +467,7 @@ psat_server_web/schema/update_tcs_gravity_alerts_001.sql
 psat_server_web/schema/update_tcs_gravity_event_annotations_001.sql
 psat_server_web/schema/update_tcs_latest_object_stats_001.sql
 psat_server_web/schema/update_tcs_vra_rank_20240814.sql
+psat_server_web/schema/update_tcs_vra_rank_20250130.sql
 psat_server_web/schema/update_tcs_vra_scores_20240814.sql
+psat_server_web/schema/update_tcs_vra_scores_20250130.sql
 psat_server_web/schema/vra_triggers_atlas.sql

psat_server_web-0.5.4/psat_server_web/__version__.py

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