clean up advanced form

Author: jchate6

tom_dataservices/data_services/alerce.py

@@ -62,7 +62,7 @@ def add_classifiers_fields(self) -> list[tuple[str, str]]:
                 label=f"{c['classifier_name']}",
                 choices=[(None, "")] + [(k, k) for k in c["classes"]],
                 required=False,
-                help_text=c["classifier_version"],
+                help_text=f'Classifier Version: {c["classifier_version"]}',
             )
             prob_field_name = (
                 f"prob_{self.CLASSIFIER_FIELD_PREFIX}{c['classifier_name']}"
@@ -249,9 +249,7 @@ def query_forced_photometry(self, query_parameters, **kwargs):
             logger.exception("Error querying ALeRCE forced photometry")
             return []
 
-    def create_reduced_datums_from_query(
-        self, target, data=None, data_type="photometry", **kwargs
-    ):
+    def create_reduced_datums_from_query(self, target, data=None, data_type="photometry", **kwargs):
         reduced_datums = []
         if data:
             for detection in data.get("detections", []):

tom_dataservices/templates/tom_dataservices/alerce/partials/alerce_advanced_form.html

@@ -1,4 +1,8 @@
 {% load bootstrap4 dataservices_extras %}
+<h2>Classification Filters</h2>
+For more information see the <a href="https://alerce.readthedocs.io/en/stable/">ALeRCE Client Docs</a>
+and the <a href="https://arxiv.org/abs/2008.03311">Light Curve Classifier Description</a>.
+<hr>
 <div class="row">
 {% for field in form %}
   {% if field|is_cfield %}
@@ -7,12 +11,14 @@
 {% endfor %}
 </div>
 <h2>Location Filters</h2>
+<hr>
 <div class="row">
   <div class="col-md-4">{% bootstrap_field form.ra %}</div>
   <div class="col-md-4">{% bootstrap_field form.dec %}</div>
   <div class="col-md-4">{% bootstrap_field form.radius %}</div>
 </div>
 <h2>Time Filters</h2>
+<hr>
 <div class="row">
   <div class="col-md-6">{% bootstrap_field form.firstmjd_gt %}</div>
   <div class="col-md-6">{% bootstrap_field form.firstmjd_lt %}</div>
@@ -22,6 +28,7 @@ <h2>Time Filters</h2>
   <div class="col-md-6">{% bootstrap_field form.lastmjd_lt %}</div>
 </div>
 <h2>Other Filters</h2>
+<hr>
 <div class="row">
   <div class="col-md-6">{% bootstrap_field form.ndet %}</div>
 </div>

tom_dataservices/views.py

@@ -382,8 +382,8 @@ def update_data_from_query(request):
         form = UpdateDataFromDataServiceForm(request.POST)
         data = {}
         if form.is_valid():
+            target = form.cleaned_data['target']
             try:
-                target = form.cleaned_data['target']
                 data_service_class = get_data_service_class(form.cleaned_data['data_service'])()
                 data = data_service_class.query_reduced_data(target)
                 data_service_class.to_reduced_datums(target, data)