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

dkist_processing_common/tests/test_transfer_input_data.py

@@ -5,12 +5,10 @@ from pathlib import Path
 import pytest
 
 from dkist_processing_common._util.scratch import WorkflowFileSystem
-from dkist_processing_common.codecs.basemodel import basemodel_decoder
+from dkist_processing_common.codecs.json import json_decoder
 from dkist_processing_common.models.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
 
@@ -20,7 +18,7 @@ class TransferL0DataTask(TransferL0Data):
         ...
 
 
-class FakeGQLClientMissingInputDatasetCalibrationPart(FakeGQLClient):
+class FakeGQLClientMissingInputDatasetPart(FakeGQLClient):
     """Same metadata mocker with calibration input dataset part missing."""
 
     def execute_gql_query(self, **kwargs):
@@ -55,152 +53,103 @@ def transfer_l0_data_task(recipe_run_id, tmp_path, mocker):
 
 
 @pytest.fixture
-def transfer_l0_data_task_missing_calibration_part(recipe_run_id, tmp_path, mocker):
+def transfer_l0_data_task_missing_part(recipe_run_id, tmp_path, mocker):
     yield from _transfer_l0_data_task_with_client(
-        recipe_run_id, tmp_path, mocker, FakeGQLClientMissingInputDatasetCalibrationPart
+        recipe_run_id, tmp_path, mocker, FakeGQLClientMissingInputDatasetPart
     )
 
 
-@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):
+def test_download_dataset(transfer_l0_data_task):
     """
     :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, along with tags for file parameters
+    :Then: the correct documents are written to disk
     """
     # Given
     task = transfer_l0_data_task
     # When
     task.download_input_dataset()
     # Then
