dkist-processing-dlnirsp 1.6.2__tar.gz → 1.6.3__tar.gz

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/CHANGELOG.rst

@@ -1,3 +1,18 @@
+v1.6.3 (2026-05-04)
+===================
+
+Features
+--------
+
+- Add `quality_write_intermediate_task_type_counts` method to `DlnirspTaskBase` workflow task. (`#182 <https://bitbucket.org/dkistdc/dkist-processing-dlnirsp/pull-requests/182>`__)
+
+
+Misc
+----
+
+- Update dkist-processing-common to 14.0.2 which converts TASK_TYPES quality metric to the new methodology. (`#182 <https://bitbucket.org/dkistdc/dkist-processing-dlnirsp/pull-requests/182>`__)
+
+
 v1.6.2 (2026-04-27)
 ===================
 

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-dlnirsp
-Version: 1.6.2
+Version: 1.6.3
 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==14.0.1
+Requires-Dist: dkist-processing-common==14.0.2
 Requires-Dist: dkist-processing-math==2.2.2
 Requires-Dist: dkist-processing-pac==3.1.2
 Requires-Dist: dkist-header-validator==5.3.1
@@ -66,7 +66,7 @@ Provides-Extra: frozen
 Requires-Dist: Deprecated==1.3.1; extra == "frozen"
 Requires-Dist: ImageIO==2.37.3; extra == "frozen"
 Requires-Dist: Jinja2==3.1.6; extra == "frozen"
-Requires-Dist: Mako==1.3.11; extra == "frozen"
+Requires-Dist: Mako==1.3.12; extra == "frozen"
 Requires-Dist: MarkupSafe==3.0.3; extra == "frozen"
 Requires-Dist: PIMS==0.7; extra == "frozen"
 Requires-Dist: PeakUtils==1.3.5; extra == "frozen"
@@ -92,7 +92,7 @@ Requires-Dist: annotated-types==0.7.0; extra == "frozen"
 Requires-Dist: anyio==4.13.0; extra == "frozen"
 Requires-Dist: apache-airflow==3.1.8; extra == "frozen"
 Requires-Dist: apache-airflow-core==3.1.8; extra == "frozen"
-Requires-Dist: apache-airflow-providers-celery==3.18.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-celery==3.19.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-common-compat==1.14.3; extra == "frozen"
 Requires-Dist: apache-airflow-providers-common-io==1.7.2; extra == "frozen"
 Requires-Dist: apache-airflow-providers-common-sql==1.35.0; extra == "frozen"
@@ -107,14 +107,14 @@ Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
 Requires-Dist: asgiref==3.11.1; 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.4.27.1.3.2; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2026.5.4.1.4.54; extra == "frozen"
 Requires-Dist: astropy_healpix==1.1.3; extra == "frozen"
 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.97; extra == "frozen"
-Requires-Dist: botocore==1.42.97; extra == "frozen"
+Requires-Dist: boto3==1.43.3; extra == "frozen"
+Requires-Dist: botocore==1.43.3; extra == "frozen"
 Requires-Dist: cadwyn==5.4.6; extra == "frozen"
 Requires-Dist: celery==5.6.3; extra == "frozen"
 Requires-Dist: certifi==2026.4.22; extra == "frozen"
@@ -129,16 +129,16 @@ Requires-Dist: colorlog==6.10.1; extra == "frozen"
 Requires-Dist: contourpy==1.3.3; extra == "frozen"
 Requires-Dist: cron_descriptor==2.0.8; extra == "frozen"
 Requires-Dist: croniter==6.2.2; extra == "frozen"
-Requires-Dist: cryptography==47.0.0; extra == "frozen"
+Requires-Dist: cryptography==48.0.0; extra == "frozen"
 Requires-Dist: cycler==0.12.1; extra == "frozen"
 Requires-Dist: dask==2026.3.0; extra == "frozen"
 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.1; extra == "frozen"
-Requires-Dist: dkist-processing-common==14.0.1; extra == "frozen"
+Requires-Dist: dkist-processing-common==14.0.2; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.2.1; extra == "frozen"
-Requires-Dist: dkist-processing-dlnirsp==1.6.2; extra == "frozen"
+Requires-Dist: dkist-processing-dlnirsp==1.6.3; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.2; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.2; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.3.0; extra == "frozen"
@@ -153,7 +153,7 @@ Requires-Dist: fastjsonschema==2.21.2; extra == "frozen"
 Requires-Dist: flower==2.0.1; extra == "frozen"
 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: fsspec==2026.4.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.74.0; extra == "frozen"
