dkist-processing-cryonirsp 2.0.1__tar.gz → 2.0.2__tar.gz

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/CHANGELOG.rst

@@ -1,3 +1,16 @@
+v2.0.2 (2026-07-28)
+===================
+
+Misc
+----
+
+- Replace the named tuple ExposureConditions with a Pydantic BaseModel of the same name.
+  To be added to the constants database, ExposureConditions are converted to a simple tuple.
+  When retrieved from the constants database, the tuples are converted back to model instances. (`#280 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/280>`__)
+- Replace the named tuples PolarimetricValueDataContainer and DarkTaskTestAndExposureConditionsContainer
+  with dataclasses PolarimetricValueData and DarkTaskTestAndExposureConditions, respectively. (`#280 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/280>`__)
+
+
 v2.0.1 (2026-07-22)
 ===================
 

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 2.0.1
+Version: 2.0.2
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -77,22 +77,22 @@ Requires-Dist: Send2Trash==2.1.0; extra == "frozen"
 Requires-Dist: a2wsgi==1.10.10; extra == "frozen"
 Requires-Dist: aioftp==0.27.2; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.7.1; extra == "frozen"
-Requires-Dist: aiohttp==3.14.2; extra == "frozen"
+Requires-Dist: aiohttp==3.14.3; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: aiosmtplib==5.1.2; extra == "frozen"
 Requires-Dist: aiosqlite==0.21.0; extra == "frozen"
 Requires-Dist: alembic==1.18.5; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
-Requires-Dist: annotated-doc==0.0.4; extra == "frozen"
-Requires-Dist: annotated-types==0.7.0; extra == "frozen"
+Requires-Dist: annotated-doc==0.0.5; extra == "frozen"
+Requires-Dist: annotated-types==0.8.0; extra == "frozen"
 Requires-Dist: anyio==4.14.2; extra == "frozen"
 Requires-Dist: apache-airflow==3.2.1; extra == "frozen"
 Requires-Dist: apache-airflow-core==3.2.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-celery==3.22.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-compat==1.16.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-celery==3.23.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-compat==1.17.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-common-io==1.8.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-sql==2.0.2; extra == "frozen"
-Requires-Dist: apache-airflow-providers-postgres==6.8.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-sql==2.0.3; extra == "frozen"
+Requires-Dist: apache-airflow-providers-postgres==7.0.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-smtp==3.0.2; extra == "frozen"
 Requires-Dist: apache-airflow-providers-standard==1.16.0; extra == "frozen"
 Requires-Dist: apache-airflow-task-sdk==1.2.1; extra == "frozen"
@@ -105,7 +105,7 @@ Requires-Dist: asdf_standard==1.5.0; extra == "frozen"
 Requires-Dist: asgiref==3.12.1; extra == "frozen"
 Requires-Dist: asteval==1.0.9; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2026.7.20.15.31.18; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2026.7.27.0.56.29; extra == "frozen"
 Requires-Dist: asttokens==3.0.2; extra == "frozen"
 Requires-Dist: async-lru==2.3.0; extra == "frozen"
 Requires-Dist: asyncpg==0.31.0; extra == "frozen"
@@ -114,9 +114,9 @@ Requires-Dist: babel==2.18.0; extra == "frozen"
 Requires-Dist: beautifulsoup4==4.15.0; extra == "frozen"
 Requires-Dist: billiard==4.2.4; extra == "frozen"
 Requires-Dist: bleach==6.4.0; extra == "frozen"
-Requires-Dist: boto3==1.43.53; extra == "frozen"
-Requires-Dist: botocore==1.43.53; extra == "frozen"
-Requires-Dist: cadwyn==7.1.1; extra == "frozen"
+Requires-Dist: boto3==1.43.57; extra == "frozen"
+Requires-Dist: botocore==1.43.57; extra == "frozen"
+Requires-Dist: cadwyn==7.1.2; extra == "frozen"
 Requires-Dist: celery==5.6.3; extra == "frozen"
 Requires-Dist: certifi==2026.7.22; extra == "frozen"
 Requires-Dist: cffi==2.1.0; extra == "frozen"
