Merge branch 'develop'

thespacedoctor · May 13, 2022 · 340bd73 · 340bd73
2 parents 555b99d + 33b9f9c
commit 340bd73
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -8,7 +8,7 @@ mistune<2.0.0
 mdx_include>1.3
 lxml
 sphinxcontrib-mermaid
-git+https://github.com/readthedocs/readthedocs-sphinx-search@master
+git+https://github.com/readthedocs/readthedocs-sphinx-search@main
 docopt
 unicodecsv
 psutil>5.7
diff --git a/sherlock/transient_classifier.py b/sherlock/transient_classifier.py
@@ -8,6 +8,22 @@
 """
 from __future__ import print_function
 from __future__ import division
+from astrocalc.coords import unit_conversion
+import copy
+from fundamentals.mysql import insert_list_of_dictionaries_into_database_tables
+from fundamentals import fmultiprocess
+import psutil
+from sherlock.commonutils import get_crossmatch_catalogues_column_map
+from sherlock.imports import ned
+from HMpTy.htm import sets
+from HMpTy.mysql import conesearch
+from fundamentals.renderer import list_of_dictionaries
+from fundamentals.mysql import readquery, directory_script_runner, writequery
+from fundamentals import tools
+import numpy as np
+from operator import itemgetter
+from datetime import datetime, date, time, timedelta
+
 from builtins import zip
 from builtins import str
 from builtins import range
@@ -24,24 +40,6 @@
 import yaml
 from random import randint
 os.environ['TERM'] = 'vt100'
-from datetime import datetime, date, time, timedelta
-from operator import itemgetter
-import numpy as np
-from fundamentals import tools
-from fundamentals.mysql import readquery, directory_script_runner, writequery
-from fundamentals.renderer import list_of_dictionaries
-from HMpTy.mysql import conesearch
-from HMpTy.htm import sets
-from sherlock.imports import ned
-from sherlock.commonutils import get_crossmatch_catalogues_column_map
-import psutil
-from fundamentals import fmultiprocess
-from fundamentals.mysql import insert_list_of_dictionaries_into_database_tables
-import copy
-import psutil
-import copy
-from operator import itemgetter
-from astrocalc.coords import unit_conversion
 
 theseBatches = []
 crossmatchArray = []
@@ -1944,6 +1942,10 @@ def generate_match_annotation(
         objectType = match["catalogue_object_type"]
         objectSubtype = match["catalogue_object_subtype"]
         catalogueString = catalogue
+        if catalogueString is None:
+            badGuy = match["transient_object_id"]
+            print(f"Issue with object {badGuy}")
+            raise TypeError(f"Issue with object {badGuy}")
         if "catalogue" not in catalogueString.lower():
             catalogueString = catalogue + " catalogue"
         if "/" in catalogueString:
@@ -2097,8 +2099,12 @@ def generate_match_annotation(
                 absMag = ""
 
         annotation = "The transient is %(classificationReliability)s with <em>%(objectId)s</em>; %(best_mag_filter)s%(best_mag)smag %(objectType)s found in the %(catalogueString)s. It's located %(location)s.%(absMag)s" % locals()
-        summary = '%(sep)0.1f" from %(objectType)s in %(catalogue)s' % locals(
-        )
+        try:
+            summary = '%(sep)0.1f" from %(objectType)s in %(catalogue)s' % locals()
+        except:
+            badGuy = match["transient_object_id"]
+            print(f"Issue with object {badGuy}")
+            raise TypeError(f"Issue with object {badGuy}")
 
         self.log.debug('completed the ``generate_match_annotation`` method')
         return annotation, summary, sep