dkist-processing-cryonirsp 1.4.20__py3-none-any.whl → 1.14.9rc1__py3-none-any.whl

dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py

@@ -14,6 +14,7 @@ from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
+from dkist_processing_cryonirsp.models.fits_access import CryonirspMetadataKey
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks import CIBeamBoundariesCalibration
 from dkist_processing_cryonirsp.tasks import CIScienceCalibration
@@ -39,21 +40,13 @@ from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspSPLinearizedD
 from dkist_processing_cryonirsp.tasks.quality_metrics import CryonirspL0QualityMetrics
 from dkist_processing_cryonirsp.tasks.quality_metrics import CryonirspL1QualityMetrics
 from dkist_processing_cryonirsp.tasks.sp_beam_boundaries import SPBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks.sp_dispersion_axis_correction import (
-    SPDispersionAxisCorrection,
-)
 from dkist_processing_cryonirsp.tasks.sp_geometric import SPGeometricCalibration
 from dkist_processing_cryonirsp.tasks.sp_science import SPScienceCalibration
 from dkist_processing_cryonirsp.tasks.sp_solar_gain import SPSolarGainCalibration
+from dkist_processing_cryonirsp.tasks.sp_wavelength_calibration import SPWavelengthCalibration
 from dkist_processing_cryonirsp.tasks.write_l1 import CIWriteL1Frame
 from dkist_processing_cryonirsp.tasks.write_l1 import SPWriteL1Frame
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    create_input_dataset_parameter_document,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import DBAccess
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    load_parsing_task,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     LoadBadPixelMap,
 )
@@ -61,9 +54,6 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     LoadBeamBoundaryCal,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import LoadDarkCal
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    LoadDispersionAxisCorrection,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     LoadGeometricCal,
 )
@@ -76,7 +66,7 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import LoadSolarCal
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    save_parsing_task,
+    LoadWavelengthCorrection,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     SaveBadPixelMap,
@@ -85,9 +75,6 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     SaveBeamBoundaryCal,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import SaveDarkCal
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    SaveDispersionAxisCorrection,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     SaveGeometricCal,
 )
@@ -99,6 +86,18 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     SaveLinearizedFiles,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import SaveSolarCal
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    SaveWavelengthCorrection,
+)
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    create_input_dataset_parameter_document,
+)
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    load_parsing_task,
+)
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    save_parsing_task,
+)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     tag_inputs_task,
 )
@@ -151,7 +150,7 @@ def tag_linearized_inputs_task(suffix: str):
                     hdu = hdul[0]
                 else:
                     hdu = hdul[1]
-                arm_id = hdu.header["CNARMID"]
+                arm_id = hdu.header[CryonirspMetadataKey.arm_id]
             self.constants._update({CryonirspBudName.arm_id.value: arm_id})
 
     return TagLinearizedInputs
@@ -193,21 +192,6 @@ class ValidateL1Output(CryonirspTaskBase):
             spec214_validator.validate(f, extra=False)
 
 
