dkist-processing-common 11.4.0rc1__tar.gz → 11.5.0__tar.gz

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/.readthedocs.yml

@@ -2,7 +2,7 @@ version: 2
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.11"
+    python: "3.12"
   apt_packages:
     - libopenjp2-7
     - graphviz

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/CHANGELOG.rst

@@ -1,3 +1,34 @@
+v11.5.0 (2025-09-08)
+====================
+
+Misc
+----
+
+- Update dkist-processing-core to 5.2.0 which includes upgrades to airflow 2.11.0 and requires Python 3.12+. (`#266 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/266>`__)
+
+
+v11.4.0 (2025-09-04)
+====================
+
+Features
+--------
+
+- Create new MetadataKey string enum class.  Replace usages like `metadata_key="keyword_name"`
+  with `metadata_key=MetadataKey.keyword_name`.  Note that unlike other enum classes, we are using
+  the name, not the value. Stem bases now check if they are passed a MetadataKey, and take
+  the name as the required string. (`#265 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/265>`__)
+- Add `_set_metadata_key_value` method to FitsAccessBase that takes a StrEnum and sets
+  a class attribute.  The attribute name is the StrEnum name and the attribute value
+  gets the header value with the StrEnum value as key. (`#265 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/265>`__)
+
+
+Misc
+----
+
+- Change classes that inherit from `str` and `Enum` to inherit `StrEnum` instead: BudName, StemName, TaskName.  Convert
+  strings to class members where relevant. (`#265 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/265>`__)
+
+
 v11.3.0 (2025-08-30)
 ====================
 

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.4.0rc1
+Version: 11.5.0
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,7 +17,7 @@ Requires-Dist: asdf<4.0.0,>=3.5.0
 Requires-Dist: astropy>=7.0.0
 Requires-Dist: dkist-fits-specifications<5.0,>=4.0.0
 Requires-Dist: dkist-header-validator<6.0,>=5.0.0
-Requires-Dist: dkist-processing-core==5.2.0rc1
+Requires-Dist: dkist-processing-core==5.2.1
 Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<3.0,>=2.0.2
 Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/models/constants.py

@@ -5,7 +5,7 @@ Contains names of database entries and Base class for an object that simplifies
 accessing the database (tab completion, etc.)
 """
 
-from enum import Enum
+from enum import StrEnum
 from string import ascii_uppercase
 
 from sqids import Sqids
@@ -13,13 +13,13 @@ from sqids import Sqids
 from dkist_processing_common._util.constants import ConstantsDb
 
 
-class BudName(str, Enum):
+class BudName(StrEnum):
     """Controlled list of names for constant stems (buds)."""
 
-    recipe_run_id = "RECIPE_RUN_ID"
     instrument = "INSTRUMENT"
     num_cs_steps = "NUM_CS_STEPS"
     num_modstates = "NUM_MODSTATES"
+    retarder_name = "RETARDER_NAME"
     proposal_id = "PROPOSAL_ID"
     contributing_proposal_ids = "CONTRIBUTING_PROPOSAL_IDS"
     experiment_id = "EXPERIMENT_ID"
@@ -33,7 +33,6 @@ class BudName(str, Enum):
     dark_exposure_times = "DARK_EXPOSURE_TIMES"
     dark_readout_exp_times = "DARK_READOUT_EXP_TIMES"
     wavelength = "WAVELENGTH"
-    retarder_name = "RETARDER_NAME"
 
 
 class ConstantsBase:
@@ -63,7 +62,7 @@ class ConstantsBase:
     Parameters
     ----------
     recipe_run_id
-        Thew recipe_run_id
+        The recipe_run_id
     task_name
         The task_name
     """
@@ -91,6 +90,31 @@ class ConstantsBase:
         """Define the dataset_id constant."""
         return Sqids(min_length=6, alphabet=ascii_uppercase).encode([self._recipe_run_id])
 
