dkist-processing-test 1.22.0rc1__py3-none-any.whl → 1.22.0rc3__py3-none-any.whl

dkist_processing_test/tasks/fake_science.py

@@ -10,6 +10,7 @@ from dkist_processing_common.codecs.json import json_encoder
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_processing_common.tasks.mixin.input_dataset import InputDatasetMixin
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_test.models.parameters import TestParameters
 
@@ -63,12 +64,8 @@ class GenerateCalibratedData(WorkflowTaskBase, InputDatasetMixin):
             self.write(data=b"123", tags=[Tag.intermediate(), Tag.task("NOT_USED"), Tag.frame()])
             self.write(data=b"123", tags=["FOO"])
 
-            # Here is where we record the easy-to-check parameterValues for downstream checking
-            param_check_dict = {
-                "file_message": self.parameters.file_message,
-                "value_message": self.parameters.value_message,
-            }
-            self.write(data=param_check_dict, tags=["PARAM_CHECK"], encoder=json_encoder)
+        logger.info(f"Using {self.parameters.value_message = }")
+        logger.info(f"Using {self.parameters.file_message = }")
 
         with self.apm_task_step("Loop over inputs"):
             count = 1  # keep a running count to increment the dsps repeat number
@@ -90,6 +87,10 @@ class GenerateCalibratedData(WorkflowTaskBase, InputDatasetMixin):
                     header["VBINMOSC"] = self.constants.num_dsps_repeats
                     header["VBICMOSC"] = count
 
+                    # Sneak date-dependent parameter values into header for end-to-end checking
+                    header["CAM_ID"] = self.parameters.file_message
+                    header["CAMERA"] = self.parameters.value_message
+
                     output_hdu = fits.PrimaryHDU(data=data, header=header)
 
                     wavelength_category = self.parameters.wavelength_category

dkist_processing_test/tests/test_tasks.py

@@ -274,33 +274,28 @@ def test_generate_calibrated_data(
         task.read(tags=[Tag.calibrated(), Tag.frame()], decoder=fits_hdu_decoder)
     )
 
+    if early_or_late == "early":
+        expected_file_message = early_file_message_str
+        expected_value_message = early_value_message_str
+    elif early_or_late == "late":
+        expected_file_message = late_file_message_str
+        expected_value_message = late_value_message_str
+
     # Verify frames
     assert len(calibrated_frame_hdus) == number_of_frames
     for hdu in calibrated_frame_hdus:
         assert "VBINMOSC" in hdu.header
         assert "VBICMOSC" in hdu.header
 
+        # Verify correct date params were used
+        assert hdu.header["CAM_ID"] == expected_file_message
+        assert hdu.header["CAMERA"] == expected_value_message
+
     # Verify debug frame was written
     debug_frame_paths = list(task.read(tags=[Tag.debug(), Tag.frame()]))
     assert len(debug_frame_paths) == 1
     assert debug_frame_paths[0].exists()
 
-    # Verify correct date params were used
-    param_check_paths = list(task.read(tags=["PARAM_CHECK"]))
-    assert len(param_check_paths) == 1
-    with open(param_check_paths[0], "r") as f:
-        date_dict = json.load(f)
-
-    if early_or_late == "early":
-        expected_file_message = early_file_message_str
-        expected_value_message = early_value_message_str
-    elif early_or_late == "late":
-        expected_file_message = late_file_message_str
-        expected_value_message = late_value_message_str
-
-    assert date_dict["file_message"] == expected_file_message
-    assert date_dict["value_message"] == expected_value_message
-
 
 class CommonDataset(Spec122Dataset):
     # NOTE: We use ViSP data for unit tests because ViSP can be polarimetric