-def setup_APM_config() -> None:
-    mesh_config = {
-        "system-monitoring-log-apm": {
-            "mesh_address": "system-monitoring-log-apm.service.sim.consul",
-            "mesh_port": 8200,
-        },
-        "automated-processing-scratch-inventory": {"mesh_address": "localhost", "mesh_port": 6379},
-        "internal-api-gateway": {"mesh_address": "localhost", "mesh_port": 80},
-    }
-    apm_options = {"TRANSACTION_MAX_SPANS": 10000}
-    os.environ["MESH_CONFIG"] = json.dumps(mesh_config)
-    os.environ["ELASTIC_APM_ENABLED"] = "true"
-    os.environ["ELASTIC_APM_OTHER_OPTIONS"] = json.dumps(apm_options)
-
-
 def CI_workflow(
     manual_processing_run: ManualProcessing,
     load_beam_boundaries: bool = False,
@@ -254,7 +238,7 @@ def SP_workflow(
     load_geometric: bool = False,
     load_solar: bool = False,
     load_inst_pol: bool = False,
-    load_dispersion_correction: bool = False,
+    load_wavelength_correction: bool = False,
 ) -> None:
     if load_beam_boundaries:
         manual_processing_run.run_task(task=LoadBeamBoundaryCal)
@@ -286,11 +270,11 @@ def SP_workflow(
         manual_processing_run.run_task(task=SPSolarGainCalibration)
         manual_processing_run.run_task(task=SaveSolarCal)
 
-    if load_dispersion_correction:
-        manual_processing_run.run_task(task=LoadDispersionAxisCorrection)
+    if load_wavelength_correction:
+        manual_processing_run.run_task(task=LoadWavelengthCorrection)
     else:
-        manual_processing_run.run_task(task=SPDispersionAxisCorrection)
-        manual_processing_run.run_task(task=SaveDispersionAxisCorrection)
+        manual_processing_run.run_task(task=SPWavelengthCalibration)
+        manual_processing_run.run_task(task=SaveWavelengthCorrection)
 
     if load_inst_pol:
         manual_processing_run.run_task(task=LoadInstPolCal)
@@ -322,14 +306,11 @@ def main(
     load_lamp: bool = False,
     load_geometric: bool = False,
     load_solar: bool = False,
-    load_dispersion_correction: bool = False,
     load_inst_pol: bool = False,
-    use_apm: bool = False,
+    load_wavelength_calibration: bool = False,
     param_path: Path = None,
     transfer_trial_data: str | None = None,
 ):
-    if use_apm:
-        setup_APM_config()
     with ManualProcessing(
         workflow_path=Path(scratch_path),
         recipe_run_id=recipe_run_id,
@@ -414,7 +395,7 @@ def main(
                 load_lamp=load_lamp,
                 load_geometric=load_geometric,
                 load_solar=load_solar,
-                load_dispersion_correction=load_dispersion_correction,
+                load_wavelength_correction=load_wavelength_calibration,
                 load_inst_pol=load_inst_pol,
             )
         elif arm_id == "CI":
@@ -565,8 +546,8 @@ if __name__ == "__main__":
     )
     parser.add_argument(
         "-W",
-        "--load-dispersion-correction",
-        help="Load dispersion correction solution from previously saved run",
+        "--load-wavelength-calibration",
+        help="Load wavelength calibration solution from previously saved run",
         action="store_true",
     )
     parser.add_argument(
@@ -575,7 +556,6 @@ if __name__ == "__main__":
         help="Load instrument polarization calibration from previously saved run",
         action="store_true",
     )
-    parser.add_argument("-A", "--use-apm", help="Send APM spans to SIM", action="store_true")
     parser.add_argument(
         "-p",
         "--param-path",
@@ -603,9 +583,8 @@ if __name__ == "__main__":
             load_lamp=args.load_lamp,
             load_geometric=args.load_geometric,
             load_solar=args.load_solar,
-            load_dispersion_correction=args.load_dispersion_correction,
+            load_wavelength_calibration=args.load_wavelength_calibration,
             load_inst_pol=args.load_inst_pol,
-            use_apm=args.use_apm,
             param_path=Path(args.param_path),
             transfer_trial_data=args.transfer_trial_data,
         )

dkist_processing_cryonirsp/tests/local_trial_workflows/linearize_only.py

@@ -8,13 +8,13 @@ from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.linearity_correction import LinearityCorrection
 from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    create_input_dataset_parameter_document,
+    SaveLinearizedFiles,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    save_parsing_task,
+    create_input_dataset_parameter_document,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    SaveLinearizedFiles,
+    save_parsing_task,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     tag_inputs_task,

dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py

@@ -8,6 +8,8 @@ from random import randint
 import asdf
 from astropy.io import fits
 from dkist_header_validator import spec122_validator
+from dkist_processing_common.codecs.basemodel import basemodel_encoder
+from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.tasks import TransferTrialData
 from dkist_processing_common.tasks import WorkflowTaskBase
@@ -17,22 +19,22 @@ from dkist_service_configuration.logging import logger
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName
 from dkist_processing_cryonirsp.tasks.cryonirsp_base import CryonirspTaskBase
+from dkist_processing_cryonirsp.tests.conftest import FileParameter
 from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 
-
 # These are the workflow versions of the polyfit coefficient parameters
 WORKFLOW_LINEARIZATION_POLYFIT_COEFFS_CI = [
-    1.1565851e00,
-    -1.1925439e-05,
-    2.6748548e-10,
-    -2.7366326e-15,
+    1.10505215e00,
+    -7.50178863e-06,
+    1.43050375e-10,
+    -1.62898848e-15,
 ]
 
 WORKFLOW_LINEARIZATION_POLYFIT_COEFFS_SP = [
-    1.1421334e00,
-    -1.0536260e-05,
-    2.2702712e-10,
-    -2.5632187e-15,
+    1.14636662,
+    -1.05173302e-05,
+    2.18059789e-10,
+    -3.00894653e-15,
 ]
 
 
@@ -356,14 +358,14 @@ class SaveSolarCal(SaveTaskTags):
         ]
 
 
-class SaveDispersionAxisCorrection(SaveTaskTags):
+class SaveWavelengthCorrection(SaveTaskTags):
     @property
     def task_str(self) -> str:
         return CryonirspTaskName.spectral_fit.value
 
     @property
     def relative_save_file(self) -> str:
-        return "sp_dispersion_axis_correction.asdf"
+        return "sp_wavelength_correction.asdf"
 
     @property
     def tag_lists_to_save(self) -> list[list[str]]:
@@ -381,10 +383,10 @@ class LoadSolarCal(LoadTaskTags):
         return "solar_cal.asdf"
 
 
-class LoadDispersionAxisCorrection(LoadTaskTags):
+class LoadWavelengthCorrection(LoadTaskTags):
     @property
     def relative_save_file(self) -> str:
-        return "sp_dispersion_axis_correction.asdf"
+        return "sp_wavelength_correction.asdf"
 
 
 class SaveInstPolCal(SaveTaskTags):
@@ -424,13 +426,13 @@ class LoadInstPolCal(LoadTaskTags):
 def translate_122_to_214_task(suffix: str):
     class Translate122To214L0(WorkflowTaskBase):
         def run(self) -> None:
-            raw_dir = Path(self.scratch.scratch_base_path) / f"CRYO-NIRSP{self.recipe_run_id:03n}"
+            raw_dir = Path(self.scratch.scratch_base_path) / f"CRYONIRSP{self.recipe_run_id:03n}"
             if not os.path.exists(self.scratch.workflow_base_path):
                 os.makedirs(self.scratch.workflow_base_path)
 
             if not raw_dir.exists():
                 raise FileNotFoundError(
-                    f"Expected to find a raw CRYO-NIRSP{self.recipe_run_id:03n} folder in {self.scratch.scratch_base_path}"
+                    f"Expected to find a raw CRYONIRSP{self.recipe_run_id:03n} folder in {self.scratch.scratch_base_path}"
                 )
 
             for file in raw_dir.glob(f"*.{suffix}"):
@@ -465,26 +467,39 @@ def translate_122_to_214_task(suffix: str):
 def create_input_dataset_parameter_document(param_path: Path):
     class CreateInputDatasetParameterDocument(WorkflowTaskBase):
         def run(self) -> None:
-            doc_path = self.scratch.workflow_base_path / "input_dataset_parameters.json"
-            with open(doc_path, "w") as f:
-                f.write(json.dumps(self.input_dataset_document_simple_parameters_part))
-            self.tag(doc_path, CryonirspTag.input_dataset_parameters())
-            logger.info(f"Wrote input dataset doc to {doc_path}")
+            relative_path = "input_dataset_parameters.json"
+            self.write(
+                data=InputDatasetPartDocumentList(
+                    doc_list=self.input_dataset_document_simple_parameters_part
+                ),
+                relative_path=relative_path,
+                tags=CryonirspTag.input_dataset_parameters(),
+                encoder=basemodel_encoder,
+                overwrite=True,
+            )
+            logger.info(f"Wrote input dataset parameter doc to {relative_path}")
+            self.copy_and_tag_parameter_files(param_path=param_path)
+            logger.info(f"Copied input dataset parameter files from {param_path}")
 
         @property
-        def input_dataset_document_simple_parameters_part(self):
-            parameters_list = []
-            value_id = randint(1000, 2000)
-            param_class = cryonirsp_testing_parameters_factory(
-                param_path=param_path, create_files=False
-            )
+        def parameter_dict(self):
+            param_class = cryonirsp_testing_parameters_factory(task=self, create_files=False)
             params = asdict(
                 param_class(
                     cryonirsp_linearization_polyfit_coeffs_ci=WORKFLOW_LINEARIZATION_POLYFIT_COEFFS_CI,
                     cryonirsp_linearization_polyfit_coeffs_sp=WORKFLOW_LINEARIZATION_POLYFIT_COEFFS_SP,
                 )
             )
+            return params
+
+        @property
+        def input_dataset_document_simple_parameters_part(self):
+            parameters_list = []
+            value_id = randint(1000, 2000)
+            params = self.parameter_dict
             for pn, pv in params.items():
+                if isinstance(pv, FileParameter):
+                    pv = pv.model_dump()
                 values = [
                     {
                         "parameterValueId": value_id,
@@ -497,6 +512,22 @@ def create_input_dataset_parameter_document(param_path: Path):
 
             return parameters_list
 
+        def copy_and_tag_parameter_files(self, param_path=param_path):
+            # Copy parameter files from param_path to a place where they can be tagged
+            params = self.parameter_dict
+            destination_dir = Path(self.scratch.workflow_base_path) / "parameters"
+            destination_dir.mkdir(parents=True, exist_ok=True)
+            for pn, pv in params.items():
+                if isinstance(pv, FileParameter):
+                    file_path = next(param_path.rglob(pv.file_pointer.object_key))
+                    if file_path.parent != destination_dir:
+                        shutil.copy(file_path, destination_dir)
+                        logger.info(
+                            f"Copied parameter file for '{pn}' to {destination_dir / file_path}"
+                        )
+                        file_path = next(destination_dir.rglob(pv.file_pointer.object_key))
+                    self.tag(path=file_path, tags=pv.file_pointer.tag)
+
     return CreateInputDatasetParameterDocument
 
 

dkist_processing_cryonirsp/tests/test_assemble_movie.py

@@ -2,7 +2,6 @@ import numpy as np
 import pytest
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
@@ -68,9 +67,9 @@ def assemble_movie_task_with_tagged_movie_frames(
             task._purge()
 
 
-def test_assemble_movie(assemble_movie_task_with_tagged_movie_frames, mocker):
+def test_assemble_movie(assemble_movie_task_with_tagged_movie_frames, mocker, fake_gql_client):
     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, _, _ = assemble_movie_task_with_tagged_movie_frames
     task()
@@ -134,9 +133,9 @@ def assemble_sp_task_with_tagged_movie_frames(tmp_path, recipe_run_id, init_cryo
             task._purge()
 
 
-def test_assemble_sp_movie(assemble_sp_task_with_tagged_movie_frames, mocker):
+def test_assemble_sp_movie(assemble_sp_task_with_tagged_movie_frames, mocker, fake_gql_client):
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     assemble_sp_task_with_tagged_movie_frames()
     movie_file = list(assemble_sp_task_with_tagged_movie_frames.read(tags=[CryonirspTag.movie()]))

dkist_processing_cryonirsp/tests/test_assemble_qualilty.py

@@ -474,7 +474,11 @@ def test_assemble_quality_data(
     # Then
     # each quality_data file is a list - this will combine the elements of multiple lists into a single list
     quality_data = list(
-        chain.from_iterable(task.read(tags=CryonirspTag.quality_data(), decoder=json_decoder))
+        chain.from_iterable(
+            task.read(
+                tags=[CryonirspTag.output(), CryonirspTag.quality_data()], decoder=json_decoder
+            )
+        )
     )
     # 19 with polcal
     assert len(quality_data) == 19

dkist_processing_cryonirsp/tests/test_bad_pixel_maps.py

@@ -6,13 +6,12 @@ from astropy.io import fits
 from dkist_header_validator import spec122_validator
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
-from dkist_processing_common.tests.conftest import FakeGQLClient
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.bad_pixel_map import BadPixelMapCalibration
-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 CryonirspHeadersValidCISolarGainFrames
 
@@ -43,7 +42,7 @@ def compute_bad_pixel_map_task(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
             start_time = datetime.now()
             ds = CryonirspHeadersValidCISolarGainFrames(
@@ -91,14 +90,14 @@ def compute_bad_pixel_map_task(
             task._purge()
 
 
-def test_compute_bad_pixel_map_task(compute_bad_pixel_map_task, mocker):
+def test_compute_bad_pixel_map_task(compute_bad_pixel_map_task, mocker, fake_gql_client):
     """
     Given: An BadPixelMapCalibration task
     When: Calling the task instance with known input data
     Then: The correct beam boundary values are created and saved as intermediate files
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     # Given
     task, num_zeros, num_hot = compute_bad_pixel_map_task

dkist_processing_cryonirsp/tests/test_ci_beam_boundaries.py

@@ -7,12 +7,11 @@ from dkist_header_validator import spec122_validator
 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.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.ci_beam_boundaries import CIBeamBoundariesCalibration
-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 CryonirspHeadersValidCISolarGainFrames
 
@@ -38,7 +37,7 @@ def compute_beam_boundaries_task(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
             # Create fake bad pixel map
             task.write(
@@ -85,14 +84,14 @@ def compute_beam_boundaries_task(
             task._purge()
 
 
-def test_compute_beam_boundaries_task(compute_beam_boundaries_task, mocker):
+def test_compute_beam_boundaries_task(compute_beam_boundaries_task, mocker, fake_gql_client):
     """
     Given: A CIBeamBoundariesCalibration task
     When: Calling the task instance with known input data
     Then: The correct beam boundary values are created and saved as intermediate files
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     # Given
     task, arm_id = compute_beam_boundaries_task

dkist_processing_cryonirsp/tests/test_ci_science.py

@@ -11,15 +11,14 @@ from dkist_header_validator import spec122_validator
 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.models.exposure_conditions import AllowableOpticalDensityFilterNames
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspStemName
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.ci_science import CIScienceCalibration
-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 CryonirspHeadersValidObserveFrames
 
@@ -70,7 +69,7 @@ def ci_science_calibration_task(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
 
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
 
             # Need a beam boundary file
@@ -228,7 +227,7 @@ def ci_compressed_headers_with_dates(
     return comp_headers, start_time, exp_time, time_delta
 
 
-def test_ci_science_calibration_task(ci_science_calibration_task, mocker):
+def test_ci_science_calibration_task(ci_science_calibration_task, mocker, fake_gql_client):
     """
     Given: A CIScienceCalibration task
     When: Calling the task instance
@@ -236,7 +235,7 @@ def test_ci_science_calibration_task(ci_science_calibration_task, mocker):
     """
 
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
 
     # When

dkist_processing_cryonirsp/tests/test_corrections.py

@@ -4,13 +4,11 @@ import numpy as np
 import pytest
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.tasks import WorkflowTaskBase
-from dkist_processing_common.tasks.mixin.input_dataset import InputDatasetMixin
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.constants import CryonirspConstants
 from dkist_processing_cryonirsp.tasks.mixin.corrections import CorrectionsMixin
-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
 
 base_bad_pixel_map = np.zeros(shape=(10, 10))
 
@@ -21,7 +19,7 @@ column_error_bad_pixel_map = base_bad_pixel_map.copy()
 column_error_bad_pixel_map[:, 6] = 1
 
 
-class BadPixelMapTask(WorkflowTaskBase, CorrectionsMixin, InputDatasetMixin):
+class BadPixelMapTask(WorkflowTaskBase, CorrectionsMixin):
     constants: CryonirspConstants
 
     @property
@@ -39,11 +37,12 @@ def bad_pixel_mask_task(
     recipe_run_id,
     assign_input_dataset_doc_to_task,
     mocker,
+    fake_gql_client,
     request,
     init_cryonirsp_constants_db,
 ):
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     constants_db = CryonirspConstantsDb(
         ARM_ID=request.param,
@@ -58,7 +57,7 @@ def bad_pixel_mask_task(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
             yield task
         finally:

dkist_processing_cryonirsp/tests/test_cryo_base.py

@@ -8,8 +8,8 @@ from dkist_processing_common.codecs.fits import fits_hdu_decoder
 from dkist_processing_cryonirsp.codecs.fits import cryo_fits_array_decoder
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.cryonirsp_base import CryonirspTaskBase
-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
 
 NUM_BEAMS = 2
 NUM_MODSTATES = 8
@@ -23,8 +23,7 @@ def cryo_science_task(
     tmp_path, recipe_run_id, assign_input_dataset_doc_to_task, init_cryonirsp_constants_db
 ):
     class Task(CryonirspTaskBase):
-        def run(self):
-            ...
+        def run(self): ...
 
     constants_db = CryonirspConstantsDb(
         NUM_MODSTATES=NUM_MODSTATES,
@@ -42,7 +41,7 @@ def cryo_science_task(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
             yield task
         finally:
@@ -153,8 +152,7 @@ def cryo_science_task_with_tagged_intermediates(
     recipe_run_id, tmpdir_factory, init_cryonirsp_constants_db
 ):
     class Task(CryonirspTaskBase):
-        def run(self):
-            ...
+        def run(self): ...
 
     init_cryonirsp_constants_db(recipe_run_id, CryonirspConstantsDb())
     with Task(

dkist_processing_cryonirsp/tests/test_cryo_constants.py

@@ -1,6 +1,7 @@
 from dataclasses import asdict
 from dataclasses import dataclass
 
+import astropy.units as u
 import pytest
 
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
@@ -28,6 +29,8 @@ def testing_constants(polarimetric):
             ExposureConditions(0.01, AllowableOpticalDensityFilterNames.OPEN.value),
         )
         modulator_spin_mode: str = "Continuous" if polarimetric else "Off"
+        retarder_name: str = "SiO2 OC"
+        grating_constant: float = 6.28
         # We don't need all the common ones, but let's put one just to check
         instrument: str = "CHECK_OUT_THIS_INSTRUMENT"
         arm_id: str = "SP"
@@ -46,8 +49,7 @@ def cryo_science_task_with_constants(
     recipe_run_id, expected_constant_dict, init_cryonirsp_constants_db
 ):
     class Task(CryonirspTaskBase):
-        def run(self):
-            ...
+        def run(self): ...
 
     init_cryonirsp_constants_db(recipe_run_id, expected_constant_dict)
     task = Task(
@@ -68,9 +70,11 @@ def cryo_science_task_with_constants(
 def test_cryo_constants(cryo_science_task_with_constants, expected_constant_dict, polarimetric):
     task = cryo_science_task_with_constants
     for k, v in expected_constant_dict.items():
-        if k.lower() == "modulator_spin_mode":
+        if k.lower() in ["modulator_spin_mode", "retarder_name", "grating_constant"]:
             continue
         if type(v) is tuple:
             v = list(v)
         assert getattr(task.constants, k.lower()) == v
     assert task.constants.correct_for_polarization == polarimetric
+    assert task.constants.pac_init_set == "OCCal_VIS"
+    assert task.constants.grating_constant == expected_constant_dict["GRATING_CONSTANT"] / u.mm