dkist-processing-visp 5.4.4__tar.gz → 5.5.0__tar.gz

{dkist_processing_visp-5.4.4 → dkist_processing_visp-5.5.0}/CHANGELOG.rst

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

{dkist_processing_visp-5.4.4 → dkist_processing_visp-5.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.4.4
+Version: 5.5.0
 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.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
@@ -111,13 +111,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"
@@ -132,11 +132,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.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-math==2.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-visp==5.4.4; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.5.0; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.3.0; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.23.0; extra == "frozen"
@@ -150,7 +150,7 @@ Requires-Dist: fonttools==4.62.1; extra == "frozen"
 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: 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"
@@ -182,7 +182,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.1.2; extra == "frozen"
 Requires-Dist: msgspec==0.20.0; extra == "frozen"
 Requires-Dist: multidict==6.7.1; extra == "frozen"

{dkist_processing_visp-5.4.4 → dkist_processing_visp-5.5.0}/dkist_processing_visp/tests/test_quality.py

@@ -1,9 +1,12 @@
 import json
+from pathlib import Path
 
 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.fits import fits_array_encoder
+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
 
@@ -15,15 +18,40 @@ from dkist_processing_visp.tests.conftest import write_calibrated_frames_to_task
 from dkist_processing_visp.tests.header_models import VispHeaders
 
 
+@pytest.fixture()
+def l0_quality_task_types() -> list[str]:
+    # The task types we want to build l0 metrics for
+    return [TaskName.lamp_gain.value, TaskName.dark.value]
+
+
+@pytest.fixture()
+def dataset_task_types(l0_quality_task_types: list[str]) -> list[str]:
+    # The task types that exist in the dataset, i.e. a larger set than we want to build metrics for.
+    return l0_quality_task_types + [TaskName.solar_gain.value, TaskName.observe.value]
+
+
 @pytest.fixture
-def visp_l0_quality_task(recipe_run_id, num_modstates, init_visp_constants_db, tmp_path):
+def visp_l0_quality_task(
+    recipe_run_id: int,
+    num_modstates: int,
+    init_visp_constants_db,
+    tmp_path: Path,
+    l0_quality_task_types: list[str],
+) -> VispL0QualityMetrics:
     constants = VispConstantsDb(
         NUM_MODSTATES=num_modstates,
         POLARIMETER_MODE="observe_polarimetric" if num_modstates > 1 else "observe_intensity",
     )
     init_visp_constants_db(recipe_run_id, constants)
 
-    with VispL0QualityMetrics(
+    class TestVispL0QualityMetrics(VispL0QualityMetrics):
+        """Only process l0_quality_task_types"""
+
+        @property
+        def quality_task_types(self) -> list[str]:
+            return l0_quality_task_types
+
+    with TestVispL0QualityMetrics(
         recipe_run_id=recipe_run_id,
         workflow_name="workflow_name",
         workflow_version="workflow_version",
@@ -34,20 +62,8 @@ def visp_l0_quality_task(recipe_run_id, num_modstates, init_visp_constants_db, t
         task._purge()
 
 
-@pytest.fixture()
-def l0_quality_task_types() -> list[str]:
-    # The tasks types we want to build l0 metrics for
-    return [TaskName.lamp_gain.value, TaskName.dark.value]
-
-
-@pytest.fixture()
-def dataset_task_types(l0_quality_task_types) -> list[str]:
-    # The task types that exist in the dataset. I.e., a larger set than we want to build metrics for.
-    return l0_quality_task_types + [TaskName.solar_gain.value, TaskName.observe.value]
-
-
 @pytest.fixture
-def write_l0_task_frames_to_task(num_modstates, dataset_task_types):
+def write_l0_task_frames_to_task(num_modstates: int, dataset_task_types: list[str]):
     array_shape = (1, 4, 4)
     data = np.ones(array_shape)
 
@@ -60,15 +76,13 @@ def write_l0_task_frames_to_task(num_modstates, dataset_task_types):
             )
             for modstate, frame in enumerate(ds, start=1):
                 header = frame.header()
+                tags = [VispTag.input(), VispTag.frame(), VispTag.task(task_type)]
+                if num_modstates > 1:
+                    tags.append(VispTag.modstate(modstate))
                 task.write(
                     data=data,
                     header=header,
-                    tags=[
-                        VispTag.input(),
-                        VispTag.frame(),
-                        VispTag.task(task_type),
-                        VispTag.modstate(modstate),
-                    ],
+                    tags=tags,
                     encoder=fits_array_encoder,
                 )
 
@@ -76,7 +90,7 @@ def write_l0_task_frames_to_task(num_modstates, dataset_task_types):
 
 
 @pytest.fixture(scope="function")
-def visp_l1_quality_task(tmp_path, pol_mode, recipe_run_id, init_visp_constants_db):
+def visp_l1_quality_task(tmp_path: Path, pol_mode, recipe_run_id: int, init_visp_constants_db):
     num_map_scans = 3
     num_raster_steps = 2
     num_stokes = 4
@@ -101,7 +115,10 @@ def visp_l1_quality_task(tmp_path, pol_mode, recipe_run_id, init_visp_constants_
     "num_modstates", [pytest.param(4, id="polarimetric"), pytest.param(1, id="intensity")]
 )
 def test_l0_quality_task(
-    visp_l0_quality_task, num_modstates, write_l0_task_frames_to_task, l0_quality_task_types
+    visp_l0_quality_task: VispL0QualityMetrics,
+    num_modstates: int,
+    write_l0_task_frames_to_task,
+    l0_quality_task_types: list[str],
 ):
     """
     Given: A `VispL0QualityMetrics` task and some INPUT frames tagged with their task type and modstate
@@ -109,25 +126,35 @@ def test_l0_quality_task(
     Then: The expected L0 quality metric files exist
     """
     # NOTE: We rely on the unit tests in `*-common` to verify the correct format/data of the metric files
+    # Given
     task = visp_l0_quality_task
     write_l0_task_frames_to_task(task)
 
+    # When
     task()
 
-    task_metric_names = ["FRAME_RMS", "FRAME_AVERAGE"]
-    for metric_name in task_metric_names:
-        for modstate in range(1, num_modstates + 1):
-            for task_type in l0_quality_task_types:
-                tags = [VispTag.quality(metric_name), VispTag.quality_task(task_type)]
-                if num_modstates > 1:
-                    tags.append(VispTag.modstate(modstate))
-                files = list(task.read(tags))
-                assert len(files) == 1
-
-    global_metric_names = ["DATASET_AVERAGE", "DATASET_RMS"]
-    for metric_name in global_metric_names:
-        files = list(task.read(tags=[VispTag.quality(metric_name)]))
-        assert len(files) > 0
+    # Then
+    tags = [Tag.quality("GENERIC")]
+    metrics: list[QualityMetric] = list(
+        task.read(tags=tags, decoder=basemodel_decoder, model=QualityMetric)
+    )
+    dataset_metric_codes = ["DATASET_AVERAGE", "DATASET_RMS"]
+    frame_metric_codes = ["FRAME_AVERAGE", "FRAME_RMS"]
+    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 DARK)
+    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
+    for facet in l0_quality_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("pol_mode", ["observe_polarimetric", "observe_intensity"])

{dkist_processing_visp-5.4.4 → dkist_processing_visp-5.5.0}/dkist_processing_visp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.4.4
+Version: 5.5.0
 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.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
@@ -111,13 +111,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"
@@ -132,11 +132,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.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-math==2.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-visp==5.4.4; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.5.0; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.3.0; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.23.0; extra == "frozen"
@@ -150,7 +150,7 @@ Requires-Dist: fonttools==4.62.1; extra == "frozen"
 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: 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"
@@ -182,7 +182,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.1.2; extra == "frozen"
 Requires-Dist: msgspec==0.20.0; extra == "frozen"
 Requires-Dist: multidict==6.7.1; extra == "frozen"

{dkist_processing_visp-5.4.4 → dkist_processing_visp-5.5.0}/dkist_processing_visp.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
@@ -77,13 +77,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
@@ -98,11 +98,11 @@ dacite==1.9.2
 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-math==2.2.1
 dkist-processing-pac==3.1.1
-dkist-processing-visp==5.4.4
+dkist-processing-visp==5.5.0
 dkist-service-configuration==4.3.0
 dkist-spectral-lines==3.0.0
 dkist_fits_specifications==4.23.0
@@ -116,7 +116,7 @@ fonttools==4.62.1
 frozenlist==1.8.0
 fsspec==2026.3.0
 globus-sdk==4.5.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
@@ -148,7 +148,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.1.2
 msgspec==0.20.0
 multidict==6.7.1

{dkist_processing_visp-5.4.4 → dkist_processing_visp-5.5.0}/pyproject.toml

@@ -9,8 +9,8 @@ exclude = ["build*"]
 
 [tool.dkist-dev-tools]
 # Most recently frozen version by dkist-dev-tools
-version = "5.4.4"
-date = 2026-04-01T12:09:31.587252
+version = "5.5.0"
+date = 2026-04-02T20:13:54.506252
 
 [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",
@@ -139,13 +139,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",
@@ -160,11 +160,11 @@ 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-math == 2.2.1",
     "dkist-processing-pac == 3.1.1",
-    "dkist-processing-visp == 5.4.4",
+    "dkist-processing-visp == 5.5.0",
     "dkist-service-configuration == 4.3.0",
     "dkist-spectral-lines == 3.0.0",
     "dkist_fits_specifications == 4.23.0",
@@ -178,7 +178,7 @@ frozen = [
     "frozenlist == 1.8.0",
     "fsspec == 2026.3.0",
     "globus-sdk == 4.5.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",
@@ -210,7 +210,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.1.2",
     "msgspec == 0.20.0",
     "multidict == 6.7.1",