@@ -233,7 +233,7 @@ Requires-Dist: pathspec==1.1.1; extra == "frozen"
 Requires-Dist: pendulum==3.2.0; extra == "frozen"
 Requires-Dist: pika==1.3.2; extra == "frozen"
 Requires-Dist: pillow==11.3.0; extra == "frozen"
-Requires-Dist: pip==26.1; extra == "frozen"
+Requires-Dist: pip==26.1.1; extra == "frozen"
 Requires-Dist: platformdirs==4.9.6; extra == "frozen"
 Requires-Dist: pluggy==1.6.0; extra == "frozen"
 Requires-Dist: pooch==1.9.0; extra == "frozen"
@@ -257,16 +257,16 @@ Requires-Dist: python-dateutil==2.9.0.post0; extra == "frozen"
 Requires-Dist: python-dotenv==1.2.2; extra == "frozen"
 Requires-Dist: python-multipart==0.0.27; extra == "frozen"
 Requires-Dist: python-slugify==8.0.4; extra == "frozen"
-Requires-Dist: pytz==2026.1.post1; extra == "frozen"
+Requires-Dist: pytz==2026.2; extra == "frozen"
 Requires-Dist: redis==6.4.0; extra == "frozen"
 Requires-Dist: referencing==0.37.0; extra == "frozen"
 Requires-Dist: reproject==0.19.0; extra == "frozen"
 Requires-Dist: requests==2.33.1; extra == "frozen"
 Requires-Dist: rich==15.0.0; extra == "frozen"
-Requires-Dist: rich-argparse==1.7.2; extra == "frozen"
+Requires-Dist: rich-argparse==1.8.0; extra == "frozen"
 Requires-Dist: rich-toolkit==0.19.7; extra == "frozen"
 Requires-Dist: rpds-py==0.30.0; extra == "frozen"
-Requires-Dist: s3transfer==0.16.1; extra == "frozen"
+Requires-Dist: s3transfer==0.17.0; extra == "frozen"
 Requires-Dist: scikit-image==0.26.0; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
 Requires-Dist: semantic-version==2.10.0; extra == "frozen"
@@ -287,12 +287,12 @@ Requires-Dist: talus==1.3.4; extra == "frozen"
 Requires-Dist: tenacity==8.5.0; extra == "frozen"
 Requires-Dist: termcolor==3.3.0; extra == "frozen"
 Requires-Dist: text-unidecode==1.3; extra == "frozen"
-Requires-Dist: tifffile==2026.4.11; extra == "frozen"
+Requires-Dist: tifffile==2026.5.2; extra == "frozen"
 Requires-Dist: toolz==1.1.0; extra == "frozen"
 Requires-Dist: tornado==6.5.5; extra == "frozen"
 Requires-Dist: tqdm==4.67.3; extra == "frozen"
 Requires-Dist: traitlets==5.14.3; extra == "frozen"
-Requires-Dist: typer==0.25.0; extra == "frozen"
+Requires-Dist: typer==0.25.1; extra == "frozen"
 Requires-Dist: typing-inspection==0.4.2; extra == "frozen"
 Requires-Dist: typing_extensions==4.15.0; extra == "frozen"
 Requires-Dist: tzdata==2026.2; extra == "frozen"
@@ -307,13 +307,13 @@ 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.6.0; extra == "frozen"
+Requires-Dist: wcwidth==0.7.0; extra == "frozen"
 Requires-Dist: websockets==16.0; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
 Requires-Dist: wrapt==2.1.2; extra == "frozen"
 Requires-Dist: yamale==6.1.0; extra == "frozen"
 Requires-Dist: yarl==1.23.0; extra == "frozen"
-Requires-Dist: zarr==3.1.6; extra == "frozen"
+Requires-Dist: zarr==3.2.0; extra == "frozen"
 Requires-Dist: zipp==3.23.1; extra == "frozen"
 
 dkist-processing-dlnirsp

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tasks/dark.py

@@ -82,7 +82,7 @@ class DarkCalibration(DlnirspTaskBase, QualityMixin):
                 ],
             )
             unused_count = int(no_of_raw_dark_frames - total_dark_frames_used)
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=TaskName.dark.value,
                 total_frames=no_of_raw_dark_frames,
                 frames_not_used=unused_count,

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tasks/dlnirsp_base.py

