dkist-processing-visp 5.3.0rc6__tar.gz → 5.3.1__tar.gz

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/.readthedocs.yml

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

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/CHANGELOG.rst

@@ -1,3 +1,25 @@
+v5.3.1 (2026-01-26)
+===================
+
+Misc
+----
+
+- Update name of `non_dark_or_polcal_readout_exp_times` constant to more accurately reflect what it is. This changed when
+  we stopped using DARK and GAIN task type frames to correct POLCAL data. (`#265 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/265>`__)
+- Use new base `Stems` in `dkist-processing-common` to speed up custom ViSP `Stems`. `TotalRasterStepsBud`, `ReflectedLightAngleBud`,
+  and `NonDarkNonPolcalTaskReadoutExpTimesBud` are now based on `SetStem`, and `DarkReadoutExpTimesPickyBud` is based on `ListStem`. (`#265 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/265>`__)
+- Update `dkist-processing-common` to v12.1.0 to take advantage of big speedups in the Parse task. (`#265 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/265>`__)
+
+
+v5.3.0 (2026-01-22)
+===================
+
+Misc
+----
+
+- Upgrade to use Airflow 3 and a minimum python version of 3.13. (`#261 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/261>`__)
+
+
 v5.2.5 (2026-01-09)
 ===================
 

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.3.0rc6
+Version: 5.3.1
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/x-rst
-Requires-Dist: dkist-processing-common==12.0.0rc7
+Requires-Dist: dkist-processing-common==12.1.0
 Requires-Dist: dkist-processing-math==2.2.1
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-header-validator==5.2.1
@@ -84,7 +84,7 @@ Requires-Dist: aioftp==0.27.2; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
 Requires-Dist: aiohttp==3.13.3; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
-Requires-Dist: aiosmtplib==5.0.0; extra == "frozen"
+Requires-Dist: aiosmtplib==5.1.0; extra == "frozen"
 Requires-Dist: aiosqlite==0.21.0; extra == "frozen"
 Requires-Dist: alembic==1.18.1; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
@@ -107,13 +107,13 @@ Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
 Requires-Dist: asgiref==3.11.0; extra == "frozen"
 Requires-Dist: asteval==1.0.8; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2026.1.19.0.42.31; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2026.1.26.0.43.56; extra == "frozen"
 Requires-Dist: asyncpg==0.31.0; extra == "frozen"
 Requires-Dist: attrs==25.4.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.4; extra == "frozen"
-Requires-Dist: boto3==1.42.32; extra == "frozen"
-Requires-Dist: botocore==1.42.32; extra == "frozen"
+Requires-Dist: boto3==1.42.34; extra == "frozen"
+Requires-Dist: botocore==1.42.34; extra == "frozen"
 Requires-Dist: cadwyn==5.4.6; extra == "frozen"
 Requires-Dist: celery==5.6.2; extra == "frozen"
 Requires-Dist: certifi==2026.1.4; extra == "frozen"
@@ -133,11 +133,11 @@ Requires-Dist: dacite==1.9.2; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.1; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
-Requires-Dist: dkist-processing-common==12.0.0rc7; extra == "frozen"
-Requires-Dist: dkist-processing-core==7.0.0rc9; extra == "frozen"
+Requires-Dist: dkist-processing-common==12.1.0; extra == "frozen"
+Requires-Dist: dkist-processing-core==7.0.1; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-visp==5.3.0rc6; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.3.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.2.0; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.20.0; extra == "frozen"
@@ -154,7 +154,7 @@ Requires-Dist: globus-sdk==4.3.1; extra == "frozen"
 Requires-Dist: googleapis-common-protos==1.72.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
 Requires-Dist: greenback==1.3.0; extra == "frozen"
-Requires-Dist: greenlet==3.3.0; extra == "frozen"
+Requires-Dist: greenlet==3.3.1; extra == "frozen"
 Requires-Dist: grpcio==1.76.0; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
 Requires-Dist: httpcore==1.0.9; extra == "frozen"
