psat-server-web 0.6.2__tar.gz → 0.6.4__tar.gz

{psat_server_web-0.6.2/psat_server_web.egg-info → psat_server_web-0.6.4}/PKG-INFO

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

psat_server_web-0.6.4/psat_server_web/__version__.py

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

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web/atlas/accounts/admin.py

@@ -5,6 +5,8 @@ expiry time for tokens can be set.
 import logging
 
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
+from django.contrib.auth.admin import GroupAdmin as BaseGroupAdmin
 from django.contrib.auth.models import User, Group
 from django.forms.models import ModelForm
 from .models import GroupProfile, UserProfile
@@ -27,7 +29,10 @@ class GroupProfileInline(admin.StackedInline):
     extra = 1
     form = AlwaysChangedModelForm
 
-class GroupAdmin(admin.ModelAdmin):
+class GroupAdmin(BaseGroupAdmin):
+    """ Customise admin interface for Group model to include GroupProfile, so 
+    expiry time for tokens can be set. 
+    """
     inlines = (GroupProfileInline,)
     
 admin.site.unregister(Group)
@@ -39,7 +44,10 @@ class UserProfileInline(admin.StackedInline):
     extra = 1
     form = AlwaysChangedModelForm
     
-class UserAdmin(admin.ModelAdmin):
+class UserAdmin(BaseUserAdmin):
+    """ Customise admin interface for User model to include UserProfile, so
+    unuseable_password flag can be set. 
+    """
     inlines = (UserProfileInline,)
 
 admin.site.unregister(User)

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web/atlas/atlas/commonqueries.py

@@ -79,6 +79,7 @@ LC_POINTS_QUERY_ATLAS = '''\
            '''
 
 # 2015-12-10 KWS Updated query for DDT format schema.
+# 2025-07-02 KWS Added nx and ny.
 LC_POINTS_QUERY_ATLAS_DDT = '''\
           select o.id,
                  d.ra,
@@ -95,6 +96,8 @@ LC_POINTS_QUERY_ATLAS_DDT = '''\
                  m.reference,
                  m.object pointing,
                  m.mag5sig,
+                 m.nx,
+                 m.ny,
                  d.atlas_metadata_id,
                  d.atlas_object_id,
                  o.atlas_designation,
@@ -172,6 +175,7 @@ def metadataWhereClause(metadataIds):
 
 # 2017-06-16 KWS Updated query for DDC format schema.
 # 2024-03-07 KWS Added date_inserted.
+# 2025-07-02 KWS Added nx and ny.
 LC_POINTS_QUERY_ATLAS_DDC = '''\
           select o.id,
                  d.ra,
@@ -188,6 +192,8 @@ LC_POINTS_QUERY_ATLAS_DDC = '''\
                  m.reference,
                  m.obj pointing,
                  m.mag5sig,
+                 m.nx,
+                 m.ny,
                  d.atlas_metadata_id,
                  d.atlas_object_id,
                  o.atlas_designation,

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web/atlas/atlas/django-default.log

@@ -337,3 +337,73 @@ accounts.utils DEBUG 2025-05-14 11:27:29,248 utils User profile: UserProfile obj
 accounts.utils DEBUG 2025-05-14 11:27:41,679 utils Checking if user rube needs to change password.
 accounts.utils DEBUG 2025-05-14 11:27:41,682 utils User profile: UserProfile object (1)
 atlas.views DEBUG 2025-05-14 11:27:41,693 views User can edit observations: True
