From ac1a3ba3e22f3d2ce9f236fc1a369bc0e71356c3 Mon Sep 17 00:00:00 2001 From: Eric Neilsen Date: Thu, 14 Nov 2024 14:53:43 -0800 Subject: [PATCH 1/2] use scheduler name when possible --- schedview/compute/scheduler.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/schedview/compute/scheduler.py b/schedview/compute/scheduler.py index 5028d11..f53db98 100644 --- a/schedview/compute/scheduler.py +++ b/schedview/compute/scheduler.py @@ -265,11 +265,13 @@ def make_unique_survey_name(scheduler, survey_index=None): # attribute. try: observation_note = f"{survey.observations['note'][0]}" + if len(observation_note) == 0: + observation_note = None except (AttributeError, ValueError, TypeError): observation_note = None if (observation_note is not None) and (survey.survey_name != observation_note): - survey_name = f"{survey.observations['note'][0]}" + survey_name = f"{survey.survey_name} ({survey.observations['note'][0]})" survey_name = f"{survey_index[1]}: {survey_name}" From d4a5f3454975d92002844a559e75d5ae337f9a80 Mon Sep 17 00:00:00 2001 From: Eric Neilsen Date: Fri, 15 Nov 2024 07:37:31 -0800 Subject: [PATCH 2/2] use scheduler_note instead of note when present --- schedview/compute/scheduler.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/schedview/compute/scheduler.py b/schedview/compute/scheduler.py index f53db98..58d6c90 100644 --- a/schedview/compute/scheduler.py +++ b/schedview/compute/scheduler.py @@ -261,17 +261,21 @@ def make_unique_survey_name(scheduler, survey_index=None): # For auxtel, different fields have the same survey_name, but # the interface should show the field name. So, if we're - # getting a field name in note, use that instead of the survey_name - # attribute. + # getting a field name in scheduler_note or note, use that in addition to + # the survey_name attribute. try: - observation_note = f"{survey.observations['note'][0]}" - if len(observation_note) == 0: - observation_note = None - except (AttributeError, ValueError, TypeError): - observation_note = None - - if (observation_note is not None) and (survey.survey_name != observation_note): - survey_name = f"{survey.survey_name} ({survey.observations['note'][0]})" + try: + scheduler_note = f"{survey.observations['scheduler_note'][0]}" + except KeyError: + # The key used to be just "note". If "scheduler_note" is absent, + # we may be following the older convention, so fall back on + # that. + scheduler_note = f"{survey.observations['note'][0]}" + except (AttributeError, ValueError, TypeError, KeyError): + scheduler_note = None + + if scheduler_note and scheduler_note not in survey_name: + survey_name = f"{survey_name} ({scheduler_note})" survey_name = f"{survey_index[1]}: {survey_name}"