dkist-processing-common 10.6.2__py3-none-any.whl → 10.6.4__py3-none-any.whl

dkist_processing_common/models/wavelength.py

@@ -26,3 +26,4 @@ class WavelengthRange(BaseModel):
         """Validate that the max wavelength is greater than the min wavelength."""
         if self.min > self.max:
             raise ValueError("min is greater than max.  Values may be reversed.")
+        return self

dkist_processing_common/tasks/transfer_input_data.py

@@ -20,12 +20,17 @@ class TransferL0Data(WorkflowTaskBase, GlobusMixin, InputDatasetMixin):
 
     def download_input_dataset(self):
         """Get the input dataset document parts and save it to scratch with the appropriate tags."""
-        if doc := self.metadata_store_input_dataset_observe_frames.inputDatasetPartDocument:
-            self.write(doc, tags=Tag.input_dataset_observe_frames(), encoder=json_encoder)
-        if doc := self.metadata_store_input_dataset_calibration_frames.inputDatasetPartDocument:
-            self.write(doc, tags=Tag.input_dataset_calibration_frames(), encoder=json_encoder)
-        if doc := self.metadata_store_input_dataset_parameters.inputDatasetPartDocument:
-            self.write(doc, tags=Tag.input_dataset_parameters(), encoder=json_encoder)
+        if observe_frames := self.metadata_store_input_dataset_observe_frames:
+            observe_doc = observe_frames.inputDatasetPartDocument
+            self.write(observe_doc, tags=Tag.input_dataset_observe_frames(), encoder=json_encoder)
+        if calibration_frames := self.metadata_store_input_dataset_calibration_frames:
+            calibration_doc = calibration_frames.inputDatasetPartDocument
+            self.write(
+                calibration_doc, tags=Tag.input_dataset_calibration_frames(), encoder=json_encoder
+            )
+        if parameters := self.metadata_store_input_dataset_parameters:
+            parameters_doc = parameters.inputDatasetPartDocument
+            self.write(parameters_doc, tags=Tag.input_dataset_parameters(), encoder=json_encoder)
 
     def format_transfer_items(
         self, input_dataset_objects: list[InputDatasetObject]

dkist_processing_common/tasks/write_l1.py

@@ -214,11 +214,12 @@ class WriteL1Frame(WorkflowTaskBase, MetadataStoreMixin, ABC):
         header["CADMAX"] = self.constants.maximum_cadence
         header["CADVAR"] = self.constants.variance_cadence
         # Keywords to support reprocessing
-        if ids_par_id := self.metadata_store_input_dataset_parameters.inputDatasetPartId:
-            header["IDSPARID"] = ids_par_id
-        header["IDSOBSID"] = self.metadata_store_input_dataset_observe_frames.inputDatasetPartId
-        if ids_cal_id := self.metadata_store_input_dataset_calibration_frames.inputDatasetPartId:
-            header["IDSCALID"] = ids_cal_id
+        if parameters := self.metadata_store_input_dataset_parameters:
+            header["IDSPARID"] = parameters.inputDatasetPartId
+        if observe_frames := self.metadata_store_input_dataset_observe_frames:
+            header["IDSOBSID"] = observe_frames.inputDatasetPartId
+        if calibration_frames := self.metadata_store_input_dataset_calibration_frames:
+            header["IDSCALID"] = calibration_frames.inputDatasetPartId
         header["WKFLNAME"] = self.workflow_name
         header["WKFLVERS"] = self.workflow_version
         header = self.add_contributing_id_headers(header=header)

dkist_processing_common/tests/test_transfer_input_data.py

@@ -6,6 +6,7 @@ import pytest
 
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.json import json_decoder
+from dkist_processing_common.models.graphql import InputDatasetRecipeRunResponse
 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_parameter_files
@@ -17,10 +18,21 @@ class TransferL0DataTask(TransferL0Data):
         ...
 
 
-@pytest.fixture
-def transfer_l0_data_task(recipe_run_id, tmp_path, mocker):
+class FakeGQLClientMissingInputDatasetPart(FakeGQLClient):
+    """Same metadata mocker with calibration input dataset part missing."""
+
+    def execute_gql_query(self, **kwargs):
+        original_response = super().execute_gql_query(**kwargs)
+        # Remove calibration frames part if getting InputDatasetRecipeRunResponse:
+        if kwargs.get("query_response_cls") == InputDatasetRecipeRunResponse:
+            del original_response[0].recipeInstance.inputDataset.inputDatasetInputDatasetParts[2]
+        return original_response
+
+
+def _transfer_l0_data_task_with_client(recipe_run_id, tmp_path, mocker, client_cls):
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient",
+        new=client_cls,
     )
     with TransferL0DataTask(
         recipe_run_id=recipe_run_id,
@@ -35,6 +47,18 @@ def transfer_l0_data_task(recipe_run_id, tmp_path, mocker):
         task._purge()
 
 
+@pytest.fixture
+def transfer_l0_data_task(recipe_run_id, tmp_path, mocker):
+    yield from _transfer_l0_data_task_with_client(recipe_run_id, tmp_path, mocker, FakeGQLClient)
+
+
+@pytest.fixture
+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, FakeGQLClientMissingInputDatasetPart
+    )
+
+
 def test_download_dataset(transfer_l0_data_task):
     """
     :Given: a TransferL0Data task with a valid input dataset
@@ -63,6 +87,29 @@ def test_download_dataset(transfer_l0_data_task):
     assert parameters_doc_from_file == expected_parameters_doc
 
 
+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_part
+    # When
+    task.download_input_dataset()
+    # Then
+    observe_doc_from_file = next(
+        task.read(tags=Tag.input_dataset_observe_frames(), decoder=json_decoder)
+    )
+    parameters_doc_from_file = next(
+        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=json_decoder)
+        )
+
+
 def test_format_frame_transfer_items(transfer_l0_data_task):
     """
     :Given: a TransferL0Data task with a downloaded input dataset