@@ -125,7 +125,7 @@ Requires-Dist: click==8.4.2; extra == "frozen"
 Requires-Dist: click-didyoumean==0.3.1; extra == "frozen"
 Requires-Dist: click-plugins==1.1.1.2; extra == "frozen"
 Requires-Dist: click-repl==0.3.0; extra == "frozen"
-Requires-Dist: colorlog==6.11.0; extra == "frozen"
+Requires-Dist: colorlog==6.12.0; extra == "frozen"
 Requires-Dist: comm==0.2.3; extra == "frozen"
 Requires-Dist: contourpy==1.3.3; extra == "frozen"
 Requires-Dist: cron_descriptor==2.1.0; extra == "frozen"
@@ -139,7 +139,7 @@ Requires-Dist: dill==0.4.1; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.4.0; extra == "frozen"
 Requires-Dist: dkist-processing-common==14.3.4; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.3.0; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==2.0.1; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==2.0.2; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.3; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.2; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.3.0; extra == "frozen"
@@ -148,20 +148,20 @@ Requires-Dist: dkist_fits_specifications==4.28.0; extra == "frozen"
 Requires-Dist: dnspython==2.8.0; extra == "frozen"
 Requires-Dist: email-validator==2.3.0; extra == "frozen"
 Requires-Dist: executing==2.2.1; extra == "frozen"
-Requires-Dist: fastapi==0.139.2; extra == "frozen"
+Requires-Dist: fastapi==0.140.13; extra == "frozen"
 Requires-Dist: fastapi-cli==0.0.32; extra == "frozen"
-Requires-Dist: fastjsonschema==2.21.2; extra == "frozen"
+Requires-Dist: fastjsonschema==2.22.1; extra == "frozen"
 Requires-Dist: flower==2.0.1; extra == "frozen"
 Requires-Dist: fonttools==4.63.0; extra == "frozen"
 Requires-Dist: fqdn==1.5.1; extra == "frozen"
 Requires-Dist: frozenlist==1.8.0; extra == "frozen"
-Requires-Dist: fsspec==2026.6.0; extra == "frozen"
+Requires-Dist: fsspec==2026.7.0; extra == "frozen"
 Requires-Dist: globus-sdk==4.8.1; extra == "frozen"
 Requires-Dist: googleapis-common-protos==1.75.0; extra == "frozen"
 Requires-Dist: gqlclient==2.0.0; extra == "frozen"
 Requires-Dist: greenback==1.3.0; extra == "frozen"
 Requires-Dist: greenlet==3.5.4; extra == "frozen"
-Requires-Dist: grpcio==1.82.1; extra == "frozen"
+Requires-Dist: grpcio==1.83.0; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
 Requires-Dist: httpcore==1.0.9; extra == "frozen"
 Requires-Dist: httptools==0.8.0; extra == "frozen"
@@ -252,7 +252,7 @@ Requires-Dist: opentelemetry-semantic-conventions==0.65b0; extra == "frozen"
 Requires-Dist: opentelemetry-util-http==0.65b0; extra == "frozen"
 Requires-Dist: outcome==1.3.0.post0; extra == "frozen"
 Requires-Dist: packaging==26.2; extra == "frozen"
-Requires-Dist: pandas==3.0.3; extra == "frozen"
+Requires-Dist: pandas==3.0.5; extra == "frozen"
 Requires-Dist: pandocfilters==1.5.1; extra == "frozen"
 Requires-Dist: parfive==2.3.1; extra == "frozen"
 Requires-Dist: parso==0.8.7; extra == "frozen"
@@ -260,18 +260,20 @@ Requires-Dist: pathlib_abc==0.5.2; extra == "frozen"
 Requires-Dist: pathspec==1.1.1; extra == "frozen"
 Requires-Dist: pendulum==3.2.0; extra == "frozen"
 Requires-Dist: pexpect==4.9.0; extra == "frozen"
