dkist-processing-vbi 1.21.1__py3-none-any.whl → 1.25.2__py3-none-any.whl

dkist_processing_vbi/tests/test_parse_l0.py

@@ -4,15 +4,14 @@ import pytest
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.models.constants import BudName
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_vbi.models.constants import VbiBudName
 from dkist_processing_vbi.models.tags import VbiTag
 from dkist_processing_vbi.tasks.parse import ParseL0VbiInputData
-from dkist_processing_vbi.tests.conftest import generate_214_l0_fits_frame
 from dkist_processing_vbi.tests.conftest import Vbi122DarkFrames
 from dkist_processing_vbi.tests.conftest import Vbi122GainFrames
 from dkist_processing_vbi.tests.conftest import Vbi122ObserveFrames
+from dkist_processing_vbi.tests.conftest import generate_214_l0_fits_frame
 
 
 @pytest.fixture(scope="function")
@@ -181,14 +180,14 @@ def parse_inputs_task_with_aborted_last_mosaic(tmp_path, recipe_run_id):
         task._purge()
 
 
-def test_parse_l0_input_data_spatial_pos(parse_inputs_task, mocker):
+def test_parse_l0_input_data_spatial_pos(parse_inputs_task, mocker, fake_gql_client):
     """
     Given: a set of raw inputs of multiple task types and a ParseL0VbiInputData task
     When: the task is run
     Then: the input frames are correctly tagged by spatial position
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     parse_inputs_task()
 
@@ -208,14 +207,14 @@ def test_parse_l0_input_data_spatial_pos(parse_inputs_task, mocker):
             assert filepath.exists()
 
 
-def test_parse_l0_input_constants(parse_inputs_task, mocker):
+def test_parse_l0_input_constants(parse_inputs_task, mocker, fake_gql_client):
     """
     Given: a set of raw inputs of multiple task types and a ParseL0VbiInputData task
     When: the task is run
     Then: pipeline constants are correctly updated from the input headers
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     parse_inputs_task()
 
@@ -231,14 +230,14 @@ def test_parse_l0_input_constants(parse_inputs_task, mocker):
     assert BudName.obs_ip_start_time.value in parse_inputs_task.constants._db_dict
 
 
-def test_parse_l0_input_frames_found(parse_inputs_task, mocker):
+def test_parse_l0_input_frames_found(parse_inputs_task, mocker, fake_gql_client):
     """
     Given: a set of raw inputs of multiple task types and a ParseL0VbiInputData task
     When: the task is run
     Then: the frames from each task type are correctly identified and tagged
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     parse_inputs_task()
     assert (
@@ -258,7 +257,9 @@ def test_parse_l0_input_frames_found(parse_inputs_task, mocker):
     )
 
 
-def test_parse_l0_input_with_only_observe(parse_inputs_task_with_only_observe, mocker):
+def test_parse_l0_input_with_only_observe(
+    parse_inputs_task_with_only_observe, mocker, fake_gql_client
+):
     """
     Given: a set of raw inputs of a single task type and a ParseL0VbiInputData task
     When: the task is run
