dkist-processing-common 10.8.2__py3-none-any.whl → 10.8.4rc1__py3-none-any.whl

dkist_processing_common/tests/test_quality_mixin.py

@@ -39,9 +39,9 @@ def quality_task(tmp_path, recipe_run_id):
 @pytest.fixture
 def plot_data():
     datetimes_a = ["2021-01-01T01:01:01", "2021-01-01T02:01:01"]
-    values_a = [3, 4]
+    values_a = [0.1, 0.2]
     datetimes_b = ["2020-01-01T01:01:01", "2020-01-01T02:01:01"]
-    values_b = [1, 2]
+    values_b = [0.15, 0.25]
     return datetimes_a, values_a, datetimes_b, values_b
 
 
@@ -198,8 +198,9 @@ def test_store_ao_status_and_fried_parameter(quality_task, ao_values):
     """
     task = quality_task
     datetimes = ["2020-01-01T01:01:01", "2020-01-01T02:01:01"]
-    fried_values = [3.0, 4.0]
-    combined_values = [[ao, r0] for ao, r0 in zip(ao_values, fried_values)]
+    fried_values = [0.1, 0.2]
+    oob_values = [25, 50]
+    combined_values = [[ao, r0, oob] for ao, r0, oob in zip(ao_values, fried_values, oob_values)]
     task.quality_store_ao_status_and_fried_parameter(datetimes=datetimes, values=combined_values)
     path = list(task.read(tags=Tag.quality("AO_STATUS")))
     assert len(path) == 1
@@ -220,10 +221,11 @@ def test_store_ao_status_and_fried_parameter(quality_task, ao_values):
 @pytest.mark.parametrize(
     "combined_values",
     [
-        pytest.param([[True, 1], [None, 2]], id="AO_some_none"),
-        pytest.param([[True, 1], [True, None]], id="Fried_some_none"),
-        pytest.param([[None, 1], [None, 2]], id="AO_all_none"),
-        pytest.param([[True, None], [True, None]], id="Fried_all_none"),
+        pytest.param([[True, 0.1, 25], [None, 0.2, 25]], id="AO_some_none"),
+        pytest.param([[True, 0.1, 25], [True, None, 25]], id="Fried_some_none"),
+        pytest.param([[None, 0.1, 25], [None, 0.2, 25]], id="AO_all_none"),
+        pytest.param([[True, None, 25], [True, None, 25]], id="Fried_all_none"),
+        pytest.param([[True, 0.1, None], [True, 0.2, None]], id="Out_of_bounds_all_none"),
     ],
 )
 def test_store_ao_status_and_fried_parameter_with_nones(quality_task, combined_values):
@@ -231,13 +233,14 @@ def test_store_ao_status_and_fried_parameter_with_nones(quality_task, combined_v
     datetimes = ["2020-01-01T01:01:01", "2020-01-01T02:01:01"]
     task.quality_store_ao_status_and_fried_parameter(datetimes=datetimes, values=combined_values)
     path = list(task.read(tags=Tag.quality("AO_STATUS")))
-    ao_values = [ao for ao, r0 in combined_values]
-    fried_values = [r0 for ao, r0 in combined_values]
+    ao_values = [ao for ao, r0, oob in combined_values]
+    fried_values = [r0 for ao, r0, oob in combined_values]
+    ao_out_of_bounds = [oob for ao, r0, oob in combined_values]
     if not all(ao is None for ao in ao_values):
         assert len(path) == 1
         with path[0].open() as f:
             data = json.load(f)
-            assert len(data) == sum(1 for ao, r0 in combined_values if ao is not None)
+            assert len(data) == sum(1 for ao, r0, oob in combined_values if ao is not None)
     else:
         assert len(path) == 0
     path = list(task.read(tags=Tag.quality("FRIED_PARAMETER")))
@@ -246,7 +249,7 @@ def test_store_ao_status_and_fried_parameter_with_nones(quality_task, combined_v
         with path[0].open() as f:
             data = json.load(f)
             assert len(data["y_values"]) == sum(
-                1 for ao, r0 in combined_values if ao is True and r0 is not None
+                1 for ao, r0, oob in combined_values if ao is True and r0 is not None
             )
     else:
         assert len(path) == 0
@@ -263,7 +266,8 @@ def test_build_ao_status(quality_task, plot_data):
     datetimes = datetimes_a + datetimes_b
     fried_values = values_a + values_b
     ao_values = [False, True, True, True]
-    combined_values = [[ao, r0] for ao, r0 in zip(ao_values, fried_values)]
+    oob_values = [25, 50, None, 50]
+    combined_values = [[ao, r0, oob] for ao, r0, oob in zip(ao_values, fried_values, oob_values)]
     task.quality_store_ao_status_and_fried_parameter(datetimes=datetimes, values=combined_values)
     metric = task.quality_build_ao_status()
     assert metric["name"] == "Adaptive Optics Status"
@@ -284,9 +288,15 @@ def test_build_fried_parameter(quality_task, plot_data):
     task = quality_task
     datetimes_a, fried_values_a, datetimes_b, fried_values_b = plot_data
     ao_values_a = [True, True]
-    combined_values_a = [[ao, r0] for ao, r0 in zip(ao_values_a, fried_values_a)]
+    oob_values_a = [25, 50]
+    combined_values_a = [
+        [ao, r0, oob] for ao, r0, oob in zip(ao_values_a, fried_values_a, oob_values_a)
+    ]
     ao_values_b = [True, True]
-    combined_values_b = [[ao, r0] for ao, r0 in zip(ao_values_b, fried_values_b)]
+    oob_values_b = [25, 50]
+    combined_values_b = [
+        [ao, r0, oob] for ao, r0, oob in zip(ao_values_b, fried_values_b, oob_values_b)
+    ]
     task.quality_store_ao_status_and_fried_parameter(
         datetimes=datetimes_a, values=combined_values_a
     )
@@ -307,14 +317,14 @@ def test_build_fried_parameter(quality_task, plot_data):
             "2021-01-01T02:01:01",
         ]
     ]
-    assert metric["plot_data"]["series_data"][""][1] == [1, 2, 3, 4]
+    assert metric["plot_data"]["series_data"][""][1] == [0.15, 0.25, 0.1, 0.2]
     assert metric["name"] == "Fried Parameter"
     assert metric["metric_code"] == "FRIED_PARAMETER"
     assert metric["facet"] is None
     assert metric["warnings"] is None
     assert (
         metric["statement"]
-        == "Average valid Fried Parameter measurements for L1 dataset: 2.5 ± 1.12 m"
+        == "Average valid Fried Parameter measurements for L1 dataset: 0.18 ± 0.06 m"
     )
 
 
@@ -340,12 +350,12 @@ def test_build_light_level(quality_task, plot_data):
             "2021-01-01T02:01:01",
         ]
     ]
-    assert metric["plot_data"]["series_data"][""][1] == [1, 2, 3, 4]
+    assert metric["plot_data"]["series_data"][""][1] == [0.15, 0.25, 0.1, 0.2]
     assert metric["name"] == "Light Level"
     assert metric["metric_code"] == "LIGHT_LEVEL"
     assert metric["facet"] is None
     assert metric["warnings"] is None
-    assert metric["statement"] == f"Average Light Level for L1 dataset: 2.5 ± 1.12 adu"
+    assert metric["statement"] == f"Average Light Level for L1 dataset: 0.18 ± 0.06 adu"
 
 
 def test_build_frame_average(quality_task, plot_data):
@@ -461,7 +471,7 @@ def test_build_noise(quality_task, plot_data):
             "2021-01-01T02:01:01",
         ]
     ]
-    assert metric["plot_data"]["series_data"]["I"][1] == [1, 2, 3, 4]
+    assert metric["plot_data"]["series_data"]["I"][1] == [0.15, 0.25, 0.1, 0.2]
     assert metric["name"] == "Noise Estimation"
     assert metric["metric_code"] == "NOISE"
     assert metric["facet"] is None
@@ -493,7 +503,7 @@ def test_build_sensitivity(quality_task, plot_data):
             "2021-01-01T02:01:01",
         ]
     ]
-    assert metric["plot_data"]["series_data"]["I"][1] == [1, 2, 3, 4]
+    assert metric["plot_data"]["series_data"]["I"][1] == [0.15, 0.25, 0.1, 0.2]
     assert metric["name"] == f"Sensitivity"
     assert metric["metric_code"] == "SENSITIVITY"
     assert metric["facet"] is None
@@ -692,7 +702,7 @@ def test_build_report(quality_task, plot_data):
     task.quality_store_task_type_counts(task_type="dark", total_frames=100, frames_not_used=7)
     task.quality_store_task_type_counts(task_type="gain", total_frames=100, frames_not_used=0)
     task.quality_store_ao_status_and_fried_parameter(
-        datetimes=datetimes, values=[[True, values[0]], [True, values[1]]]
+        datetimes=datetimes, values=[[True, values[0], values[0]], [True, values[1], values[1]]]
     )
     task.quality_store_light_level(datetimes=datetimes, values=values)
     task.quality_store_frame_average(

dkist_processing_common/tests/test_transfer_input_data.py

@@ -5,10 +5,12 @@ from pathlib import Path
 import pytest
 
 from dkist_processing_common._util.scratch import WorkflowFileSystem
-from dkist_processing_common.codecs.json import json_decoder
+from dkist_processing_common.codecs.basemodel import basemodel_decoder
 from dkist_processing_common.models.graphql import InputDatasetRecipeRunResponse
+from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.tasks.transfer_input_data import TransferL0Data
+from dkist_processing_common.tests.conftest import create_input_frames
 from dkist_processing_common.tests.conftest import create_parameter_files
 from dkist_processing_common.tests.conftest import FakeGQLClient
 
@@ -18,7 +20,7 @@ class TransferL0DataTask(TransferL0Data):
         ...
 
 
-class FakeGQLClientMissingInputDatasetPart(FakeGQLClient):
+class FakeGQLClientMissingInputDatasetCalibrationPart(FakeGQLClient):
     """Same metadata mocker with calibration input dataset part missing."""
 
     def execute_gql_query(self, **kwargs):
@@ -53,103 +55,152 @@ def transfer_l0_data_task(recipe_run_id, tmp_path, mocker):
 
 
 @pytest.fixture
-def transfer_l0_data_task_missing_part(recipe_run_id, tmp_path, mocker):
+def transfer_l0_data_task_missing_calibration_part(recipe_run_id, tmp_path, mocker):
     yield from _transfer_l0_data_task_with_client(
-        recipe_run_id, tmp_path, mocker, FakeGQLClientMissingInputDatasetPart
+        recipe_run_id, tmp_path, mocker, FakeGQLClientMissingInputDatasetCalibrationPart
     )
 
 
-def test_download_dataset(transfer_l0_data_task):
+@pytest.mark.parametrize(
+    "expected_doc, tag",
+    [
+        pytest.param(
+            FakeGQLClient.observe_frames_doc_object,
+            Tag.input_dataset_observe_frames(),
+            id="observe_frames",
+        ),
+        pytest.param(
+            FakeGQLClient.calibration_frames_doc_object,
+            Tag.input_dataset_calibration_frames(),
+            id="calibration_frames",
+        ),
+        pytest.param(
+            FakeGQLClient.parameters_doc_object,
+            Tag.input_dataset_parameters(),
+            id="parameters",
+        ),
+    ],
+)
+def test_download_dataset(transfer_l0_data_task, expected_doc, tag):
     """
     :Given: a TransferL0Data task with a valid input dataset
     :When: downloading the dataset documents from the metadata store
