psat-server-web 0.3.16__tar.gz → 0.3.17__tar.gz

{psat-server-web-0.3.16/psat_server_web.egg-info → psat_server_web-0.3.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.3.16
+Version: 0.3.17
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken
@@ -13,6 +13,20 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
+Requires-Dist: mysqlclient
+Requires-Dist: django<4.2
+Requires-Dist: django_tables2
+Requires-Dist: djangorestframework
+Requires-Dist: mod-wsgi
+Requires-Dist: pyyaml
+Requires-Dist: docopt
+Requires-Dist: python-dotenv
+Requires-Dist: gkhtm
+Requires-Dist: gkutils>=0.3.2
+Requires-Dist: requests
+Requires-Dist: lasair
+Requires-Dist: dustmaps
 
 # psat-server-web
 Python 3 web interface for the Pan-STARRS and ATLAS surveys.

psat_server_web-0.3.17/psat_server_web/__version__.py

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

{psat-server-web-0.3.16 → psat_server_web-0.3.17}/psat_server_web/atlas/atlas/models.py

@@ -1245,6 +1245,9 @@ class TcsVraScores(models.Model):
     preal = models.FloatField(blank=True, null=True)
     pgal = models.FloatField(blank=True, null=True)
     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)
     timestamp = models.DateTimeField()
     apiusername = models.CharField(max_length=30, blank=True, null=True)
     username = models.CharField(max_length=30, blank=True, null=True)
@@ -1269,6 +1272,8 @@ class TcsVraTodo(models.Model):
 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)
     timestamp = models.DateTimeField()
 
     class Meta:

{psat-server-web-0.3.16 → psat_server_web-0.3.17}/psat_server_web/atlas/atlasapi/serializers.py

@@ -139,8 +139,12 @@ class ObjectListSerializer(serializers.Serializer):
 class VRAScoresSerializer(serializers.Serializer):
     objectid = serializers.IntegerField(required=True)
     preal = serializers.FloatField(required=False, default=None)
-    pfast = serializers.FloatField(required=False, default=None)
     pgal = serializers.FloatField(required=False, default=None)
+    pfast = serializers.FloatField(required=False, default=None)
+    # 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)
     debug = serializers.BooleanField(required=False, default=False)
     insertdate = serializers.DateTimeField(required=False, default=None)
 
@@ -150,8 +154,11 @@ class VRAScoresSerializer(serializers.Serializer):
         from django.conf import settings
         objectid = self.validated_data['objectid']
         preal = self.validated_data['preal']
-        pfast = self.validated_data['pfast']
         pgal = self.validated_data['pgal']
+        pfast = self.validated_data['pfast']
+        rank = self.validated_data['rank']
+        rank_alt1 = self.validated_data['rank_alt1']
+        rank_alt2 = self.validated_data['rank_alt2']
         insertdate = self.validated_data['insertdate']
         debug = self.validated_data['debug']
 
@@ -173,6 +180,9 @@ class VRAScoresSerializer(serializers.Serializer):
                 'preal': preal,
                 'pgal': pgal,
                 'pfast': pfast,
+                'rank': rank,
+                'rank_alt1': rank_alt1,
+                'rank_alt2': rank_alt2,
                 'timestamp': insertDate,
                 'debug': debug,
                 'apiusername': userId}
@@ -424,6 +434,8 @@ class TcsObjectGroupsListSerializer(serializers.Serializer):
 class VRARankSerializer(serializers.Serializer):
     objectid = serializers.IntegerField(required=True)
     rank = serializers.FloatField(required=True)
+    rank_alt1 = serializers.FloatField(required=True)
+    rank_alt2= serializers.FloatField(required=True)
     insertdate = serializers.DateTimeField(required=False, default=None)
 
     import sys
@@ -434,6 +446,8 @@ class VRARankSerializer(serializers.Serializer):
         objectid = self.validated_data['objectid']
         insertdate = self.validated_data['insertdate']
         rank = self.validated_data['rank']
+        rank_alt1 = self.validated_data['rank_alt1']
+        rank_alt2 = self.validated_data['rank_alt2']
 
         insertDate = None
         if insertdate is not None:
@@ -446,6 +460,8 @@ class VRARankSerializer(serializers.Serializer):
 
         data = {'transient_object_id_id': objectid,
                 'rank': rank,
+                'rank_alt1': rank_alt1,
+                'rank_alt2': rank_alt2,
                 'timestamp': insertDate}
 
         # Does the objectId actually exit - not allowed to comment on objects that don't exist!

{psat-server-web-0.3.16 → psat_server_web-0.3.17}/psat_server_web/ps1/psdb/views.py

@@ -2772,17 +2772,18 @@ def followupQuickViewBootstrapPlotly(request, listNumber):
             # Processing is done in the searchResults method
         else:
             # We're using the submit form for the object updates
-            objectsQueryset = TcsTransientObjects.objects.filter(**queryFilter)
+            objectsQueryset = TcsTransientObjects.objects.filter(**queryFilter).order_by(*sort)
+            sys.stderr.write('\nAAAAH - FILTER = %s\n' % str(queryFilter))
             
             # 2019-07-31 KWS Rattle through all the objects to see if we have any
             #                associated with a specified GW event.
             if queryFilterGW:
-                gw = TcsGravityEventAnnotations.objects.filter(transient_object_id__detection_list_id=list_id).filter(**queryFilterGW)
+                gw = TcsGravityEventAnnotations.objects.filter(transient_object_id__detection_list_id=list_id).filter(**queryFilterGW).order_by(*sort)
                 gwTaggedObjects = [x.transient_object_id_id for x in gw]
                 if len(gwTaggedObjects) == 0:
                     # Put one fake object in the list. The query will fail with an EmptyResultSet error if we don't.
                     gwTaggedObjects = [1]