+accounts.utils DEBUG 2025-05-14 20:49:19,405 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 20:49:19,407 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 20:49:19,473 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 20:49:19,474 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 21:00:46,264 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 21:00:46,266 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 21:00:46,313 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 21:00:46,315 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 21:13:07,361 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 21:13:07,363 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 21:13:07,408 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 21:13:07,409 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 21:33:21,057 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 21:33:21,059 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 21:33:21,106 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 21:33:21,108 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-15 15:57:40,089 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-15 15:57:40,090 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-15 15:57:40,148 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-15 15:57:40,148 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-15 16:05:25,574 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-15 16:05:25,620 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-15 16:05:42,656 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-15 16:05:42,699 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-16 14:02:17,059 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-16 14:02:17,120 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-20 13:41:26,648 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-20 13:41:26,710 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-20 13:41:33,775 utils Checking if user ken.smith needs to change password.
+atlas.views DEBUG 2025-05-20 13:41:33,790 views User can edit observations: True
+accounts.utils DEBUG 2025-05-20 13:41:42,513 utils Checking if user ken.smith needs to change password.
+atlas.views DEBUG 2025-05-20 13:41:42,522 views User can edit observations: True
+accounts.utils DEBUG 2025-05-20 13:41:44,875 utils Checking if user ken.smith needs to change password.
+atlas.views DEBUG 2025-05-20 13:41:44,888 views User can edit observations: True
+urllib3.connectionpool DEBUG 2025-05-20 13:41:45,309 connectionpool Starting new HTTPS connection (1): lasair-ztf.lsst.ac.uk:443
+urllib3.connectionpool DEBUG 2025-05-20 13:41:45,427 connectionpool https://lasair-ztf.lsst.ac.uk:443 "POST /api/cone/ HTTP/1.1" 200 2
+urllib3.connectionpool DEBUG 2025-05-20 13:41:45,431 connectionpool Starting new HTTP connection (1): localhost:8084
+accounts.utils DEBUG 2025-05-26 09:58:52,538 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-26 09:58:52,722 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-26 09:58:59,098 utils Checking if user ken.smith needs to change password.
+atlas.views DEBUG 2025-05-26 09:58:59,109 views User can edit observations: True
+accounts.utils DEBUG 2025-05-26 09:59:01,139 utils Checking if user ken.smith needs to change password.
+atlas.views DEBUG 2025-05-26 09:59:01,151 views User can edit observations: True
+urllib3.connectionpool DEBUG 2025-05-26 09:59:01,437 connectionpool Starting new HTTPS connection (1): lasair-ztf.lsst.ac.uk:443
+urllib3.connectionpool DEBUG 2025-05-26 09:59:01,608 connectionpool https://lasair-ztf.lsst.ac.uk:443 "POST /api/cone/ HTTP/1.1" 200 2
+urllib3.connectionpool DEBUG 2025-05-26 09:59:01,617 connectionpool Starting new HTTP connection (1): localhost:8084
+accounts.utils DEBUG 2025-05-26 09:59:18,679 utils Checking if user ken.smith needs to change password.
+atlas.views DEBUG 2025-05-26 09:59:18,691 views User can edit observations: True
+urllib3.connectionpool DEBUG 2025-05-26 09:59:18,929 connectionpool Starting new HTTPS connection (1): lasair-ztf.lsst.ac.uk:443
+urllib3.connectionpool DEBUG 2025-05-26 09:59:19,070 connectionpool https://lasair-ztf.lsst.ac.uk:443 "POST /api/cone/ HTTP/1.1" 200 2
+urllib3.connectionpool DEBUG 2025-05-26 09:59:19,071 connectionpool Starting new HTTP connection (1): localhost:8084
+accounts.utils DEBUG 2025-05-26 09:59:36,251 utils Checking if user ken.smith needs to change password.
+atlas.views DEBUG 2025-05-26 09:59:36,263 views User can edit observations: True
+accounts.utils DEBUG 2025-05-26 09:59:48,644 utils Checking if user ken.smith needs to change password.
+atlas.views DEBUG 2025-05-26 09:59:48,656 views User can edit observations: True
+urllib3.connectionpool DEBUG 2025-05-26 09:59:49,174 connectionpool Starting new HTTPS connection (1): lasair-ztf.lsst.ac.uk:443
+urllib3.connectionpool DEBUG 2025-05-26 09:59:49,276 connectionpool https://lasair-ztf.lsst.ac.uk:443 "POST /api/cone/ HTTP/1.1" 200 2
+urllib3.connectionpool DEBUG 2025-05-26 09:59:49,278 connectionpool Starting new HTTP connection (1): localhost:8084
+accounts.utils DEBUG 2025-05-27 16:30:37,223 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-27 16:30:37,274 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-27 16:35:01,507 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-27 16:35:01,553 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-28 10:33:24,677 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-28 10:33:24,736 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-28 10:49:51,393 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-28 10:49:51,472 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-28 17:00:56,400 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-28 17:00:56,458 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-28 17:23:58,599 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-28 17:23:58,646 utils Checking if user ken.smith needs to change password.

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web/atlas/templates/base_bootstrap.html