-    :Then: the correct documents are written to disk
+    :Then: the correct documents are written to disk, along with tags for file parameters
     """
     # Given
     task = transfer_l0_data_task
     # When
     task.download_input_dataset()
     # Then
-    expected_observe_doc = FakeGQLClient.observe_frames_doc_object
-    observe_doc_from_file = next(
-        task.read(tags=Tag.input_dataset_observe_frames(), decoder=json_decoder)
-    )
-    assert observe_doc_from_file == expected_observe_doc
-    expected_calibration_doc = FakeGQLClient.calibration_frames_doc_object
-    calibration_doc_from_file = next(
-        task.read(tags=Tag.input_dataset_calibration_frames(), decoder=json_decoder)
-    )
-    assert calibration_doc_from_file == expected_calibration_doc
-    expected_parameters_doc = FakeGQLClient.parameters_doc_object
-    parameters_doc_from_file = next(
-        task.read(tags=Tag.input_dataset_parameters(), decoder=json_decoder)
+    doc_from_file = next(
+        task.read(tags=tag, decoder=basemodel_decoder, model=InputDatasetPartDocumentList)
     )
-    assert parameters_doc_from_file == expected_parameters_doc
+    doc_list_from_file = doc_from_file.model_dump()["doc_list"]
+    if (
+        tag == Tag.input_dataset_parameters()
+    ):  # parameter doc gets written with tags for file objects
+        for item in expected_doc:
+            for val in item["parameterValues"]:
+                if "__file__" in val["parameterValue"]:
+                    file_dict = json.loads(val["parameterValue"])["__file__"]
+                    file_dict["tag"] = Tag.parameter(Path(file_dict["objectKey"]).name)
+                    val["parameterValue"] = json.dumps({"__file__": file_dict})
+    assert doc_list_from_file == expected_doc
 
 
-def test_download_dataset_missing_part(transfer_l0_data_task_missing_part):
+def test_download_dataset_missing_part(transfer_l0_data_task_missing_calibration_part):
     """
     :Given: a TransferL0Data task with a valid input dataset without calibration frames
     :When: downloading the dataset documents from the metadata store
     :Then: the correct number of documents are written to disk
     """
     # Given
-    task = transfer_l0_data_task_missing_part
+    task = transfer_l0_data_task_missing_calibration_part
     # When
     task.download_input_dataset()
     # Then
     observe_doc_from_file = next(
-        task.read(tags=Tag.input_dataset_observe_frames(), decoder=json_decoder)
+        task.read(
+            tags=Tag.input_dataset_observe_frames(),
+            decoder=basemodel_decoder,
+            model=InputDatasetPartDocumentList,
+        )
     )
     parameters_doc_from_file = next(
-        task.read(tags=Tag.input_dataset_parameters(), decoder=json_decoder)
+        task.read(
+            tags=Tag.input_dataset_parameters(),
+            decoder=basemodel_decoder,
+            model=InputDatasetPartDocumentList,
+        )
     )
     with pytest.raises(StopIteration):
         calibration_doc_from_file = next(
-            task.read(tags=Tag.input_dataset_calibration_frames(), decoder=json_decoder)
+            task.read(
+                tags=Tag.input_dataset_calibration_frames(),
+                decoder=basemodel_decoder,
+                model=InputDatasetPartDocumentList,
+            )
         )
 
 
-def test_format_frame_transfer_items(transfer_l0_data_task):
+@pytest.mark.parametrize(
+    "task_name",
+    [
+        pytest.param(
+            "transfer_l0_data_task",
+            id="observe_and_calibration_frames",
+        ),
+        pytest.param(
+            "transfer_l0_data_task_missing_calibration_part",
+            id="calibration_frames_missing",
+        ),
+    ],
+)
+def test_build_frame_transfer_list_formatted(request, task_name):
     """
