dkist-processing-cryonirsp 1.11.1__tar.gz → 1.12.0__tar.gz

{dkist_processing_cryonirsp-1.11.1 → dkist_processing_cryonirsp-1.12.0}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -28,6 +28,6 @@ repos:
             - --convention=numpy
             - --add-ignore=D105
 -   repo: https://bitbucket.org/dkistdc/pre-commit-hooks
-    rev: v1.0.0
+    rev: v1.0.2
     hooks:
     -   id: calibration-workflow-name

{dkist_processing_cryonirsp-1.11.1 → dkist_processing_cryonirsp-1.12.0}/CHANGELOG.rst

@@ -1,3 +1,18 @@
+v1.12.0 (2025-07-30)
+====================
+
+Features
+--------
+
+- Enable handling of single-map, single-step observations with repeated measurements that end in an abort. (`#212 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/212>`__)
+
+
+Misc
+----
+
+- Update some pre-commit hook versions. (`#213 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/213>`__)
+
+
 v1.11.1 (2025-07-28)
 ====================
 

{dkist_processing_cryonirsp-1.11.1 → dkist_processing_cryonirsp-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 1.11.1
+Version: 1.12.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -89,7 +89,7 @@ Requires-Dist: WTForms==3.2.1; extra == "frozen"
 Requires-Dist: Werkzeug==2.2.3; extra == "frozen"
 Requires-Dist: aioftp==0.26.2; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
-Requires-Dist: aiohttp==3.12.14; extra == "frozen"
+Requires-Dist: aiohttp==3.12.15; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: alembic==1.16.4; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
@@ -121,8 +121,8 @@ Requires-Dist: attrs==25.3.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.1; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.39.14; extra == "frozen"
-Requires-Dist: botocore==1.39.14; extra == "frozen"
+Requires-Dist: boto3==1.39.16; extra == "frozen"
+Requires-Dist: botocore==1.39.16; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.5.3; extra == "frozen"
 Requires-Dist: certifi==2025.7.14; extra == "frozen"
@@ -147,7 +147,7 @@ Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-common==11.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==5.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==1.11.1; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==1.12.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==2.2; extra == "frozen"
@@ -209,14 +209,14 @@ Requires-Dist: networkx==3.5; extra == "frozen"
 Requires-Dist: numba==0.61.2; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==0.1.2; extra == "frozen"
-Requires-Dist: opentelemetry-api==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-proto==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-sdk==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-semantic-conventions==0.56b0; extra == "frozen"
+Requires-Dist: opentelemetry-api==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-proto==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-sdk==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-semantic-conventions==0.57b0; extra == "frozen"
 Requires-Dist: ordered-set==4.1.0; extra == "frozen"
 Requires-Dist: packaging==25.0; extra == "frozen"
 Requires-Dist: pandas==2.3.1; extra == "frozen"

dkist_processing_cryonirsp-1.12.0/dkist_processing_cryonirsp/parsers/measurements.py

@@ -0,0 +1,64 @@
+"""Copies of UniqueBud and SingleValueSingleKeyFlower from common that only activate if the frames are "observe" task."""
+from typing import Hashable
+from typing import Type
+
+from dkist_processing_common.models.flower_pot import SpilledDirt
+from dkist_processing_common.parsers.single_value_single_key_flower import (
+    SingleValueSingleKeyFlower,
+)
+
+from dkist_processing_cryonirsp.models.constants import CryonirspBudName
+from dkist_processing_cryonirsp.models.tags import CryonirspStemName
+from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
+from dkist_processing_cryonirsp.parsers.scan_step import NumberOfScanStepsBase
+
+
+class NumberOfMeasurementsBud(NumberOfScanStepsBase):
+    """Bud for finding the total number of measurements per scan step."""
+
+    def __init__(self):
+        self.metadata_key = "num_meas"
+        super().__init__(stem_name=CryonirspBudName.num_meas.value)
+
+    def getter(self, key: Hashable) -> Hashable:
+        """
+        Search all scan steps to find the maximum number of measurements in a step.
+
+        This maximum number should be the same for all measurements, with the possible exception of the last one in
+        an abort.
+
+        Abort possibilities:
+        * if a measurement is missing in the last scan step of a multi-scan, multi-map observation, it will be handled
+        as an incomplete scan step and truncated by the scan step abort handler.
+        * if a measurement is missing in a single-map, single-scan observation then the number of measurements will be
+        given by the last measurement value that had as many frames as the maximum number of frames of any
+        measurement.
+        This is a formality for intensity mode observations but is an important check for polarimetric data as the
+        abort may have happened in the middle of the modulator state sequence.
+        """
+        measurements_in_scan_steps = []
+        for meas_dict in self.scan_step_dict.values():
+            measurements_in_scan_steps.append(len(meas_dict))
+        return max(
+            measurements_in_scan_steps
+        )  # if there are incomplete measurements, they should be at the end and will be truncated by an incomplete scan step
+
+
+class MeasurementNumberFlower(SingleValueSingleKeyFlower):
+    """Flower for a measurement number."""
+
+    def __init__(self):
+        super().__init__(tag_stem_name=CryonirspStemName.meas_num.value, metadata_key="meas_num")
+
+    def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | int:
+        """
+        Setter for a flower.
+
+        Parameters
+        ----------
+        fits_obj:
+            A single FitsAccess object
+        """
+        if fits_obj.ip_task_type != "observe":
+            return SpilledDirt
+        return super().setter(fits_obj)

{dkist_processing_cryonirsp-1.11.1 → dkist_processing_cryonirsp-1.12.0}/dkist_processing_cryonirsp/parsers/scan_step.py

@@ -312,11 +312,11 @@ class MapScanStepStemBase(Stem, ABC):
         return step_list.index(scan_step_obj) + 1  # Here we decide that map scan indices start at 1
 
 
-class NumberOfScanStepsBud(MapScanStepStemBase):
-    """Bud for finding the total number of scan steps."""
+class NumberOfScanStepsBase(MapScanStepStemBase, ABC):
+    """Base class for managing scan steps."""
 
-    def __init__(self):
-        super().__init__(stem_name=CryonirspBudName.num_scan_steps.value)
+    def __init__(self, stem_name: CryonirspBudName):
+        super().__init__(stem_name=stem_name)
 
     @cached_property
     def map_scan_to_obj_dict(self) -> dict[int, list[SingleScanStep]]:
@@ -361,6 +361,13 @@ class NumberOfScanStepsBud(MapScanStepStemBase):
 
         return len(completed_steps)
 
+
+class NumberOfScanStepsBud(NumberOfScanStepsBase):
+    """Bud for finding the total number of scan steps."""
+
+    def __init__(self):
+        super().__init__(stem_name=CryonirspBudName.num_scan_steps.value)
+
     def getter(self, key):
         """
         Compute the number of complete scan steps.

{dkist_processing_cryonirsp-1.11.1 → dkist_processing_cryonirsp-1.12.0}/dkist_processing_cryonirsp/tests/test_parse.py

@@ -980,6 +980,7 @@ def test_parse_cryonirsp_linearized_incomplete_raster_scan(
 
     assert task.constants._db_dict[CryonirspBudName.num_scan_steps.value] == num_scan_steps - 1
     assert task.constants._db_dict[CryonirspBudName.num_map_scans.value] == num_map_scans
+    assert task.constants._db_dict[CryonirspBudName.num_meas.value] == 2
 
 
 @pytest.mark.parametrize("arm_id", ["CI", "SP"])

{dkist_processing_cryonirsp-1.11.1 → dkist_processing_cryonirsp-1.12.0}/dkist_processing_cryonirsp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 1.11.1
+Version: 1.12.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -89,7 +89,7 @@ Requires-Dist: WTForms==3.2.1; extra == "frozen"
 Requires-Dist: Werkzeug==2.2.3; extra == "frozen"
 Requires-Dist: aioftp==0.26.2; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
-Requires-Dist: aiohttp==3.12.14; extra == "frozen"
+Requires-Dist: aiohttp==3.12.15; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: alembic==1.16.4; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
@@ -121,8 +121,8 @@ Requires-Dist: attrs==25.3.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.1; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.39.14; extra == "frozen"
-Requires-Dist: botocore==1.39.14; extra == "frozen"
+Requires-Dist: boto3==1.39.16; extra == "frozen"
+Requires-Dist: botocore==1.39.16; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.5.3; extra == "frozen"
 Requires-Dist: certifi==2025.7.14; extra == "frozen"
@@ -147,7 +147,7 @@ Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-common==11.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==5.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==1.11.1; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==1.12.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==2.2; extra == "frozen"
@@ -209,14 +209,14 @@ Requires-Dist: networkx==3.5; extra == "frozen"
 Requires-Dist: numba==0.61.2; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==0.1.2; extra == "frozen"
-Requires-Dist: opentelemetry-api==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-proto==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-sdk==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-semantic-conventions==0.56b0; extra == "frozen"
+Requires-Dist: opentelemetry-api==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-proto==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-sdk==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-semantic-conventions==0.57b0; extra == "frozen"
 Requires-Dist: ordered-set==4.1.0; extra == "frozen"
 Requires-Dist: packaging==25.0; extra == "frozen"
 Requires-Dist: pandas==2.3.1; extra == "frozen"

{dkist_processing_cryonirsp-1.11.1 → dkist_processing_cryonirsp-1.12.0}/dkist_processing_cryonirsp.egg-info/requires.txt

@@ -57,7 +57,7 @@ WTForms==3.2.1
 Werkzeug==2.2.3
 aioftp==0.26.2
 aiohappyeyeballs==2.6.1
-aiohttp==3.12.14
+aiohttp==3.12.15
 aiosignal==1.4.0
 alembic==1.16.4
 amqp==5.3.1
@@ -89,8 +89,8 @@ attrs==25.3.0
 babel==2.17.0
 billiard==4.2.1
 blinker==1.9.0
-boto3==1.39.14
-botocore==1.39.14
+boto3==1.39.16
+botocore==1.39.16
 cachelib==0.13.0
 celery==5.5.3
 certifi==2025.7.14
@@ -115,7 +115,7 @@ dill==0.4.0
 dkist-header-validator==5.2.1
 dkist-processing-common==11.2.0
 dkist-processing-core==5.1.1
-dkist-processing-cryonirsp==1.11.1
+dkist-processing-cryonirsp==1.12.0
 dkist-processing-math==2.2.0
 dkist-processing-pac==3.1.1
 dkist-service-configuration==2.2
@@ -177,14 +177,14 @@ networkx==3.5
 numba==0.61.2
 numpy==2.2.5
 object-clerk==0.1.2
-opentelemetry-api==1.35.0
-opentelemetry-exporter-otlp==1.35.0
-opentelemetry-exporter-otlp-proto-common==1.35.0
-opentelemetry-exporter-otlp-proto-grpc==1.35.0
-opentelemetry-exporter-otlp-proto-http==1.35.0
-opentelemetry-proto==1.35.0
-opentelemetry-sdk==1.35.0
-opentelemetry-semantic-conventions==0.56b0
+opentelemetry-api==1.36.0
+opentelemetry-exporter-otlp==1.36.0
+opentelemetry-exporter-otlp-proto-common==1.36.0
+opentelemetry-exporter-otlp-proto-grpc==1.36.0
+opentelemetry-exporter-otlp-proto-http==1.36.0
+opentelemetry-proto==1.36.0
+opentelemetry-sdk==1.36.0
+opentelemetry-semantic-conventions==0.57b0
 ordered-set==4.1.0
 packaging==25.0
 pandas==2.3.1

{dkist_processing_cryonirsp-1.11.1 → dkist_processing_cryonirsp-1.12.0}/pyproject.toml

@@ -9,8 +9,8 @@ find = {}
 
 [tool.dkist-dev-tools]
 # Most recently frozen version by dkist-dev-tools
-version = "1.11.1"
-date = 2025-07-28T09:56:20.936915
+version = "1.12.0"
+date = 2025-07-30T10:52:13.538948
 
 [project]
 dynamic = ["version"]
@@ -117,7 +117,7 @@ frozen = [
     "Werkzeug == 2.2.3",
     "aioftp == 0.26.2",
     "aiohappyeyeballs == 2.6.1",
-    "aiohttp == 3.12.14",
+    "aiohttp == 3.12.15",
     "aiosignal == 1.4.0",
     "alembic == 1.16.4",
     "amqp == 5.3.1",
@@ -149,8 +149,8 @@ frozen = [
     "babel == 2.17.0",
     "billiard == 4.2.1",
     "blinker == 1.9.0",
-    "boto3 == 1.39.14",
-    "botocore == 1.39.14",
+    "boto3 == 1.39.16",
+    "botocore == 1.39.16",
     "cachelib == 0.13.0",
     "celery == 5.5.3",
     "certifi == 2025.7.14",
@@ -175,7 +175,7 @@ frozen = [
     "dkist-header-validator == 5.2.1",
     "dkist-processing-common == 11.2.0",
     "dkist-processing-core == 5.1.1",
-    "dkist-processing-cryonirsp == 1.11.1",
+    "dkist-processing-cryonirsp == 1.12.0",
     "dkist-processing-math == 2.2.0",
     "dkist-processing-pac == 3.1.1",
     "dkist-service-configuration == 2.2",
@@ -237,14 +237,14 @@ frozen = [
     "numba == 0.61.2",
     "numpy == 2.2.5",
     "object-clerk == 0.1.2",
-    "opentelemetry-api == 1.35.0",
-    "opentelemetry-exporter-otlp == 1.35.0",
-    "opentelemetry-exporter-otlp-proto-common == 1.35.0",
-    "opentelemetry-exporter-otlp-proto-grpc == 1.35.0",
-    "opentelemetry-exporter-otlp-proto-http == 1.35.0",
-    "opentelemetry-proto == 1.35.0",
-    "opentelemetry-sdk == 1.35.0",
-    "opentelemetry-semantic-conventions == 0.56b0",
+    "opentelemetry-api == 1.36.0",
+    "opentelemetry-exporter-otlp == 1.36.0",
+    "opentelemetry-exporter-otlp-proto-common == 1.36.0",
+    "opentelemetry-exporter-otlp-proto-grpc == 1.36.0",
+    "opentelemetry-exporter-otlp-proto-http == 1.36.0",
+    "opentelemetry-proto == 1.36.0",
+    "opentelemetry-sdk == 1.36.0",
+    "opentelemetry-semantic-conventions == 0.57b0",
     "ordered-set == 4.1.0",
     "packaging == 25.0",
     "pandas == 2.3.1",

dkist_processing_cryonirsp-1.11.1/dkist_processing_cryonirsp/parsers/measurements.py

@@ -1,55 +0,0 @@
-"""Copies of UniqueBud and SingleValueSingleKeyFlower from common that only activate if the frames are "observe" task."""
-from typing import Type
-
-from dkist_processing_common.models.flower_pot import SpilledDirt
-from dkist_processing_common.parsers.single_value_single_key_flower import (
-    SingleValueSingleKeyFlower,
-)
-from dkist_processing_common.parsers.unique_bud import UniqueBud
-
-from dkist_processing_cryonirsp.models.constants import CryonirspBudName
-from dkist_processing_cryonirsp.models.tags import CryonirspStemName
-from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
-
-
-class NumberOfMeasurementsBud(UniqueBud):
-    """Bud for finding the total number of measurements per scan step."""
-
-    def __init__(self):
-        self.metadata_key = "num_meas"
-        super().__init__(
-            constant_name=CryonirspBudName.num_meas.value, metadata_key=self.metadata_key
-        )
-
-    def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | int:
-        """
-        Setter for the bud.
-
-        Parameters
-        ----------
-        fits_obj:
-            A single FitsAccess object
-        """
-        if fits_obj.ip_task_type != "observe":
-            return SpilledDirt
-        return getattr(fits_obj, self.metadata_key)
-
-
-class MeasurementNumberFlower(SingleValueSingleKeyFlower):
-    """Flower for a measurement number."""
-
-    def __init__(self):
-        super().__init__(tag_stem_name=CryonirspStemName.meas_num.value, metadata_key="meas_num")
-
-    def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | int:
-        """
-        Setter for a flower.
-
-        Parameters
-        ----------
-        fits_obj:
-            A single FitsAccess object
-        """
-        if fits_obj.ip_task_type != "observe":
-            return SpilledDirt
-        return super().setter(fits_obj)