@@ -186,7 +186,7 @@ Requires-Dist: methodtools==0.4.7; extra == "frozen"
 Requires-Dist: more-itertools==10.8.0; extra == "frozen"
 Requires-Dist: moviepy==2.1.2; extra == "frozen"
 Requires-Dist: msgspec==0.20.0; extra == "frozen"
-Requires-Dist: multidict==6.7.0; extra == "frozen"
+Requires-Dist: multidict==6.7.1; extra == "frozen"
 Requires-Dist: natsort==8.4.0; extra == "frozen"
 Requires-Dist: nbformat==5.10.4; extra == "frozen"
 Requires-Dist: networkx==3.6.1; extra == "frozen"
@@ -219,7 +219,7 @@ Requires-Dist: opentelemetry-util-http==0.60b1; extra == "frozen"
 Requires-Dist: outcome==1.3.0.post0; extra == "frozen"
 Requires-Dist: packaging==26.0; extra == "frozen"
 Requires-Dist: pandas==3.0.0; extra == "frozen"
-Requires-Dist: parfive==2.2.0; extra == "frozen"
+Requires-Dist: parfive==2.3.0; extra == "frozen"
 Requires-Dist: pathspec==1.0.3; extra == "frozen"
 Requires-Dist: pendulum==3.1.0; extra == "frozen"
 Requires-Dist: pika==1.3.2; extra == "frozen"
@@ -245,13 +245,13 @@ Requires-Dist: pyparsing==3.3.2; extra == "frozen"
 Requires-Dist: python-daemon==3.1.2; extra == "frozen"
 Requires-Dist: python-dateutil==2.9.0.post0; extra == "frozen"
 Requires-Dist: python-dotenv==1.2.1; extra == "frozen"
-Requires-Dist: python-multipart==0.0.21; extra == "frozen"
+Requires-Dist: python-multipart==0.0.22; extra == "frozen"
 Requires-Dist: python-slugify==8.0.4; extra == "frozen"
 Requires-Dist: pytz==2025.2; extra == "frozen"
 Requires-Dist: redis==6.4.0; extra == "frozen"
 Requires-Dist: referencing==0.37.0; extra == "frozen"
 Requires-Dist: requests==2.32.5; extra == "frozen"
-Requires-Dist: rich==14.2.0; extra == "frozen"
+Requires-Dist: rich==14.3.1; extra == "frozen"
 Requires-Dist: rich-argparse==1.7.2; extra == "frozen"
 Requires-Dist: rich-toolkit==0.17.1; extra == "frozen"
 Requires-Dist: rpds-py==0.30.0; extra == "frozen"
@@ -296,7 +296,7 @@ Requires-Dist: uvloop==0.22.1; extra == "frozen"
 Requires-Dist: vine==5.1.0; extra == "frozen"
 Requires-Dist: voluptuous==0.16.0; extra == "frozen"
 Requires-Dist: watchfiles==1.1.1; extra == "frozen"
-Requires-Dist: wcwidth==0.3.0; extra == "frozen"
+Requires-Dist: wcwidth==0.4.0; extra == "frozen"
 Requires-Dist: websockets==16.0; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
 Requires-Dist: wrapt==1.17.3; extra == "frozen"

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/models/constants.py

@@ -23,7 +23,7 @@ class VispBudName(Enum):
     observe_readout_exp_times = "OBSERVE_READOUT_EXP_TIMES"
     polcal_exposure_times = "POLCAL_EXPOSURE_TIMES"
     polcal_readout_exp_times = "POLCAL_READOUT_EXP_TIMES"
-    non_dark_task_readout_exp_times = "NON_DARK_TASK_READOUT_EXP_TIMES"
+    non_dark_or_polcal_readout_exp_times = "NON_DARK_OR_POLCAL_READOUT_EXP_TIMES"
     num_map_scans = "NUM_MAP_SCANS"
     incident_light_angle_deg = "INCIDENT_LIGHT_ANGLE_DEG"
     reflected_light_angle_deg = "REFLECTED_LIGHT_ANGLE_DEG"