-    :Given: a TransferL0Data task with a downloaded input dataset
-    :When: formatting frames in the input dataset for transfer
-    :Then: the items are correctly loaded into GlobusTransferItem objects
+    :Given: a TransferL0Data task with downloaded input dataset docs
+    :When: building a list of frames in the input dataset formatted for transfer
+    :Then: the correct items are correctly loaded into GlobusTransferItem objects
     """
     # Given
-    task = transfer_l0_data_task
+    task = request.getfixturevalue(task_name)
     task.download_input_dataset()
     # When
-    transfer_items = task.format_frame_transfer_items()
+    observe_transfer_objects = task.build_transfer_list(doc_tag=Tag.input_dataset_observe_frames())
+    calibration_transfer_objects = task.build_transfer_list(
+        doc_tag=Tag.input_dataset_calibration_frames()
+    )
+    transfer_objects = observe_transfer_objects + calibration_transfer_objects
+    formatted_transfer_items = task.format_transfer_items(input_dataset_objects=transfer_objects)
     # Then
     source_filenames = []
     destination_filenames = []
-    all_frames = (
-        FakeGQLClient.observe_frames_doc_object + FakeGQLClient.calibration_frames_doc_object
-    )
-    for frame_set in all_frames:
+    expected_frames = list(FakeGQLClient.observe_frames_doc_object)
+    if "missing_calibration_part" not in task_name:
+        expected_frames += FakeGQLClient.calibration_frames_doc_object
+    for frame_set in expected_frames:
         for key in frame_set["object_keys"]:
             source_filenames.append(os.path.join("/", frame_set["bucket"], key))
             destination_filenames.append(Path(key).name)
-    assert len(transfer_items) == len(source_filenames)
-    for item in transfer_items:
+    assert len(formatted_transfer_items) == len(source_filenames)
+    for item in formatted_transfer_items:
         assert item.source_path.as_posix() in source_filenames
         assert item.destination_path.name in destination_filenames
         assert not item.recursive
 
 
-def test_format_parameter_file_transfer_items(transfer_l0_data_task):
+def test_build_parameter_file_transfer_items(transfer_l0_data_task):
     """