-Requires-Dist: pika==1.4.1; extra == "frozen"
+Requires-Dist: pika==1.4.2; extra == "frozen"
 Requires-Dist: pillow==10.4.0; extra == "frozen"
 Requires-Dist: pip==26.1.2; extra == "frozen"
 Requires-Dist: platformdirs==4.11.0; extra == "frozen"
 Requires-Dist: pluggy==1.6.0; extra == "frozen"
 Requires-Dist: pooch==1.9.0; extra == "frozen"
 Requires-Dist: proglog==0.1.12; extra == "frozen"
-Requires-Dist: prometheus_client==0.25.0; extra == "frozen"
-Requires-Dist: prompt_toolkit==3.0.52; extra == "frozen"
+Requires-Dist: prometheus_client==0.26.0; extra == "frozen"
+Requires-Dist: prompt_toolkit==3.0.53; extra == "frozen"
 Requires-Dist: propcache==0.5.2; extra == "frozen"
 Requires-Dist: protobuf==7.35.1; extra == "frozen"
 Requires-Dist: psutil==7.2.2; extra == "frozen"
+Requires-Dist: psycopg==3.3.4; extra == "frozen"
+Requires-Dist: psycopg-binary==3.3.4; extra == "frozen"
 Requires-Dist: psycopg2-binary==2.9.12; extra == "frozen"
 Requires-Dist: ptyprocess==0.7.0; extra == "frozen"
 Requires-Dist: pure_eval==0.2.3; extra == "frozen"
@@ -289,7 +291,7 @@ Requires-Dist: python-dotenv==1.2.2; extra == "frozen"
 Requires-Dist: python-json-logger==4.1.0; extra == "frozen"
 Requires-Dist: python-multipart==0.0.32; extra == "frozen"
 Requires-Dist: python-slugify==8.0.4; extra == "frozen"
-Requires-Dist: pytz==2026.2; extra == "frozen"
+Requires-Dist: pytz==2026.3.post1; extra == "frozen"
 Requires-Dist: pyzmq==27.1.0; extra == "frozen"
 Requires-Dist: redis==6.4.0; extra == "frozen"
 Requires-Dist: referencing==0.37.0; extra == "frozen"
@@ -301,7 +303,7 @@ Requires-Dist: rich==15.0.0; extra == "frozen"
 Requires-Dist: rich-argparse==1.8.0; extra == "frozen"
 Requires-Dist: rich-toolkit==0.20.3; extra == "frozen"
 Requires-Dist: rpds-py==2026.6.3; extra == "frozen"
-Requires-Dist: s3transfer==0.19.1; extra == "frozen"
+Requires-Dist: s3transfer==0.19.2; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
 Requires-Dist: scikit-learn==1.9.0; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
@@ -329,7 +331,7 @@ Requires-Dist: threadpoolctl==3.6.0; extra == "frozen"
 Requires-Dist: tifffile==2026.7.14; extra == "frozen"
 Requires-Dist: tinycss2==1.5.1; extra == "frozen"
 Requires-Dist: tornado==6.5.7; extra == "frozen"
-Requires-Dist: tqdm==4.69.0; extra == "frozen"
+Requires-Dist: tqdm==4.70.0; extra == "frozen"
 Requires-Dist: traitlets==5.15.1; extra == "frozen"
 Requires-Dist: typer==0.27.0; extra == "frozen"
 Requires-Dist: typing-inspection==0.4.2; extra == "frozen"
@@ -353,7 +355,7 @@ Requires-Dist: webencodings==0.5.1; extra == "frozen"
 Requires-Dist: websocket-client==1.9.0; extra == "frozen"
 Requires-Dist: websockets==16.1.1; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
-Requires-Dist: wrapt==2.2.2; extra == "frozen"
+Requires-Dist: wrapt==2.3.0; extra == "frozen"
 Requires-Dist: yamale==6.1.0; extra == "frozen"
 Requires-Dist: yarl==1.24.5; extra == "frozen"
 Requires-Dist: zipp==4.1.0; extra == "frozen"

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/dkist_processing_cryonirsp/models/constants.py

