dkist-processing-visp 5.7.2__tar.gz → 5.7.4rc1__tar.gz

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/CHANGELOG.rst

@@ -1,3 +1,12 @@
+v5.7.3 (2026-04-27)
+===================
+
+Misc
+----
+
+- Update dkist-fits-specifications to SPEC-0122 revision L. (`#306 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/306>`__)
+
+
 v5.7.2 (2026-04-23)
 ===================
 

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.7.2
+Version: 5.7.4rc1
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,11 +13,11 @@ 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.2rc2
 Requires-Dist: dkist-processing-math==2.2.2
 Requires-Dist: dkist-processing-pac==3.1.2
 Requires-Dist: dkist-header-validator==5.3.1
-Requires-Dist: dkist-fits-specifications==4.24.1
+Requires-Dist: dkist-fits-specifications==4.25.0
 Requires-Dist: solar-wavelength-calibration==2.0.3
 Requires-Dist: dkist-service-configuration==4.3.0
 Requires-Dist: dkist-spectral-lines==3.0.1
@@ -67,7 +67,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: PeakUtils==1.3.5; extra == "frozen"
 Requires-Dist: PyJWT==2.12.1; extra == "frozen"
@@ -91,12 +91,12 @@ 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.34.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-sql==1.35.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-postgres==6.6.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-smtp==2.4.5; extra == "frozen"
+Requires-Dist: apache-airflow-providers-smtp==3.0.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-standard==1.12.3; extra == "frozen"
 Requires-Dist: apache-airflow-task-sdk==1.1.8; extra == "frozen"
 Requires-Dist: argcomplete==3.6.3; extra == "frozen"
@@ -106,13 +106,13 @@ 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.20.0.58.15; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2026.5.4.1.4.54; 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.95; extra == "frozen"
-Requires-Dist: botocore==1.42.95; 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"
@@ -126,19 +126,19 @@ 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==46.0.7; extra == "frozen"
+Requires-Dist: cryptography==47.0.0; extra == "frozen"
 Requires-Dist: cycler==0.12.1; 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.2rc2; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.2.1; 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-processing-visp==5.7.2; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.7.4rc1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.3.0; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.1; extra == "frozen"
-Requires-Dist: dkist_fits_specifications==4.24.1; extra == "frozen"
+Requires-Dist: dkist_fits_specifications==4.25.0; extra == "frozen"
 Requires-Dist: dnspython==2.8.0; extra == "frozen"
 Requires-Dist: email-validator==2.3.0; extra == "frozen"
 Requires-Dist: fastapi==0.117.1; extra == "frozen"
@@ -147,12 +147,12 @@ 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: googleapis-common-protos==1.74.0; extra == "frozen"
 Requires-Dist: gqlclient==2.0.0; extra == "frozen"
 Requires-Dist: greenback==1.3.0; extra == "frozen"
-Requires-Dist: greenlet==3.4.0; extra == "frozen"
+Requires-Dist: greenlet==3.5.0; extra == "frozen"
 Requires-Dist: grpcio==1.80.0; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
 Requires-Dist: httpcore==1.0.9; extra == "frozen"
@@ -178,7 +178,7 @@ Requires-Dist: lmfit==1.3.4; extra == "frozen"
 Requires-Dist: lockfile==0.12.2; extra == "frozen"
 Requires-Dist: loguru==0.7.3; extra == "frozen"
 Requires-Dist: markdown-it-py==4.0.0; extra == "frozen"
-Requires-Dist: matplotlib==3.10.8; extra == "frozen"
+Requires-Dist: matplotlib==3.10.9; extra == "frozen"
 Requires-Dist: mdurl==0.1.2; extra == "frozen"
 Requires-Dist: methodtools==0.4.7; extra == "frozen"
 Requires-Dist: more-itertools==11.0.2; extra == "frozen"
@@ -190,39 +190,39 @@ Requires-Dist: nbformat==5.10.4; extra == "frozen"
 Requires-Dist: networkx==3.6.1; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==1.0.0; extra == "frozen"
-Requires-Dist: opentelemetry-api==1.41.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp==1.41.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.41.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.41.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.41.0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-aiohttp-client==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-asgi==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-botocore==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-celery==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-dbapi==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-fastapi==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-pika==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-psycopg2==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-pymongo==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-redis==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-requests==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-sqlalchemy==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-system-metrics==0.62b0; extra == "frozen"
+Requires-Dist: opentelemetry-api==1.41.1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp==1.41.1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.41.1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.41.1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.41.1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-aiohttp-client==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-asgi==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-botocore==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-celery==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-dbapi==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-fastapi==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-pika==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-psycopg2==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-pymongo==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-redis==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-requests==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-sqlalchemy==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-system-metrics==0.62b1; extra == "frozen"
 Requires-Dist: opentelemetry-propagator-aws-xray==1.0.2; extra == "frozen"