@@ -269,5 +269,6 @@ Unset Content
       <li class="nav-item"><a class="nav-link" href="{% url 'privacy_policy' %}">Privacy Policy</a></li>
     </ul>
   </div>
+</nav>
 </body>
 </html>

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web/atlas/templates/privacy_policy.html

@@ -4,7 +4,7 @@
 
 <div class="container-fluid h-100">
   <div class="row justify-content-center align-items-center h-100">
-    <div class="col-lg-4 col-md-6 col-sm-12">
+    <div class="col-lg-10 col-md-10 col-sm-10">
         <h1>Privacy Policy</h1>
 
         <p>
@@ -22,12 +22,13 @@
         </p>
 
         <p>
-        Who can see my data?: All users of the server can see your name.surname when 
-        you comment. Your email is stored in a private Google Drive spreadsheet that 
-        only a couple of project administrators can access.
+        <b>Who can see my data?</b> All users of the server can see your 
+        name.surname when you comment. Your email is stored in a private Google 
+        Drive spreadsheet that only a couple of project administrators can 
+        access.
         </p>
 
-        <p>We will never share your data with third parties</p>
+        <p><b>We will never share your data with third parties.</b></p>
     </div>
   </div>
 </div>

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web/ps1/psdb/commonqueries.py

@@ -330,8 +330,9 @@ FOLLOWUP_PHOTOMETRY_QUERY = """\
 
 # Get forced photometry only if the flux s/n ratio > 3 and limit to a minimum MJD.
 # 2021-12-18 KWS Added pscamera (GPC1 or GPC2) to the forced photometry raw query.
+# 2025-06-30 KWS Added fptype to the forced photometry raw query.
 FORCED_PHOTOMETRY_QUERY = """\
-          select id, transient_object_id, mjd_obs, ra_psf, dec_psf, skycell, exptime, psf_inst_mag, psf_inst_mag_sig, cal_psf_mag, psf_inst_flux, psf_inst_flux_sig, filter, zero_pt, fpa_id, pscamera
+          select id, transient_object_id, mjd_obs, ra_psf, dec_psf, skycell, exptime, psf_inst_mag, psf_inst_mag_sig, cal_psf_mag, psf_inst_flux, psf_inst_flux_sig, filter, zero_pt, fpa_id, pscamera, fptype
             from tcs_forced_photometry
            where transient_object_id = %s
              and mjd_obs > %s

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web/ps1/psdb/models.py

@@ -1122,3 +1122,70 @@ class TcsZooniverseScores(models.Model):
 
         db_table = 'tcs_zooniverse_scores'
         managed = False