-    doc_from_file = next(
-        task.read(tags=tag, decoder=basemodel_decoder, model=InputDatasetPartDocumentList)
+    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_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
+    assert parameters_doc_from_file == expected_parameters_doc
 
 
-def test_download_dataset_missing_part(transfer_l0_data_task_missing_calibration_part):
+def test_download_dataset_missing_part(transfer_l0_data_task_missing_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_calibration_part
+    task = transfer_l0_data_task_missing_part
     # When
     task.download_input_dataset()
     # Then
     observe_doc_from_file = next(
-        task.read(
-            tags=Tag.input_dataset_observe_frames(),
-            decoder=basemodel_decoder,
-            model=InputDatasetPartDocumentList,
-        )
+        task.read(tags=Tag.input_dataset_observe_frames(), decoder=json_decoder)
     )
     parameters_doc_from_file = next(
-        task.read(
-            tags=Tag.input_dataset_parameters(),
-            decoder=basemodel_decoder,
-            model=InputDatasetPartDocumentList,
-        )
+        task.read(tags=Tag.input_dataset_parameters(), decoder=json_decoder)
     )
     with pytest.raises(StopIteration):
         calibration_doc_from_file = next(
-            task.read(
-                tags=Tag.input_dataset_calibration_frames(),
-                decoder=basemodel_decoder,
-                model=InputDatasetPartDocumentList,
-            )
+            task.read(tags=Tag.input_dataset_calibration_frames(), decoder=json_decoder)
         )
 
 
-@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):
+def test_format_frame_transfer_items(transfer_l0_data_task):
     """
-    :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: 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
-    task = request.getfixturevalue(task_name)
+    task = transfer_l0_data_task
     task.download_input_dataset()
     # When
-    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)
+    transfer_items = task.format_frame_transfer_items()
     # Then
     source_filenames = []
     destination_filenames = []
-    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:
+    all_frames = (
+        FakeGQLClient.observe_frames_doc_object + FakeGQLClient.calibration_frames_doc_object
+    )
+    for frame_set in all_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(formatted_transfer_items) == len(source_filenames)
-    for item in formatted_transfer_items:
+    assert len(transfer_items) == len(source_filenames)
+    for item in 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_build_parameter_file_transfer_items(transfer_l0_data_task):
+def test_format_parameter_file_transfer_items(transfer_l0_data_task):
     """
-    :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: 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
     task = transfer_l0_data_task
     task.download_input_dataset()
+    create_parameter_files(task)
     # When
-    transfer_objects = task.build_transfer_list(doc_tag=Tag.input_dataset_parameters())
-    formatted_transfer_items = task.format_transfer_items(input_dataset_objects=transfer_objects)
+    transfer_items = task.format_parameter_transfer_items()
     # Then
     source_filenames = []
     destination_filenames = []
@@ -213,44 +162,9 @@ def test_build_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(formatted_transfer_items) == len(source_filenames)
-    for transfer_item in formatted_transfer_items:
+    assert len(transfer_items) == len(source_filenames)
+    for transfer_item in 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 (
-    FakeGQLClientMissingInputDatasetCalibrationPart,
+    FakeGQLClientMissingInputDatasetPart,
 )
 
 
@@ -101,6 +101,12 @@ class CompleteWriteL1Frame(WriteL1Frame):
         return WavelengthRange(min=1075.0 * u.nm, max=1085.0 * u.nm)
 
 
+class CompleteWriteL1FrameWithEmptyWaveband(CompleteWriteL1Frame):
+    def get_wavelength_range(self, header: fits.Header) -> WavelengthRange:
+        # Return an empty range to test the empty waveband case
+        return WavelengthRange(min=10000.0 * u.nm, max=10050.0 * u.nm)
+
+
 @dataclass
 class FakeConstantDb:
     INSTRUMENT: str = "TEST"
@@ -154,6 +160,44 @@ def write_l1_task(request, recipe_run_id, tmp_path):
         task._purge()
 
 
+@pytest.fixture(
+    scope="function",
+    params=[
+        pytest.param((1, "complete_common_header"), id="Intensity"),
+        pytest.param((4, "complete_polarimetric_header"), id="Polarimetric"),
+    ],
+)
+def write_l1_task_with_empty_waveband(recipe_run_id, tmp_path, request):
+    with CompleteWriteL1FrameWithEmptyWaveband(
+        recipe_run_id=recipe_run_id,
+        workflow_name="workflow_name",
+        workflow_version="workflow_version",
+    ) as task:
+        task.scratch = WorkflowFileSystem(recipe_run_id=recipe_run_id, scratch_base_path=tmp_path)
+        num_of_stokes_params, header_fixture_name = request.param
+        header = request.getfixturevalue(header_fixture_name)
+        stokes_params = ["I", "Q", "U", "V"]
+        used_stokes_params = []
+        hdu = fits.PrimaryHDU(data=np.random.random(size=(1, 128, 128)) * 10, header=header)
+        hdu.header["IPTASK"] = "level0_only key to be removed"
+        hdul = fits.HDUList([hdu])
+        for i in range(num_of_stokes_params):
+            task.write(
+                data=hdul,
+                tags=[
+                    Tag.calibrated(),
+                    Tag.frame(),
+                    Tag.stokes(stokes_params[i]),
+                    Tag.dsps_repeat(i),
+                ],
+                encoder=fits_hdulist_encoder,
+            )
+            used_stokes_params.append(stokes_params[i])
+        task.constants._update(asdict(FakeConstantDb()))
+        yield task, used_stokes_params, header
+        task._purge()
+
+
 @pytest.fixture(
     scope="function",
     params=[
@@ -503,7 +547,7 @@ def test_missing_input_dataset_part(write_l1_task, mocker):
     """
     mocker.patch(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient",
-        new=FakeGQLClientMissingInputDatasetCalibrationPart,
+        new=FakeGQLClientMissingInputDatasetPart,
     )
     task, _, _ = write_l1_task
     task()
@@ -616,3 +660,67 @@ def test_check_r0_ao_lock(write_l1_task_no_data):
         with pytest.raises(KeyError, match="Keyword 'ATMOS_R0' not found"):
             invalid_r0 = header_after_check["ATMOS_R0"]
         assert header.get("AO_LOCK") != True
+
+
+@pytest.mark.parametrize(
+    "wavelength, wavemin, wavemax, expected",
+    [
+        pytest.param(
+            617,
+            615,
+            619,
+            "Fe I (617.33 nm)",
+            id="line_is_between_wavemin_and_wavemax_and_exists",
+        ),
+        pytest.param(
+            700,
+            698,
+            702,
+            None,
+            id="line_is_between_wavemin_and_wavemax_and_does_not_exist",
+        ),
+        pytest.param(
+            617,
+            698,
+            702,
+            None,
+            id="line_is_not_between_wavemin_and_wavemax_and_exists",
+        ),
+    ],
+)
+def test_get_waveband(write_l1_task, wavelength, wavemin, wavemax, expected):
+    """
+    :Given: an input wavelength contribution
+    :When: determining the waveband
+    :Then: the correct waveband is returned
+    """
+    wavelength_range = WavelengthRange(min=wavemin * u.nm, max=wavemax * u.nm)
+    task, _, _ = write_l1_task
+    waveband = task.get_waveband(wavelength=wavelength * u.nm, wavelength_range=wavelength_range)
+    assert waveband == expected
+
+
+def test_empty_waveband(write_l1_task_with_empty_waveband, mocker):
+    """
+    :Given: a header converted to SPEC 214 L1 and a wavelength range that has no listed spectral lines
+    :When: checking the waveband key
+    :Then: it does not exist
+    """
+    mocker.patch(
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+    )
+    mocker.patch(
+        "dkist_processing_common.tasks.write_l1.WriteL1Frame.version_from_module_name",
+        new_callable=Mock,
+        return_value="fake_version_number",
+    )
+
+    task, _, _ = write_l1_task_with_empty_waveband
+    task()
+    files = list(task.read(tags=[Tag.frame(), Tag.output()]))
+    for file in files:
+        header = fits.open(file)[1].header
+        assert header["WAVEMIN"] == 10000
+        assert header["WAVEMAX"] == 10050
+        with pytest.raises(KeyError):
+            header["WAVEBAND"]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 10.8.1rc1
+Version: 10.8.2
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,7 +17,7 @@ Requires-Dist: asdf<4.0.0,>=3.5.0
 Requires-Dist: astropy>=7.0.0
 Requires-Dist: dkist-fits-specifications<5.0,>=4.0.0
 Requires-Dist: dkist-header-validator<6.0,>=5.0.0
-Requires-Dist: dkist-processing-core==5.1.0
+Requires-Dist: dkist-processing-core==5.1.1
 Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<3.0,>=2.0.2
 Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0

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

@@ -1,21 +1,16 @@
 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=M7FW1viESaTfK1jLqHLp7JMGTGeoTxHtgCXRjZpDR8g,6990
+dkist_processing_common/manual.py,sha256=IH72QxdGlr-BuWq2EDrfC9yStegO-elUWrobQqT4710,7042
 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=AxS3AKjB22JZl9sSk2A5JI7-Yyb9dOXw84bTpYqbPoQ,2585
+dkist_processing_common/codecs/fits.py,sha256=0D6tDvt13OhVXok4tS8VGHdd8OSV8DrRet8VCD6Zt3g,2346
 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
@@ -27,12 +22,11 @@ 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=BBJBIBADAPQAskqS8Qh58DYEyFjY9GY9ZN8nrJ1EKHs,5364
-dkist_processing_common/models/input_dataset.py,sha256=OZDxyjHZfFrksFGpas1gsB14Q77CeNsk_nI-EYo3ZRI,4121
+dkist_processing_common/models/graphql.py,sha256=t2PYEjEwSq08zq0HcVH2RG5FX4PVXgs4BdM2gunJ8fs,4747
 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=dTup7mPTEmySXP0O3j4sPPY8Jqe2zf-3sr2hjeMatEY,9649
+dkist_processing_common/models/parameters.py,sha256=Ymx-wvPVMkXg5emhOivv7NG0QsAt98If4KotopLIRrw,7736
 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
@@ -61,34 +55,35 @@ dkist_processing_common/tasks/output_data_base.py,sha256=CC1TnCrChi8_iuMymr425CJ
 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/teardown.py,sha256=e4LKnphJDYDVDAez2tH7MxpZgCmxYsKrq9Zk0qAkzzM,2355
-dkist_processing_common/tasks/transfer_input_data.py,sha256=8dDOfnT46qavGW-6fy-FT9LVb0TXANSpk1WpACpWK70,5787
+dkist_processing_common/tasks/transfer_input_data.py,sha256=afEW0glpCFMZRj90nFtQo_4XOQ4CuoOh86jahP6a-a0,5548
 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=8KQ5LWa15mmjcoN0EgyaeLJS2qxeAowU5MC8IEIt4l4,22695
+dkist_processing_common/tasks/write_l1.py,sha256=vwNJs8gSzc0RPIfcpZ267L6pIJWdbPQ8ZmKR6hX1BIs,23498
 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=yTKijpQ-tNx_H2V_9HsZjMzkrzBDSQaSKkySV6VnnOM,11618
+dkist_processing_common/tasks/mixin/metadata_store.py,sha256=dMwjlhBI89xX0Pagub2Bk09z0fToipFN51DwyQEIHbk,11510
 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/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkist_processing_common/tests/conftest.py,sha256=Rz1r2_by8aRZslSkS4AduEtpu3cpPxsAonZQyUCBPSQ,30867
+dkist_processing_common/tests/conftest.py,sha256=h_ObhpXb1S0-db0Je8XoHNLkrXxXW_0B0TMhbnbDjMo,30160
 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=FGhldrTdc28YD9FKrsW3lZ34LtvzecGP1qNi9fGHVGQ,22173
+dkist_processing_common/tests/test_codecs.py,sha256=9Ln8FJs319rbHpCukO9lKLk3aDrdyDREjA4nCHsxDCA,20796
 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=pQ01rWAkQ2XQojyHWzAqeOdrMXshNcgEVL5I_9bBTdo,9610
+dkist_processing_common/tests/test_input_dataset.py,sha256=AI5uqaDea4kOwpwAU5qQdzUbxMpBwD20YCAvB7nzD5o,18766
 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=kNzX89vfrNRJ8d9rusMVv4DM9rPD3l-7HIstZsLoYBE,14033
+dkist_processing_common/tests/test_parameters.py,sha256=Tr0Wu8-_rj9Lp7CkUVmJjSouW7CAL_ZwhShK_U1GzVs,12384
 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
@@ -100,12 +95,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=B-kDsGJTUxxnamN4xjn69TFiY_TEN8MmhHNndP6bKac,10301
+dkist_processing_common/tests/test_transfer_input_data.py,sha256=kE-FQTcN9nft5bh2Rhtp-8ldCTvGXTvWFcsNm6DY7lk,6619
 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=dihbnrqbmcQ-Lh34tdlwr4EFW4slGEcfBL-aQs8gtCo,22225
+dkist_processing_common/tests/test_write_l1.py,sha256=ahAdMg3QhE-gnV_UMhL_xne-H5nHHDVMOWrP1vonIQ0,25962
 docs/Makefile,sha256=qnlVz6PuBqE39NfHWuUnHhNEA-EFgT2-WJNNNy9ttfk,4598
 docs/changelog.rst,sha256=S2jPASsWlQxSlAPqdvNrYvhk9k3FcFWNXFNDYXBSjl4,120
 docs/conf.py,sha256=FkX575cqTqZGCcLAjg2MlvE8Buj1Vt3CpHNgZxG256E,1890
@@ -114,7 +109,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.1rc1.dist-info/METADATA,sha256=rRARlrhMRte3nzFkBou8EOB8-1FONTMP2MZohKJ3wVw,7150
-dkist_processing_common-10.8.1rc1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-dkist_processing_common-10.8.1rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
-dkist_processing_common-10.8.1rc1.dist-info/RECORD,,
+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.1rc1.dist-info → dkist_processing_common-10.8.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

changelog/235.feature.rst

@@ -1,3 +0,0 @@
-Add two new codecs:  Basemodel codecs are used for encoding and decoding Pydantic BaseModel objects.  For decoding, the intended model
-is passed to the decoder through a keyword argument in the task read method.  Array codecs are used for encoding and decoding numpy
-arrays similar to the standard np.load() and np.save(), but with the task tag-based write method.

changelog/235.misc.1.rst

@@ -1,2 +0,0 @@
-Change the behavior of ParameterBase such that it takes the task scratch as an argument to provide access to the
-parameter document and parameters that are files.  This behavior replaces the input dataset mixin parameter read method.

changelog/235.misc.rst

@@ -1 +0,0 @@
-Remove the input_dataset mixin and replace it with input_dataset Pydantic BaseModel models.

dkist_processing_common/codecs/array.py

@@ -1,19 +0,0 @@
-"""Encoder/decoder for writing/reading numpy arrays."""
-import io
-from pathlib import Path
-
-import numpy as np
-
-from dkist_processing_common.codecs.iobase import iobase_encoder
-
-
-def array_encoder(data: np.ndarray, **np_kwargs) -> bytes:
-    """Convert a numpy array to bytes compatible with np.load()."""
-    buffer = io.BytesIO()
-    np.save(buffer, data, **np_kwargs)
-    return iobase_encoder(buffer)
-
-
-def array_decoder(path: Path, **np_kwargs) -> np.ndarray:
-    """Return the data in the file as a numpy array using np.load()."""
-    return np.load(path, **np_kwargs)

dkist_processing_common/codecs/basemodel.py

@@ -1,21 +0,0 @@
-"""Encoder/decoder for writing and reading Pydantic BaseModel objects."""
-from pathlib import Path
-from typing import Type
-
-from pydantic import BaseModel
-
-from dkist_processing_common.codecs.bytes import bytes_decoder
-from dkist_processing_common.codecs.str import str_encoder
-
-
-def basemodel_encoder(data: BaseModel, **basemodel_kwargs) -> bytes:
-    """Convert a Pydantic BaseModel object into bytes for writing to file."""
-    data_dump = data.model_dump_json(**basemodel_kwargs)
-    return str_encoder(data_dump)
-
-
-def basemodel_decoder(path: Path, model: Type[BaseModel], **basemodel_kwargs) -> BaseModel:
-    """Return the data in the file as a Pydantic BaseModel object."""
-    data = bytes_decoder(path)
-    model_validated = model.model_validate_json(data, **basemodel_kwargs)
-    return model_validated