@@ -63,6 +63,11 @@ class CryonirspBudName(StrEnum):
 class CryonirspConstants(ConstantsBase):
     """CryoNIRSP specific constants to add to the common constants."""
 
+    def _build_exposure_conditions_list(self, key: str) -> list[ExposureConditions]:
+        """Fetch exposure conditions from database and rebuild as ExposureConditions objects."""
+        raw_conditions: list[list[float | str]] = self._db_dict[key]
+        return [ExposureConditions.model_validate_json(conditions) for conditions in raw_conditions]
+
     @property
     def arm_id(self) -> str:
         """Arm used to record the data, SP or CI."""
@@ -144,48 +149,38 @@ class CryonirspConstants(ConstantsBase):
     @property
     def dark_exposure_conditions_list(self) -> list[ExposureConditions]:
         """Construct a list of dark frame ExposureConditions tuples for the dataset."""
-        raw_conditions: list[list[float | str]] = self._db_dict[
+        return self._build_exposure_conditions_list(
             CryonirspBudName.dark_exposure_conditions_list.value
-        ]
-        conditions = [ExposureConditions(*item) for item in raw_conditions]
-        return conditions
+        )
 
     @property
     def lamp_gain_exposure_conditions_list(self) -> list[ExposureConditions]:
         """Construct a list of lamp gain ExposureConditions tuples for the dataset."""
-        raw_conditions: list[list[float | str]] = self._db_dict[
+        return self._build_exposure_conditions_list(
             CryonirspBudName.lamp_gain_exposure_conditions_list.value
-        ]
-        conditions = [ExposureConditions(*item) for item in raw_conditions]
-        return conditions
+        )
 
     @property
     def solar_gain_exposure_conditions_list(self) -> list[ExposureConditions]:
         """Construct a list of solar gain ExposureConditions tuples for the dataset."""
-        raw_conditions: list[list[float | str]] = self._db_dict[
+        return self._build_exposure_conditions_list(
             CryonirspBudName.solar_gain_exposure_conditions_list.value
-        ]
-        conditions = [ExposureConditions(*item) for item in raw_conditions]
-        return conditions
+        )
 
     @property
     def observe_exposure_conditions_list(self) -> list[ExposureConditions]:
         """Construct a list of observe ExposureConditions tuples for the dataset."""
-        raw_conditions: list[list[float | str]] = self._db_dict[
+        return self._build_exposure_conditions_list(
             CryonirspBudName.observe_exposure_conditions_list.value
-        ]
-        conditions = [ExposureConditions(*item) for item in raw_conditions]
-        return conditions
+        )
 
     @property
     def polcal_exposure_conditions_list(self) -> list[ExposureConditions]:
         """Construct a list of polcal ExposureConditions tuples for the dataset."""
         if self.correct_for_polarization:
-            raw_conditions: list[list[float | str]] = self._db_dict[
+            return self._build_exposure_conditions_list(
                 CryonirspBudName.polcal_exposure_conditions_list.value
-            ]
-            conditions = [ExposureConditions(*item) for item in raw_conditions]
-            return conditions
+            )
         else:
             return []
 
@@ -194,20 +189,16 @@ class CryonirspConstants(ConstantsBase):
         self,
     ) -> list[ExposureConditions]:
         """Return a list of all exposure times required for all tasks other than dark, polcal, and lamp gain."""
-        raw_conditions: list[list[float | str]] = self._db_dict[
+        return self._build_exposure_conditions_list(
             CryonirspBudName.ci_non_dark_and_non_polcal_and_non_lamp_gain_task_exposure_conditions_list.value
-        ]
-        conditions = [ExposureConditions(*item) for item in raw_conditions]
-        return conditions
+        )
 
     @property
     def sp_non_dark_and_non_polcal_task_exposure_conditions_list(self) -> list[ExposureConditions]:
         """Return a list of all exposure times required for all tasks other than dark and polcal."""