dkist_processing_common/tests/test_write_l1.py

@@ -24,6 +24,9 @@ from dkist_processing_common.models.wavelength import WavelengthRange
 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,
+)
 
 
 class FakeGQLClientDefaultRecipeConfiguration(FakeGQLClient):
@@ -484,6 +487,29 @@ def test_reprocessing_keys(write_l1_task, mocker):
         assert header["PRODUCT"] == task.compute_product_id(header["IDSOBSID"], header["PROCTYPE"])
 
 
+def test_missing_input_dataset_part(write_l1_task, mocker):
+    """
+    :Given: a Write_L1 task with a missing calibration frames part
+    :When: running the task
+    :Then: the input dataset part keys are correctly written without throwing an exception
+    """
+    mocker.patch(
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient",
+        new=FakeGQLClientMissingInputDatasetPart,
+    )
+    task, _, _ = write_l1_task
+    task()
+    files = list(task.read(tags=[Tag.frame(), Tag.output()]))
+    for file in files:
+        header = fits.open(file)[1].header
+        assert header["IDSPARID"] == task.metadata_store_input_dataset_parameters.inputDatasetPartId
+        assert (
+            header["IDSOBSID"]
+            == task.metadata_store_input_dataset_observe_frames.inputDatasetPartId
+        )
+        assert "IDSCALID" not in header
+
+
 @pytest.mark.parametrize(
     "ids_obs_id, proc_type",
     [

{dkist_processing_common-10.6.2.dist-info → dkist_processing_common-10.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 10.6.2
+Version: 10.6.4
 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.6.2.dist-info → dkist_processing_common-10.6.4.dist-info}/RECORD

@@ -30,7 +30,7 @@ dkist_processing_common/models/parameters.py,sha256=Ymx-wvPVMkXg5emhOivv7NG0QsAt
 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
-dkist_processing_common/models/wavelength.py,sha256=mH4xkNdPU7kedJfQStI6A0WdkMLi61wfe47pJI9kHBI,946
+dkist_processing_common/models/wavelength.py,sha256=Wtmu5QhjPpsqIGfUQ0Wh-3PQlGeRdGV9BfFAy23HLGg,966
 dkist_processing_common/parsers/__init__.py,sha256=XJQzHtPb78F6-qXXKXjyztc0x-aHVlgv1C_l4dR88tI,67
 dkist_processing_common/parsers/cs_step.py,sha256=en1ovwy8H2jeUxZd0XDSV8Qv3ZawRm03q6wpJj4a3C8,6461
 dkist_processing_common/parsers/dsps_repeat.py,sha256=NiUMnfMYSn0qserHM735V1Z6BCfw4CAanlqtjfyRkos,1571
@@ -55,10 +55,10 @@ 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=bv2t0DN7nQ9opfl3VPdXG9m69zdzNIjordlCyZVNyBQ,5324
+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=C5IRUX1JO_Wa7suv_tgE4tH1E2eAUkro0rtj9EHduqw,22429
+dkist_processing_common/tasks/write_l1.py,sha256=XhWLOw4hmql3n01SU26B0McPfYD_7oRKHna0Tswn8Lk,22494
 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
@@ -95,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=MYPsZldzQ_j0AoGFqP6_ahn8Nr5mX8WAyG0wpcQReeI,4735
+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=bIQd95Dhb8aHxCtOXV7Az4Fy_OeEIlspoSktdUR5lRA,20794
+dkist_processing_common/tests/test_write_l1.py,sha256=P_ep0_T2ZDZXPzFQmN7GgNs-RK6c5G6_DssPUW_sW7Q,21773
 docs/Makefile,sha256=qnlVz6PuBqE39NfHWuUnHhNEA-EFgT2-WJNNNy9ttfk,4598
 docs/changelog.rst,sha256=S2jPASsWlQxSlAPqdvNrYvhk9k3FcFWNXFNDYXBSjl4,120
 docs/conf.py,sha256=FkX575cqTqZGCcLAjg2MlvE8Buj1Vt3CpHNgZxG256E,1890
@@ -109,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.6.2.dist-info/METADATA,sha256=xBQvt5JjVSsGXLINVfL3RZKU4Cx8oyxiXh5uKxc9MHY,7154
-dkist_processing_common-10.6.2.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-dkist_processing_common-10.6.2.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
-dkist_processing_common-10.6.2.dist-info/RECORD,,
+dkist_processing_common-10.6.4.dist-info/METADATA,sha256=xFPyZqrXkRO-vWgas9iUWZiduYlNn4qhPTOUCcfXigA,7154
+dkist_processing_common-10.6.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dkist_processing_common-10.6.4.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
+dkist_processing_common-10.6.4.dist-info/RECORD,,

{dkist_processing_common-10.6.2.dist-info → dkist_processing_common-10.6.4.dist-info}/WHEEL

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