+    @property
+    def stokes_params(self) -> [str]:
+        """Return the list of stokes parameter names."""
+        return ["I", "Q", "U", "V"]
+
+    @property
+    def instrument(self) -> str:
+        """Get the instrument name."""
+        return self._db_dict[BudName.instrument]
+
+    @property
+    def num_cs_steps(self):
+        """Get the number of calibration sequence steps."""
+        return self._db_dict[BudName.num_cs_steps]
+
+    @property
+    def num_modstates(self):
+        """Get the number of modulation states."""
+        return self._db_dict[BudName.num_modstates]
+
+    @property
+    def retarder_name(self):
+        """Get the retarder name."""
+        return self._db_dict[BudName.retarder_name]
+
     @property
     def proposal_id(self) -> str:
         """Get the proposal_id constant."""
@@ -105,14 +129,22 @@ class ConstantsBase:
         return proposal_ids
 
     @property
-    def instrument(self) -> str:
-        """Get the instrument name."""
-        return self._db_dict[BudName.instrument]
+    def experiment_id(self) -> str:
+        """Get the experiment_id constant."""
+        return self._db_dict[BudName.experiment_id]
+
+    @property
+    def contributing_experiment_ids(self) -> [str]:
+        """Return the list of contributing experiment IDs."""
+        experiment_ids = self._db_dict[BudName.contributing_experiment_ids]
+        if isinstance(experiment_ids, str):
+            return [experiment_ids]
+        return experiment_ids
 
     @property
     def obs_ip_start_time(self) -> str:
         """Return the start time of the observe IP."""
-        return self._db_dict[BudName.obs_ip_start_time.value]
+        return self._db_dict[BudName.obs_ip_start_time]
 
     @property
     def average_cadence(self) -> float:
@@ -149,25 +181,7 @@ class ConstantsBase:
         """Get a list of readout exp times for all DARK frames."""
         return self._db_dict[BudName.dark_readout_exp_times]
 
-    @property
-    def stokes_params(self) -> [str]:
-        """Return the list of stokes parameter names."""
-        return ["I", "Q", "U", "V"]
-
-    @property
-    def experiment_id(self) -> str:
-        """Get the experiment_id constant."""
-        return self._db_dict[BudName.experiment_id]
-
-    @property
-    def contributing_experiment_ids(self) -> [str]:
-        """Return the list of contributing experiment IDs."""
-        experiment_ids = self._db_dict[BudName.contributing_experiment_ids]
-        if isinstance(experiment_ids, str):
-            return [experiment_ids]
-        return experiment_ids
-
     @property
     def wavelength(self) -> float:
         """Wavelength."""
-        return self._db_dict[BudName.wavelength.value]
+        return self._db_dict[BudName.wavelength]

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/models/fits_access.py

@@ -2,11 +2,44 @@
 
 from __future__ import annotations
 
+from enum import StrEnum
 from pathlib import Path
+from typing import Any
 
 import numpy as np
 from astropy.io import fits
 
+NOT_FOUND_MESSAGE = "_HEADER_KEYWORD_NOT_FOUND"
+
+
+class MetadataKey(StrEnum):
+    """Controlled list of names for FITS metadata header keys."""
+
+    ip_task_type = "IPTASK"  # in L0FitsAccess
+    ip_start_time = "DKIST011"  # in L0FitsAccess
+    ip_end_time = "DKIST012"  # in L0FitsAccess
+    elevation = "ELEV_ANG"
+    azimuth = "TAZIMUTH"
+    table_angle = "TTBLANGL"
+    gos_level3_status = "LVL3STAT"
+    gos_level3_lamp_status = "LAMPSTAT"
+    gos_polarizer_status = "LVL2STAT"
+    gos_polarizer_angle = "POLANGLE"
+    gos_retarder_status = "LVL1STAT"
+    gos_retarder_angle = "RETANGLE"
+    gos_level0_status = "LVL0STAT"
+    time_obs = "DATE-BEG"
+    ip_id = "IP_ID"
+    instrument = "INSTRUME"
+    wavelength = "LINEWAV"
+    proposal_id = "PROP_ID"
+    experiment_id = "EXPER_ID"
+    num_dsps_repeats = "DSPSREPS"
+    current_dsps_repeat = "DSPSNUM"
+    fpa_exposure_time_ms = "XPOSURE"
+    sensor_readout_exposure_time_ms = "TEXPOSUR"
+    num_raw_frames_per_fpa = "NSUMEXP"
+
 
 class FitsAccessBase:
     """
@@ -35,6 +68,29 @@ class FitsAccessBase:
     def __repr__(self):
         return f"{self.__class__.__name__}(hdu={self._hdu!r}, name={self.name!r}, auto_squeeze={self.auto_squeeze})"
 
+    def _set_metadata_key_value(
+        self, key: StrEnum, optional: bool = False, default: Any = NOT_FOUND_MESSAGE
+    ) -> None:
+        """
+        Get the header value and assign it as a metadata key name attribute.
+
+        Parameters
+        ----------
+        key
+            The StrEnum member in attribute_name = fits_keyword structure
+        optional
+            If the keyword is optional
+        default
+            Value for the attribute if the key is not found
+        """
+        if optional:
+            if default != NOT_FOUND_MESSAGE:
+                setattr(self, key.name, self.header.get(key, default))
+            else:
+                setattr(self, key.name, self.header.get(key, key + NOT_FOUND_MESSAGE))
+        else:
+            setattr(self, key.name, self.header[key])
+
     @property
     def data(self) -> np.ndarray:
         """

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/models/tags.py

