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

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
 
@@ -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,12 +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.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))
 
@@ -38,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,

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,
@@ -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

@@ -49,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(

dkist_processing_cryonirsp/tests/test_dark.py

@@ -7,14 +7,13 @@ 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 CryonirspTag
 from dkist_processing_cryonirsp.tasks.dark import DarkCalibration
-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 CryonirspHeadersValidDarkFrames
 
@@ -176,14 +175,14 @@ def ci_dark_calibration_task(
             task._purge()
 
 
-def test_sp_dark_calibration_task(sp_dark_calibration_task, mocker):
+def test_sp_dark_calibration_task(sp_dark_calibration_task, mocker, fake_gql_client):
     """
     Given: A DarkCalibration task with multiple task exposure times
     When: Calling the task instance
     Then: Only one average intermediate dark frame exists for each exposure time and unused times are not made
     """
     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
     (
@@ -232,14 +231,14 @@ def test_sp_dark_calibration_task(sp_dark_calibration_task, mocker):
             assert data["frames_not_used"] == 3
 
 
-def test_ci_dark_calibration_task(ci_dark_calibration_task, mocker):
+def test_ci_dark_calibration_task(ci_dark_calibration_task, mocker, fake_gql_client):
     """
     Given: A DarkCalibration task with multiple task exposure times
     When: Calling the task instance
     Then: Only one average intermediate dark frame exists for each exposure time and unused times are not made
     """
     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
     task, exp_conditions, unused_condition = ci_dark_calibration_task

dkist_processing_cryonirsp/tests/test_fits_access.py

@@ -0,0 +1,44 @@
+import pytest
+from dkist_header_validator.translator import translate_spec122_to_spec214_l0
+
+from dkist_processing_cryonirsp.models.fits_access import CryonirspMetadataKey
+from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
+from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspRampFitsAccess
+from dkist_processing_cryonirsp.parsers.cryonirsp_l1_fits_access import CryonirspL1FitsAccess
+from dkist_processing_cryonirsp.tests.header_models import Cryonirsp122ObserveFrames
+
+
+@pytest.fixture(scope="session")
+def complete_header():
+    dataset = Cryonirsp122ObserveFrames(array_shape=(1, 2, 2))
+    header = [translate_spec122_to_spec214_l0(d.header()) for d in dataset]
+    return header
+
+
+def test_metadata_keys_in_access_bases(complete_header):
+    """
+    Given: the set of metadata key names in CryonirspMetadataKey
+    When: the Cryo FITS access classes define a set of new attributes
+    Then: the sets are the same and the attributes have the correct values
+    """
+    cryo_metadata_key_names = {cmk.name for cmk in CryonirspMetadataKey}
+    all_cryo_fits_access_attrs = set()
+    for access_class in [CryonirspRampFitsAccess, CryonirspL0FitsAccess, CryonirspL1FitsAccess]:
+        fits_obj = access_class.from_header(complete_header[0])
+        cryo_instance_attrs = set(vars(fits_obj).keys())
+        parent_class = access_class.mro()[1]
+        parent_fits_obj = parent_class.from_header(complete_header[0])
+        parent_instance_attrs = set(vars(parent_fits_obj).keys())
+        cryo_fits_access_attrs = cryo_instance_attrs - parent_instance_attrs
+        # exposure_conditions is created from multiple header keys, so it is not in CryonirspMetadataKey:
+        cryo_fits_access_attrs -= {"exposure_conditions"}
+        for attr in cryo_fits_access_attrs:
+            match attr:
+                case "cn1_scan_step":
+                    assert getattr(fits_obj, attr) == int(
+                        fits_obj.header[CryonirspMetadataKey[attr]]
+                    )
+                case _:
+                    assert getattr(fits_obj, attr) == fits_obj.header[CryonirspMetadataKey[attr]]
+        all_cryo_fits_access_attrs |= cryo_fits_access_attrs
+    assert cryo_metadata_key_names == all_cryo_fits_access_attrs

dkist_processing_cryonirsp/tests/test_gain.py

@@ -8,15 +8,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 CryonirspTag
 from dkist_processing_cryonirsp.tasks.gain import CISolarGainCalibration
 from dkist_processing_cryonirsp.tasks.gain import LampGainCalibration
-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 CryonirspHeadersValidLampGainFrames
 
@@ -201,14 +200,14 @@ def lamp_calibration_task(
             task._purge()
 
 
-def test_ci_solar_gain_calibration_task(ci_solar_gain_calibration_task, mocker):
+def test_ci_solar_gain_calibration_task(ci_solar_gain_calibration_task, mocker, fake_gql_client):
     """
     Given: A CISolarGainCalibration task
     When: Calling the task instance
     Then: The correct number of output solar gain frames exists, are tagged correctly, and are not normalized
     """
     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
     task, solar_signal = ci_solar_gain_calibration_task
@@ -242,14 +241,14 @@ def test_ci_solar_gain_calibration_task(ci_solar_gain_calibration_task, mocker):
 
 
 @pytest.mark.parametrize("number_of_beams", [pytest.param(1, id="CI"), pytest.param(2, id="SP")])
-def test_lamp_calibration_task(lamp_calibration_task, number_of_beams, mocker):
+def test_lamp_calibration_task(lamp_calibration_task, number_of_beams, mocker, fake_gql_client):
     """
     Given: A LampGainCalibration task
     When: Calling the task instance
     Then: The correct number of output lamp gain frames exists, are tagged correctly, and are normalized
     """
     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
     task = lamp_calibration_task

dkist_processing_cryonirsp/tests/test_instrument_polarization.py

@@ -10,7 +10,6 @@ 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.models.task_name import TaskName
-from dkist_processing_common.tests.conftest import FakeGQLClient
 from dkist_processing_pac.fitter.polcal_fitter import PolcalFitter
 from dkist_processing_pac.input_data.dresser import Dresser
 
@@ -23,8 +22,8 @@ from dkist_processing_cryonirsp.tasks.instrument_polarization import (
 from dkist_processing_cryonirsp.tasks.instrument_polarization import (
     SPInstrumentPolarizationCalibration,
 )
-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 CryonirspHeadersValidPolcalFrames
 
@@ -399,7 +398,9 @@ def multiple_demodulation_matrices() -> np.ndarray:
 
 
 def test_ci_instrument_polarization_calibration_task(
-    ci_instrument_polarization_calibration_task, mocker
+    ci_instrument_polarization_calibration_task,
+    mocker,
+    fake_gql_client,
 ):
     """
     Given: An InstrumentPolarizationCalibration task
@@ -408,7 +409,7 @@ def test_ci_instrument_polarization_calibration_task(
     """
 
     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
@@ -438,7 +439,9 @@ def test_ci_instrument_polarization_calibration_task(
 
 
 def test_sp_instrument_polarization_calibration_task(
-    sp_instrument_polarization_calibration_task, mocker
+    sp_instrument_polarization_calibration_task,
+    mocker,
+    fake_gql_client,
 ):
     """
     Given: An InstrumentPolarizationCalibration task
@@ -447,7 +450,7 @@ def test_sp_instrument_polarization_calibration_task(
     """
 
     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_linearity_correction.py

@@ -1,4 +1,5 @@
 """Test the linearity correction task."""
+
 import re
 from dataclasses import dataclass
 from datetime import datetime
@@ -10,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_hdulist_encoder
 from dkist_processing_common.models.tags import Tag
-from dkist_processing_common.tests.conftest import FakeGQLClient
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.linearity_correction import LinearityCorrection
-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 CryonirspHeadersValidNonLinearizedFrames
 
@@ -143,6 +143,7 @@ def linearity_correction(
 def test_linearity_correction(
     linearity_correction,
     mocker,
+    fake_gql_client,
     arm_id,
     frames_in_ramp,
     num_chunks,
@@ -154,7 +155,7 @@ def test_linearity_correction(
     Then: The non-linearized frames are linearized and produce the correct results.
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     if num_chunks == 2:
         mocker.patch(

dkist_processing_cryonirsp/tests/test_make_movie_frames.py

@@ -5,7 +5,6 @@ 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_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.make_movie_frames import MakeCryonirspMovieFrames
@@ -90,14 +89,14 @@ def movie_frames_task(tmp_path, recipe_run_id, init_cryonirsp_constants_db, requ
             task._purge()
 
 
-def test_make_movie_frames(movie_frames_task, mocker):
+def test_make_movie_frames(movie_frames_task, mocker, fake_gql_client):
     """
     Given: A MakeCryonirspMovieFrames task
     When: Calling the task instance
     Then: a fits file is made for each scan containing the movie frame for that scan
     """
     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, map_scans, scan_steps, array_shape, is_polarimetric = movie_frames_task
     expected_shape = array_shape

dkist_processing_cryonirsp/tests/test_parameters.py

@@ -7,9 +7,9 @@ from astropy.units import Quantity
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.array import array_decoder
 from dkist_processing_common.models.input_dataset import InputDatasetFilePointer
+from hypothesis import HealthCheck
 from hypothesis import example
 from hypothesis import given
-from hypothesis import HealthCheck
 from hypothesis import settings
 from hypothesis import strategies as st
 from pydantic import BaseModel
@@ -20,9 +20,9 @@ from dkist_processing_cryonirsp.parsers.optical_density_filters import (
     ALLOWABLE_OPTICAL_DENSITY_FILTERS,
 )
 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 TestingParameters
+from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 
 # The property names of all parameters on `CryonirspParsingParameters`
 PARSE_PARAMETER_NAMES = [
@@ -44,8 +44,7 @@ def basic_science_task_with_parameter_mixin(
         obs_ip_start_time: str = testing_obs_ip_start_time,
     ):
         class Task(CryonirspTaskBase):
-            def run(self):
-                ...
+            def run(self): ...
 
         init_cryonirsp_constants_db(recipe_run_id, CryonirspConstantsDb())
         with Task(

dkist_processing_cryonirsp/tests/test_parse.py

@@ -11,7 +11,6 @@ from astropy.io import fits
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.models.constants import BudName
 from dkist_processing_common.tasks import WorkflowTaskBase
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
@@ -345,10 +344,10 @@ def make_non_linearized_test_frames(
 
 @pytest.fixture
 def parse_linearized_task(
-    tmp_path, recipe_run_id, assign_input_dataset_doc_to_task, mocker, arm_id
+    tmp_path, recipe_run_id, assign_input_dataset_doc_to_task, mocker, fake_gql_client, arm_id
 ):
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     if arm_id == "CI":
         parsing_class = ParseL0CryonirspCILinearizedData
@@ -376,9 +375,9 @@ def parse_linearized_task(
 
 
 @pytest.fixture
-def parse_non_linearized_task(tmp_path, recipe_run_id, mocker):
+def parse_non_linearized_task(tmp_path, recipe_run_id, 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
     )
     with ParseL0CryonirspRampData(
         recipe_run_id=recipe_run_id,
@@ -981,6 +980,7 @@ def test_parse_cryonirsp_linearized_incomplete_raster_scan(
 
     assert task.constants._db_dict[CryonirspBudName.num_scan_steps.value] == num_scan_steps - 1
     assert task.constants._db_dict[CryonirspBudName.num_map_scans.value] == num_map_scans
+    assert task.constants._db_dict[CryonirspBudName.num_meas.value] == 2
 
 
 @pytest.mark.parametrize("arm_id", ["CI", "SP"])
@@ -1275,6 +1275,12 @@ def test_parse_cryonirsp_linearized_data_constants(
             task.constants._db_dict[CryonirspBudName.grating_constant.value] == 770970.3576216539
         )  # From `SimpleModulatedHeaders`
 
+    assert task.constants._db_dict["CAMERA_NAME"] == "camera_name"
+    assert task.constants._db_dict["DARK_GOS_LEVEL3_STATUS"] == "lamp"
+    assert task.constants._db_dict["SOLAR_GAIN_GOS_LEVEL3_STATUS"] == "clear"
+    assert task.constants._db_dict["SOLAR_GAIN_NUM_RAW_FRAMES_PER_FPA"] == 10
+    assert task.constants._db_dict["POLCAL_NUM_RAW_FRAMES_PER_FPA"] == 10
+
 
 @pytest.mark.parametrize("arm_id", ["SP"])
 def test_parse_cryonirsp_linearized_data_internal_scan_loops_as_map_scan_and_scan_step(
@@ -1307,9 +1313,9 @@ def test_parse_cryonirsp_linearized_data_internal_scan_loops_as_map_scan_and_sca
     num_alt_scan_steps = 3
 
     def make_dual_scan_loop_headers(translated_header):
-        translated_header[
-            "CNP2DSS"
-        ] = 0.0  # This triggers the parsing of the dual internal scan loops
+        translated_header["CNP2DSS"] = (
+            0.0  # This triggers the parsing of the dual internal scan loops
+        )
         translated_header["CNP1DNSP"] = num_alt_scan_steps  # inner loop -- becomes num scan steps
         translated_header["CNP2DNSP"] = num_alt_maps  # outer loop -- becomes num map scans
         translated_header["CNP1DCUR"] = (translated_header["CNCURSCN"] - 1) % num_alt_scan_steps + 1

dkist_processing_cryonirsp/tests/test_quality.py

@@ -8,7 +8,6 @@ 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.models.task_name import TaskName
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.quality_metrics import CryonirspL0QualityMetrics
@@ -161,7 +160,7 @@ def test_l0_quality_task(
         assert len(files) > 0
 
 
-def test_l1_quality_task(cryo_l1_quality_task, mocker):
+def test_l1_quality_task(cryo_l1_quality_task, mocker, fake_gql_client):
     """
     Given: A CryonirspL1QualityMetrics task
     When: Calling the task instance
@@ -169,7 +168,7 @@ def test_l1_quality_task(cryo_l1_quality_task, mocker):
             and a single noise measurement and datetime is recorded for L1 file for each Stokes Q, U, and V
     """
     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
     task = cryo_l1_quality_task

dkist_processing_cryonirsp/tests/test_sp_beam_boundaries.py

@@ -7,12 +7,12 @@ 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.sp_beam_boundaries import SPBeamBoundariesCalibration
-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 fake_gql_client
 from dkist_processing_cryonirsp.tests.conftest import generate_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeadersValidSPSolarGainFrames
 
@@ -85,14 +85,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 SPBeamBoundariesCalibration 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_sp_geometric.py

@@ -5,7 +5,6 @@ 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_math import transform
 
 from dkist_processing_cryonirsp.codecs.fits import cryo_fits_array_decoder
@@ -13,8 +12,8 @@ from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOptic
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.sp_geometric import SPGeometricCalibration
-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
 
@@ -287,7 +286,7 @@ def geometric_calibration_task_with_simple_raw_data(
             task._purge()
 
 
-def test_geometric_task(geometric_calibration_task_that_completes, mocker):
+def test_geometric_task(geometric_calibration_task_that_completes, mocker, fake_gql_client):
     """
     Given: A set of raw solar gain images and necessary intermediate calibrations
     When: Running the geometric task
@@ -295,7 +294,7 @@ def test_geometric_task(geometric_calibration_task_that_completes, mocker):
     """
     # See the note in the fixture above: this test does NOT test for accuracy of the calibration
     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, beam_shape = geometric_calibration_task_that_completes
     task()

dkist_processing_cryonirsp/tests/test_sp_make_movie_frames.py

@@ -6,7 +6,6 @@ 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_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.make_movie_frames import SPMakeCryonirspMovieFrames
@@ -95,14 +94,14 @@ def sp_movie_frames_task(tmp_path, recipe_run_id, init_cryonirsp_constants_db, r
             task._purge()
 
 
-def test_sp_make_movie_frames(sp_movie_frames_task, mocker):
+def test_sp_make_movie_frames(sp_movie_frames_task, mocker, fake_gql_client):
     """
     Given: A SPMakeCryonirspMovieFrames task
     When: Calling the task instance
     Then: a fits file is made for each scan containing the movie frame for that scan
     """
     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, map_scans, scan_steps, array_shape, is_polarimetric = sp_movie_frames_task
     if scan_steps > 1:

dkist_processing_cryonirsp/tests/test_sp_science.py

@@ -11,7 +11,6 @@ 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
@@ -20,8 +19,8 @@ from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
 from dkist_processing_cryonirsp.tasks.sp_science import CalibrationCollection
 from dkist_processing_cryonirsp.tasks.sp_science import SPScienceCalibration
-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
 
@@ -320,7 +319,7 @@ def calibrated_array_and_header_dicts(
     return array_dict, header_dict, array_shape
 
 
-def test_sp_science_calibration_task(sp_science_calibration_task, mocker):
+def test_sp_science_calibration_task(sp_science_calibration_task, mocker, fake_gql_client):
     """
     Given: A SPScienceCalibration task
     When: Calling the task instance
@@ -328,7 +327,7 @@ def test_sp_science_calibration_task(sp_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