dkist-processing-cryonirsp 1.10.0rc1__py3-none-any.whl → 1.14.9rc1__py3-none-any.whl

dkist_processing_cryonirsp/tests/test_sp_solar.py

@@ -5,15 +5,14 @@ import pytest
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.codecs.fits import cryo_fits_array_decoder
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.sp_solar_gain import SPSolarGainCalibration
-from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.conftest import CryonirspConstantsDb
+from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.conftest import generate_214_l0_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeadersValidSPSolarGainFrames
 
@@ -178,14 +177,16 @@ def solar_gain_calibration_task_with_no_data(tmp_path, recipe_run_id, init_cryon
 
 
 @pytest.mark.parametrize("fringe_correction", [False, True])
-def test_solar_gain_task(solar_gain_calibration_task_that_completes, mocker, fringe_correction):
+def test_solar_gain_task(
+    solar_gain_calibration_task_that_completes, mocker, fake_gql_client, fringe_correction
+):
     """
     Given: A set of raw solar gain images and necessary intermediate calibrations
     When: Running the solargain task
     Then: The task completes and the outputs are correct
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
 
     task, true_solar_single_beam = solar_gain_calibration_task_that_completes

dkist_processing_cryonirsp/tests/test_sp_wavelength_calibration.py

@@ -8,12 +8,11 @@ from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.codecs.json import json_decoder
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.sp_wavelength_calibration import SPWavelengthCalibration
-from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.conftest import CryonirspConstantsDb
+from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.conftest import generate_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeadersValidSPSolarGainFrames
 
@@ -41,7 +40,7 @@ def sp_dispersion_axis_correction_task(
         GRATING_POSITION_DEG=grating_position_deg,
         GRATING_LITTROW_ANGLE_DEG=grating_littrow_angle,
         GRATING_CONSTANT=grating_constant,
-        SOLAR_GAIN_IP_START_TIME="2021-01-01T00:00:00",
+        SOLAR_GAIN_START_TIME="2021-01-01T00:00:00",
     )
     init_cryonirsp_constants_db(recipe_run_id, constants_db)
     with SPWavelengthCalibration(
@@ -114,14 +113,14 @@ def sp_dispersion_axis_correction_task(
             task._purge()
 
 
-def test_sp_dispersion_axis_correction(sp_dispersion_axis_correction_task, mocker):
+def test_sp_dispersion_axis_correction(sp_dispersion_axis_correction_task, mocker, fake_gql_client):
     """
     Given: A SPDispersionAxisCorrection task
     When: Calling the task instance
     Then: There are the expected number of intermediate fit frames with the correct tags applied and the values have been correctly fit
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
 
     task, original_header = sp_dispersion_axis_correction_task

dkist_processing_cryonirsp/tests/test_trial_create_quality_report.py

@@ -49,7 +49,7 @@ def create_trial_quality_report_task(
         )
         task.write(
             quality_data_warning_only,
-            tags=CryonirspTag.quality_data(),
+            tags=[CryonirspTag.output(), CryonirspTag.quality_data()],
             encoder=quality_data_encoder,
             relative_path=f"{task.constants.dataset_id}_quality_data.json",
         )

dkist_processing_cryonirsp/tests/test_workflows.py

@@ -1,4 +1,5 @@
 """Test integrity of workflows."""
+
 from dkist_processing_core.build_utils import validate_workflows
 
 from dkist_processing_cryonirsp import workflows

dkist_processing_cryonirsp/tests/test_write_l1.py

@@ -9,7 +9,6 @@ from dkist_fits_specifications import __version__ as spec_version
 from dkist_header_validator import spec214_validator
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.codecs.json import json_encoder
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.write_l1 import CIWriteL1Frame
@@ -164,14 +163,16 @@ def write_dummy_sp_dispersion_intermediate(task: SPWriteL1Frame) -> None:
     "arm_id",
     [pytest.param("CI", id="CI"), pytest.param("SP", id="SP")],
 )