-                objectsQueryset = TcsTransientObjects.objects.filter(**queryFilter).filter(id__in=gwTaggedObjects)
+                objectsQueryset = TcsTransientObjects.objects.filter(**queryFilter).filter(id__in=gwTaggedObjects).order_by(*sort)
 
             for key, value in list(request.POST.items()):
                 if '_promote_demote' in key and value != 'U':
@@ -2873,17 +2874,21 @@ def followupQuickViewBootstrapPlotly(request, listNumber):
     if objectsQueryset.count() > 0:
         if objectsQueryset[0].tcs_cmf_metadata_id.filename.split('.')[0].upper() == 'FGSS':
             fgss = True
-            table = TcsTransientObjectsTableFGSS(objectsQueryset, order_by=request.GET.get('sort', '-followup_id'))
+            table = TcsTransientObjectsTableFGSS(objectsQueryset)
+            sys.stderr.write('\nPUKE!\n')
         else:
             try:
                 if int(list_id) in (0,1,2,3,4,5,6,7,8):
-                    table = TcsTransientObjectsTables[list_id](objectsQueryset, order_by=request.GET.get('sort', '-followup_id'))
+                    table = TcsTransientObjectsTables[list_id](objectsQueryset)
+                    sys.stderr.write('\nAARGH!\n')
                 else:
-                    table = TcsTransientObjectsTable(objectsQueryset, order_by=request.GET.get('sort', '-followup_id'))
+                    table = TcsTransientObjectsTable(objectsQueryset)
             except ValueError as e:
-                table = TcsTransientObjectsTable(objectsQueryset, order_by=request.GET.get('sort', '-followup_id'))
+                table = TcsTransientObjectsTable(objectsQueryset)
+                sys.stderr.write('\nBAARF!\n')
     else:
-        table = TcsTransientObjectsTable(objectsQueryset, order_by=request.GET.get('sort', '-followup_id'))
+        table = TcsTransientObjectsTable(objectsQueryset)
+        sys.stderr.write('\nPUKE!\n')
 
     # Paginate the results. Completely bypass Django tables.
     paginator = Paginator(objectsQueryset, nobjects)

psat_server_web-0.3.17/psat_server_web/schema/tcs_vra_probabilities.sql

@@ -0,0 +1,14 @@
+-- 2024-01-17 KWS New virtual research assistant probabilities table.
+drop table if exists `tcs_vra_probabilities`;
+
+create table `tcs_vra_probabilities` (
+`id` bigint unsigned not null auto_increment,  -- autoincrementing detection id
+`transient_object_id` bigint(20) unsigned NOT NULL,
+`preal` float,
+`pgal` float,
+`pfast` float,
+`updated` timestamp not null default current_timestamp,
+`username` varchar(30) default null,
+primary key `idx_pk_id` (`id`),
+key `idx_transient_object_id` (`transient_object_id`)
+) engine=InnoDB;

{psat-server-web-0.3.16 → psat_server_web-0.3.17}/psat_server_web/schema/tcs_vra_scores.sql

@@ -7,6 +7,9 @@ create table `tcs_vra_scores` (
 `preal` float,
 `pgal` float,
 `pfast` float,
+`rank_oxqub` float,
+`rank_alt1` float,
+`rank_alt2` float,
 `timestamp` timestamp not null default current_timestamp,
 `apiusername` varchar(30) default null,
 `username` varchar(30) default null,

psat_server_web-0.3.17/psat_server_web/schema/update_tcs_vra_rank_20240814.sql

@@ -0,0 +1,5 @@
+alter table tcs_vra_rank
+add column `rank_alt1` float after `rank`,
+add column `rank_alt2` float after `rank_alt1`
+;
+

psat_server_web-0.3.17/psat_server_web/schema/update_tcs_vra_scores_20240814.sql

@@ -0,0 +1,6 @@
+alter table tcs_vra_scores
+add column `rank` float after `pfast`,
+add column `rank_alt1` float after `rank`,
+add column `rank_alt2` float after `rank_alt1`
+;
+

{psat-server-web-0.3.16 → psat_server_web-0.3.17/psat_server_web.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.3.16
+Version: 0.3.17
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken
@@ -13,6 +13,20 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
+Requires-Dist: mysqlclient
+Requires-Dist: django<4.2
+Requires-Dist: django_tables2
+Requires-Dist: djangorestframework
+Requires-Dist: mod-wsgi
+Requires-Dist: pyyaml
+Requires-Dist: docopt
+Requires-Dist: python-dotenv
+Requires-Dist: gkhtm
+Requires-Dist: gkutils>=0.3.2
+Requires-Dist: requests
+Requires-Dist: lasair
+Requires-Dist: dustmaps
 
 # psat-server-web
 Python 3 web interface for the Pan-STARRS and ATLAS surveys.

{psat-server-web-0.3.16 → psat_server_web-0.3.17}/psat_server_web.egg-info/SOURCES.txt

@@ -426,6 +426,7 @@ psat_server_web/schema/tcs_tns_requests.sql
 psat_server_web/schema/tcs_tphot_detections.sql
 psat_server_web/schema/tcs_transient_objects.sql
 psat_server_web/schema/tcs_transient_reobservations.sql
+psat_server_web/schema/tcs_vra_probabilities.sql
 psat_server_web/schema/tcs_vra_rank.sql
 psat_server_web/schema/tcs_vra_scores.sql
 psat_server_web/schema/tcs_vra_todo.sql
@@ -437,4 +438,6 @@ psat_server_web/schema/update_database_types_to_tns_types_panstarrs.sql
 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_scores_20240814.sql
 psat_server_web/schema/vra_triggers_atlas.sql

psat-server-web-0.3.16/psat_server_web/__version__.py

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