@@ -2,10 +2,14 @@
 
 from abc import ABC
 
+from dkist_processing_common.codecs.basemodel import basemodel_encoder
+from dkist_processing_common.models.metric_code import MetricCode
+from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_common.tasks import WorkflowTaskBase
 
 from dkist_processing_dlnirsp.models.constants import DlnirspConstants
 from dkist_processing_dlnirsp.models.parameters import DlnirspParameters
+from dkist_processing_dlnirsp.models.tags import DlnirspTag
 from dkist_processing_dlnirsp.tasks.mixin.group_id import GroupIdMixin
 
 
@@ -51,3 +55,27 @@ class DlnirspTaskBase(
             obs_ip_start_time=self.constants.obs_ip_start_time,
             arm_id=self.constants.arm_id,
         )
+
+    def quality_write_intermediate_task_type_counts(
+        self, task_type: str, total_frames: int, frames_not_used: int = 0
+    ):
+        """
+        Write intermediate task type data.
+
+        Parameters
+        ----------
+        task_type:
+        task type as listed in the headers
+        total_frames:
+        total number of frames supplied of the given task type
+        frames_not_used:
+        if some frames aren't used, how many
+        """
+        task_count = TaskCount(
+            task_type=task_type,
+            total_frames=total_frames,
+            frames_not_used=frames_not_used,
+        )
+        self.write(
+            task_count, tags=DlnirspTag.quality(MetricCode.task_types), encoder=basemodel_encoder
+        )

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tasks/geometric.py

@@ -80,7 +80,7 @@ class GeometricCalibration(DlnirspTaskBase, CorrectionsMixin, QualityMixin):
                 tags=[DlnirspTag.linearized_frame(), DlnirspTag.task_solar_gain()],
             )
 
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=TaskName.geometric.value, total_frames=no_of_raw_solar_frames
             )
 

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tasks/instrument_polarization.py

@@ -160,7 +160,7 @@ class InstrumentPolarizationCalibration(DlnirspTaskBase, QualityMixin):
                 tags=[DlnirspTag.linearized_frame(), DlnirspTag.task_polcal()],
             )
 
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=TaskName.polcal.value, total_frames=no_of_raw_lamp_frames
             )
 

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tasks/lamp.py

@@ -99,7 +99,7 @@ class LampCalibration(DlnirspTaskBase, QualityMixin):
                 tags=[DlnirspTag.linearized_frame(), DlnirspTag.task_lamp_gain()],
             )
 
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=TaskName.lamp_gain.value, total_frames=no_of_raw_lamp_frames
             )
 

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tasks/science.py

@@ -168,7 +168,7 @@ class ScienceCalibration(
                 ],
             )
 
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=TaskName.observe.value, total_frames=no_of_raw_science_frames
             )
 

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tasks/solar.py

@@ -104,7 +104,7 @@ class SolarCalibration(DlnirspTaskBase, CorrectionsMixin, QualityMixin, GroupIdM
                 tags=[DlnirspTag.linearized_frame(), DlnirspTag.task_solar_gain()],
             )
 
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=TaskName.solar_gain.value, total_frames=no_of_raw_solar_frames
             )
 

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tests/test_dark.py

@@ -1,10 +1,10 @@
-import json
-
 import numpy as np
 import pytest
 from astropy.io import fits
 from dkist_data_simulator.spec122 import Spec122Dataset
 from dkist_processing_common._util.scratch import WorkflowFileSystem
+from dkist_processing_common.codecs.basemodel import basemodel_decoder
+from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_common.models.task_name import TaskName
 
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
@@ -100,12 +100,11 @@ def test_dark_calibration_task(dark_task, mocker, fake_gql_client):
     )
     assert len(unused_dark_list) == 0
 