-    :Given: a TransferL0Data task with a downloaded input dataset
-    :When: formatting parameter files in the input dataset for transfer
-    :Then: the items are correctly loaded into GlobusTransferItem objects
+    :Given: a TransferL0Data task with downloaded input dataset docs
+    :When: building a list of parameter files formatted for transfer
+    :Then: the correct items are correctly loaded into GlobusTransferItem objects
     """
     # Given
     task = transfer_l0_data_task
     task.download_input_dataset()
-    create_parameter_files(task)
     # When
-    transfer_items = task.format_parameter_transfer_items()
+    transfer_objects = task.build_transfer_list(doc_tag=Tag.input_dataset_parameters())
+    formatted_transfer_items = task.format_transfer_items(input_dataset_objects=transfer_objects)
     # Then
     source_filenames = []
     destination_filenames = []
@@ -162,9 +213,44 @@ def test_format_parameter_file_transfer_items(transfer_l0_data_task):
                 object_key = value_dict["__file__"]["objectKey"]
                 source_filenames.append(os.path.join("/", bucket, object_key))
                 destination_filenames.append(Path(object_key).name)
-    assert len(transfer_items) == len(source_filenames)
-    for transfer_item in transfer_items:
+    assert len(formatted_transfer_items) == len(source_filenames)
+    for transfer_item in formatted_transfer_items:
         assert transfer_item.source_path.as_posix() in source_filenames
         assert transfer_item.destination_path.name in destination_filenames
         assert str(transfer_item.destination_path).startswith(str(task.scratch.workflow_base_path))
         assert not transfer_item.recursive
+
+
+def test_tag_transfer_items(transfer_l0_data_task):
+    """
+    :Given: a TransferL0Data task with downloaded input dataset frames and parameter files
+    :When: tagging the downloaded files
+    :Then: the downloaded items are correctly tagged
+    """
+    # Given
+    task = transfer_l0_data_task
+    task.download_input_dataset()
+    observe_transfer_objects = task.build_transfer_list(doc_tag=Tag.input_dataset_observe_frames())
+    calibration_transfer_objects = task.build_transfer_list(
+        doc_tag=Tag.input_dataset_calibration_frames()
+    )
+    frame_transfer_objects = observe_transfer_objects + calibration_transfer_objects
+    create_input_frames(task)
+    parameter_transfer_objects = task.build_transfer_list(doc_tag=Tag.input_dataset_parameters())
+    create_parameter_files(task)
+    # When
+    transfer_objects = frame_transfer_objects + parameter_transfer_objects
+    task.tag_transfer_objects(input_dataset_objects=transfer_objects)
+    # Then
+    input_tags = [Tag.input(), Tag.frame()]
+    input_frames_on_disk = list(task.scratch.find_all(tags=input_tags))
+    for obj in frame_transfer_objects:
+        destination_path = task.scratch.absolute_path(obj.object_key)
+        assert destination_path in input_frames_on_disk
+    assert len(input_frames_on_disk) == len(frame_transfer_objects)
+    for obj in parameter_transfer_objects:
+        destination_path = task.scratch.absolute_path(obj.object_key)
+        param_tag = Tag.parameter(Path(obj.object_key))
+        param_file_on_disk = list(task.scratch.find_all(tags=param_tag))
+        assert destination_path in param_file_on_disk
+        assert len(param_file_on_disk) == 1

dkist_processing_common/tests/test_write_l1.py

@@ -25,7 +25,7 @@ from dkist_processing_common.tasks.write_l1 import WriteL1Frame
 from dkist_processing_common.tests.conftest import FakeGQLClient
 from dkist_processing_common.tests.conftest import TILE_SIZE
 from dkist_processing_common.tests.test_transfer_input_data import (
-    FakeGQLClientMissingInputDatasetPart,
+    FakeGQLClientMissingInputDatasetCalibrationPart,
 )
 
 
@@ -201,9 +201,32 @@ def write_l1_task_with_empty_waveband(recipe_run_id, tmp_path, request):
 @pytest.fixture(
     scope="function",
     params=[
-        pytest.param({"AO_LOCK": True}, id="AO_LOCK_True"),
-        pytest.param({"AO_LOCK": False}, id="AO_LOCK_False"),
-        pytest.param({}, id="AO_LOCK_missing"),
+        pytest.param(
+            {"AO_LOCK": True, "ATMOS_R0": 0.2, "OOBSHIFT": 17}, id="AO_LOCK_True_good_R0_good_oob"
+        ),
+        pytest.param(
+            {"AO_LOCK": True, "ATMOS_R0": 1, "OOBSHIFT": 17}, id="AO_LOCK_True_bad_R0_good_oob"
+        ),
+        pytest.param(
+            {"AO_LOCK": False, "ATMOS_R0": 0.2, "OOBSHIFT": 17}, id="AO_LOCK_False_good_R0_good_oob"
+        ),
+        pytest.param(
+            {"AO_LOCK": False, "ATMOS_R0": 1, "OOBSHIFT": 17}, id="AO_LOCK_False_bad_R0_good_oob"
+        ),
+        pytest.param(
+            {"AO_LOCK": True, "ATMOS_R0": 0.2, "OOBSHIFT": 150}, id="AO_LOCK_True_good_R0_bad_oob"
+        ),
+        pytest.param(
+            {"AO_LOCK": True, "ATMOS_R0": 1, "OOBSHIFT": 150}, id="AO_LOCK_True_bad_R0_bad_oob"
+        ),
+        pytest.param(
+            {"AO_LOCK": False, "ATMOS_R0": 0.2, "OOBSHIFT": 150}, id="AO_LOCK_False_good_R0_bad_oob"
+        ),
+        pytest.param(
+            {"AO_LOCK": False, "ATMOS_R0": 1, "OOBSHIFT": 150}, id="AO_LOCK_False_bad_R0_bad_oob"
+        ),
+        pytest.param({"ATMOS_R0": 0.2, "OOBSHIFT": 17}, id="AO_LOCK_missing"),
+        pytest.param({"ATMOS_R0": 0.2, "AO_LOCK": True}, id="OOBSHIFT_missing"),
     ],
 )
 def write_l1_task_no_data(request, recipe_run_id, tmp_path, complete_common_header):
@@ -216,10 +239,10 @@ def write_l1_task_no_data(request, recipe_run_id, tmp_path, complete_common_head
     ):
         task.scratch = WorkflowFileSystem(recipe_run_id=recipe_run_id, scratch_base_path=tmp_path)
         header = complete_common_header
-        header.pop("AO_LOCK", None)  # If it's not required, shouldn't be here in the first place??
+        header.pop("AO_LOCK", None)
+        header.pop("ATMOS_R0", None)
+        header.pop("OOBSHIFT", None)
         header.update(request.param)
-        fried_parameter = 0.2
-        header["ATMOS_R0"] = fried_parameter
         hdu = fits.PrimaryHDU(data=np.random.random(size=(1, 1, 1)) * 1, header=header)
         hdul = fits.HDUList([hdu])
         task.write(
@@ -231,7 +254,9 @@ def write_l1_task_no_data(request, recipe_run_id, tmp_path, complete_common_head
             encoder=fits_hdulist_encoder,
         )
         task.constants._update(asdict(FakeConstantDb()))
-        yield task, header, fried_parameter
+        fried_parameter = request.param["ATMOS_R0"]
+        oob_shift = request.param.get("OOBSHIFT")
+        yield task, header, fried_parameter, oob_shift
         task._purge()
 
 
@@ -547,7 +572,7 @@ def test_missing_input_dataset_part(write_l1_task, mocker):
     """
     mocker.patch(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient",
-        new=FakeGQLClientMissingInputDatasetPart,
+        new=FakeGQLClientMissingInputDatasetCalibrationPart,
     )
     task, _, _ = write_l1_task
     task()
