dkist-processing-dlnirsp 1.2.4__tar.gz → 1.3.0__tar.gz

{dkist_processing_dlnirsp-1.2.4 → dkist_processing_dlnirsp-1.3.0}/CHANGELOG.rst

@@ -1,3 +1,12 @@
+v1.3.0 (2026-04-02)
+===================
+
+Features
+--------
+
+- Simplify the production of L0 quality metrics.  Update dkist-processing-common to 12.10.0. (`#159 <https://bitbucket.org/dkistdc/dkist-processing-dlnirsp/pull-requests/159>`__)
+
+
 v1.2.4 (2026-04-01)
 ===================
 

{dkist_processing_dlnirsp-1.2.4 → dkist_processing_dlnirsp-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-dlnirsp
-Version: 1.2.4
+Version: 1.3.0
 Summary: Science processing code for the DLNIRSP 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.9.0
+Requires-Dist: dkist-processing-common==12.10.0
 Requires-Dist: dkist-processing-math==2.2.1
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-header-validator==5.3.0
@@ -113,13 +113,13 @@ Requires-Dist: asyncpg==0.31.0; extra == "frozen"
 Requires-Dist: attrs==26.1.0; extra == "frozen"
 Requires-Dist: babel==2.18.0; extra == "frozen"
 Requires-Dist: billiard==4.2.4; extra == "frozen"
-Requires-Dist: boto3==1.42.80; extra == "frozen"
-Requires-Dist: botocore==1.42.80; extra == "frozen"
+Requires-Dist: boto3==1.42.82; extra == "frozen"
+Requires-Dist: botocore==1.42.82; extra == "frozen"
 Requires-Dist: cadwyn==5.4.6; extra == "frozen"
 Requires-Dist: celery==5.6.3; extra == "frozen"
 Requires-Dist: certifi==2026.2.25; extra == "frozen"
 Requires-Dist: cffi==2.0.0; extra == "frozen"
-Requires-Dist: charset-normalizer==3.4.6; extra == "frozen"
+Requires-Dist: charset-normalizer==3.4.7; extra == "frozen"
 Requires-Dist: click==8.3.1; extra == "frozen"
 Requires-Dist: click-didyoumean==0.3.1; extra == "frozen"
 Requires-Dist: click-plugins==1.1.1.2; extra == "frozen"
@@ -137,9 +137,9 @@ Requires-Dist: dask-image==2025.11.0; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.1; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.3.0; extra == "frozen"
-Requires-Dist: dkist-processing-common==12.9.0; extra == "frozen"
+Requires-Dist: dkist-processing-common==12.10.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.1.0; extra == "frozen"
-Requires-Dist: dkist-processing-dlnirsp==1.2.4; extra == "frozen"
+Requires-Dist: dkist-processing-dlnirsp==1.3.0; 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-service-configuration==4.3.0; extra == "frozen"
@@ -157,7 +157,7 @@ Requires-Dist: frozenlist==1.8.0; extra == "frozen"
 Requires-Dist: fsspec==2026.3.0; extra == "frozen"
 Requires-Dist: globus-sdk==4.5.0; extra == "frozen"
 Requires-Dist: google-crc32c==1.8.0; extra == "frozen"
-Requires-Dist: googleapis-common-protos==1.73.1; extra == "frozen"
+Requires-Dist: googleapis-common-protos==1.74.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
 Requires-Dist: greenback==1.3.0; extra == "frozen"
 Requires-Dist: greenlet==3.3.2; extra == "frozen"
@@ -190,7 +190,7 @@ Requires-Dist: markdown-it-py==4.0.0; extra == "frozen"
 Requires-Dist: matplotlib==3.10.8; extra == "frozen"
 Requires-Dist: mdurl==0.1.2; extra == "frozen"
 Requires-Dist: methodtools==0.4.7; extra == "frozen"
-Requires-Dist: more-itertools==10.8.0; extra == "frozen"
+Requires-Dist: more-itertools==11.0.1; extra == "frozen"
 Requires-Dist: moviepy==2.2.1; extra == "frozen"
 Requires-Dist: msgspec==0.20.0; extra == "frozen"
 Requires-Dist: multidict==6.7.1; extra == "frozen"

{dkist_processing_dlnirsp-1.2.4 → dkist_processing_dlnirsp-1.3.0}/dkist_processing_dlnirsp/tests/test_quality.py

@@ -1,7 +1,13 @@
+from pathlib import Path
+from typing import Callable
+
 import numpy as np
 import pytest
 from dkist_processing_common._util.scratch import WorkflowFileSystem
+from dkist_processing_common.codecs.basemodel import basemodel_decoder
 from dkist_processing_common.codecs.json import json_decoder
+from dkist_processing_common.models.quality import QualityMetric
+from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.models.task_name import TaskName
 
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
@@ -27,7 +33,12 @@ def make_infy_3D_data(frame: CalibratedHeaders) -> np.ndarray:
 
 
 @pytest.fixture
-def quality_l0_task(recipe_run_id, is_polarimetric, link_constants_db, tmp_path):
+def quality_l0_task(
+    recipe_run_id: int,
+    is_polarimetric: bool,
+    link_constants_db,
+    tmp_path: Path,
+) -> DlnirspL0QualityMetrics:
     constants = DlnirspTestingConstants(
         NUM_MODSTATES=8 if is_polarimetric else 1,
         POLARIMETER_MODE="Full Stokes" if is_polarimetric else "Stokes I",
@@ -71,7 +82,7 @@ def quality_l1_task(recipe_run_id, is_polarimetric, link_constants_db, tmp_path)
 
 
 @pytest.fixture
-def l0_task_types_and_writers():
+def l0_task_types_and_writers() -> list[tuple[str, Callable]]:
     return [
         (TaskName.lamp_gain.value, write_lamp_gain_frames_to_task),
         (TaskName.solar_gain.value, write_solar_gain_frames_to_task),
@@ -79,12 +90,19 @@ def l0_task_types_and_writers():
 
 
 @pytest.fixture
-def metric_names():
-    return ["FRAME_RMS", "FRAME_AVERAGE"]
+def dataset_metric_codes() -> list[str]:
+    return ["DATASET_AVERAGE", "DATASET_RMS"]
+
+
+@pytest.fixture
+def frame_metric_codes() -> list[str]:
+    return ["FRAME_AVERAGE", "FRAME_RMS"]
 
 
 @pytest.fixture
-def write_l0_data_to_task(l0_task_types_and_writers, is_polarimetric):
+def write_l0_data_to_task(
+    l0_task_types_and_writers: list[tuple[str, Callable]], is_polarimetric: bool
+):
     def writer(task):
         for task_type, task_writer in l0_task_types_and_writers:
             task_writer(
@@ -102,37 +120,54 @@ def write_l0_data_to_task(l0_task_types_and_writers, is_polarimetric):
     "is_polarimetric",
     [pytest.param(True, id="polarimetric"), pytest.param(False, id="spectrographic")],
 )
-def test_qualiy_l0_task(
-    quality_l0_task, is_polarimetric, write_l0_data_to_task, l0_task_types_and_writers, metric_names
+def test_quality_l0_task(
+    quality_l0_task: DlnirspL0QualityMetrics,
+    is_polarimetric: bool,
+    write_l0_data_to_task,
+    l0_task_types_and_writers: list[tuple[str, Callable]],
+    dataset_metric_codes: list[str],
+    frame_metric_codes: list[str],
 ):
     """
     Given: A quality L0 task and some linearized data
     When: Calling the task
     Then: The expected type and number of quality metric files is written
     """
+    # Given
     task = quality_l0_task
-
     write_l0_data_to_task(task)
 
+    # When
     task()
 
-    for metric_name in metric_names:
-        for task_type, _ in l0_task_types_and_writers:
-            quality_files = list(
-                task.read(
-                    tags=[DlnirspTag.quality_task(task_type), DlnirspTag.quality(metric_name)]
-                )
-            )
-            assert len(quality_files) == task.constants.num_modstates
-            for f in quality_files:
-                assert f.exists()
+    # Then
+    tags = [Tag.quality("GENERIC")]
+    metrics: list[QualityMetric] = list(
+        task.read(tags=tags, decoder=basemodel_decoder, model=QualityMetric)
+    )
+    dataset_metrics = [metric for metric in metrics if metric.metric_code in dataset_metric_codes]
+    frame_metrics = [metric for metric in metrics if metric.metric_code in frame_metric_codes]
+    # 2 metrics, no segregation by task
+    assert len(dataset_metrics) == 2
+    for metric_code in dataset_metric_codes:
+        # make sure one metric code of each type
+        assert len([metric for metric in dataset_metrics if metric.metric_code == metric_code]) == 1
+    # 2 metrics, 2 task types (LAMP_GAIN and SOLAR_GAIN)
+    assert len(frame_metrics) == 2 * 2
+    for metric_code in frame_metric_codes:
+        # make sure two metric codes of each type
+        assert len([metric for metric in frame_metrics if metric.metric_code == metric_code]) == 2
+    task_types = [t[0] for t in l0_task_types_and_writers]
+    for facet in task_types:
+        # make sure two facets of each type
+        assert len([metric for metric in frame_metrics if metric.facet == facet]) == 2
 
 
 @pytest.mark.parametrize(
     "is_polarimetric",
     [pytest.param(True, id="polarimetric"), pytest.param(False, id="spectrographic")],
 )
-def test_qualiy_l1_task(
+def test_quality_l1_task(
     quality_l1_task,
     is_polarimetric,
 ):
@@ -179,7 +214,7 @@ def test_qualiy_l1_task(
             )
         )
         assert len(noise_data) == 0
-        # Don't assert noise while calculation is correct
+        # Don't assert noise while calculation is incorrect
         # assert (
         #     len(noise_data[0]["x_values"])
         #     == len(noise_data[0]["y_values"])

{dkist_processing_dlnirsp-1.2.4 → dkist_processing_dlnirsp-1.3.0}/dkist_processing_dlnirsp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-dlnirsp
-Version: 1.2.4
+Version: 1.3.0
 Summary: Science processing code for the DLNIRSP 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.9.0
+Requires-Dist: dkist-processing-common==12.10.0
 Requires-Dist: dkist-processing-math==2.2.1
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-header-validator==5.3.0
@@ -113,13 +113,13 @@ Requires-Dist: asyncpg==0.31.0; extra == "frozen"
 Requires-Dist: attrs==26.1.0; extra == "frozen"
 Requires-Dist: babel==2.18.0; extra == "frozen"
 Requires-Dist: billiard==4.2.4; extra == "frozen"
-Requires-Dist: boto3==1.42.80; extra == "frozen"
-Requires-Dist: botocore==1.42.80; extra == "frozen"
+Requires-Dist: boto3==1.42.82; extra == "frozen"
+Requires-Dist: botocore==1.42.82; extra == "frozen"
 Requires-Dist: cadwyn==5.4.6; extra == "frozen"
 Requires-Dist: celery==5.6.3; extra == "frozen"
 Requires-Dist: certifi==2026.2.25; extra == "frozen"
 Requires-Dist: cffi==2.0.0; extra == "frozen"
-Requires-Dist: charset-normalizer==3.4.6; extra == "frozen"
+Requires-Dist: charset-normalizer==3.4.7; extra == "frozen"
 Requires-Dist: click==8.3.1; extra == "frozen"
 Requires-Dist: click-didyoumean==0.3.1; extra == "frozen"
 Requires-Dist: click-plugins==1.1.1.2; extra == "frozen"
@@ -137,9 +137,9 @@ Requires-Dist: dask-image==2025.11.0; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.1; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.3.0; extra == "frozen"
-Requires-Dist: dkist-processing-common==12.9.0; extra == "frozen"
+Requires-Dist: dkist-processing-common==12.10.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.1.0; extra == "frozen"
-Requires-Dist: dkist-processing-dlnirsp==1.2.4; extra == "frozen"
+Requires-Dist: dkist-processing-dlnirsp==1.3.0; 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-service-configuration==4.3.0; extra == "frozen"
@@ -157,7 +157,7 @@ Requires-Dist: frozenlist==1.8.0; extra == "frozen"
 Requires-Dist: fsspec==2026.3.0; extra == "frozen"
 Requires-Dist: globus-sdk==4.5.0; extra == "frozen"
 Requires-Dist: google-crc32c==1.8.0; extra == "frozen"
-Requires-Dist: googleapis-common-protos==1.73.1; extra == "frozen"
+Requires-Dist: googleapis-common-protos==1.74.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
 Requires-Dist: greenback==1.3.0; extra == "frozen"
 Requires-Dist: greenlet==3.3.2; extra == "frozen"
@@ -190,7 +190,7 @@ Requires-Dist: markdown-it-py==4.0.0; extra == "frozen"
 Requires-Dist: matplotlib==3.10.8; extra == "frozen"
 Requires-Dist: mdurl==0.1.2; extra == "frozen"
 Requires-Dist: methodtools==0.4.7; extra == "frozen"
-Requires-Dist: more-itertools==10.8.0; extra == "frozen"
+Requires-Dist: more-itertools==11.0.1; extra == "frozen"
 Requires-Dist: moviepy==2.2.1; extra == "frozen"
 Requires-Dist: msgspec==0.20.0; extra == "frozen"
 Requires-Dist: multidict==6.7.1; extra == "frozen"

{dkist_processing_dlnirsp-1.2.4 → dkist_processing_dlnirsp-1.3.0}/dkist_processing_dlnirsp.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dkist-processing-common==12.9.0
+dkist-processing-common==12.10.0
 dkist-processing-math==2.2.1
 dkist-processing-pac==3.1.1
 dkist-header-validator==5.3.0
@@ -79,13 +79,13 @@ asyncpg==0.31.0
 attrs==26.1.0
 babel==2.18.0
 billiard==4.2.4
-boto3==1.42.80
-botocore==1.42.80
+boto3==1.42.82
+botocore==1.42.82
 cadwyn==5.4.6
 celery==5.6.3
 certifi==2026.2.25
 cffi==2.0.0
-charset-normalizer==3.4.6
+charset-normalizer==3.4.7
 click==8.3.1
 click-didyoumean==0.3.1
 click-plugins==1.1.1.2
@@ -103,9 +103,9 @@ dask-image==2025.11.0
 decorator==5.2.1
 dill==0.4.1
 dkist-header-validator==5.3.0
-dkist-processing-common==12.9.0
+dkist-processing-common==12.10.0
 dkist-processing-core==7.1.0
-dkist-processing-dlnirsp==1.2.4
+dkist-processing-dlnirsp==1.3.0
 dkist-processing-math==2.2.1
 dkist-processing-pac==3.1.1
 dkist-service-configuration==4.3.0
@@ -123,7 +123,7 @@ frozenlist==1.8.0
 fsspec==2026.3.0
 globus-sdk==4.5.0
 google-crc32c==1.8.0
-googleapis-common-protos==1.73.1
+googleapis-common-protos==1.74.0
 gqlclient==1.2.3
 greenback==1.3.0
 greenlet==3.3.2
@@ -156,7 +156,7 @@ markdown-it-py==4.0.0
 matplotlib==3.10.8
 mdurl==0.1.2
 methodtools==0.4.7
-more-itertools==10.8.0
+more-itertools==11.0.1
 moviepy==2.2.1
 msgspec==0.20.0
 multidict==6.7.1

{dkist_processing_dlnirsp-1.2.4 → dkist_processing_dlnirsp-1.3.0}/pyproject.toml

@@ -9,8 +9,8 @@ exclude = ["build*"]
 
 [tool.dkist-dev-tools]
 # Most recently frozen version by dkist-dev-tools
-version = "1.2.4"
-date = 2026-04-01T12:35:40.324045
+version = "1.3.0"
+date = 2026-04-02T20:20:55.567983
 
 [project]
 dynamic = ["version"]
@@ -26,7 +26,7 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "dkist-processing-common == 12.9.0",
+  "dkist-processing-common == 12.10.0",
   "dkist-processing-math == 2.2.1",
   "dkist-processing-pac == 3.1.1",
   "dkist-header-validator == 5.3.0",
@@ -141,13 +141,13 @@ frozen = [
     "attrs == 26.1.0",
     "babel == 2.18.0",
     "billiard == 4.2.4",
-    "boto3 == 1.42.80",
-    "botocore == 1.42.80",
+    "boto3 == 1.42.82",
+    "botocore == 1.42.82",
     "cadwyn == 5.4.6",
     "celery == 5.6.3",
     "certifi == 2026.2.25",
     "cffi == 2.0.0",
-    "charset-normalizer == 3.4.6",
+    "charset-normalizer == 3.4.7",
     "click == 8.3.1",
     "click-didyoumean == 0.3.1",
     "click-plugins == 1.1.1.2",
@@ -165,9 +165,9 @@ frozen = [
     "decorator == 5.2.1",
     "dill == 0.4.1",
     "dkist-header-validator == 5.3.0",
-    "dkist-processing-common == 12.9.0",
+    "dkist-processing-common == 12.10.0",
     "dkist-processing-core == 7.1.0",
-    "dkist-processing-dlnirsp == 1.2.4",
+    "dkist-processing-dlnirsp == 1.3.0",
     "dkist-processing-math == 2.2.1",
     "dkist-processing-pac == 3.1.1",
     "dkist-service-configuration == 4.3.0",
@@ -185,7 +185,7 @@ frozen = [
     "fsspec == 2026.3.0",
     "globus-sdk == 4.5.0",
     "google-crc32c == 1.8.0",
-    "googleapis-common-protos == 1.73.1",
+    "googleapis-common-protos == 1.74.0",
     "gqlclient == 1.2.3",
     "greenback == 1.3.0",
     "greenlet == 3.3.2",
@@ -218,7 +218,7 @@ frozen = [
     "matplotlib == 3.10.8",
     "mdurl == 0.1.2",
     "methodtools == 0.4.7",
-    "more-itertools == 10.8.0",
+    "more-itertools == 11.0.1",
     "moviepy == 2.2.1",
     "msgspec == 0.20.0",
     "multidict == 6.7.1",