dkist-processing-cryonirsp 1.10.0rc1__tar.gz → 1.11.0__tar.gz

{dkist_processing_cryonirsp-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/CHANGELOG.rst

@@ -1,3 +1,32 @@
+v1.11.0 (2025-07-18)
+====================
+
+Bugfixes
+--------
+
+- Calculate the `WAVEMIN` and `WAVEMAX` after correcting the spectral WCS keys instead of before. (`#200 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/200>`__)
+- Update `dkist-processing-common` to include the results of wavelength calibration when determining spectral lines in the data. (`#211 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/211>`__)
+
+
+v1.10.1 (2025-07-15)
+====================
+
+Misc
+----
+
+- Replace `FakeGQLClient` with the `fake_gql_client` fixture imported from the `mock_metadata_store` module
+  in `dkist-processing-common`.  Because the fixture is imported into `conftest.py`, individual imports are not needed. (`#208 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/208>`__)
+
+
+v1.10.0 (2025-07-14)
+====================
+
+Features
+--------
+
+- This change pulls the dispersion axis correction out of the Cryonirsp pipeline and uses the generalized solar-wavelength-calibration library. (`#167 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/167>`__)
+
+
 v1.9.0 (2025-07-10)
 ===================
 

{dkist_processing_cryonirsp-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 1.10.0rc1
+Version: 1.11.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,7 +17,7 @@ Requires-Dist: Pillow==10.4.0
 Requires-Dist: astropy==7.0.2
 Requires-Dist: dkist-fits-specifications==4.17.0
 Requires-Dist: dkist-header-validator==5.2.1
-Requires-Dist: dkist-processing-common==11.0.1
+Requires-Dist: dkist-processing-common==11.2.0
 Requires-Dist: dkist-processing-math==2.2.0
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-spectral-lines==3.0.0
@@ -121,8 +121,8 @@ Requires-Dist: attrs==25.3.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.1; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.39.4; extra == "frozen"
-Requires-Dist: botocore==1.39.4; extra == "frozen"
+Requires-Dist: boto3==1.39.8; extra == "frozen"
+Requires-Dist: botocore==1.39.8; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.5.3; extra == "frozen"
 Requires-Dist: certifi==2025.7.14; extra == "frozen"
@@ -145,9 +145,9 @@ Requires-Dist: dacite==1.9.2; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
-Requires-Dist: dkist-processing-common==11.0.1; extra == "frozen"
+Requires-Dist: dkist-processing-common==11.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==5.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==1.10.0rc1; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==1.11.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==2.2; extra == "frozen"
@@ -159,9 +159,9 @@ Requires-Dist: elastic-apm==6.23.0; extra == "frozen"
 Requires-Dist: email_validator==2.2.0; extra == "frozen"
 Requires-Dist: fastjsonschema==2.21.1; extra == "frozen"
 Requires-Dist: flower==2.0.1; extra == "frozen"
-Requires-Dist: fonttools==4.58.5; extra == "frozen"
+Requires-Dist: fonttools==4.59.0; extra == "frozen"
 Requires-Dist: frozenlist==1.7.0; extra == "frozen"
-Requires-Dist: fsspec==2025.5.1; extra == "frozen"
+Requires-Dist: fsspec==2025.7.0; extra == "frozen"
 Requires-Dist: globus-sdk==3.60.0; extra == "frozen"
 Requires-Dist: google-re2==1.1.20240702; extra == "frozen"
 Requires-Dist: googleapis-common-protos==1.70.0; extra == "frozen"
@@ -179,7 +179,7 @@ Requires-Dist: importlib_metadata==8.7.0; extra == "frozen"
 Requires-Dist: inflection==0.5.1; extra == "frozen"
 Requires-Dist: itsdangerous==2.2.0; extra == "frozen"
 Requires-Dist: jmespath==1.0.1; extra == "frozen"
-Requires-Dist: jsonschema==4.24.0; extra == "frozen"
+Requires-Dist: jsonschema==4.25.0; extra == "frozen"
 Requires-Dist: jsonschema-specifications==2025.4.1; extra == "frozen"
 Requires-Dist: jupyter_core==5.8.1; extra == "frozen"
 Requires-Dist: kiwisolver==1.4.8; extra == "frozen"

{dkist_processing_cryonirsp-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/conftest.py

@@ -26,6 +26,7 @@ from dkist_processing_common.models.input_dataset import InputDatasetFilePointer
 from dkist_processing_common.models.input_dataset import InputDatasetObject
 from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.tasks import WorkflowTaskBase
+from dkist_processing_common.tests.mock_metadata_store import fake_gql_client
 from pydantic import Field
 from pydantic import model_validator
 
@@ -277,11 +278,9 @@ class FileParameter(InputDatasetFilePointer):
 
     @model_validator(mode="after")
     def _populate_file_object(self):
-        self.file_pointer = FileObject(
-            bucket="not_used_because_we_dont_transfer",
-            object_key=self.object_key,
-            tag=CryonirspTag.parameter((self.object_key)),
-        )
+        self.file_pointer.bucket = "not_used_because_we_dont_transfer"
+        self.file_pointer.object_key = self.object_key
+        self.file_pointer.tag = CryonirspTag.parameter((self.object_key))
         return self
 
 

{dkist_processing_cryonirsp-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/test_bad_pixel_maps.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_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
@@ -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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/test_ci_beam_boundaries.py

@@ -7,7 +7,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.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.ci_beam_boundaries import CIBeamBoundariesCalibration
@@ -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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/test_ci_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
@@ -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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/test_corrections.py

@@ -4,13 +4,13 @@ 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
 
+
 base_bad_pixel_map = np.zeros(shape=(10, 10))
 
 normal_bad_pixel_map = base_bad_pixel_map.copy()
@@ -38,11 +38,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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/test_dark.py

@@ -7,7 +7,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
@@ -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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/test_gain.py

@@ -8,7 +8,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
@@ -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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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
 
@@ -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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/test_linearity_correction.py

@@ -10,7 +10,6 @@ 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
@@ -143,6 +142,7 @@ def linearity_correction(
 def test_linearity_correction(
     linearity_correction,
     mocker,
+    fake_gql_client,
     arm_id,
     frames_in_ramp,
     num_chunks,
@@ -154,7 +154,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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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,

{dkist_processing_cryonirsp-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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 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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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
@@ -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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/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
@@ -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

{dkist_processing_cryonirsp-1.10.0rc1 → dkist_processing_cryonirsp-1.11.0}/dkist_processing_cryonirsp/tests/test_sp_solar.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_cryonirsp.codecs.fits import cryo_fits_array_decoder
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
@@ -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