@@ -134,14 +134,17 @@ class VispConstants(ConstantsBase):
             return []
 
     @property
-    def non_dark_task_readout_exp_times(self) -> list[float]:
+    def non_dark_or_polcal_readout_exp_times(self) -> list[float]:
         """
         Find all readout exposure times that *need* to exist in a dark IP.
 
         Every non-dark task needs to be corrected with an average dark frame of the same readout exp time, which means
         we need DARK IP task frames for all of these readout exposure times.
+
+        We don't care about the readout exposure time of the POLCAL frames because they do their own dark correction from
+        the polcal Calibration Sequence.
         """
-        return self._db_dict[VispBudName.non_dark_task_readout_exp_times.value]
+        return self._db_dict[VispBudName.non_dark_or_polcal_readout_exp_times.value]
 
     @property
     def observe_readout_exp_times(self) -> list[float]:

dkist_processing_visp-5.3.1/dkist_processing_visp/parsers/modulator_states.py

@@ -0,0 +1,83 @@
+"""ViSP modulator state parser."""
+
+from dkist_processing_common.models.constants import BudName
+from dkist_processing_common.models.tags import StemName
+from dkist_processing_common.parsers.single_value_single_key_flower import (
+    SingleValueSingleKeyFlower,
+)
+from dkist_processing_common.parsers.unique_bud import UniqueBud
+
+from dkist_processing_visp.models.fits_access import VispMetadataKey
+from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
+
+
+class ObserveFrameError(BaseException):
+    """Error raised when no observe frames are identified by polarization mode."""
+
+    pass
+
+
+class NumberModulatorStatesBud(UniqueBud):
+    """Bud to check the number of modulator states."""
+
+    def __init__(self):
+        super().__init__(
+            constant_name=BudName.num_modstates.value,
+            metadata_key=VispMetadataKey.number_of_modulator_states,
+        )
+        self.polarimeter_mode_set = set()
+
+    def setter(self, fits_obj: VispL0FitsAccess) -> int:
+        """
+        Set the value of the bud.
+
+        Parameters
+        ----------
+        fits_obj:
+            A single FitsAccess object
+        """
+        pol_mode = getattr(fits_obj, VispMetadataKey.polarimeter_mode.name)
+        self.polarimeter_mode_set.add(pol_mode)
+        return super().setter(fits_obj)
+
+    def getter(self):
+        """Get the value of the bud, checking for restrictions on polarimetric observe data."""
+        if "observe_intensity" in self.polarimeter_mode_set:
+            return 1
+
+        # Polarimetric data must have the same number of modulator states in all frames
+        if "observe_polarimetric" in self.polarimeter_mode_set:
+            return super().getter()
+
+        raise ObserveFrameError(
+            "No valid observe frames types were found in the headers of the data. Check the input data."
+        )
+
+
+class ModulatorStateFlower(SingleValueSingleKeyFlower):
+    """Flower to find the ip task type."""
+
+    def __init__(self):
+        super().__init__(
+            tag_stem_name=StemName.modstate.value, metadata_key=VispMetadataKey.modulator_state
+        )
+        self.polarimeter_mode_set = set()
+
+    def setter(self, fits_obj: VispL0FitsAccess) -> int:
+        """
+        Set value of the flower.
+
+        Parameters
+        ----------
+        fits_obj:
+            A single FitsAccess object
+        """
+        pol_mode = getattr(fits_obj, VispMetadataKey.polarimeter_mode.name)
+        self.polarimeter_mode_set.add(pol_mode)
+        return super().setter(fits_obj)
+
+    def getter(self, key: str) -> int:
+        """Return the modulator state given in the header of each file unless it is in intensity mode - then return modulator state = 1 for everything."""
+        if "observe_intensity" in self.polarimeter_mode_set:
+            return 1
+        return super().getter(key)

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/parsers/raster_step.py