-Requires-Dist: opentelemetry-proto==1.41.0; extra == "frozen"
-Requires-Dist: opentelemetry-sdk==1.41.0; extra == "frozen"
-Requires-Dist: opentelemetry-semantic-conventions==0.62b0; extra == "frozen"
-Requires-Dist: opentelemetry-util-http==0.62b0; extra == "frozen"
+Requires-Dist: opentelemetry-proto==1.41.1; extra == "frozen"
+Requires-Dist: opentelemetry-sdk==1.41.1; extra == "frozen"
+Requires-Dist: opentelemetry-semantic-conventions==0.62b1; extra == "frozen"
+Requires-Dist: opentelemetry-util-http==0.62b1; extra == "frozen"
 Requires-Dist: outcome==1.3.0.post0; extra == "frozen"
-Requires-Dist: packaging==26.1; extra == "frozen"
+Requires-Dist: packaging==26.2; extra == "frozen"
 Requires-Dist: pandas==3.0.2; extra == "frozen"
 Requires-Dist: parfive==2.3.1; extra == "frozen"
-Requires-Dist: pathspec==1.1.0; extra == "frozen"
+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==10.4.0; extra == "frozen"
-Requires-Dist: pip==26.0.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"
@@ -243,17 +243,17 @@ 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.2; extra == "frozen"
-Requires-Dist: python-multipart==0.0.26; 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: 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.25.2; extra == "frozen"
 Requires-Dist: scikit-learn==1.6.1; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
@@ -275,14 +275,14 @@ 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: threadpoolctl==3.6.0; extra == "frozen"
-Requires-Dist: tifffile==2026.4.11; extra == "frozen"
+Requires-Dist: tifffile==2026.5.2; 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.24.2; 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.1; extra == "frozen"
+Requires-Dist: tzdata==2026.2; extra == "frozen"
 Requires-Dist: tzlocal==5.3.1; extra == "frozen"
 Requires-Dist: uc-micro-py==2.0.0; extra == "frozen"
 Requires-Dist: uncertainties==3.2.3; extra == "frozen"
@@ -294,7 +294,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.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"

dkist_processing_visp-5.7.4rc1/changelog/307.feature.rst

@@ -0,0 +1 @@
+Add `quality_write_intermediate_task_type_counts` method to `VispTaskBase` workflow task.

dkist_processing_visp-5.7.4rc1/changelog/307.misc.rst

@@ -0,0 +1 @@
+Update dkist-processing-common to 14.0.2 which converts TASK_TYPES quality metric to the new methodology.

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tasks/background_light.py

@@ -116,7 +116,7 @@ class BackgroundLightCalibration(
             gc.collect()
 
         with self.telemetry_span("Computing and logging quality metrics"):
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=VispTaskName.background.value,
                 total_frames=num_used_polcal_files,
             )

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tasks/dark.py

@@ -102,7 +102,7 @@ class DarkCalibration(VispTaskBase, BeamAccessMixin, QualityMixin):
                 ],
             )
             unused_count = int(no_of_raw_dark_frames - (total_dark_frames_used / 2))
-            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_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tasks/geometric.py

@@ -140,7 +140,7 @@ class GeometricCalibration(
                 ],
             )
 
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=TaskName.geometric.value, total_frames=no_of_raw_geo_frames
             )
 

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tasks/instrument_polarization.py

@@ -172,7 +172,7 @@ class InstrumentPolarizationCalibration(
                 ],
             )
 
-            self.quality_store_task_type_counts(
+            self.quality_write_intermediate_task_type_counts(
                 task_type=TaskName.polcal.value, total_frames=no_of_raw_polcal_frames
             )
 

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tasks/lamp.py

@@ -121,6 +121,6 @@ class LampCalibration(
                 ],
             )
 
-            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_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tasks/science.py

@@ -159,7 +159,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_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tasks/solar.py

@@ -311,7 +311,7 @@ class SolarCalibration(
                 ],
             )
 
-            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_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tasks/visp_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_visp.models.constants import VispConstants
 from dkist_processing_visp.models.parameters import VispParameters
+from dkist_processing_visp.models.tags import VispTag
 
 
 class VispTaskBase(WorkflowTaskBase, ABC):
@@ -47,3 +51,27 @@ class VispTaskBase(WorkflowTaskBase, ABC):
             wavelength=self.constants.wavelength,
             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=VispTag.quality(MetricCode.task_types), encoder=basemodel_encoder