-        raw_conditions: list[list[float | str]] = self._db_dict[
+        return self._build_exposure_conditions_list(
             CryonirspBudName.sp_non_dark_and_non_polcal_task_exposure_conditions_list.value
-        ]
-        conditions = [ExposureConditions(*item) for item in raw_conditions]
-        return conditions
+        )
 
     @property
     def stokes_I_list(self) -> list[str]:

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/dkist_processing_cryonirsp/models/exposure_conditions.py

@@ -1,22 +1,14 @@
 """Support classes for exposure conditions."""
 
 from enum import StrEnum
-from typing import NamedTuple
+
+from pydantic import BaseModel
+from pydantic import ConfigDict
 
 # Number of digits used to round the exposure when creating the ExposureConditions tuple in fits_access
 CRYO_EXP_TIME_ROUND_DIGITS: int = 3
 
 
-class ExposureConditions(NamedTuple):
-    """Named tuple to hold exposure time and filter name."""
-
-    exposure_time: float
-    filter_name: str
-
-    def __str__(self):
-        return f"{self.exposure_time}_{self.filter_name}"
-
-
 class AllowableOpticalDensityFilterNames(StrEnum):
     """Enum to implement list of allowable Optical Density Filter names."""
 
@@ -25,3 +17,19 @@ class AllowableOpticalDensityFilterNames(StrEnum):
     G408 = "G408"
     OPEN = "OPEN"
     NONE = "NONE"
+
+
+class ExposureConditions(BaseModel):
+    """Model to validate and hold exposure time and filter name."""
+
+    model_config = ConfigDict(frozen=True)
+
+    exposure_time: float
+    filter_name: AllowableOpticalDensityFilterNames
+
+    def __lt__(self, other):
+        # Compare based on exposure time
+        return self.exposure_time < other.exposure_time
+
+    def __str__(self):
+        return f"{self.exposure_time}_{self.filter_name}"

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/dkist_processing_cryonirsp/models/tags.py

@@ -140,7 +140,7 @@ class CryonirspTag(Tag):
         Parameters
         ----------
         exposure_conditions
-            A tuple of (exposure time, filter name)
+            An ExposureConditions object
 
         Returns
         -------

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/dkist_processing_cryonirsp/parsers/cryonirsp_l0_fits_access.py

@@ -108,7 +108,8 @@ class CryonirspL0FitsAccess(L0FitsAccess):
         self.filter_name = self.header[CryonirspMetadataKey.filter_name.value].upper()
         # The ExposureConditions are a combination of the exposure time and the OD filter name:
         self.exposure_conditions = ExposureConditions(
-            round(self.fpa_exposure_time_ms, CRYO_EXP_TIME_ROUND_DIGITS), self.filter_name
+            exposure_time=round(self.fpa_exposure_time_ms, CRYO_EXP_TIME_ROUND_DIGITS),
+            filter_name=self.filter_name,
         )
         self.center_wavelength = self.header[CryonirspMetadataKey.center_wavelength]
         self.slit_width = self.header[CryonirspMetadataKey.slit_width]

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/dkist_processing_cryonirsp/parsers/exposure_conditions.py

@@ -1,6 +1,6 @@
 """Buds to parse the combination of exposure time and filter name."""
 
-from typing import NamedTuple
+from dataclasses import dataclass
 from typing import Type
 
 from dkist_processing_common.models.flower_pot import SetStem
@@ -30,28 +30,38 @@ class CryonirspTaskExposureConditionsBud(SetStem):
         super().__init__(stem_name=stem_name)
         self.ip_task_type = ip_task_type
 
-    def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | ExposureConditions:
+    def setter(self, fits_obj: CryonirspL0FitsAccess) -> ExposureConditions | Type[SpilledDirt]:
         """
-        Set the value of the bud.
+        Set the task exposure conditions for this fits object.
 
         Parameters
         ----------
         fits_obj:
             A single FitsAccess object
+
+        Returns
+        -------
+        The exposure conditions associated with this fits object
         """
         ip_task_type = parse_header_ip_task_with_gains(fits_obj)
         if ip_task_type.lower() == self.ip_task_type.lower():
             return fits_obj.exposure_conditions
         return SpilledDirt
 