@@ -1,6 +1,7 @@
 """Components of the Tag model.  Stem + Optional Suffix = Tag."""
 
 from enum import Enum
+from enum import StrEnum
 
 from dkist_processing_common.models.task_name import TaskName
 
@@ -8,7 +9,7 @@ from dkist_processing_common.models.task_name import TaskName
 EXP_TIME_ROUND_DIGITS: int = 6
 
 
-class StemName(str, Enum):
+class StemName(StrEnum):
     """Controlled list of Tag Stems."""
 
     output = "OUTPUT"

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/models/task_name.py

@@ -1,9 +1,9 @@
 """Controlled list of common IP task tag names."""
 
-from enum import Enum
+from enum import StrEnum
 
 
-class TaskName(str, Enum):
+class TaskName(StrEnum):
     """Controlled list of task tag names."""
 
     observe = "OBSERVE"

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/cs_step.py

@@ -101,7 +101,7 @@ class CSStepFlower(Stem):
     """
 
     def __init__(self, max_cs_step_time_sec: float):
-        super().__init__(stem_name=StemName.cs_step.value)
+        super().__init__(stem_name=StemName.cs_step)
         self.max_cs_step_time_sec = max_cs_step_time_sec
 
     def setter(self, fits_obj: L0FitsAccess) -> CSStep | Type[SpilledDirt]:
@@ -148,7 +148,7 @@ class NumCSStepBud(Stem):
     """
 
     def __init__(self, max_cs_step_time_sec: float):
-        super().__init__(stem_name=BudName.num_cs_steps.value)
+        super().__init__(stem_name=BudName.num_cs_steps)
         self.max_cs_step_time_sec = max_cs_step_time_sec
 
     def setter(self, fits_obj: L0FitsAccess) -> CSStep | Type[SpilledDirt]:

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/dsps_repeat.py

@@ -1,6 +1,7 @@
 """Classes supporting the Data Set Parameters Set (DSPS) Repeat parameter."""
 
 from dkist_processing_common.models.constants import BudName
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.flower_pot import SpilledDirt
 from dkist_processing_common.models.tags import StemName
 from dkist_processing_common.models.task_name import TaskName
@@ -16,9 +17,9 @@ class TotalDspsRepeatsBud(TaskUniqueBud):
 
     def __init__(self):
         super().__init__(
-            constant_name=BudName.num_dsps_repeats.value,
-            metadata_key="num_dsps_repeats",
-            ip_task_types=TaskName.observe.value,
+            constant_name=BudName.num_dsps_repeats,
+            metadata_key=MetadataKey.num_dsps_repeats,
+            ip_task_types=TaskName.observe,
         )
 
 
@@ -27,7 +28,7 @@ class DspsRepeatNumberFlower(SingleValueSingleKeyFlower):
 
     def __init__(self):
         super().__init__(
-            tag_stem_name=StemName.dsps_repeat.value, metadata_key="current_dsps_repeat"
+            tag_stem_name=StemName.dsps_repeat, metadata_key=MetadataKey.current_dsps_repeat
         )
 
     def setter(self, fits_obj: L0FitsAccess):

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/experiment_id_bud.py