@@ -266,7 +267,7 @@ def test_parse_l0_input_with_only_observe(parse_inputs_task_with_only_observe, m
     """
     task, camera_str = parse_inputs_task_with_only_observe
     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()
     if camera_str == "red":
@@ -293,14 +294,16 @@ def test_parse_l0_input_with_only_observe(parse_inputs_task_with_only_observe, m
                 assert filepath.exists()
 
 
-def test_parse_l0_aborted_last_mosaic(parse_inputs_task_with_aborted_last_mosaic, mocker):
+def test_parse_l0_aborted_last_mosaic(
+    parse_inputs_task_with_aborted_last_mosaic, mocker, fake_gql_client
+):
     """
     Given: a set of raw inputs representing a dataset with an aborted last mosaic
     When: the task is run
     Then: pipeline constants are correctly updated from the input headers
     """
     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, expected_num_mosaic_repeats = parse_inputs_task_with_aborted_last_mosaic
     task()
@@ -310,14 +313,16 @@ def test_parse_l0_aborted_last_mosaic(parse_inputs_task_with_aborted_last_mosaic
     )
 
 
-def test_parse_l0_correctly_tagged_mosaic_subrepeats(parse_inputs_task_with_subrepeats, mocker):
+def test_parse_l0_correctly_tagged_mosaic_subrepeats(
+    parse_inputs_task_with_subrepeats, mocker, fake_gql_client
+):
     """
     Given: A set of observe frames taken with subrepeats (i.e., multiple mosaics per DSPS repeat)
     When: the parse task is run
     Then: pipeline constants are correctly updated and the 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 = parse_inputs_task_with_subrepeats
     task()

dkist_processing_vbi/tests/test_parse_summit.py

@@ -1,19 +1,19 @@
 """
 This might be a totally redundant test. Leave it in for now.
 """
+
 from itertools import chain
 
 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_vbi.models.constants import VbiBudName
 from dkist_processing_vbi.models.tags import VbiTag
 from dkist_processing_vbi.tasks.parse import ParseL0VbiInputData
-from dkist_processing_vbi.tests.conftest import generate_214_l0_fits_frame
 from dkist_processing_vbi.tests.conftest import Vbi122DarkFrames
 from dkist_processing_vbi.tests.conftest import Vbi122SummitObserveFrames
+from dkist_processing_vbi.tests.conftest import generate_214_l0_fits_frame
 
 
 @pytest.fixture(scope="function")
@@ -80,14 +80,14 @@ def parse_summit_task_with_subrepeats(tmp_path, recipe_run_id):
         task._purge()
 
 
-def test_parse_summit_proccessed_data(parse_summit_processed_task, mocker):
+def test_parse_summit_proccessed_data(parse_summit_processed_task, mocker, fake_gql_client):
     """
     Given: a set of raw inputs of summit-processed data and a ParseL0VbiInputData task
     When: the task is run
     Then: the observe frames are correctly identified and tagged
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     parse_summit_processed_task()
 
@@ -109,14 +109,16 @@ def test_parse_summit_proccessed_data(parse_summit_processed_task, mocker):
                 assert filepath.exists()
 
 
-def test_parse_summit_correctly_tagged_mosaic_subrepeats(parse_summit_task_with_subrepeats, mocker):
+def test_parse_summit_correctly_tagged_mosaic_subrepeats(
+    parse_summit_task_with_subrepeats, mocker, fake_gql_client
+):
     """
     Given: A set of observe frames taken with subrepeats (i.e., multiple mosaics per DSPS repeat)
     When: the parse task is run
     Then: pipeline constants are correctly updated and the 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 = parse_summit_task_with_subrepeats
     task()

dkist_processing_vbi/tests/test_process_summit.py

@@ -7,16 +7,15 @@ from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_access_decoder
 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_vbi.models.tags import VbiTag
 from dkist_processing_vbi.parsers.vbi_l0_fits_access import VbiL0FitsAccess
 from dkist_processing_vbi.tasks.process_summit_processed import GenerateL1SummitData
-from dkist_processing_vbi.tests.conftest import ensure_all_inputs_used
-from dkist_processing_vbi.tests.conftest import generate_compressed_214_l0_fits_frame
 from dkist_processing_vbi.tests.conftest import Vbi122DarkFrames
 from dkist_processing_vbi.tests.conftest import Vbi122SummitObserveFrames
 from dkist_processing_vbi.tests.conftest import VbiConstantsDb
+from dkist_processing_vbi.tests.conftest import ensure_all_inputs_used
+from dkist_processing_vbi.tests.conftest import generate_compressed_214_l0_fits_frame
 
 RNG = np.random.default_rng()
 
@@ -133,14 +132,14 @@ def process_summit_processed_with_aborted_last_mosaic(
         task._purge()
 
 
-def test_process_summit_data(process_summit_processed, mocker):
+def test_process_summit_data(process_summit_processed, mocker, fake_gql_client):
     """
     Given: a set of parsed input frames of summit-processed data and a GenerateL1SummitData task
     When: the task is run
     Then: the correct data-dependent L1 headers are added, an output tag is applied to each frame, and the input tag is removed
     """
     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, expected_data, num_exp_per_step = process_summit_processed
     task()
@@ -172,7 +171,7 @@ def test_process_summit_data(process_summit_processed, mocker):
 
 
 def test_process_summit_data_with_aborted_last_mosaic(
-    process_summit_processed_with_aborted_last_mosaic, mocker
+    process_summit_processed_with_aborted_last_mosaic, mocker, fake_gql_client
 ):
     """
     Given: a set of parsed input frames of summit-processed data that contain an aborted mosaic
@@ -180,7 +179,7 @@ def test_process_summit_data_with_aborted_last_mosaic(
     Then: only frames from complete mosaics are pass through as "calibrated"
     """
     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,

dkist_processing_vbi/tests/test_science.py

@@ -8,15 +8,14 @@ from dkist_processing_common.codecs.fits import fits_access_decoder
 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.tags import Tag
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_vbi.models.tags import VbiTag
 from dkist_processing_vbi.parsers.vbi_l0_fits_access import VbiL0FitsAccess
 from dkist_processing_vbi.tasks.science import ScienceCalibration
-from dkist_processing_vbi.tests.conftest import ensure_all_inputs_used
-from dkist_processing_vbi.tests.conftest import generate_214_l0_fits_frame
 from dkist_processing_vbi.tests.conftest import Vbi122ObserveFrames
 from dkist_processing_vbi.tests.conftest import VbiConstantsDb
+from dkist_processing_vbi.tests.conftest import ensure_all_inputs_used
+from dkist_processing_vbi.tests.conftest import generate_214_l0_fits_frame
 
 
 @pytest.fixture(scope="function")
@@ -111,14 +110,14 @@ def science_calibration_task(tmp_path, recipe_run_id, init_vbi_constants_db, abo
     "abort_mosaic",
     [pytest.param(False, id="Full set"), pytest.param(True, id="Aborted last mosaic")],
 )
-def test_science_calibration(science_calibration_task, mocker):
+def test_science_calibration(science_calibration_task, mocker, fake_gql_client):
     """
     Given: a set of parsed input observe frames, dark and gain calibrations, and a ScienceCalibration task
     When: the task is run
     Then: the science frames are processed, no exposures are averaged, and the array values 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, num_steps, num_exp_per_step, expected_num_mosaic_repeats = science_calibration_task
     task()

dkist_processing_vbi/tests/test_vbi_constants.py

@@ -18,8 +18,7 @@ def expected_constant_dict() -> dict:
 @pytest.fixture(scope="function")
 def vbi_science_task_with_constants(expected_constant_dict, recipe_run_id):
     class Task(VbiTaskBase):
-        def run(self):
-            ...
+        def run(self): ...
 
     task = Task(
         recipe_run_id=recipe_run_id,

dkist_processing_vbi/tests/test_workflows.py

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

dkist_processing_vbi/tests/test_write_l1.py

@@ -10,7 +10,6 @@ from dkist_header_validator import spec122_validator
 from dkist_header_validator import spec214_validator
 from dkist_processing_common.codecs.fits import fits_array_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_vbi.models.constants import VbiConstants
@@ -105,14 +104,16 @@ def write_l1_task(calibrated_header, num_mosaic_repeats, camera_str: Literal["re
         pytest.param(False, "red", id="Non-Mosaic"),
     ],
 )
-def test_write_l1_frame(write_l1_task, num_mosaic_repeats, is_mosaic, camera_str, mocker):
+def test_write_l1_frame(
+    write_l1_task, num_mosaic_repeats, is_mosaic, camera_str, mocker, fake_gql_client
+):
     """
     :Given: a write L1 task
     :When: running the task
     :Then: no errors are raised
     """
     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 = write_l1_task
     task()
@@ -199,7 +200,7 @@ def test_write_l1_frame(write_l1_task, num_mosaic_repeats, is_mosaic, camera_str
         assert header["EXPRID01"] == "EXPERID1"
         assert header["EXPRID02"] == "EXPERID2"
         assert header["EXPRID03"] == "EXPERID3"
-        assert header["WAVEBAND"] == "H alpha (656.28 nm)"
+        assert header["WAVEBAND"] == "VBI-Red H-alpha"
         assert header["SPECLN01"] == "H alpha (656.28 nm)"
         with pytest.raises(KeyError):
             header["SPECLN02"]

dkist_processing_vbi/workflows/__init__.py

@@ -1,2 +1,3 @@
 """Workflow package."""
+
 from dkist_processing_vbi.config import dkist_processing_vbi_configurations

dkist_processing_vbi/workflows/l0_processing.py

@@ -10,6 +10,7 @@ VBI: https://nso.edu/telescopes/dkist/instruments/vbi/
 This workflow does *not* include the speckle reconstruction algorithms used in summit-calibrated data.
 Instead, darks and gains are generated by averaging the raw darks and gains, and are then subtracted from the science frames.
 """
+
 from dkist_processing_common.tasks import AssembleQualityData
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
@@ -60,7 +61,9 @@ l0_pipeline.add_node(
 
 # Output flow
 l0_pipeline.add_node(task=TransferL1Data, upstreams=[VbiWriteL1Frame, AssembleVbiMovie])
-l0_pipeline.add_node(task=SubmitDatasetMetadata, upstreams=[VbiWriteL1Frame, AssembleQualityData])
+l0_pipeline.add_node(
+    task=SubmitDatasetMetadata, upstreams=[VbiWriteL1Frame, AssembleQualityData, AssembleVbiMovie]
+)
 l0_pipeline.add_node(
     task=PublishCatalogAndQualityMessages, upstreams=[SubmitDatasetMetadata, TransferL1Data]
 )

dkist_processing_vbi/workflows/summit_data_processing.py

@@ -10,6 +10,7 @@ In this case it is then transferred to the DKIST Data Center for packaging, but
 To determine the type of calibrations applied, please inspect the `VBI__005` keyword in the FITS headers.
 It will indicate whether frame selection, speckle imaging, or other calibration algorithms were applied.
 """
+
 from dkist_processing_common.tasks import AssembleQualityData
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
@@ -53,7 +54,7 @@ summit_processed_data.add_node(
 
 # Output flow
 summit_processed_data.add_node(
-    task=SubmitDatasetMetadata, upstreams=[VbiWriteL1Frame, AssembleQualityData]
+    task=SubmitDatasetMetadata, upstreams=[VbiWriteL1Frame, AssembleQualityData, AssembleVbiMovie]
 )
 summit_processed_data.add_node(task=TransferL1Data, upstreams=[VbiWriteL1Frame, AssembleVbiMovie])
 summit_processed_data.add_node(

dkist_processing_vbi/workflows/trial_workflows.py

@@ -4,6 +4,7 @@ Workflow for trial runs.
 These runs send their outputs (as well as intermediate files) to an unpublished location so that
 the DC, in coordination instrument scientists, can assess the performance of the pipeline.
 """
+
 from dkist_processing_common.tasks import AssembleQualityData
 from dkist_processing_common.tasks import CreateTrialAsdf
 from dkist_processing_common.tasks import CreateTrialDatasetInventory