{dkist_processing_test-1.22.0rc1.dist-info → dkist_processing_test-1.22.0rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-test
-Version: 1.22.0rc1
+Version: 1.22.0rc3
 Summary: Example instrument code used by the DKIST science data processing pipelines to test processing infrastructure
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause

{dkist_processing_test-1.22.0rc1.dist-info → dkist_processing_test-1.22.0rc3.dist-info}/RECORD

@@ -6,7 +6,7 @@ dkist_processing_test/models/parameters.py,sha256=OLrS1O_xZptjdNW882Otx5cHWyd4FH
 dkist_processing_test/tasks/__init__.py,sha256=ZWoqlNgFrn2auTMGNX9YWmHW_3JwQzn04XE_FmCAU24,517
 dkist_processing_test/tasks/exercise_numba.py,sha256=XfMVffPUgeiPoxSgo39tIjzFBJKKt3fnIYGaDFyBibc,1437
 dkist_processing_test/tasks/fail.py,sha256=jiOiuqoX_JR5hx81REgvcSvb0GBlVKc9MIXKUO0Nhr4,245
-dkist_processing_test/tasks/fake_science.py,sha256=L5994d1amaeOT24noWoEsBKfuoabeJ7Pdyp3TnbLHe8,4496
+dkist_processing_test/tasks/fake_science.py,sha256=-DMjAtQbtTly0PAv78lIgD8T_HVMo5mmBjyLiYQF0Ko,4555
 dkist_processing_test/tasks/high_memory.py,sha256=J3vBsivFkqs8eZZwBPpEORlHnFX1bGsbO3CjllJMRsc,540
 dkist_processing_test/tasks/manual.py,sha256=gjol_EieMbclv0ZDkVqR2Xd7abutali6KNwoqaCJiAI,583
 dkist_processing_test/tasks/movie.py,sha256=uFPWQlRFP5zzzYGT58IXebbG49su2I4AEpN2bIy7vGc,1831
@@ -19,7 +19,7 @@ dkist_processing_test/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 dkist_processing_test/tests/conftest.py,sha256=9H8_tqNKofHnl1IRqYM2-M2_K_TJ3b6oaIfb1dVkbsg,2728
 dkist_processing_test/tests/parameter_models.py,sha256=c-SqCBqHP4KkFs0_Y7HLED4mH4oMCpAYu-rYVlTHy1M,4635
 dkist_processing_test/tests/test_parameters.py,sha256=KGeEUOhtC_l-LN6hjB2jgwUZIWAMBx8wlmEeIja-eKo,4572
-dkist_processing_test/tests/test_tasks.py,sha256=t3jNEBucxLndzbE2qClKd_huYo-7T4w7qqp6ImqyLLc,27628
+dkist_processing_test/tests/test_tasks.py,sha256=VNd8F-hDMrwk_4dOEP61nCBRJfGZX1qXPDeNbc4QfM8,27447
 dkist_processing_test/tests/test_workflows.py,sha256=NqRkstqcqwH80cKJ1uDw16G4MsDOuOiZRWdfH0STarQ,286
 dkist_processing_test/workflows/__init__.py,sha256=Ryn_HXsVkZM_lLKyVteXC909Td2geylmz_1Z-8SE8c8,78
 dkist_processing_test/workflows/common_tasks.py,sha256=4H1TaUNa5-HyE1NJQiAc3NAN62ZOTYb7MbR1yjKMg-k,6843
@@ -29,7 +29,7 @@ dkist_processing_test/workflows/fail.py,sha256=KGhyAF7gKYYutP4aGa-1tDqPsC7Nr4xKY
 dkist_processing_test/workflows/noop.py,sha256=k2-6BpRkl1JDGaHPavxDzIlVx11KQtxKmsHmHTNQ9o0,666
 dkist_processing_test/workflows/resource_queue.py,sha256=_jOT99O0MFN_ACne6i8T5ZIwe_lBQqGz2Ccb8JlqQMI,500
 dkist_processing_test/workflows/trial_end_to_end.py,sha256=wkl_gk0zQ5TJ41CY0gEREPSIldZdTtLGwPDL_iwObe4,2425
-dkist_processing_test-1.22.0rc1.dist-info/METADATA,sha256=x2uSqgJndQx33siO1UZE6pq20yrNufSrLPrdk8kE4AI,3295
-dkist_processing_test-1.22.0rc1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-dkist_processing_test-1.22.0rc1.dist-info/top_level.txt,sha256=Hs4oTIrG_r-svhk_RGFTEO4e3vqQoYlBzdv5mvJVF24,22
-dkist_processing_test-1.22.0rc1.dist-info/RECORD,,
+dkist_processing_test-1.22.0rc3.dist-info/METADATA,sha256=ejZAtIlxe3OeUebU12-Oi7IH_kmUe9Wo0cya91d2558,3295
+dkist_processing_test-1.22.0rc3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+dkist_processing_test-1.22.0rc3.dist-info/top_level.txt,sha256=Hs4oTIrG_r-svhk_RGFTEO4e3vqQoYlBzdv5mvJVF24,22
+dkist_processing_test-1.22.0rc3.dist-info/RECORD,,