@@ -1,6 +1,7 @@
 """Experiment Id parser."""
 
 from dkist_processing_common.models.constants import BudName
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.parsers.id_bud import ContributingIdsBud
 from dkist_processing_common.parsers.id_bud import IdBud
 
@@ -9,7 +10,9 @@ class ExperimentIdBud(IdBud):
     """Class to create a Bud for the experiment_id."""
 
     def __init__(self):
-        super().__init__(constant_name=BudName.experiment_id.value, metadata_key="experiment_id")
+        super().__init__(
+            constant_name=BudName.experiment_id, metadata_key=MetadataKey.experiment_id
+        )
 
 
 class ContributingExperimentIdsBud(ContributingIdsBud):
@@ -17,5 +20,5 @@ class ContributingExperimentIdsBud(ContributingIdsBud):
 
     def __init__(self):
         super().__init__(
-            stem_name=BudName.contributing_experiment_ids.value, metadata_key="experiment_id"
+            stem_name=BudName.contributing_experiment_ids, metadata_key=MetadataKey.experiment_id
         )

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/id_bud.py

@@ -1,5 +1,6 @@
 """Base classes for ID bud parsing."""
 
+from enum import StrEnum
 from typing import Type
 
 from dkist_processing_common.models.flower_pot import SpilledDirt
@@ -12,19 +13,21 @@ from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
 class IdBud(TaskUniqueBud):
     """Base class for ID buds."""
 
-    def __init__(self, constant_name, metadata_key):
+    def __init__(self, constant_name: str, metadata_key: str | StrEnum):
         super().__init__(
             constant_name=constant_name,
             metadata_key=metadata_key,
-            ip_task_types=TaskName.observe.value,
+            ip_task_types=TaskName.observe,
         )
 
 
 class ContributingIdsBud(Stem):
     """Base class for contributing ID buds."""
 
-    def __init__(self, stem_name, metadata_key):
+    def __init__(self, stem_name: str, metadata_key: str | StrEnum):
         super().__init__(stem_name=stem_name)
+        if isinstance(metadata_key, StrEnum):
+            metadata_key = metadata_key.name
         self.metadata_key = metadata_key
 
     def setter(self, fits_obj: L0FitsAccess) -> str | Type[SpilledDirt]:

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/l0_fits_access.py

@@ -2,6 +2,7 @@
 
 from astropy.io import fits
 
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.parsers.l1_fits_access import L1FitsAccess
 
 
@@ -26,6 +27,6 @@ class L0FitsAccess(L1FitsAccess):
         auto_squeeze: bool = True,
     ):
         super().__init__(hdu=hdu, name=name, auto_squeeze=auto_squeeze)
-        self.ip_task_type: str = self.header["IPTASK"]
-        self.ip_start_time: str = self.header["DKIST011"]
-        self.ip_end_time: str = self.header["DKIST012"]
+        self._set_metadata_key_value(MetadataKey.ip_task_type)
+        self._set_metadata_key_value(MetadataKey.ip_start_time)
+        self._set_metadata_key_value(MetadataKey.ip_end_time)

dkist_processing_common-11.5.0/dkist_processing_common/parsers/l1_fits_access.py

