psat-server-web 0.4.0__tar.gz → 0.4.2__tar.gz

{psat_server_web-0.4.0/psat_server_web.egg-info → psat_server_web-0.4.2}/PKG-INFO

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

psat_server_web-0.4.2/psat_server_web/__version__.py

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

psat_server_web-0.4.2/psat_server_web/atlas/accounts/admin.py

@@ -0,0 +1,18 @@
+"""
+Customise admin interface for Group model to include GroupProfile, so default 
+expiry time for tokens can be set. 
+"""
+
+from django.contrib import admin
+from django.contrib.auth.models import Group
+from .models import GroupProfile
+
+class GroupProfileInline(admin.StackedInline):
+    model = GroupProfile
+    can_delete = False
+
+class GroupAdmin(admin.ModelAdmin):
+    inlines = (GroupProfileInline,)
+
+admin.site.unregister(Group)
+admin.site.register(Group, GroupAdmin)

psat_server_web-0.4.2/psat_server_web/atlas/accounts/apps.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class ATLASAccountsConfig(AppConfig):
+    name = 'accounts'
+
+    def ready(self):
+        import accounts.signals

psat_server_web-0.4.2/psat_server_web/atlas/accounts/migrations/0001_initial.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.1 on 2024-10-30 15:28
+
+import datetime
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GroupProfile',
+            fields=[
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('token_expiration_time', models.DurationField(default=datetime.timedelta(days=1), help_text='in days, default 1 day (24*60*60 seconds)')),
+                ('description', models.TextField(blank=True, help_text='What is the group for?')),
+                ('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to='auth.group')),
+            ],
+            options={
+                'verbose_name': 'Group Profile',
+                'verbose_name_plural': 'Group Profiles',
+                'db_table': 'auth_group_profile',
+                'managed': True,
+            },
+        ),
+    ]

psat_server_web-0.4.2/psat_server_web/atlas/accounts/models.py

@@ -0,0 +1,37 @@
+
+from django.utils.timezone import timedelta
+from django.contrib.auth.models import Group
+from django.db import models
+
+
+
+class GroupProfile(models.Model):
+    """GroupProfile.
+    
+    Extension of the Group model to store additional information, such as token 
+    expiration time.
+    """
+    id = models.AutoField(primary_key=True)
+    group = models.OneToOneField(
+        Group, 
+        on_delete=models.CASCADE, 
+        related_name='profile'
+    )
+    token_expiration_time = models.DurationField(
+        help_text='in days, default 1 day (24*60*60 seconds)',
+        default=timedelta(days=1)
+        )
+    description = models.TextField(
+        blank=True,
+        help_text='What is the group for?'
+    )
+    
+    class Meta:
+        """Meta.
+        """
+        app_label = 'accounts'
+        managed = True
+        verbose_name = 'Group Profile'
+        verbose_name_plural = 'Group Profiles'
+        db_table = 'auth_group_profile'
+

psat_server_web-0.4.2/psat_server_web/atlas/accounts/signals.py

@@ -0,0 +1,15 @@
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+from django.contrib.auth.models import Group
+from .models import GroupProfile
+
+@receiver(post_save, sender=Group)
+def create_group_profile(sender, instance, created, **kwargs):
+    if created:
+        new_profile, profile_created = GroupProfile.objects.get_or_create(
+            group=instance
+        )
+        if profile_created:
+            # If we created a new profile then set the group's profile to it
+            instance.profile = new_profile 
+            instance.save()

{psat_server_web-0.4.0 → psat_server_web-0.4.2}/psat_server_web/atlas/atlas/dbviews.py

@@ -21,6 +21,12 @@ class CustomLCPoints(models.Model):
     dec = models.FloatField(db_column='dec')
     atlas_metadata_id = models.IntegerField(db_column='atlas_metadata_id')
 
+    class Meta:
+        """Meta.
+        """
+
+        managed = False
+
 # 2023-12-19 KWS Added ALL the detection columns - not just the ones for plotting.
 # 2024-03-07 KWS Added date_inserted column.
 class CustomLCPoints2(models.Model):