+        )

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tests/test_background_light.py

@@ -1,5 +1,4 @@
 import datetime
-import json
 from typing import Callable
 
 import numpy as np
@@ -10,7 +9,9 @@ from dkist_data_simulator.spec122 import Spec122Dataset
 from dkist_header_validator import spec122_validator
 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_pac.fitter.fitter_parameters import PolcalDresserParameters
 from dkist_processing_pac.input_data.drawer import Drawer
@@ -425,13 +426,14 @@ def test_background_light_calibration_task(
     assert len(beam_2_bg) == 1
     assert beam_2_bg[0].exists()
 
-    quality_record = list(task.read(tags=[VispTag.quality("TASK_TYPES")]))
-    assert len(quality_record) == 1
-    with open(quality_record[0], "r") as f:
-        data = json.load(f)
-        assert data["task_type"] == VispTaskName.background.value
-        assert data["total_frames"] == total_polcal_files - num_polcal_dark_files
-        assert data["frames_not_used"] == 0
+    task_counts: list[TaskCount] = list(
+        task.read(tags=VispTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == VispTaskName.background.value
+    assert task_counts[0].total_frames == total_polcal_files - num_polcal_dark_files
+    assert task_counts[0].frames_not_used == 0
 
     # We don't currently test the actual accuracy of the calibration. We might never want to do this
     # beam_1_data = fits.open(beam_1_bg[0])[0].data

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tests/test_dark.py

@@ -1,11 +1,11 @@
-import json
 from functools import partial
 
 import numpy as np
 import pytest
 from astropy.io import fits
 from dkist_processing_common._util.scratch import WorkflowFileSystem
-from dkist_processing_common.models.tags import Tag
+from dkist_processing_common.codecs.basemodel import basemodel_decoder
+from dkist_processing_common.models.quality import TaskCount
 
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.tasks.dark import DarkCalibration
@@ -156,12 +156,14 @@ def test_dark_calibration_task(
     )
     assert len(list(unused_time_read)) == 0
 
-    quality_files = task.read(tags=[Tag.quality("TASK_TYPES")])
-    for file in quality_files:
-        with file.open() as f:
-            data = json.load(f)
-            assert isinstance(data, dict)
-            assert data["total_frames"] == task.scratch.count_all(
-                tags=[VispTag.input(), VispTag.frame(), VispTag.task_dark()]
-            )
-            assert data["frames_not_used"] == num_frames_per
+    task_counts: list[TaskCount] = list(
+        task.read(tags=VispTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == "DARK"
+    total_frames = task.scratch.count_all(
+        tags=[VispTag.input(), VispTag.frame(), VispTag.task_dark()]
+    )
+    assert task_counts[0].total_frames == total_frames
+    assert task_counts[0].frames_not_used == num_frames_per

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tests/test_geometric.py

@@ -1,12 +1,12 @@
-import json
 from functools import partial
 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.fits import fits_array_decoder
-from dkist_processing_common.models.tags import Tag
+from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_math import transform
 
 from dkist_processing_visp.models.tags import VispTag
@@ -286,14 +286,17 @@ def test_geometric_task(
             )
             assert array.shape == (2,)
 
-    quality_files = task.read(tags=[Tag.quality("TASK_TYPES")])
-    for file in quality_files:
-        with file.open() as f:
-            data = json.load(f)
-            assert isinstance(data, dict)
-            assert data["total_frames"] == task.scratch.count_all(
-                tags=[VispTag.input(), VispTag.frame(), VispTag.task_solar_gain()]
-            )
+    task_counts: list[TaskCount] = list(
+        task.read(tags=VispTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == "GEOMETRIC"
+    total_frames = task.scratch.count_all(
+        tags=[VispTag.input(), VispTag.frame(), VispTag.task_solar_gain()]
+    )
+    assert task_counts[0].total_frames == total_frames
+    assert task_counts[0].frames_not_used == 0
 
 
 def test_basic_corrections(geometric_calibration_task, assign_input_dataset_doc_to_task):

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tests/test_lamp.py

@@ -1,11 +1,11 @@
-import json
 from functools import partial
 
 import numpy as np
 import pytest
 from astropy.io import fits
 from dkist_processing_common._util.scratch import WorkflowFileSystem
-from dkist_processing_common.models.tags import Tag
+from dkist_processing_common.codecs.basemodel import basemodel_decoder
+from dkist_processing_common.models.quality import TaskCount
 
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.tasks.lamp import LampCalibration
@@ -150,11 +150,14 @@ def test_lamp_calibration_task(
             hdu = hdul[0]
             np.testing.assert_allclose(hdu.data, np.ones(intermediate_shape) * expected_signal)
 
-    quality_files = task.read(tags=[Tag.quality("TASK_TYPES")])
-    for file in quality_files:
-        with file.open() as f:
-            data = json.load(f)
-            assert isinstance(data, dict)
-            assert data["total_frames"] == task.scratch.count_all(
-                tags=[VispTag.input(), VispTag.frame(), VispTag.task_lamp_gain()]
-            )
+    task_counts: list[TaskCount] = list(
+        task.read(tags=VispTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == "LAMP_GAIN"
+    total_frames = task.scratch.count_all(
+        tags=[VispTag.input(), VispTag.frame(), VispTag.task_lamp_gain()]
+    )
+    assert task_counts[0].total_frames == total_frames
+    assert task_counts[0].frames_not_used == 0

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tests/test_science.py

@@ -1,4 +1,3 @@
-import json
 import random
 from datetime import datetime
 from typing import Literal
@@ -10,11 +9,12 @@ from astropy.time import Time
 from astropy.time import TimeDelta
 from dkist_header_validator import spec122_validator
 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.codecs.fits import fits_hdu_decoder
 from dkist_processing_common.codecs.json import json_encoder
 from dkist_processing_common.models.fits_access import MetadataKey
-from dkist_processing_common.models.tags import Tag
+from dkist_processing_common.models.quality import TaskCount
 
 from dkist_processing_visp.models.tags import VispStemName
 from dkist_processing_visp.models.tags import VispTag
@@ -415,14 +415,17 @@ def test_science_calibration_task(
                 f"CRPIX{spatial_axis_num}A"
             ] - np.ceil(-offsets[1, 0, 1])
 
-    quality_files = task.read(tags=[Tag.quality("TASK_TYPES")])
-    for file in quality_files:
-        with file.open() as f:
-            data = json.load(f)
-            assert isinstance(data, dict)
-            assert data["total_frames"] == task.scratch.count_all(
-                tags=[VispTag.input(), VispTag.frame(), VispTag.task_observe()]
-            )
+    task_counts: list[TaskCount] = list(
+        task.read(tags=VispTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == "OBSERVE"
+    total_frames = task.scratch.count_all(
+        tags=[VispTag.input(), VispTag.frame(), VispTag.task_observe()]
+    )
+    assert task_counts[0].total_frames == total_frames
+    assert task_counts[0].frames_not_used == 0
 
 
 @pytest.mark.parametrize("swap_wcs_axes", [pytest.param(False, id="no_swap")])

{dkist_processing_visp-5.7.2 → dkist_processing_visp-5.7.4rc1}/dkist_processing_visp/tests/test_solar.py

@@ -1,4 +1,3 @@
-import json
 from functools import partial
 from typing import Callable
 
@@ -12,8 +11,10 @@ from astropy.coordinates import EarthLocation
 from astropy.stats import gaussian_fwhm_to_sigma
 from astropy.time import Time
 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.tags import Tag
 from scipy.ndimage import gaussian_filter1d
 from sunpy.coordinates import HeliocentricInertial
@@ -405,14 +406,17 @@ def test_solar_gain_task(
         # Testing that the ratio is close to 1.0 give us a bit more leeway in the deviation
         np.testing.assert_allclose(expected_signal / solar_gain, 1.0, atol=1e-2, rtol=1e-2)
 
-    quality_files = task.read(tags=[Tag.quality("TASK_TYPES")])
-    for file in quality_files:
-        with file.open() as f:
-            data = json.load(f)
-            assert isinstance(data, dict)
-            assert data["total_frames"] == task.scratch.count_all(
-                tags=[VispTag.input(), VispTag.frame(), VispTag.task_solar_gain()]
-            )
+    task_counts: list[TaskCount] = list(
+        task.read(tags=VispTag.quality("TASK_TYPES"), decoder=basemodel_decoder, model=TaskCount)
+    )
+    assert isinstance(task_counts, list)
+    assert len(task_counts) == 1
+    assert task_counts[0].task_type == "SOLAR_GAIN"
+    total_frames = task.scratch.count_all(
+        tags=[VispTag.input(), VispTag.frame(), VispTag.task_solar_gain()]
+    )
+    assert task_counts[0].total_frames == total_frames
+    assert task_counts[0].frames_not_used == 0
 
     first_vignette_quality_files = list(task.read(tags=[Tag.quality("SOLAR_CAL_FIRST_VIGNETTE")]))
     assert len(first_vignette_quality_files) == 2