@@ -0,0 +1,65 @@
+"""By-frame 214 L1 only header keywords that are not instrument specific."""
+
+from astropy.io import fits
+
+from dkist_processing_common.models.fits_access import FitsAccessBase
+from dkist_processing_common.models.fits_access import MetadataKey
+
+
+class L1FitsAccess(FitsAccessBase):
+    """
+    Class defining a fits access object for processed L1 data.
+
+    Parameters
+    ----------
+    hdu
+        The input fits hdu
+    name
+        An optional name to be associated with the hdu
+    auto_squeeze
+        A boolean indicating whether to 'squeeze' out dimensions of size 1
+    """
+
+    def __init__(
+        self,
+        hdu: fits.ImageHDU | fits.PrimaryHDU | fits.CompImageHDU,
+        name: str | None = None,
+        auto_squeeze: bool = False,  # Because L1 data should always have the right form, right?
+    ):
+        super().__init__(hdu=hdu, name=name, auto_squeeze=auto_squeeze)
+
+        self._set_metadata_key_value(MetadataKey.elevation)
+        self._set_metadata_key_value(MetadataKey.azimuth)
+        self._set_metadata_key_value(MetadataKey.table_angle)
+        self._set_metadata_key_value(MetadataKey.gos_level3_status)
+        self._set_metadata_key_value(MetadataKey.gos_level3_lamp_status)
+        self._set_metadata_key_value(MetadataKey.gos_polarizer_status)
+        self._set_metadata_key_value(MetadataKey.gos_retarder_status)
+        self._set_metadata_key_value(MetadataKey.gos_level0_status)
+        self._set_metadata_key_value(MetadataKey.time_obs)
+        self._set_metadata_key_value(MetadataKey.ip_id)
+        self._set_metadata_key_value(MetadataKey.instrument)
+        self._set_metadata_key_value(MetadataKey.wavelength)
+        self._set_metadata_key_value(MetadataKey.proposal_id)
+        self._set_metadata_key_value(MetadataKey.experiment_id)
+        self._set_metadata_key_value(MetadataKey.num_dsps_repeats)
+        self._set_metadata_key_value(MetadataKey.current_dsps_repeat)
+        self._set_metadata_key_value(MetadataKey.fpa_exposure_time_ms)
+        self._set_metadata_key_value(MetadataKey.sensor_readout_exposure_time_ms)
+        self._set_metadata_key_value(MetadataKey.num_raw_frames_per_fpa)
+
+    @property
+    def gos_polarizer_angle(self) -> float:
+        """Convert the polarizer angle to a float if possible before returning."""
+        try:
+            return float(self.header[MetadataKey.gos_polarizer_angle])
+        except ValueError:
+            return -999  # The angle is only used if the polarizer is in the beam
+
+    @property
+    def gos_retarder_angle(self) -> float:
+        """Convert the retarder angle to a float if possible before returning."""
+        try:
+            return float(self.header[MetadataKey.gos_retarder_angle])
+        except ValueError:
+            return -999  # The angle is only used if the retarder is in the beam

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/near_bud.py

@@ -1,5 +1,6 @@
 """Pre-made flower that reads a single header key from all files and raises a ValueError if the values are not in a supplied range."""
 
+from enum import StrEnum
 from statistics import mean
 from typing import Callable
 
@@ -30,10 +31,12 @@ class NearFloatBud(Stem):
     def __init__(
         self,
         constant_name: str,
-        metadata_key: str,
+        metadata_key: str | StrEnum,
         tolerance: float,
     ):
         super().__init__(stem_name=constant_name)
+        if isinstance(metadata_key, StrEnum):
+            metadata_key = metadata_key.name
         self.metadata_key = metadata_key
         self.tolerance = tolerance
 