@@ -650,7 +675,7 @@ def test_check_r0_ao_lock(write_l1_task_no_data):
     :When: writing, check if the AO lock is on
     :Then: write the r0 value if AO lock on, don't write if AO lock off
     """
-    task, header, r0 = write_l1_task_no_data
+    task, header, r0, _ = write_l1_task_no_data
     header_after_check = task.remove_invalid_r0_values(header=header)
     if header.get("AO_LOCK"):
         assert header_after_check["ATMOS_R0"] == header["ATMOS_R0"]

{dkist_processing_common-10.8.2.dist-info → dkist_processing_common-10.8.4rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 10.8.2
+Version: 10.8.4rc1
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause

{dkist_processing_common-10.8.2.dist-info → dkist_processing_common-10.8.4rc1.dist-info}/RECORD

@@ -1,16 +1,21 @@
 changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+changelog/235.feature.rst,sha256=F27MUnNkqjcmlmRQ6NQUi2wd5M9dOjN2jZ70TV95Y20,365
+changelog/235.misc.1.rst,sha256=kQujVYRa_axHQSRFxW3SNPNMgEL-YgtnyLud-aJljL8,234
+changelog/235.misc.rst,sha256=ooK2tbA5EEFyYNZLLvgYiMZ-Eza5UzPHN9MvpuX-cu4,92
 dkist_processing_common/__init__.py,sha256=490Fwm_GgqpwriQlsYfKcLUZNhZ6GkINtJqcYSIEKoU,319
 dkist_processing_common/config.py,sha256=IcpaD_NvHZU-aLlUNOTdRC4V7ADIvVQwrZ2dHhIr4NY,4247
-dkist_processing_common/manual.py,sha256=IH72QxdGlr-BuWq2EDrfC9yStegO-elUWrobQqT4710,7042
+dkist_processing_common/manual.py,sha256=M7FW1viESaTfK1jLqHLp7JMGTGeoTxHtgCXRjZpDR8g,6990
 dkist_processing_common/_util/__init__.py,sha256=xf6JNpMKQgbhE2Jivymt-WO0WF6PpGt9rl604YpuTWk,92
 dkist_processing_common/_util/constants.py,sha256=b0zlRaT09aGj2RU72OQ5J-8u6Z_RevPXtcyx5tlnf-Y,3244
 dkist_processing_common/_util/graphql.py,sha256=qjsvLWDHqb1X7hDLA8uqbpOIDjZZ2mjsSIL0Wkt1TJc,3420
 dkist_processing_common/_util/scratch.py,sha256=4X5K260ffBHWvyVfP0SCk_-QTWEcTougB7qu9TdF7LM,10364
 dkist_processing_common/_util/tags.py,sha256=8r62_-x3xpbCoCu5dd09Q2u-OYzYiML6SlPUf9LXCEw,6220
 dkist_processing_common/codecs/__init__.py,sha256=du1iitvsudSSOMENSywXmXSLOlvIocJsPbvfEcyqFNc,159
+dkist_processing_common/codecs/array.py,sha256=GeIB6mTMZuQK4Jxn2tGmMmYgA-bLik2SAlWopRZhEO8,575
 dkist_processing_common/codecs/asdf.py,sha256=2GHCFOZk1j-ml4EolXac_sUzk7aPYJUGqKYxZk4mG_c,1046
+dkist_processing_common/codecs/basemodel.py,sha256=6w7OjsPLdsmY_tiwveBmDthYW3WLtAWqM3hjrQa5UhA,814
 dkist_processing_common/codecs/bytes.py,sha256=tiVEUu_Gzc5NfW1_qsJtHDlYAZzgIqA7f4cfAwN734k,495
-dkist_processing_common/codecs/fits.py,sha256=0D6tDvt13OhVXok4tS8VGHdd8OSV8DrRet8VCD6Zt3g,2346
+dkist_processing_common/codecs/fits.py,sha256=AxS3AKjB22JZl9sSk2A5JI7-Yyb9dOXw84bTpYqbPoQ,2585
 dkist_processing_common/codecs/iobase.py,sha256=r0ImN0CxfjAnfMflNv7w2pGDp2i6EQg0p2OaEkE82pk,977
 dkist_processing_common/codecs/json.py,sha256=OWXzoFWccJiojkiKSeDrMdL9f7EpdNIOMvO9YBBg-Yg,939
 dkist_processing_common/codecs/path.py,sha256=LU5Kh1ew2PQI9hcpzbnZkE47k-zAMZDDV4cgqHRcDkY,197
@@ -22,11 +27,13 @@ dkist_processing_common/models/__init__.py,sha256=6LMqemdzVZ87fRrpAsbEnTtWZ02_Gu
 dkist_processing_common/models/constants.py,sha256=1Eb8RDeuCr6brl237iGKxYLWCH49I6bOUEj_Tv-zFbQ,5441
 dkist_processing_common/models/fits_access.py,sha256=Au9JROwhVla9zb_u0dN8mIWiSJd_Pca0oOr4N1hN0HY,4113
 dkist_processing_common/models/flower_pot.py,sha256=59C5uGYKyMyncqQYxhzDZWl8k1DRZFB6s9RF-HFp9mY,5128
-dkist_processing_common/models/graphql.py,sha256=t2PYEjEwSq08zq0HcVH2RG5FX4PVXgs4BdM2gunJ8fs,4747
+dkist_processing_common/models/fried_parameter.py,sha256=ro_H2Eo3I88lRf1wJjZfTc_XOjhgLt4whIQR_sjAFbM,1609
+dkist_processing_common/models/graphql.py,sha256=BBJBIBADAPQAskqS8Qh58DYEyFjY9GY9ZN8nrJ1EKHs,5364
+dkist_processing_common/models/input_dataset.py,sha256=OZDxyjHZfFrksFGpas1gsB14Q77CeNsk_nI-EYo3ZRI,4121
 dkist_processing_common/models/message.py,sha256=DRW7Qhl01dF5KagcqLta5U-uzdOMewrsHvMatDT6jnk,1684
 dkist_processing_common/models/message_queue_binding.py,sha256=ROQ2ZQE3TCr4gVbz4WggvUSExAiWP8SD_GjjQl482M8,1012
 dkist_processing_common/models/metric_code.py,sha256=McXAEF1Sa0_YlR1niXYLJWLFHhdLQhmYw9Xtpr5FGws,815
-dkist_processing_common/models/parameters.py,sha256=Ymx-wvPVMkXg5emhOivv7NG0QsAt98If4KotopLIRrw,7736
+dkist_processing_common/models/parameters.py,sha256=dTup7mPTEmySXP0O3j4sPPY8Jqe2zf-3sr2hjeMatEY,9649
 dkist_processing_common/models/quality.py,sha256=ONz1A6_qyEoZhQkVp9LChAgm93aGt1O5WSRneE3XCCA,2319
 dkist_processing_common/models/tags.py,sha256=ykOYqWMU7_ffvRCv84-avjXyty9pHBo7EXwsjIjStjs,12058
 dkist_processing_common/models/task_name.py,sha256=NL0n92A9vVYBV-yvh8d-qFOCxVy0X2GECDmLgIzrmOY,565
@@ -40,7 +47,7 @@ dkist_processing_common/parsers/l0_fits_access.py,sha256=mhgezAA0X5zvgEmZFPIgKYp
 dkist_processing_common/parsers/l1_fits_access.py,sha256=o0_7XfcCcuKpuN8K0E_dfEnPvB1a9VxqKBaxpRGDOL0,2595
 dkist_processing_common/parsers/near_bud.py,sha256=gLTr7EILVCREAhmE0VaU7-KKc7aosoMmZmQtJEXxs2I,3733
 dkist_processing_common/parsers/proposal_id_bud.py,sha256=61uRxT538UDiEg3_By_asSzQ96xkAuCEEZZTrk0UF0E,677
-dkist_processing_common/parsers/quality.py,sha256=5f6Go-xf3kcmQyZ4NCcwRNG7OwQFATCp1YvYJtJBOh0,1058
+dkist_processing_common/parsers/quality.py,sha256=Lg5z53kAvJuw-lPrX9HSkkFi0Bk0D5oDv8TAIgbLOMo,1140
 dkist_processing_common/parsers/retarder.py,sha256=OzhdC8VoV2zdcvq8Nn5Ghc-Q3BFfMRITLx5jMHrWNqI,1440
 dkist_processing_common/parsers/single_value_single_key_flower.py,sha256=cQX_C_Ms6EIOCW5TTDo6PnLoJ6In6MQTShKdMvt57OU,1230
 dkist_processing_common/parsers/task.py,sha256=RTNGSg3BUpEYLOcolN79Wc16s86FqRcDP-H7Hj9ovGg,3938
@@ -53,41 +60,41 @@ dkist_processing_common/tasks/base.py,sha256=k_IJR5sVV6ennX0sbeb0C6dciqshdY7CKjt
 dkist_processing_common/tasks/l1_output_data.py,sha256=IM-nvGaTM5r-z-9vHr2wovPVUpuNCah-cWIFMO2fcII,10576
 dkist_processing_common/tasks/output_data_base.py,sha256=CC1TnCrChi8_iuMymr425CJqpY4jCggnVUMfqzFkpnw,3682
 dkist_processing_common/tasks/parse_l0_input_data.py,sha256=iRMGdvhxBobNsTDQ0IEl0myDfB4P_xpxA00guuBWDj8,7986
-dkist_processing_common/tasks/quality_metrics.py,sha256=g6MUq8s8jELDinkn6o45rfONyODw92JyVMrzb7Dd7OI,12458
+dkist_processing_common/tasks/quality_metrics.py,sha256=dWuPKBD5elRCZEs4ZC91tyXxkuPUwMuvy9OoGU9Zs04,12489
 dkist_processing_common/tasks/teardown.py,sha256=e4LKnphJDYDVDAez2tH7MxpZgCmxYsKrq9Zk0qAkzzM,2355
-dkist_processing_common/tasks/transfer_input_data.py,sha256=afEW0glpCFMZRj90nFtQo_4XOQ4CuoOh86jahP6a-a0,5548
+dkist_processing_common/tasks/transfer_input_data.py,sha256=8dDOfnT46qavGW-6fy-FT9LVb0TXANSpk1WpACpWK70,5787
 dkist_processing_common/tasks/trial_catalog.py,sha256=Y3DKstRfMS8nWWtJFMB0MUVPlZ1jWS_2jhJGMWwxy50,8748
 dkist_processing_common/tasks/trial_output_data.py,sha256=aI_aRuu0qVO8zFGrr_9baxx9i3jUEHZSmsmbO6ytlkE,6960
-dkist_processing_common/tasks/write_l1.py,sha256=vwNJs8gSzc0RPIfcpZ267L6pIJWdbPQ8ZmKR6hX1BIs,23498
+dkist_processing_common/tasks/write_l1.py,sha256=EBQEViaLG2MzWsXOvNi8tsVsgzVJXBrLSGmYtsVgSlo,23781
 dkist_processing_common/tasks/mixin/__init__.py,sha256=-g-DQbU7m1bclJYuFe3Yh757V-35GIDTbstardKQ7nU,68
 dkist_processing_common/tasks/mixin/globus.py,sha256=QAV8VElxMAqxJ2KSB_bJaraceovYfjHXjOdocrTCkIA,6592
-dkist_processing_common/tasks/mixin/input_dataset.py,sha256=dkW5vf_QPgWedHO_Lf9GjBxr1QrUCKs6gIXufUTi7GE,6813
 dkist_processing_common/tasks/mixin/interservice_bus.py,sha256=I7BUh0o8AEX-FZv7gxCts6is0uq9lycWjtTB2KqwBrU,1080
-dkist_processing_common/tasks/mixin/metadata_store.py,sha256=dMwjlhBI89xX0Pagub2Bk09z0fToipFN51DwyQEIHbk,11510
+dkist_processing_common/tasks/mixin/metadata_store.py,sha256=yTKijpQ-tNx_H2V_9HsZjMzkrzBDSQaSKkySV6VnnOM,11618
 dkist_processing_common/tasks/mixin/object_store.py,sha256=Vn4l2XuCimii9Fc3gM-pQGIkTKMv_ldqljlxkLesZLU,3236
 dkist_processing_common/tasks/mixin/quality/__init__.py,sha256=Bgu-DHW7yXLiehglldOCWluEkAP5qh0Hp1F30rh5NFw,383
 dkist_processing_common/tasks/mixin/quality/_base.py,sha256=nZ9IC-O-hsLXa5-tk29B13CZyQIdhJCv0eO9cdkAhWc,8303
-dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=WenTfa12guIUfm0GzkrK2gduKaOHs03e6RhE6j37Les,54304
+dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=lkHU6SeWeMfzf0QPM28_K9znllKx6rK91v1TiQ7vYfw,54556
 dkist_processing_common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkist_processing_common/tests/conftest.py,sha256=h_ObhpXb1S0-db0Je8XoHNLkrXxXW_0B0TMhbnbDjMo,30160
+dkist_processing_common/tests/conftest.py,sha256=Rz1r2_by8aRZslSkS4AduEtpu3cpPxsAonZQyUCBPSQ,30867
 dkist_processing_common/tests/test_assemble_movie.py,sha256=XY_ruXSYP5k6s2gUAwlFdnhJ81eyWLSd2O9IkX4RXeo,4165
 dkist_processing_common/tests/test_assemble_quality.py,sha256=fWSHK4UdVqgNjvxQuD40NBUnXrtmthUP7PUbISPV4MQ,16897
 dkist_processing_common/tests/test_base.py,sha256=4ST3__jEHitEQaQs9-0OcqtyEJfIjZsk_6PRYZFV2-U,7124
-dkist_processing_common/tests/test_codecs.py,sha256=9Ln8FJs319rbHpCukO9lKLk3aDrdyDREjA4nCHsxDCA,20796
+dkist_processing_common/tests/test_codecs.py,sha256=FGhldrTdc28YD9FKrsW3lZ34LtvzecGP1qNi9fGHVGQ,22173
 dkist_processing_common/tests/test_constants.py,sha256=Kc9k5TdYy5QkRRlGav6kfI2dy5HHKqtpf9qOuaAfDZU,5903
 dkist_processing_common/tests/test_cs_step.py,sha256=RA0QD3D8eaL3YSOL_gIJ9wkngy14RQ2jbD-05KAziW4,2408
 dkist_processing_common/tests/test_fits_access.py,sha256=tyUPNbUqoTPhQgzua_doWP9l9ee4ir_LLV-I9rHktcs,11393
 dkist_processing_common/tests/test_flower_pot.py,sha256=X9_UI3maa3ZQncV3jYHgovWnawDsdEkEB5vw6EAB96o,3151
-dkist_processing_common/tests/test_input_dataset.py,sha256=AI5uqaDea4kOwpwAU5qQdzUbxMpBwD20YCAvB7nzD5o,18766
+dkist_processing_common/tests/test_fried_parameter.py,sha256=iXtlQIifZ6cDOkEi-YDgP3oAlss2loq08Uohgvy1byQ,1295
+dkist_processing_common/tests/test_input_dataset.py,sha256=pQ01rWAkQ2XQojyHWzAqeOdrMXshNcgEVL5I_9bBTdo,9610
 dkist_processing_common/tests/test_interservice_bus.py,sha256=M_iv2CLmx5TnCB1VUN4YjkQ2LEUjfCKk7-ZlkV62XEQ,3000
 dkist_processing_common/tests/test_interservice_bus_mixin.py,sha256=8TTl0aypkq5gBPeyqSaQHbz_jmt5RmSD2oI8kT4Q1ZA,4195
 dkist_processing_common/tests/test_manual_processing.py,sha256=wAZJztsF33jzJE3m3vJ6cJT0ujgIkMg01jGq-Ys_a4c,1045
 dkist_processing_common/tests/test_output_data_base.py,sha256=Y9MFz5xw11tAnKjpHH7qrzsRYP1rZM_Trt4AylY0S6k,3120
-dkist_processing_common/tests/test_parameters.py,sha256=Tr0Wu8-_rj9Lp7CkUVmJjSouW7CAL_ZwhShK_U1GzVs,12384
+dkist_processing_common/tests/test_parameters.py,sha256=kNzX89vfrNRJ8d9rusMVv4DM9rPD3l-7HIstZsLoYBE,14033
 dkist_processing_common/tests/test_parse_l0_input_data.py,sha256=SMNV1qyQTvnMx94MCNsiA-RyS9uxaxIABEDDxsuVzqY,10629
 dkist_processing_common/tests/test_publish_catalog_messages.py,sha256=wB2lcAnT77yVnqO0cFWOPxGf-tZ8U62kvvpiB5roBwQ,3268
 dkist_processing_common/tests/test_quality.py,sha256=vomy2YSPadKqJj2tG8sCs-UkQVvfKus7Cum7_Hpee4I,10257
-dkist_processing_common/tests/test_quality_mixin.py,sha256=dLMJFK8V-KQyitdwnbNON7GEyghp6Wq2EszOsIM-uZ4,46538
+dkist_processing_common/tests/test_quality_mixin.py,sha256=hliXew6Sq7R166B2WZf022LyMKDio5G8jvkebHTm4ok,47067
 dkist_processing_common/tests/test_scratch.py,sha256=7f28FMiSskSNX-bkRSrpJf2u1HQIbSvYajbjkeGMF9s,16481
 dkist_processing_common/tests/test_stems.py,sha256=DRTfSVC1bVJ8mD9E9eR1W5lUHXBR2uBNkYBcWnVlA5E,28471
 dkist_processing_common/tests/test_submit_dataset_metadata.py,sha256=F1IKBFWhjjMhONxEgs5p-cpjbQwxh7BLhDFw9b6j874,3806
@@ -95,12 +102,12 @@ dkist_processing_common/tests/test_tags.py,sha256=UwlOJ45rkvbfbd5L5m5YltvOxQc8kG
 dkist_processing_common/tests/test_task_name.py,sha256=kqFr59XX2K87xzfTlClzDV4-Je1dx72LvdaJ22UE8UU,1233
 dkist_processing_common/tests/test_task_parsing.py,sha256=QXt1X6DTO3_liBD2c-t84DToLeEn7B3J-eteIyN4HEM,4027
 dkist_processing_common/tests/test_teardown.py,sha256=w2sATQHkg2lMLvm6VFZF1mNGFYHwWj_SxvF9RQu-tuY,5362
-dkist_processing_common/tests/test_transfer_input_data.py,sha256=kE-FQTcN9nft5bh2Rhtp-8ldCTvGXTvWFcsNm6DY7lk,6619
+dkist_processing_common/tests/test_transfer_input_data.py,sha256=B-kDsGJTUxxnamN4xjn69TFiY_TEN8MmhHNndP6bKac,10301
 dkist_processing_common/tests/test_transfer_l1_output_data.py,sha256=27PifkyH3RZg0nsM-AjmrFJ-hbYuCk5Tt_0Zx8PJBfM,2109
 dkist_processing_common/tests/test_trial_catalog.py,sha256=SZ-nyn0MXU9Lkg_94FbKER_cwiGoi06GYlzF_3AmvKg,6802
 dkist_processing_common/tests/test_trial_output_data.py,sha256=cBCj0kXyF5NEMzKh6zPVksdoXyE8ju1opJgWgjdcJWA,12790
 dkist_processing_common/tests/test_workflow_task_base.py,sha256=Z5aPW5LQtS0UWJiYho4X0r-2gPLfzpkmMwfmaoFLjMg,10517
-dkist_processing_common/tests/test_write_l1.py,sha256=ahAdMg3QhE-gnV_UMhL_xne-H5nHHDVMOWrP1vonIQ0,25962
+dkist_processing_common/tests/test_write_l1.py,sha256=TKRSx1qX9shFlafP5H0tHy5ouIVzFLU0AMJOjViNygQ,27077
 docs/Makefile,sha256=qnlVz6PuBqE39NfHWuUnHhNEA-EFgT2-WJNNNy9ttfk,4598
 docs/changelog.rst,sha256=S2jPASsWlQxSlAPqdvNrYvhk9k3FcFWNXFNDYXBSjl4,120
 docs/conf.py,sha256=FkX575cqTqZGCcLAjg2MlvE8Buj1Vt3CpHNgZxG256E,1890
@@ -109,7 +116,7 @@ docs/landing_page.rst,sha256=aPAuXFhBx73lEZ59B6E6JXxkK0LlxzD0n-HXqHrfumQ,746
 docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
 docs/requirements.txt,sha256=Kbl_X4c7RQZw035YTeNB63We6I7pvXFU4T0Uflp2yDY,29
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_common-10.8.2.dist-info/METADATA,sha256=8bbHCAylpH-0Ux_TMjUDNRySAFXKZHStbLWMYaQSKF8,7147
-dkist_processing_common-10.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_common-10.8.2.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
-dkist_processing_common-10.8.2.dist-info/RECORD,,
+dkist_processing_common-10.8.4rc1.dist-info/METADATA,sha256=mvmjsxz0nAMy1AaYE1etUD0u3QXFz4R2D3zaZca8csY,7150
+dkist_processing_common-10.8.4rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_common-10.8.4rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
+dkist_processing_common-10.8.4rc1.dist-info/RECORD,,