@@ -61,6 +67,12 @@ class CustomLCPoints2(models.Model):
     dflx = models.FloatField(db_column='dflx')
     date_inserted = models.DateTimeField(db_column='date_inserted')
 
+    class Meta:
+        """Meta.
+        """
+
+        managed = False
+
 
 class CustomLCBlanks(models.Model):
     """CustomLCBlanks.
@@ -77,6 +89,12 @@ class CustomLCBlanks(models.Model):
     reference = models.CharField(max_length=765, db_column='reference')
     pointing = models.CharField(max_length=765, db_column='pointing')
 
+    class Meta:
+        """Meta.
+        """
+
+        managed = False
+
 # 2024-03-07 KWS Added date_inserted column.
 class CustomLCBlanks2(models.Model):
     """CustomLCBlanks2.
@@ -95,6 +113,12 @@ class CustomLCBlanks2(models.Model):
     mag5sig = models.FloatField(db_column='mag5sig')
     date_inserted = models.DateTimeField(db_column='date_inserted')
 
+    class Meta:
+        """Meta.
+        """
+
+        managed = False
+
 class CustomFollowupLCData(models.Model):
     """CustomFollowupLCData.
     """
@@ -110,6 +134,12 @@ class CustomFollowupLCData(models.Model):
     instrument_name = models.CharField(max_length=90, db_column='instrument_name')
     instrument_description = models.CharField(max_length=180, db_column='instrument_description')
 
+    class Meta:
+        """Meta.
+        """
+
+        managed = False
+
 class FollowupRaw(models.Model):
     """FollowupRaw.
     """
@@ -172,6 +202,12 @@ class FollowupRaw(models.Model):
         return xms
 
 