@@ -98,7 +101,7 @@ class TaskNearFloatBud(NearFloatBud):
     def __init__(
         self,
         constant_name: str,
-        metadata_key: str,
+        metadata_key: str | StrEnum,
         ip_task_types: str | list[str],
         tolerance: float,
         task_type_parsing_function: Callable = passthrough_header_ip_task,

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/proposal_id_bud.py

@@ -1,6 +1,7 @@
 """Proposal Id parser."""
 
 from dkist_processing_common.models.constants import BudName
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.parsers.id_bud import ContributingIdsBud
 from dkist_processing_common.parsers.id_bud import IdBud
 
@@ -9,7 +10,7 @@ class ProposalIdBud(IdBud):
     """Class to create a Bud for the proposal_id."""
 
     def __init__(self):
-        super().__init__(constant_name=BudName.proposal_id.value, metadata_key="proposal_id")
+        super().__init__(constant_name=BudName.proposal_id, metadata_key=MetadataKey.proposal_id)
 
 
 class ContributingProposalIdsBud(ContributingIdsBud):
@@ -17,5 +18,5 @@ class ContributingProposalIdsBud(ContributingIdsBud):
 
     def __init__(self):
         super().__init__(
-            stem_name=BudName.contributing_proposal_ids.value, metadata_key="proposal_id"
+            stem_name=BudName.contributing_proposal_ids, metadata_key=MetadataKey.proposal_id
         )

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/retarder.py

@@ -1,6 +1,7 @@
 """Bud that parses the name of the retarder used during POLCAL task observations."""
 
 from dkist_processing_common.models.constants import BudName
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
 
@@ -19,9 +20,9 @@ class RetarderNameBud(TaskUniqueBud):
 
     def __init__(self):
         super().__init__(
-            constant_name=BudName.retarder_name.value,
-            metadata_key="gos_retarder_status",
-            ip_task_types=TaskName.polcal.value,
+            constant_name=BudName.retarder_name,
+            metadata_key=MetadataKey.gos_retarder_status,
+            ip_task_types=TaskName.polcal,
         )
 
     def getter(self, key) -> str:

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/single_value_single_key_flower.py

@@ -1,5 +1,8 @@
 """Pre-made flower that produces tag based on a single header key."""
 
+from enum import StrEnum
+
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.flower_pot import Stem
 from dkist_processing_common.parsers.l0_fits_access import L0FitsAccess
 
@@ -16,8 +19,10 @@ class SingleValueSingleKeyFlower(Stem):
         The metadata key
     """
 
-    def __init__(self, tag_stem_name: str, metadata_key: str):
+    def __init__(self, tag_stem_name: str, metadata_key: str | StrEnum):
         super().__init__(stem_name=tag_stem_name)
+        if isinstance(metadata_key, StrEnum):
+            metadata_key = metadata_key.name
         self.metadata_key = metadata_key
 
     def setter(self, fits_obj: L0FitsAccess):

{dkist_processing_common-11.4.0rc1 → dkist_processing_common-11.5.0}/dkist_processing_common/parsers/task.py

@@ -4,6 +4,7 @@ from typing import Callable
 from typing import Type
 
 from dkist_processing_common.models.fits_access import FitsAccessBase
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.flower_pot import SpilledDirt
 from dkist_processing_common.models.tags import StemName
 from dkist_processing_common.models.task_name import TaskName
@@ -36,9 +37,9 @@ def parse_header_ip_task_with_gains(fits_obj: FitsAccessBase) -> str:
         and fits_obj.gos_level3_status == "lamp"
         and fits_obj.gos_level3_lamp_status == "on"
     ):
-        return TaskName.lamp_gain.value
+        return TaskName.lamp_gain
     if fits_obj.ip_task_type == "gain" and fits_obj.gos_level3_status == "clear":
-        return TaskName.solar_gain.value
+        return TaskName.solar_gain
 
     # Everything else is unchanged
     return passthrough_header_ip_task(fits_obj)
@@ -59,14 +60,14 @@ def parse_polcal_task_type(fits_obj: Type[FitsAccessBase]) -> str | Type[Spilled
         and fits_obj.gos_retarder_status == "clear"
         and fits_obj.gos_polarizer_status == "clear"
     ):
-        return TaskName.polcal_dark.value
+        return TaskName.polcal_dark
 
     elif (
         fits_obj.gos_level0_status.startswith("FieldStop")
         and fits_obj.gos_retarder_status == "clear"
         and fits_obj.gos_polarizer_status == "clear"
     ):
-        return TaskName.polcal_gain.value
+        return TaskName.polcal_gain
 
     # We don't care about a POLCAL frame that is neither dark nor clear
     return SpilledDirt
@@ -78,7 +79,7 @@ class TaskTypeFlower(SingleValueSingleKeyFlower):
     def __init__(
         self, header_task_parsing_func: Callable[[FitsAccessBase], str] = passthrough_header_ip_task
     ):
-        super().__init__(tag_stem_name=StemName.task.value, metadata_key="ip_task_type")
+        super().__init__(tag_stem_name=StemName.task, metadata_key=MetadataKey.ip_task_type)
         self.header_parsing_function = header_task_parsing_func
 
     def setter(self, fits_obj: FitsAccessBase):
@@ -103,7 +104,7 @@ class PolcalTaskFlower(SingleValueSingleKeyFlower):
     """
 
     def __init__(self):
-        super().__init__(tag_stem_name=StemName.task.value, metadata_key="ip_task_type")
+        super().__init__(tag_stem_name=StemName.task, metadata_key=MetadataKey.ip_task_type)
 
     def setter(self, fits_obj: FitsAccessBase):
         """