-def test_write_l1_frame(write_l1_task, mocker, arm_id, num_stokes_params, num_map_scans, num_meas):
+def test_write_l1_frame(
+    write_l1_task, mocker, fake_gql_client, arm_id, num_stokes_params, num_map_scans, num_meas
+):
     """
     :Given: a write L1 task
     :When: running the task
     :Then: the correct header keys are written
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     task, stokes_params, original_headers = write_l1_task
     task()
@@ -221,6 +222,14 @@ def test_write_l1_frame(write_l1_task, mocker, arm_id, num_stokes_params, num_ma
                 axis_num += 1
                 stokes_axis_tests(axis_num, header)
 
+            # Timing header keys
+            if task.constants.correct_for_polarization:
+                assert header["CADENCE"] == 20 * num_meas
+                assert header["XPOSURE"] == 30
+            else:
+                assert header["CADENCE"] == 10 * num_meas
+                assert header["XPOSURE"] == 15
+
             # Other general tests
             general_header_tests(axis_num, header, task, arm_id)
 
@@ -423,16 +432,3 @@ def general_header_tests(
     assert isinstance(header["HLSVERS"], str)
     assert header["BUNIT"] == ""
     assert header.comments["BUNIT"] == "Values are relative to disk center. See calibration docs."
-    assert header["NSPECLNS"] == 1
-    assert header["WAVEBAND"] == "He I (1083.0 nm)"
-    assert header["SPECLN01"] == "He I (1083.0 nm)"
-    with pytest.raises(KeyError):
-        header["SPECLN02"]
-
-    # wavelength range tests
-    if arm_id == "SP":
-        assert round(header["WAVEMIN"], 2) == 1082
-        assert round(header["WAVEMAX"], 2) == 1084
-    if arm_id == "CI":
-        assert header["WAVEMIN"] == 1082.5
-        assert header["WAVEMAX"] == 1083.5

dkist_processing_cryonirsp/workflows/__init__.py

@@ -1,2 +1,3 @@
 """Workflow package."""
+
 from dkist_processing_cryonirsp.config import dkist_processing_cryonirsp_configurations

dkist_processing_cryonirsp/workflows/ci_l0_processing.py

@@ -1,4 +1,5 @@
 """Cryo CI raw data processing workflow."""
+
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import SubmitDatasetMetadata
@@ -11,9 +12,7 @@ from dkist_processing_core import Workflow
 from dkist_processing_cryonirsp.tasks import AssembleCryonirspMovie
 from dkist_processing_cryonirsp.tasks import BadPixelMapCalibration
 from dkist_processing_cryonirsp.tasks import CIBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks import (
-    CIInstrumentPolarizationCalibration,
-)
+from dkist_processing_cryonirsp.tasks import CIInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import CIScienceCalibration
 from dkist_processing_cryonirsp.tasks import CISolarGainCalibration
 from dkist_processing_cryonirsp.tasks import CIWriteL1Frame
@@ -68,9 +67,11 @@ l0_pipeline.add_node(
 # Output flow
 l0_pipeline.add_node(
     task=SubmitDatasetMetadata,
-    upstreams=[CIWriteL1Frame, CIAssembleQualityData, AssembleCryonirspMovie],
+    upstreams=[CIWriteL1Frame, AssembleCryonirspMovie],
+)
+l0_pipeline.add_node(
+    task=TransferL1Data, upstreams=[CIWriteL1Frame, AssembleCryonirspMovie, CIAssembleQualityData]
 )
-l0_pipeline.add_node(task=TransferL1Data, upstreams=[CIWriteL1Frame, AssembleCryonirspMovie])
 l0_pipeline.add_node(
     task=PublishCatalogAndQualityMessages, upstreams=[SubmitDatasetMetadata, TransferL1Data]
 )

dkist_processing_cryonirsp/workflows/sp_l0_processing.py

@@ -1,4 +1,5 @@
 """Cryo SP raw data processing workflow."""
+
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import SubmitDatasetMetadata
@@ -19,9 +20,7 @@ from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks import SPBeamBoundariesCalibration
 from dkist_processing_cryonirsp.tasks import SPGeometricCalibration
-from dkist_processing_cryonirsp.tasks import (
-    SPInstrumentPolarizationCalibration,
-)
+from dkist_processing_cryonirsp.tasks import SPInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import SPScienceCalibration
 from dkist_processing_cryonirsp.tasks import SPSolarGainCalibration
 from dkist_processing_cryonirsp.tasks import SPWavelengthCalibration
@@ -76,9 +75,11 @@ l0_pipeline.add_node(
 # Output flow
 l0_pipeline.add_node(
     task=SubmitDatasetMetadata,
-    upstreams=[SPWriteL1Frame, SPAssembleQualityData, AssembleCryonirspMovie],
+    upstreams=[SPWriteL1Frame, AssembleCryonirspMovie],
+)
+l0_pipeline.add_node(
+    task=TransferL1Data, upstreams=[SPWriteL1Frame, AssembleCryonirspMovie, SPAssembleQualityData]
 )
-l0_pipeline.add_node(task=TransferL1Data, upstreams=[SPWriteL1Frame, AssembleCryonirspMovie])
 l0_pipeline.add_node(
     task=PublishCatalogAndQualityMessages, upstreams=[SubmitDatasetMetadata, TransferL1Data]
 )

dkist_processing_cryonirsp/workflows/trial_workflows.py

@@ -1,4 +1,5 @@
 """Workflows for trial runs (i.e., not Production)."""
+
 from dkist_processing_common.tasks import CreateTrialAsdf
 from dkist_processing_common.tasks import CreateTrialDatasetInventory
 from dkist_processing_common.tasks import CreateTrialQualityReport
@@ -12,9 +13,7 @@ from dkist_processing_core import Workflow
 from dkist_processing_cryonirsp.tasks import AssembleCryonirspMovie
 from dkist_processing_cryonirsp.tasks import BadPixelMapCalibration
 from dkist_processing_cryonirsp.tasks import CIBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks import (
-    CIInstrumentPolarizationCalibration,
-)
+from dkist_processing_cryonirsp.tasks import CIInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import CIScienceCalibration
 from dkist_processing_cryonirsp.tasks import CISolarGainCalibration
 from dkist_processing_cryonirsp.tasks import CIWriteL1Frame
@@ -27,9 +26,7 @@ from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks import SPBeamBoundariesCalibration
 from dkist_processing_cryonirsp.tasks import SPGeometricCalibration
-from dkist_processing_cryonirsp.tasks import (
-    SPInstrumentPolarizationCalibration,
-)
+from dkist_processing_cryonirsp.tasks import SPInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import SPScienceCalibration
 from dkist_processing_cryonirsp.tasks import SPSolarGainCalibration
 from dkist_processing_cryonirsp.tasks import SPWavelengthCalibration
@@ -93,7 +90,9 @@ full_trial_ci_pipeline.add_node(
 )
 full_trial_ci_pipeline.add_node(task=CreateTrialAsdf, upstreams=CIWriteL1Frame, pip_extras=["asdf"])
 full_trial_ci_pipeline.add_node(
-    task=CreateTrialQualityReport, upstreams=CIAssembleQualityData, pip_extras=["quality"]
+    task=CreateTrialQualityReport,
+    upstreams=CIAssembleQualityData,
+    pip_extras=["quality", "inventory"],
 )
 
 # Output flow
@@ -171,7 +170,9 @@ full_trial_sp_pipeline.add_node(
 )
 full_trial_sp_pipeline.add_node(task=CreateTrialAsdf, upstreams=SPWriteL1Frame, pip_extras=["asdf"])
 full_trial_sp_pipeline.add_node(
-    task=CreateTrialQualityReport, upstreams=SPAssembleQualityData, pip_extras=["quality"]
+    task=CreateTrialQualityReport,
+    upstreams=SPAssembleQualityData,
+    pip_extras=["quality", "inventory"],
 )
 
 # Output flow