+    class Meta:
+        """Meta.
+        """
+
+        managed = False
+
 
 class WebViewAbstractFollowup(models.Model):
     """WebViewAbstractFollowup.
@@ -273,6 +309,7 @@ class WebViewFollowupTransients(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followupall'
 
 class WebViewFollowupTransients0(WebViewAbstractFollowup):
@@ -284,6 +321,7 @@ class WebViewFollowupTransients0(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup0'
 
 class WebViewFollowupTransients1(WebViewAbstractFollowup):
@@ -295,6 +333,7 @@ class WebViewFollowupTransients1(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup1'
 
 class WebViewFollowupTransients2(WebViewAbstractFollowup):
@@ -306,6 +345,7 @@ class WebViewFollowupTransients2(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup2'
 
 class WebViewFollowupTransients3(WebViewAbstractFollowup):
@@ -317,6 +357,7 @@ class WebViewFollowupTransients3(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup3'
 
 class WebViewFollowupTransients4(WebViewAbstractFollowup):
@@ -328,6 +369,7 @@ class WebViewFollowupTransients4(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup4'
 
 class WebViewFollowupTransients5(WebViewAbstractFollowup):
@@ -339,6 +381,7 @@ class WebViewFollowupTransients5(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup5'
 
 class WebViewFollowupTransients6(WebViewAbstractFollowup):
@@ -350,6 +393,7 @@ class WebViewFollowupTransients6(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup6'
 
 class WebViewFollowupTransients7(WebViewAbstractFollowup):
@@ -361,6 +405,7 @@ class WebViewFollowupTransients7(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup7'
 
 class WebViewFollowupTransients8(WebViewAbstractFollowup):
@@ -372,6 +417,7 @@ class WebViewFollowupTransients8(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup8'
 
 class WebViewFollowupTransients9(WebViewAbstractFollowup):
@@ -383,6 +429,7 @@ class WebViewFollowupTransients9(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup9'
 
 class WebViewFollowupTransients10(WebViewAbstractFollowup):
@@ -394,6 +441,7 @@ class WebViewFollowupTransients10(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup10'
 
 class WebViewFollowupTransients11(WebViewAbstractFollowup):
@@ -405,6 +453,7 @@ class WebViewFollowupTransients11(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup11'
 
 class WebViewFollowupTransientsGeneric(WebViewAbstractFollowup):
@@ -416,6 +465,7 @@ class WebViewFollowupTransientsGeneric(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup'
 
 class WebViewFollowupTransientsGenericGW(WebViewAbstractFollowup):
@@ -427,6 +477,7 @@ class WebViewFollowupTransientsGenericGW(WebViewAbstractFollowup):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup_gw'
 
 
@@ -550,6 +601,7 @@ class WebViewUserDefined(WebViewAbstractUserDefined):
         """Meta.
         """
 
+        managed = False
         db_table = 'atlas_v_followup_userdefined'
 
 

{psat_server_web-0.4.0 → psat_server_web-0.4.2}/psat_server_web/atlas/atlas/models.py

@@ -10,7 +10,6 @@
 import sys
 
 from django.db import models
-
 from gkutils.commonutils import FLAGS, PROCESSING_FLAGS, getFlagDefs, ra_to_sex, dec_to_sex, getDateFractionMJD, getMJDFromSqlDate
 
 
@@ -1021,6 +1020,7 @@ class TcsGravityEvents(models.Model):
         """Meta.
         """
 
+        managed = False
         db_table = 'tcs_gravity_events'
 
 
@@ -1048,7 +1048,8 @@ class TcsGravityAlerts(models.Model):
     creator = models.CharField(max_length=30, blank=True, null=True)
     group = models.CharField(max_length=100, blank=True, null=True)
     pipeline = models.CharField(max_length=100, blank=True, null=True)
-    map_iteration = models.CharField(max_length=100, blank=True, null=True)
+    #map_iteration = models.CharField(max_length=100, blank=True, null=True)
+    map_iteration = models.CharField(max_length=100, blank=True, null=True, unique=True)
     alert_map = models.CharField(db_column='map', max_length=400, blank=True, null=True)
     interesting = models.IntegerField(blank=True, null=True)
     dateadded = models.DateTimeField(db_column='dateAdded', blank=True, null=True)  # Field name made lowercase.
@@ -1167,6 +1168,7 @@ class TcsObjectComments(models.Model):
         """Meta.
         """
 
+        managed = False
         db_table = 'tcs_object_comments'
 
 

{psat_server_web-0.4.0 → psat_server_web-0.4.2}/psat_server_web/atlas/atlas/settings.py

@@ -25,9 +25,9 @@ SITE_ID = 1
 SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
-TEMPLATE_DEBUG = False
+TEMPLATE_DEBUG = True
 
 # 2021-08-21 KWS Need to set this to None, otherwise default is 1000.
 DATA_UPLOAD_MAX_NUMBER_FIELDS = None
@@ -63,6 +63,9 @@ DATABASES = {
         'PASSWORD': os.environ.get('DJANGO_MYSQL_DBPASS'),
         'HOST': os.environ.get('DJANGO_MYSQL_DBHOST'),
         'PORT': int(os.environ.get('DJANGO_MYSQL_DBPORT')),
+        'TEST': {
+            'NAME': os.environ.get('DJANGO_MYSQL_TESTDBNAME'),
+        }
     }
 }
 
@@ -177,8 +180,11 @@ INSTALLED_APPS = [
     'django.contrib.sites',
     'django.contrib.staticfiles',
     'atlas',
+    'accounts',
     'django_tables2',
     'rest_framework',
     'rest_framework.authtoken',
 ]
 
+# Token expiry time in days, default 1 day (24*60*60 seconds)
+TOKEN_EXPIRY = int(os.environ.get("API_TOKEN_EXPIRY") or 86400) # seconds

{psat_server_web-0.4.0 → psat_server_web-0.4.2}/psat_server_web/atlas/atlas/views.py

@@ -1148,57 +1148,8 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
     from django.db import connection
     import sys
 
-    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
-    from lasair import LasairError, lasair_client as lasair
-
     transient = get_object_or_404(AtlasDiffObjects, pk=atlas_diff_objects_id)
 
-    token = settings.LASAIR_TOKEN
-    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
-    #                version v0.0.5+. This should help if Lasair goes offline for any
-    #                reason. But extra (Requests)ConnectionError catch needed.
-    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
-
-    lasairZTFCrossmatches = None
-
-    # If Lasair connectivity problems arise, comment out the following 4 lines.
-    try:
-        lasairZTFCrossmatches = L.cone(transient.ra, transient.dec, 2.0, requestType='all')
-    except RequestsConnectionError as e:
-        # If the API URL is incorrect or times out we will get a connection error.
-        sys.stderr.write('Lasair API Connection Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except RequestsConnectionTimeoutError as e:
-        # If the API times out, we will get a timeout error.
-        sys.stderr.write('Lasair API Timeout Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except LasairError as e:
-        sys.stderr.write('Lasair Error\n')
-        sys.stderr.write('%s\n' % str(e))
-        
-    # 2024-10-15 KWS Talk to the ATLAS API. Are there any ATLAS objects nearby?
-    sys.path.append('../../common')
-    from psat_api_client import PSATAPIError, psat_client as psat
-    
-    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
-    #                version v0.0.5+. This should help if Lasair goes offline for any
-    #                reason. But extra (Requests)ConnectionError catch needed.
-    P = psat(settings.PANSTARRS_TOKEN, endpoint = settings.PANSTARRS_BASE_URL + '/api/', timeout = 2.0)
-
-    panstarrsCrossmatches = None
-    try:           
-        panstarrsCrossmatches = P.cone(transient.ra, transient.dec, 2.0, requestType='all')
-    except RequestsConnectionError as e:
-        # If the API URL is incorrect or times out we will get a connection error.
-        sys.stderr.write('Pan-STARRS API Connection Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except RequestsConnectionTimeoutError as e:
-        # If the API times out, we will get a timeout error.
-        sys.stderr.write('Pan-STARRS API Timeout Error\n')
-        sys.stderr.write('%s\n' % str(e))
-    except PSATAPIError as e:
-        sys.stderr.write('Pan-STARRS Error\n')
-        sys.stderr.write('%s\n' % str(e))
 
     # 2015-11-17 KWS Get the processing status. If it's not 2, what is it?
     processingStatusData = TcsProcessingStatus.objects.all().exclude(status = 2)
@@ -1341,6 +1292,54 @@ def candidateddc(request, atlas_diff_objects_id, template_name):
     if detectionList:
         listId = detectionList.id
 
+    # 2024-10-18 KWS Moved to down below where the average coordinates are calculated so we can use them.
+    # 2021-10-21 KWS Use the Lasair API to do a cone search so we can check for nearby ZTF objects
+    from lasair import LasairError, lasair_client as lasair
+
+    token = settings.LASAIR_TOKEN
+    # 2022-11-16 KWS Added a new timeout parameter, now available from Lasair client
+    #                version v0.0.5+. This should help if Lasair goes offline for any
+    #                reason. But extra (Requests)ConnectionError catch needed.
+    L = lasair(token, endpoint = 'https://lasair-ztf.lsst.ac.uk/api', timeout = 2.0)
+
+    lasairZTFCrossmatches = None
+
+    # If Lasair connectivity problems arise, comment out the following 4 lines.
+    try:
+        lasairZTFCrossmatches = L.cone(avgCoords['ra'], avgCoords['dec'], 2.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('Lasair API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('Lasair API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except LasairError as e:
+        sys.stderr.write('Lasair Error\n')
+        sys.stderr.write('%s\n' % str(e))
+        
+    # 2024-10-15 KWS Talk to the ATLAS API. Are there any ATLAS objects nearby?
+    sys.path.append('../../common')
+    from psat_api_client import PSATAPIError, psat_client as psat
+    
+    P = psat(settings.PANSTARRS_TOKEN, endpoint = settings.PANSTARRS_BASE_URL + '/api/', timeout = 2.0)
+
+    panstarrsCrossmatches = None
+    try:           
+        panstarrsCrossmatches = P.cone(avgCoords['ra'], avgCoords['dec'], 1.0, requestType='all')
+    except RequestsConnectionError as e:
+        # If the API URL is incorrect or times out we will get a connection error.
+        sys.stderr.write('Pan-STARRS API Connection Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except RequestsConnectionTimeoutError as e:
+        # If the API times out, we will get a timeout error.
+        sys.stderr.write('Pan-STARRS API Timeout Error\n')
+        sys.stderr.write('%s\n' % str(e))
+    except PSATAPIError as e:
+        sys.stderr.write('Pan-STARRS Error\n')
+        sys.stderr.write('%s\n' % str(e))
+
     # Dummy form initialisation
     formSearchObject = SearchForObjectForm()
     form = PromoteAndCommentsForm()

psat_server_web-0.4.2/psat_server_web/atlas/atlasapi/authentication.py

@@ -0,0 +1,55 @@
+from re import match
+
+from django.conf import settings
+from django.utils.timezone import now
+from rest_framework.authtoken.models import Token
+from rest_framework.authentication import TokenAuthentication
+from rest_framework.exceptions import AuthenticationFailed
+
+class ExpiringTokenAuthentication(TokenAuthentication):
+    """
+    Token authentication using the ExpiringToken model, which has an expiry 
+    date and must be refreshed manually or automatically.
+    
+    The token is passed in the Authorization header as 'Token <key>'.
+    """
+    model = Token
+
+    def authenticate_credentials(self, key):
+        user, token = super().authenticate_credentials(key)
+        
+        # Retrieve the user's group and get the token expiration time from the group profile
+        if user.groups.exists():
+            try:
+                group_profile = user.groups.first().profile
+            except AttributeError:
+                # TODO: Log this error?
+                raise AuthenticationFailed('Could not authenticate: Group has no profile. Please contact administrator.')
+            token_expiration_time = group_profile.token_expiration_time.total_seconds()
+        else:
+            # Otherwise use the default expiration time
+            token_expiration_time = settings.TOKEN_EXPIRY
+        
+        # Calculate the token's age and compare it to the expiration setting
+        token_age = (now() - token.created).total_seconds()
+        if token_age > token_expiration_time:
+            raise AuthenticationFailed('Token has expired.')
+        
+        return user, token
+    
+
+class QueryAuthentication(ExpiringTokenAuthentication):
+    """
+    Token authentication using query parameters.
+    """
+    def authenticate(self, request):
+        token = request.query_params.get('token')
+
+        if not token:
+            return None
+
+        if not match("^\w+$", token):
+            msg = 'Invalid token format.'
+            raise AuthenticationFailed(msg)
+
+        return self.authenticate_credentials(token)

{psat_server_web-0.4.0/psat_server_web/ps1/psdbapi → psat_server_web-0.4.2/psat_server_web/atlas/atlasapi}/permissions.py

@@ -9,5 +9,4 @@ class IsApprovedUser(BasePermission):
         # Only allow POST if the user is authenticated, active, and staff
         return (request.user 
                 and request.user.is_authenticated 
-                and request.user.is_active 
                 and request.user.is_staff)

{psat_server_web-0.4.0 → psat_server_web-0.4.2}/psat_server_web/atlas/atlasapi/urls.py

@@ -1,6 +1,5 @@
 from django.urls import include, path
 from rest_framework import routers
-from rest_framework.authtoken.views import obtain_auth_token
 from . import views
 
 urlpatterns = [
@@ -17,6 +16,6 @@ urlpatterns = [
     path('api/vrarank/',               views.VRARankView.as_view()),
     path('api/vraranklist/',           views.VRARankListView.as_view()),
     path('api/externalxmlist/',        views.ExternalCrossmatchesListView.as_view()),
+    path('api/auth-token/',            views.ObtainExpiringAuthToken.as_view(), name='auth_token'),
     path('api/objectdetectionlist/',   views.ObjectDetectionListView.as_view()),
-    path('api/auth-token/',            obtain_auth_token, name='auth_token'),
 ]