+
+
+# 2025-06-30 KWS Added TcsForcedPhotometry model.
+class TcsForcedPhotometry(models.Model):
+    """TcsForcedPhotometry.
+    """
+        
+    id = models.BigIntegerField(primary_key=True)
+    postage_stamp_request_id = models.BigIntegerField(blank=True, null=True)
+    transient_object_id = models.ForeignKey(TcsTransientObjects, to_field='id', db_column='transient_object_id', on_delete=models.CASCADE)
+    rownum = models.IntegerField(blank=True, null=True)
+    skycell = models.CharField(max_length=10, blank=True)
+    mjd_obs = models.FloatField(blank=True, null=True)
+    exptime = models.FloatField(blank=True, null=True)
+    filter = models.CharField(max_length=20, blank=True)
+    fpa_id = models.CharField(max_length=20, blank=True)
+    x_psf = models.FloatField(blank=True, null=True)
+    y_psf = models.FloatField(blank=True, null=True)
+    x_psf_sig = models.FloatField(blank=True, null=True)
+    y_psf_sig = models.FloatField(blank=True, null=True)
+    posangle = models.FloatField(blank=True, null=True)
+    pltscale = models.FloatField(blank=True, null=True)
+    psf_inst_mag = models.FloatField(blank=True, null=True)
+    psf_inst_mag_sig = models.FloatField(blank=True, null=True)
+    psf_inst_flux = models.FloatField(blank=True, null=True)
+    psf_inst_flux_sig = models.FloatField(blank=True, null=True)
+    ap_mag = models.FloatField(blank=True, null=True)
+    ap_mag_radius = models.FloatField(blank=True, null=True)
+    peak_flux_as_mag = models.FloatField(blank=True, null=True)
+    cal_psf_mag = models.FloatField(blank=True, null=True)
+    cal_psf_mag_sig = models.FloatField(blank=True, null=True)
+    ra_psf = models.FloatField()
+    dec_psf = models.FloatField()
+    sky = models.FloatField(blank=True, null=True)
+    sky_sigma = models.FloatField(blank=True, null=True)
+    psf_chisq = models.FloatField(blank=True, null=True)
+    cr_nsigma = models.FloatField(blank=True, null=True)
+    ext_nsigma = models.FloatField(blank=True, null=True)
+    psf_major = models.FloatField(blank=True, null=True)
+    psf_minor = models.FloatField(blank=True, null=True) 
+    psf_theta = models.FloatField(blank=True, null=True)
+    psf_qf = models.FloatField(blank=True, null=True)
+    psf_ndof = models.IntegerField(blank=True, null=True) 
+    psf_npix = models.IntegerField(blank=True, null=True)
+    moments_xx = models.FloatField(blank=True, null=True)
+    moments_xy = models.FloatField(blank=True, null=True)
+    moments_yy = models.FloatField(blank=True, null=True)
+    diff_npos = models.IntegerField(blank=True, null=True)
+    diff_fratio = models.FloatField(blank=True, null=True)
+    diff_nratio_bad = models.FloatField(blank=True, null=True)
+    diff_nratio_mask = models.FloatField(blank=True, null=True)
+    diff_nratio_all = models.FloatField(blank=True, null=True)
+    flags = models.IntegerField(blank=True, null=True)
+    n_frames = models.IntegerField(blank=True, null=True)
+    padding = models.IntegerField(blank=True, null=True)
+    zero_pt_skycell_corrected = models.FloatField(blank=True, null=True)
+    pscamera = models.CharField(max_length=30, blank=True)
+    fptype = models.IntegerField(blank=False, null=False)
+
+    class Meta:
+        """Meta.
+        """
+
+        managed = False
+        db_table = 'tcs_forced_photometry'
+
+

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web/schema/tcs_forced_photometry.sql

@@ -6,6 +6,7 @@
 -- 2021-12-28 KWS Added pscamera to the list of columns.
 -- 2023-04-17 KWS Switched to using InnoDB as backend. Requires the database to be small or
 --                regularly purged (as has been done with ATLAS).
+-- 2025-06-30 KWS Added new column "type" whose value is 0 for diff and 1 for reduced (new).
 drop table if exists `tcs_forced_photometry`;
 
 create table `tcs_forced_photometry` (
@@ -60,6 +61,7 @@ create table `tcs_forced_photometry` (
 `padding` smallint,
 `zero_pt_skycell_corrected` float,
 `pscamera` varchar(10),
+`fptype` tinyint not null default 0,
 PRIMARY KEY `key_id` (`id`),
 UNIQUE KEY `idx_transient_object_id_fpa_id` (`transient_object_id`,`fpa_id`),
 KEY `idx_ra_psf_dec_psf` (`ra_psf`,`dec_psf`),

psat_server_web-0.6.4/psat_server_web/schema/update_tcs_forced_photometry_20250630.sql

@@ -0,0 +1,3 @@
+alter table tcs_forced_photometry
+add column `fptype` tinyint not null default 0
+;

{psat_server_web-0.6.2 → psat_server_web-0.6.4/psat_server_web.egg-info}/PKG-INFO

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

{psat_server_web-0.6.2 → psat_server_web-0.6.4}/psat_server_web.egg-info/SOURCES.txt

@@ -488,6 +488,7 @@ psat_server_web/schema/tcs_zooniverse_scores.sql
 psat_server_web/schema/types_gaia_dr2_cassandra.txt
 psat_server_web/schema/update_database_types_to_tns_types_atlas.sql
 psat_server_web/schema/update_database_types_to_tns_types_panstarrs.sql
+psat_server_web/schema/update_tcs_forced_photometry_20250630.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-0.6.2/psat_server_web/__version__.py

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