-    def getter(self) -> tuple[ExposureConditions, ...]:
-        """Return a list of the ExposureConditions for this ip task type."""
-        exposure_conditions_tuple = tuple(sorted(self.value_set))
-        return exposure_conditions_tuple
+    def getter(self) -> tuple[str, ...]:
+        """
+        Return the set of exposure conditions.
+
+        Returns
+        -------
+        A sorted tuple of exposure conditions in JSON form
+        """
+        exposure_conditions = tuple(v.model_dump_json() for v in sorted(self.value_set))
+        return exposure_conditions
 
 
 class CryonirspConditionalTaskExposureConditionsBudBase(SetStem):
-    """For ip task types that are not in task_types_to_ignore, produce a list of exposure conditions tuples."""
+    """For ip task types that are not in task_types_to_ignore, produce a set of exposure conditions."""
 
     def __init__(self, stem_name: str, task_types_to_ignore: list[str]):
         super().__init__(stem_name=stem_name)
@@ -59,7 +69,7 @@ class CryonirspConditionalTaskExposureConditionsBudBase(SetStem):
 
     def setter(self, fits_obj: CryonirspL0FitsAccess) -> ExposureConditions | Type[SpilledDirt]:
         """
-        Set the task exposure conditions tuple for this fits object.
+        Set the task exposure conditions for this fits object.
 
         Parameters
         ----------
@@ -68,23 +78,23 @@ class CryonirspConditionalTaskExposureConditionsBudBase(SetStem):
 
         Returns
         -------
-        The exposure time associated with this fits object
+        The exposure conditions associated with this fits object
         """
         task_type = parse_header_ip_task_with_gains(fits_obj=fits_obj)
         if task_type.upper() not in self.task_types_to_ignore:
             return fits_obj.exposure_conditions
         return SpilledDirt
 
-    def getter(self) -> tuple[ExposureConditions, ...]:
+    def getter(self) -> tuple[str, ...]:
         """
-        Get the list of exposure conditions tuples.
+        Return the set of exposure conditions.
 
         Returns
         -------
-        A tuple of (exposure time, filter name) tuples
+        A sorted tuple of exposure conditions in JSON form
         """
-        exposure_conditions_tuple = tuple(sorted(self.value_set))
-        return exposure_conditions_tuple
+        exposure_conditions = tuple(v.model_dump_json() for v in sorted(self.value_set))
+        return exposure_conditions
 
 
 class CryonirspSPConditionalTaskExposureConditionsBud(
@@ -115,8 +125,9 @@ class CryonirspCIConditionalTaskExposureConditionsBud(
         )
 
 
-class DarkTaskTestAndExposureConditionsContainer(NamedTuple):
-    """Named tuple to hold whether the task is dark along with the associated exposure conditions."""
+@dataclass(frozen=True, slots=True)
+class DarkTaskTestAndExposureConditions:
+    """Dataclass to hold whether the task is dark along with the associated exposure conditions."""
 
     is_dark: bool
     exposure_conditions: ExposureConditions
@@ -125,15 +136,13 @@ class DarkTaskTestAndExposureConditionsContainer(NamedTuple):
 class CryonirspPickyDarkExposureConditionsBudBase(SetStem):
     """Parse exposure conditions tuples to ensure existence of dark frames with the required exposure conditions."""
 
-    DarkTaskTestAndExposureConditions = DarkTaskTestAndExposureConditionsContainer
-
     def __init__(self, stem_name: str, task_types_to_ignore: list[str]):
         super().__init__(stem_name=stem_name)
         self.task_types_to_ignore = task_types_to_ignore
 
     def setter(
         self, fits_obj: CryonirspL0FitsAccess
-    ) -> DarkTaskTestAndExposureConditionsContainer | Type[SpilledDirt]:
+    ) -> DarkTaskTestAndExposureConditions | Type[SpilledDirt]:
         """
         Set the task exposure conditions tuple and whether it is a DARK task for this fits object.
 
@@ -147,13 +156,15 @@ class CryonirspPickyDarkExposureConditionsBudBase(SetStem):
         """
         task_type = parse_header_ip_task_with_gains(fits_obj=fits_obj)
         if task_type.upper() == TaskName.dark.value:
-            return self.DarkTaskTestAndExposureConditions(
+            dark_true_and_exposure_conditions = DarkTaskTestAndExposureConditions(
                 is_dark=True, exposure_conditions=fits_obj.exposure_conditions
             )
+            return dark_true_and_exposure_conditions
         if task_type.upper() not in self.task_types_to_ignore:
-            return self.DarkTaskTestAndExposureConditions(
+            dark_false_and_exposure_conditions = DarkTaskTestAndExposureConditions(
                 is_dark=False, exposure_conditions=fits_obj.exposure_conditions
             )
+            return dark_false_and_exposure_conditions
             # Ignored task types fall through
         return SpilledDirt
 

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/dkist_processing_cryonirsp/parsers/polarimetric_check.py

@@ -1,7 +1,8 @@
 """Copy of UniqueBud from common that only activates if the frames are polarimetric "observe" or "polcal" task, or non-polarimetric "observe" task."""
 
+from dataclasses import dataclass
 from enum import StrEnum
-from typing import NamedTuple
+from typing import Iterator
 from typing import Type
 
 from dkist_processing_common.models.flower_pot import ListStem
@@ -13,8 +14,9 @@ from dkist_processing_cryonirsp.models.fits_access import CryonirspMetadataKey
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
 
 
-class PolarimetricValueDataContainer(NamedTuple):
-    """Named tuple to hold polarimetric metadata about a task."""
+@dataclass(frozen=True, slots=True)
+class PolarimetricValueData:
+    """Dataclass to hold polarimetric metadata about a task."""
 
     task: str
     num_modstates: int
@@ -25,7 +27,6 @@ class PolarimetricValueDataContainer(NamedTuple):
 class PolarimetricCheckingUniqueBud(ListStem):
     """Bud for checking if frames are polarimetric."""
 
-    PolarimetricValueData = PolarimetricValueDataContainer
     observe_task_name = TaskName.observe.value.casefold()
     polcal_task_name = TaskName.polcal.value.casefold()
 
@@ -36,19 +37,19 @@ class PolarimetricCheckingUniqueBud(ListStem):
         self.metadata_key = metadata_key
 
     @property
-    def observe_tuple_values(self) -> tuple:
-        """Return all ingested namedtuples from observe frames."""
+    def observe_values(self) -> Iterator[PolarimetricValueData]:
+        """Return ingested values from observe frames."""
         return filter(lambda x: x.task == self.observe_task_name, self.value_list)
 
     @property
-    def polcal_tuple_values(self) -> tuple:
-        """Return all ingested namedtuples from polcal frames."""
+    def polcal_values(self) -> Iterator[PolarimetricValueData]:
+        """Return ingested values from polcal frames."""
         return filter(lambda x: x.task == self.polcal_task_name, self.value_list)
 
     def is_polarimetric(self) -> bool:
         """Check if data is polarimetric."""
-        obs_num_mod_set = set((o.num_modstates for o in self.observe_tuple_values))
-        obs_spin_mode_set = set((o.spin_mode for o in self.observe_tuple_values))
+        obs_num_mod_set = set((o.num_modstates for o in self.observe_values))
+        obs_spin_mode_set = set((o.spin_mode for o in self.observe_values))
 
         if len(obs_num_mod_set) > 1:
             raise ValueError(
@@ -68,9 +69,9 @@ class PolarimetricCheckingUniqueBud(ListStem):
             return True
         return False
 
-    def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | tuple:
+    def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | PolarimetricValueData:
         """
-        Return a `PolarimetricValueData` namedtuple only for OBSERVE and POLCAL frames.
+        Return a `PolarimetricValueData` dataclass object only for OBSERVE and POLCAL frames.
 
         Parameters
         ----------
@@ -88,7 +89,7 @@ class PolarimetricCheckingUniqueBud(ListStem):
             bud_value = getattr(fits_obj, self.metadata_key)
 
         if task in [self.observe_task_name, self.polcal_task_name]:
-            return self.PolarimetricValueData(
+            return PolarimetricValueData(
                 task=task,
                 num_modstates=num_modstates,
                 spin_mode=fits_obj.modulator_spin_mode,
@@ -103,7 +104,7 @@ class PolarimetricCheckingUniqueBud(ListStem):
         If data are from a polarimetric dataset then the values must match between observe and polcal frames.
         In all cases the value returned must be the same across all observe (and potentially polcal) frames.
         """
-        obs_value_set = set((o.bud_value for o in self.observe_tuple_values))
+        obs_value_set = set((o.bud_value for o in self.observe_values))
         if len(obs_value_set) == 0:
             # For the rare case where we have polcal frames but not observe frames that are being parsed. This only
             # comes up in unit tests.
@@ -112,7 +113,7 @@ class PolarimetricCheckingUniqueBud(ListStem):
         obs_value = obs_value_set.pop()
 
         if self.is_polarimetric():
-            pol_value_set = set((o.bud_value for o in self.polcal_tuple_values))
+            pol_value_set = set((o.bud_value for o in self.polcal_values))
 
             if len(pol_value_set) > 1:
                 raise ValueError(

{dkist_processing_cryonirsp-2.0.1 → dkist_processing_cryonirsp-2.0.2}/dkist_processing_cryonirsp/tests/conftest.py

@@ -138,27 +138,45 @@ class CryonirspConstantsDb:
     SOFTWARE_BINNING_Y: int = 1
     HLS_VERSION: str = "1.8"
     LAMP_GAIN_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions, ...] = (
-        ExposureConditions(100.0, AllowableOpticalDensityFilterNames.OPEN.value),
+        ExposureConditions(
+            exposure_time=100.0, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
     )
     SOLAR_GAIN_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions, ...] = (
-        ExposureConditions(1.0, AllowableOpticalDensityFilterNames.OPEN.value),
+        ExposureConditions(
+            exposure_time=1.0, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
     )
     OBSERVE_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions, ...] = (
-        ExposureConditions(0.01, AllowableOpticalDensityFilterNames.OPEN.value),
+        ExposureConditions(
+            exposure_time=0.01, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
     )
     POLCAL_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions] | tuple = ()
     DARK_FRAME_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions] | tuple = ()
     SP_NON_DARK_AND_NON_POLCAL_TASK_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions, ...] = (
-        ExposureConditions(100.0, AllowableOpticalDensityFilterNames.OPEN.value),
-        ExposureConditions(1.0, AllowableOpticalDensityFilterNames.OPEN.value),
-        ExposureConditions(0.01, AllowableOpticalDensityFilterNames.OPEN.value),
+        ExposureConditions(
+            exposure_time=100.0, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
+        ExposureConditions(
+            exposure_time=1.0, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
+        ExposureConditions(
+            exposure_time=0.01, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
     )
     CI_NON_DARK_AND_NON_POLCAL_AND_NON_LAMP_GAIN_TASK_EXPOSURE_CONDITIONS_LIST: tuple[
         ExposureConditions, ...
     ] = (
-        ExposureConditions(100.0, AllowableOpticalDensityFilterNames.OPEN.value),
-        ExposureConditions(1.0, AllowableOpticalDensityFilterNames.OPEN.value),
-        ExposureConditions(0.01, AllowableOpticalDensityFilterNames.OPEN.value),
+        ExposureConditions(
+            exposure_time=100.0, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
+        ExposureConditions(
+            exposure_time=1.0, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
+        ExposureConditions(
+            exposure_time=0.01, filter_name=AllowableOpticalDensityFilterNames.OPEN
+        ).model_dump_json(),
     )
     SPECTRAL_LINE: str = "CRSP Ca II H"
     MODULATOR_SPIN_MODE: str = "Continuous"