psat-server-web 0.6.9__tar.gz → 0.6.12__tar.gz

{psat_server_web-0.6.9/psat_server_web.egg-info → psat_server_web-0.6.12}/PKG-INFO

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

psat_server_web-0.6.12/psat_server_web/__version__.py

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

{psat_server_web-0.6.9 → psat_server_web-0.6.12}/psat_server_web/atlas/atlas/apiutils.py

@@ -41,7 +41,26 @@ def candidateddcApi(request, atlas_diff_objects_id, mjdThreshold = None):
     # 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 = AtlasDiffObjects.objects.get(pk=atlas_diff_objects_id)
+
+    try:
+        transient = AtlasDiffObjects.objects.get(pk=atlas_diff_objects_id)
+    except ObjectDoesNotExist as e:
+        # 2025-11-14 KWS Return an empty object if the object does not exist.
+        # This protects the API from generating a 500 error if a bogus object
+        # is sent. But since the keys are the same the client code should be
+        # able to read and interpet this result.
+        data = {
+            'object': e.to_dict() if hasattr(e, 'to_dict') else str(e),
+            'lc': None,
+            'lcnondets': None,
+            'fp': None,
+            'sherlock_crossmatches': None,
+            'sherlock_classifications': None,
+            'tns_crossmatches': None,
+            'external_crossmatches': None,
+        }
+        return data
+
 
     # 2017-03-21 KWS Get Gravity Wave annotations and Sherlock Classifications
     sc = SherlockClassifications.objects.filter(transient_object_id_id = transient.id)

{psat_server_web-0.6.9 → psat_server_web-0.6.12}/psat_server_web/atlas/atlas/django-default.log

@@ -984,3 +984,10 @@ accounts.utils DEBUG 2025-08-27 11:41:26,684 utils User profile: tmangrove Profi
 atlas.views DEBUG 2025-08-27 11:41:26,699 views User can edit observations: True
 accounts.utils DEBUG 2025-08-27 11:41:52,987 utils Checking if user tmangrove needs to change password.
 accounts.utils DEBUG 2025-08-27 11:41:52,988 utils User profile: tmangrove Profile
+accounts.utils DEBUG 2025-11-21 14:39:03,073 utils Checking if user  needs to change password.
+accounts.utils DEBUG 2025-11-21 14:39:05,696 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-11-21 14:39:05,697 utils User profile: ken.smith Profile
+accounts.utils DEBUG 2025-11-21 14:39:05,752 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-11-21 14:39:05,753 utils User profile: ken.smith Profile
+accounts.utils DEBUG 2025-11-21 14:39:15,000 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-11-21 14:39:15,003 utils User profile: ken.smith Profile

{psat_server_web-0.6.9 → psat_server_web-0.6.12}/psat_server_web/atlas/atlasapi/serializers.py

@@ -100,8 +100,8 @@ class ObjectsSerializer(serializers.Serializer):
         for tok in objects.split(','):
             olist.append(tok.strip())
 
-        if len(olist) > 100:
-            return {"info": "Max number of objects for each requests is 100"}
+        if len(olist) > 50_000:
+            return {"info": "Max number of objects for each requests is 50,000"}
 #        olist = olist[:10] # restrict to 10
 
         # Get the authenticated user, if it exists.

{psat_server_web-0.6.9 → psat_server_web-0.6.12}/psat_server_web/atlas/generate_mod_wsgi_apachectl.sh

@@ -68,7 +68,9 @@ else
     mkdir -p APACHEPATH
 fi
 
-CMD="mod_wsgi-express setup-server --working-directory atlas --url-alias $PREFIX/static static --url-alias $PREFIX/media media --application-type module atlas.wsgi --server-root $APACHEPATH --port $PORT --mount-point $PREFIX"
+# 2025-11-14 KWS Added a request & socket timeout of 600 seconds in case we want to request
+#                very large batches of objects directly from the webserver.
+CMD="mod_wsgi-express setup-server --working-directory atlas --url-alias $PREFIX/static static --url-alias $PREFIX/media media --application-type module atlas.wsgi --server-root $APACHEPATH --port $PORT --mount-point $PREFIX --request-timeout 600 --socket-timeout 600"
 echo $CMD
 $CMD
 

{psat_server_web-0.6.9 → psat_server_web-0.6.12}/psat_server_web/atlas/templates/atlas/candidate_plotly.html

@@ -451,7 +451,7 @@ jscolourlabelsglobal["#flot-colourplot-forced"] = jscolourlabelsforced;
 
         {% for row in lasairZTFCrossmatches %}
         <div class="col-lg-12 col-md-12 col-sm-12">
-          <h3><a href="https://lasair-ztf.lsst.ac.uk/object/{{ row.object }}/">{{ row.object }}</a></h3>
+          <h3><a href="https://lasair-ztf.lsst.ac.uk/objects/{{ row.object }}/">{{ row.object }}</a></h3>
         </div>
 
         {% if row.separation %}