@@ -2,8 +2,8 @@
 
 from typing import Type
 
+from dkist_processing_common.models.flower_pot import SetStem
 from dkist_processing_common.models.flower_pot import SpilledDirt
-from dkist_processing_common.models.flower_pot import Stem
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.single_value_single_key_flower import (
     SingleValueSingleKeyFlower,
@@ -15,14 +15,12 @@ from dkist_processing_visp.models.tags import VispStemName
 from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
 
 
-class TotalRasterStepsBud(Stem):
+class TotalRasterStepsBud(SetStem):
     """Bud for finding the total number of raster steps."""
 
     def __init__(self):
         super().__init__(stem_name=VispBudName.num_raster_steps.value)
-
-        self.total_num_key = "total_raster_steps"
-        self.single_step_key = "raster_scan_step"
+        self.num_steps_set = set()
 
     def setter(self, fits_obj: VispL0FitsAccess) -> Type[SpilledDirt] | tuple[int, int]:
         """
@@ -36,29 +34,26 @@ class TotalRasterStepsBud(Stem):
         if fits_obj.ip_task_type.casefold() != TaskName.observe.value.casefold():
             return SpilledDirt
 
-        num_raster = getattr(fits_obj, self.total_num_key)
-        single_step = getattr(fits_obj, self.single_step_key)
+        num_raster = getattr(fits_obj, VispMetadataKey.total_raster_steps.name)
+        self.num_steps_set.add(num_raster)
+        single_step = getattr(fits_obj, VispMetadataKey.raster_scan_step.name)
 
-        return num_raster, single_step
+        return single_step
 
-    def getter(self, key) -> str | float | int:
+    def getter(self) -> int:
         """
         Getter and check for bud.
 
         Return value if only a single value was found in dataset. Error if multiple values were found or if the actual
         raster steps found do not form a complete set based on the number-of-raster-steps header key.
         """
-        values = self.key_to_petal_dict.values()
-        num_steps_set = set([v[0] for v in values])
-
-        # This is copied from UniqueBud because we still want to check this
-        if len(num_steps_set) > 1:
+        if len(self.num_steps_set) > 1:
             raise ValueError(
-                f"Multiple {self.stem_name} values found for key {key}. Values: {num_steps_set}"
+                f"Found multiple values for total number of raster steps. Values: {self.num_steps_set}"
             )
 
         # Now check that all the steps we expect are present
-        all_steps = sorted(list(set([v[1] for v in values])))
+        all_steps = sorted(self.value_set)
         if all_steps != list(range(0, max(all_steps) + 1)):
             raise ValueError(f"Not all sequential steps could be found. Found {all_steps}")
 

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/parsers/spectrograph_configuration.py

@@ -1,7 +1,7 @@
 """Buds for parsing the incident and reflected light angles of the ViSP spectrograph."""
 
+from dkist_processing_common.models.flower_pot import SetStem
 from dkist_processing_common.models.flower_pot import SpilledDirt
-from dkist_processing_common.models.flower_pot import Stem
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.task import parse_header_ip_task_with_gains
 from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
@@ -37,11 +37,9 @@ class IncidentLightAngleBud(TaskUniqueBud):
         return convert_grating_angle_to_incident_light_angle(grating_angle)
 
 
-class ReflectedLightAngleBud(Stem):
+class ReflectedLightAngleBud(SetStem):
     """Bud that combines the incident light angle and arm position header values to compute the reflected light angle."""
 
-    key_to_petal_dict: dict[str, float]
-
     def __init__(self):
         super().__init__(stem_name=VispBudName.reflected_light_angle_deg.value)
         self.ip_task_types = [
@@ -65,11 +63,10 @@ class ReflectedLightAngleBud(Stem):
 
         return SpilledDirt
 
-    def getter(self, key: str) -> float:
+    def getter(self) -> float:
         """Get the value for the reflected light angle and raise an error if it is not unique."""
-        value_set = set(self.key_to_petal_dict.values())
-        if len(value_set) > 1:
+        if len(self.value_set) > 1:
             raise ValueError(
-                f"Multiple {self.stem_name} values found for key {key}. Values: {value_set}"
+                f"Multiple {self.stem_name} values found for key. Values: {self.value_set}"
             )
-        return value_set.pop()
+        return self.value_set.pop()

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/parsers/time.py

@@ -1,11 +1,12 @@
 """Stems for parsing constants and tags related to time header keys."""
 
-from pathlib import Path
 from typing import NamedTuple
+from typing import Type
 
 from dkist_processing_common.models.fits_access import MetadataKey
+from dkist_processing_common.models.flower_pot import ListStem
+from dkist_processing_common.models.flower_pot import SetStem
 from dkist_processing_common.models.flower_pot import SpilledDirt
-from dkist_processing_common.models.flower_pot import Stem
 from dkist_processing_common.models.flower_pot import Thorn
 from dkist_processing_common.models.tags import EXP_TIME_ROUND_DIGITS
 from dkist_processing_common.models.task_name import TaskName
@@ -14,14 +15,14 @@ from dkist_processing_visp.models.constants import VispBudName
 from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
 
 
-class NonDarkNonPolcalTaskReadoutExpTimesBud(Stem):
+class NonDarkNonPolcalTaskReadoutExpTimesBud(SetStem):
     """Produce a tuple of all exposure times present in the dataset for ip task types that are not DARK or POLCAL."""
 
     def __init__(self):
-        super().__init__(stem_name=VispBudName.non_dark_task_readout_exp_times.value)
+        super().__init__(stem_name=VispBudName.non_dark_or_polcal_readout_exp_times.value)
         self.metadata_key = MetadataKey.sensor_readout_exposure_time_ms.name
 
-    def setter(self, fits_obj: VispL0FitsAccess) -> float | SpilledDirt:
+    def setter(self, fits_obj: VispL0FitsAccess) -> float | Type[SpilledDirt]:
         """
         Set the task exposure time for this fits object.
 
@@ -41,20 +42,15 @@ class NonDarkNonPolcalTaskReadoutExpTimesBud(Stem):
 
         return SpilledDirt
 
-    def getter(self, key: str | Path) -> (float, ...):
+    def getter(self) -> tuple[float, ...]:
         """
         Get the list of exposure times.
 
-        Parameters
-        ----------
-        key
-            The input key
-
         Returns
         -------
         A tuple of exposure times
         """
-        exposure_times = tuple(sorted(set(self.key_to_petal_dict.values())))
+        exposure_times = tuple(sorted(self.value_set))
         return exposure_times
 
 
@@ -66,11 +62,10 @@ class ReadoutExposureTimeContainer(NamedTuple):
     readout_exposure_time: float
 
 
-class DarkReadoutExpTimePickyBud(Stem):
+class DarkReadoutExpTimePickyBud(ListStem):
     """Parse exposure times to ensure existence of the necessary DARK exposure times."""
 
     ReadoutExposureTime: ReadoutExposureTimeContainer = ReadoutExposureTimeContainer
-    key_to_petal_dict: dict[str | Path, ReadoutExposureTimeContainer]  # For type hinting
 
     def __init__(self):
         super().__init__(stem_name=VispBudName.dark_readout_exp_time_picky_bud.value)
@@ -97,7 +92,7 @@ class DarkReadoutExpTimePickyBud(Stem):
             is_dark=is_dark, is_polcal=is_polcal, readout_exposure_time=exposure_time
         )
 