-    quality_files = list(task.read(tags=[DlnirspTag.quality("TASK_TYPES")]))
-    assert len(quality_files) == 1
-    file = quality_files[0]
-    with file.open() as f:
-        data = json.load(f)
-        assert isinstance(data, dict)
-        assert data["task_type"] == TaskName.dark.value
-        assert data["total_frames"] == num_frames_per_exp * 4  # For lamp, solar, obs, and unused
-        assert data["frames_not_used"] == num_frames_per_exp
+    task_counts: list[TaskCount] = list(
+        task.read(tags=DlnirspTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == TaskName.dark.value
+    assert task_counts[0].total_frames == num_frames_per_exp * 4  # For lamp, solar, obs, and unused
+    assert task_counts[0].frames_not_used == num_frames_per_exp

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tests/test_dlnirsp_base.py

@@ -1,4 +1,6 @@
 import pytest
+from dkist_processing_common.codecs.basemodel import basemodel_decoder
+from dkist_processing_common.models.quality import TaskCount
 
 from dkist_processing_dlnirsp.models.constants import DlnirspConstants
 from dkist_processing_dlnirsp.models.parameters import DlnirspParameters
@@ -57,3 +59,43 @@ def test_base_parameters_class(dlnirsp_science_task, dummy_arm_id):
     else:
         with pytest.raises(AttributeError):
             task.parameters
+
+
+@pytest.mark.parametrize(
+    "task_type, total_frames, frames_not_used",
+    [
+        pytest.param("one", 1, 1, id="simple"),
+        pytest.param("two", 2, 0, id="not_used_zero"),
+        pytest.param("three", 3, None, id="not_used_none"),
+    ],
+)
+def test_quality_write_intermediate_task_type_counts(
+    task_type: str, total_frames: int, frames_not_used: int | None, dlnirsp_science_task
+):
+    """
+    Given: Valid intermediate task type count input
+    When: Running DlnirspTaskBase quality_write_intermediate_task_type_counts()
+    Then: A single TaskCount file gets created
+    """
+    # Given
+    task = dlnirsp_science_task
+
+    # When
+    if frames_not_used is not None:
+        task.quality_write_intermediate_task_type_counts(task_type, total_frames, frames_not_used)
+    else:
+        task.quality_write_intermediate_task_type_counts(task_type, total_frames)
+
+    # Then
+    task_counts: list[TaskCount] = list(
+        task.read(tags="QUALITY_TASK_TYPES", decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    task_count = task_counts[0]
+    assert task_count.task_type == str(task_type).upper()
+    assert task_count.total_frames == total_frames
+    if frames_not_used is not None:
+        assert task_count.frames_not_used == frames_not_used
+    else:
+        assert task_count.frames_not_used == 0

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tests/test_geometric.py

@@ -5,8 +5,10 @@ import numpy as np
 import pytest
 from dkist_data_simulator.spec122 import Spec122Dataset
 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_decoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
+from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_common.models.task_name import TaskName
 
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
@@ -210,12 +212,11 @@ def test_geometric_task_completes(geometric_task_for_basic_corrections, mocker,
         dispersion = json.load(f)
         assert isinstance(dispersion, float)
 
-    quality_files = list(task.read(tags=[DlnirspTag.quality("TASK_TYPES")]))
-    assert len(quality_files) == 1
-    file = quality_files[0]
-    with file.open() as f:
-        data = json.load(f)
-        assert isinstance(data, dict)
-        assert data["task_type"] == TaskName.geometric.value
-        assert data["total_frames"] == num_solar_frames
-        assert data["frames_not_used"] == 0
+    task_counts: list[TaskCount] = list(
+        task.read(tags=DlnirspTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == TaskName.geometric.value
+    assert task_counts[0].total_frames == num_solar_frames
+    assert task_counts[0].frames_not_used == 0

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tests/test_instrument_polarization_calibration.py

@@ -1,4 +1,3 @@
-import json
 from unittest.mock import ANY
 from unittest.mock import patch
 
@@ -9,9 +8,11 @@ from astropy.io import fits
 from astropy.time import Time
 from dkist_header_validator.translator import translate_spec122_to_spec214_l0
 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_decoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
+from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_pac.fitter.polcal_fitter import PolcalFitter
 from dkist_processing_pac.input_data.dresser import Dresser
@@ -605,15 +606,14 @@ def test_instrument_polarization_task(
     assert len(demod_array) == 1
     assert demod_array[0].shape == array_shape + (4, 8)
 
-    quality_files = list(task.read(tags=[DlnirspTag.quality("TASK_TYPES")]))
-    assert len(quality_files) == 1
-    file = quality_files[0]
-    with file.open() as f:
-        data = json.load(f)
-        assert isinstance(data, dict)
-        assert data["task_type"] == TaskName.polcal.value
-        assert data["total_frames"] == num_polcal_frames
-        assert data["frames_not_used"] == 0
+    task_counts: list[TaskCount] = list(
+        task.read(tags=DlnirspTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == TaskName.polcal.value
+    assert task_counts[0].total_frames == num_polcal_frames
+    assert task_counts[0].frames_not_used == 0
 
     for label, skip_constants in zip(polcal_quality_beam_labels, polcal_quality_skip_constants):
         quality_metric_mocker.assert_any_call(

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tests/test_lamp.py

@@ -1,10 +1,10 @@
-import json
-
 import numpy as np
 import pytest
 from astropy.io import fits
 from dkist_data_simulator.spec122 import Spec122Dataset
 from dkist_processing_common._util.scratch import WorkflowFileSystem
+from dkist_processing_common.codecs.basemodel import basemodel_decoder
+from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_common.models.task_name import TaskName
 
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
@@ -118,12 +118,11 @@ def test_lamp_calibration_task(lamp_task, lamp_signal, mocker, fake_gql_client):
     with fits.open(file_list[0], memmap=False) as data:
         assert np.allclose(data[0].data, lamp_signal)
 
-    quality_files = list(task.read(tags=[DlnirspTag.quality("TASK_TYPES")]))
-    assert len(quality_files) == 1
-    file = quality_files[0]
-    with file.open() as f:
-        data = json.load(f)
-        assert isinstance(data, dict)
-        assert data["task_type"] == TaskName.lamp_gain.value
-        assert data["total_frames"] == num_lamp_frames
-        assert data["frames_not_used"] == 0
+    task_counts: list[TaskCount] = list(
+        task.read(tags=DlnirspTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == TaskName.lamp_gain.value
+    assert task_counts[0].total_frames == num_lamp_frames
+    assert task_counts[0].frames_not_used == 0

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tests/test_science.py

@@ -1,5 +1,3 @@
-import json
-
 import numpy as np
 import pytest
 from astropy.convolution import Gaussian2DKernel
@@ -9,7 +7,9 @@ from astropy.time import TimeDelta
 from dkist_data_simulator.spec122 import Spec122Dataset
 from dkist_header_validator.translator import translate_spec122_to_spec214_l0
 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 TaskCount
 from dkist_processing_common.models.task_name import TaskName
 
 from dkist_processing_dlnirsp.models.fits_access import DlnirspMetadataKey
@@ -470,15 +470,14 @@ def test_science_task_completes(science_task_with_data, is_polarimetric, mocker,
     assert bad_pixel_cube.dtype is np.dtype("int8")
     np.testing.assert_equal(np.unique(bad_pixel_cube), np.array([0, 1]))
 
-    quality_files = list(task.read(tags=[DlnirspTag.quality("TASK_TYPES")]))
-    assert len(quality_files) == 1
-    file = quality_files[0]
-    with file.open() as f:
-        data = json.load(f)
-        assert isinstance(data, dict)
-        assert data["task_type"] == TaskName.observe.value
-        assert data["total_frames"] == num_observe_frames
-        assert data["frames_not_used"] == 0
+    task_counts: list[TaskCount] = list(
+        task.read(tags=DlnirspTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == TaskName.observe.value
+    assert task_counts[0].total_frames == num_observe_frames
+    assert task_counts[0].frames_not_used == 0
 
 
 @pytest.mark.parametrize("is_polarimetric", [pytest.param(True, id="polarimetric")])

{dkist_processing_dlnirsp-1.6.2 → dkist_processing_dlnirsp-1.6.3}/dkist_processing_dlnirsp/tests/test_solar.py

@@ -1,11 +1,11 @@
-import json
-
 import numpy as np
 import pytest
 from dkist_data_simulator.spec122 import Spec122Dataset
 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_decoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
+from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_common.models.task_name import TaskName
 
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
@@ -450,12 +450,11 @@ def test_solar_task_completes(
     if not is_polarimetric:
         assert task.count(tags=tags + [DlnirspTag.stokes("I")]) == 0
 
-    quality_files = list(task.read(tags=[DlnirspTag.quality("TASK_TYPES")]))
-    assert len(quality_files) == 1
-    file = quality_files[0]
-    with file.open() as f:
-        data = json.load(f)
-        assert isinstance(data, dict)
-        assert data["task_type"] == TaskName.solar_gain.value
-        assert data["total_frames"] == num_solar_frames
-        assert data["frames_not_used"] == 0
+    task_counts: list[TaskCount] = list(
+        task.read(tags=DlnirspTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == TaskName.solar_gain.value
+    assert task_counts[0].total_frames == num_solar_frames
+    assert task_counts[0].frames_not_used == 0