-    def getter(self, key: str | Path) -> Thorn:
+    def getter(self) -> Type[Thorn]:
         """
         Parse all exposure times and raise an error if any non-dark exposure time is missing from the set of dark exposure times.
 
@@ -110,7 +105,7 @@ class DarkReadoutExpTimePickyBud(Stem):
         -------
         Thorn
         """
-        readout_exp_tuples = list(self.key_to_petal_dict.values())
+        readout_exp_tuples = self.value_list
 
         dark_readout_exp_times = {
             exp_time.readout_exposure_time for exp_time in readout_exp_tuples if exp_time.is_dark

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/tasks/dark.py

@@ -47,7 +47,7 @@ class DarkCalibration(VispTaskBase, BeamAccessMixin, QualityMixin):
         None
 
         """
-        required_readout_exp_times = list(self.constants.non_dark_task_readout_exp_times)
+        required_readout_exp_times = list(self.constants.non_dark_or_polcal_readout_exp_times)
         logger.info(f"{required_readout_exp_times = }")
 
         with self.telemetry_span(

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/tests/README.rst

@@ -254,7 +254,7 @@ Here is a set of example tests showing usage of all the patterns discussed above
       task = dark_calibration_task
 
       # This test needs some unique constants
-      init_visp_constants_db(task.recipe_run_id, VispConstantsDb(NON_DARK_TASK_READOUT_EXP_TIMES=(10.,)))
+      init_visp_constants_db(task.recipe_run_id, VispConstantsDb(NON_DARK_OR_POLCAL_READOUT_EXP_TIMES=(10.,)))
 
       assert True
 

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/tests/conftest.py

@@ -63,7 +63,7 @@ class VispConstantsDb:
     MAXIMUM_CADENCE: float = 10.0
     VARIANCE_CADENCE: float = 0.0
     WAVELENGTH: float = 588.0
-    NON_DARK_TASK_READOUT_EXP_TIMES: tuple[float, ...] = (200.0, 2.0, 0.02)
+    NON_DARK_OR_POLCAL_READOUT_EXP_TIMES: tuple[float, ...] = (200.0, 2.0, 0.02)
     LAMP_EXPOSURE_TIMES: tuple[float] = (100.0,)
     SOLAR_EXPOSURE_TIMES: tuple[float] = (1.0,)
     OBSERVE_EXPOSURE_TIMES: tuple[float] = (0.01,)

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/tests/test_dark.py

@@ -70,7 +70,7 @@ def write_darks_to_task(
 def dark_calibration_task(tmp_path, init_visp_constants_db, recipe_run_id):
     readout_exp_times = [0.02, 2.0, 200.0]
     constants_db = VispConstantsDb(
-        NON_DARK_TASK_READOUT_EXP_TIMES=tuple(readout_exp_times),
+        NON_DARK_OR_POLCAL_READOUT_EXP_TIMES=tuple(readout_exp_times),
     )
     init_visp_constants_db(recipe_run_id, constants_db)
     with DarkCalibration(

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp/tests/test_parse.py

@@ -394,12 +394,13 @@ def test_parse_visp_input_data(
     )
     task = parse_task_with_no_data
     write_input_cal_frames_to_task(task)
+    num_steps = 3
     for obs_readout_exp_time, obs_exp_time in zip(observe_readout_exp_times, observe_exp_times):
         write_input_observe_frames_to_task(
             task,
             num_maps=1,
             num_modstates=num_modstates,
-            num_steps=3,
+            num_steps=num_steps,
             readout_exp_time=obs_readout_exp_time,
             exp_time=obs_exp_time,
             arm_id=testing_arm_id,
@@ -421,10 +422,24 @@ def test_parse_visp_input_data(
     assert (
         len(list(task.read(tags=[Tag.input(), Tag.task_polcal()]))) == 6
     )  # 2 polcal observes, 2 darks, 2 gains
-    assert list(task.read(tags=[Tag.input(), Tag.task_observe()]))
     assert len(list(task.read(tags=[Tag.input(), Tag.task_polcal_dark()]))) == 2  # 2 polcal darks
     assert len(list(task.read(tags=[Tag.input(), Tag.task_polcal_gain()]))) == 2  # 2 polcal gains
 
+    for m in range(1, num_modstates + 1):
+        for s in range(num_steps):
+            assert len(
+                list(
+                    task.read(
+                        tags=[
+                            Tag.input(),
+                            Tag.task_observe(),
+                            VispTag.modstate(m),
+                            VispTag.raster_step(s),
+                        ]
+                    )
+                )
+            ) == len(observe_exp_times)
+
 
 def test_parse_visp_input_data_constants(
     parse_task_with_no_data,
@@ -515,6 +530,13 @@ def test_parse_visp_input_data_constants(
     assert task.constants._db_dict["SOLAR_GAIN_GOS_LEVEL3_STATUS"] == "clear"
     assert task.constants._db_dict["SOLAR_GAIN_NUM_RAW_FRAMES_PER_FPA"] == 10
     assert task.constants._db_dict["POLCAL_NUM_RAW_FRAMES_PER_FPA"] == 10
+    expected_non_dark_polcal_readout_times = sorted(
+        [lamp_readout_exp_time, solar_readout_exp_time] + observe_readout_exp_times
+    )
+    assert (
+        task.constants._db_dict["NON_DARK_OR_POLCAL_READOUT_EXP_TIMES"]
+        == expected_non_dark_polcal_readout_times
+    )
 
 
 def test_parse_visp_values(
@@ -584,7 +606,7 @@ def test_multiple_num_raster_steps_raises_error(
         obs_dataset_class=VispHeadersMultiNumRasterSteps,
     )
 
-    with pytest.raises(ValueError, match="Multiple NUM_RASTER_STEPS values found"):
+    with pytest.raises(ValueError, match="Found multiple values for total number of raster steps"):
         task()
 
 

{dkist_processing_visp-5.3.0rc6 → dkist_processing_visp-5.3.1}/dkist_processing_visp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.3.0rc6
+Version: 5.3.1
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/x-rst
-Requires-Dist: dkist-processing-common==12.0.0rc7
+Requires-Dist: dkist-processing-common==12.1.0
 Requires-Dist: dkist-processing-math==2.2.1
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-header-validator==5.2.1
@@ -84,7 +84,7 @@ Requires-Dist: aioftp==0.27.2; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
 Requires-Dist: aiohttp==3.13.3; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
-Requires-Dist: aiosmtplib==5.0.0; extra == "frozen"
+Requires-Dist: aiosmtplib==5.1.0; extra == "frozen"
 Requires-Dist: aiosqlite==0.21.0; extra == "frozen"
 Requires-Dist: alembic==1.18.1; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
@@ -107,13 +107,13 @@ Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
 Requires-Dist: asgiref==3.11.0; extra == "frozen"
 Requires-Dist: asteval==1.0.8; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2026.1.19.0.42.31; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2026.1.26.0.43.56; extra == "frozen"
 Requires-Dist: asyncpg==0.31.0; extra == "frozen"
 Requires-Dist: attrs==25.4.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.4; extra == "frozen"
-Requires-Dist: boto3==1.42.32; extra == "frozen"
-Requires-Dist: botocore==1.42.32; extra == "frozen"
+Requires-Dist: boto3==1.42.34; extra == "frozen"
+Requires-Dist: botocore==1.42.34; extra == "frozen"
 Requires-Dist: cadwyn==5.4.6; extra == "frozen"
 Requires-Dist: celery==5.6.2; extra == "frozen"
 Requires-Dist: certifi==2026.1.4; extra == "frozen"
@@ -133,11 +133,11 @@ Requires-Dist: dacite==1.9.2; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.1; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
-Requires-Dist: dkist-processing-common==12.0.0rc7; extra == "frozen"
-Requires-Dist: dkist-processing-core==7.0.0rc9; extra == "frozen"
+Requires-Dist: dkist-processing-common==12.1.0; extra == "frozen"
+Requires-Dist: dkist-processing-core==7.0.1; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-visp==5.3.0rc6; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.3.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.2.0; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.20.0; extra == "frozen"
@@ -154,7 +154,7 @@ Requires-Dist: globus-sdk==4.3.1; extra == "frozen"
 Requires-Dist: googleapis-common-protos==1.72.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
 Requires-Dist: greenback==1.3.0; extra == "frozen"
-Requires-Dist: greenlet==3.3.0; extra == "frozen"
+Requires-Dist: greenlet==3.3.1; extra == "frozen"
 Requires-Dist: grpcio==1.76.0; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
 Requires-Dist: httpcore==1.0.9; extra == "frozen"
@@ -186,7 +186,7 @@ Requires-Dist: methodtools==0.4.7; extra == "frozen"
 Requires-Dist: more-itertools==10.8.0; extra == "frozen"
 Requires-Dist: moviepy==2.1.2; extra == "frozen"
 Requires-Dist: msgspec==0.20.0; extra == "frozen"
-Requires-Dist: multidict==6.7.0; extra == "frozen"
+Requires-Dist: multidict==6.7.1; extra == "frozen"
 Requires-Dist: natsort==8.4.0; extra == "frozen"
 Requires-Dist: nbformat==5.10.4; extra == "frozen"
 Requires-Dist: networkx==3.6.1; extra == "frozen"
@@ -219,7 +219,7 @@ Requires-Dist: opentelemetry-util-http==0.60b1; extra == "frozen"
 Requires-Dist: outcome==1.3.0.post0; extra == "frozen"
 Requires-Dist: packaging==26.0; extra == "frozen"
 Requires-Dist: pandas==3.0.0; extra == "frozen"
-Requires-Dist: parfive==2.2.0; extra == "frozen"
+Requires-Dist: parfive==2.3.0; extra == "frozen"
 Requires-Dist: pathspec==1.0.3; extra == "frozen"
 Requires-Dist: pendulum==3.1.0; extra == "frozen"
 Requires-Dist: pika==1.3.2; extra == "frozen"
@@ -245,13 +245,13 @@ Requires-Dist: pyparsing==3.3.2; extra == "frozen"
 Requires-Dist: python-daemon==3.1.2; extra == "frozen"
 Requires-Dist: python-dateutil==2.9.0.post0; extra == "frozen"
 Requires-Dist: python-dotenv==1.2.1; extra == "frozen"
-Requires-Dist: python-multipart==0.0.21; extra == "frozen"
+Requires-Dist: python-multipart==0.0.22; extra == "frozen"
 Requires-Dist: python-slugify==8.0.4; extra == "frozen"
 Requires-Dist: pytz==2025.2; extra == "frozen"
 Requires-Dist: redis==6.4.0; extra == "frozen"
 Requires-Dist: referencing==0.37.0; extra == "frozen"
 Requires-Dist: requests==2.32.5; extra == "frozen"
-Requires-Dist: rich==14.2.0; extra == "frozen"
+Requires-Dist: rich==14.3.1; extra == "frozen"
 Requires-Dist: rich-argparse==1.7.2; extra == "frozen"
 Requires-Dist: rich-toolkit==0.17.1; extra == "frozen"
 Requires-Dist: rpds-py==0.30.0; extra == "frozen"
@@ -296,7 +296,7 @@ Requires-Dist: uvloop==0.22.1; extra == "frozen"
 Requires-Dist: vine==5.1.0; extra == "frozen"
 Requires-Dist: voluptuous==0.16.0; extra == "frozen"
 Requires-Dist: watchfiles==1.1.1; extra == "frozen"
-Requires-Dist: wcwidth==0.3.0; extra == "frozen"
+Requires-Dist: wcwidth==0.4.0; extra == "frozen"
 Requires-Dist: websockets==16.0; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
 Requires-Dist: wrapt==1.17.3; extra == "frozen"