dkist-processing-test 1.22.0rc2__py3-none-any.whl → 1.23.0rc2__py3-none-any.whl

dkist_processing_test/tasks/__init__.py

@@ -6,5 +6,4 @@ from dkist_processing_test.tasks.movie import *
 from dkist_processing_test.tasks.noop import *
 from dkist_processing_test.tasks.parse import *
 from dkist_processing_test.tasks.quality import *
-from dkist_processing_test.tasks.trial_output_data import *
 from dkist_processing_test.tasks.write_l1 import *

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,6 +64,9 @@ 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"])
 
+        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
             for hdu in self.read(tags=Tag.input(), decoder=fits_hdu_decoder):
@@ -84,8 +88,8 @@ class GenerateCalibratedData(WorkflowTaskBase, InputDatasetMixin):
                     header["VBICMOSC"] = count
 
                     # Sneak date-dependent parameter values into header for end-to-end checking
-                    header["GOS_STAT"] = self.parameters.file_message
-                    header["LVL3STAT"] = self.parameters.value_message
+                    header["CAM_ID"] = self.parameters.file_message
+                    header["CAMERA"] = self.parameters.value_message
 
                     output_hdu = fits.PrimaryHDU(data=data, header=header)
 

dkist_processing_test/tests/test_tasks.py

@@ -23,6 +23,7 @@ from dkist_processing_common.models.constants import BudName
 from dkist_processing_common.models.constants import ConstantsBase
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.models.task_name import TaskName
+from dkist_processing_common.tasks import TransferTrialData
 from dkist_processing_common.tests.conftest import FakeGQLClient
 from dkist_service_configuration.logging import logger
 
@@ -34,7 +35,6 @@ from dkist_processing_test.tasks.fake_science import GenerateCalibratedData
 from dkist_processing_test.tasks.movie import AssembleTestMovie
 from dkist_processing_test.tasks.movie import MakeTestMovieFrames
 from dkist_processing_test.tasks.noop import NoOpTask
-from dkist_processing_test.tasks.trial_output_data import TransferTestTrialData
 from dkist_processing_test.tasks.write_l1 import WriteL1Data
 from dkist_processing_test.tests.conftest import generate_214_l0_fits_frame
 from dkist_processing_test.tests.conftest import S122Headers
@@ -288,8 +288,8 @@ def test_generate_calibrated_data(
         assert "VBICMOSC" in hdu.header
 
         # Verify correct date params were used
-        assert hdu.header["GOS_STAT"] == expected_file_message
-        assert hdu.header["LVL3STAT"] == expected_value_message
+        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()]))
@@ -661,7 +661,7 @@ def trial_output_task(recipe_run_id, tmp_path, mocker):
         new=FakeGQLClient,
     )
     proposal_id = "test_proposal_id"
-    with TransferTestTrialData(
+    with TransferTrialData(
         recipe_run_id=recipe_run_id,
         workflow_name="workflow_name",
         workflow_version="workflow_version",
@@ -678,21 +678,14 @@ def trial_output_task(recipe_run_id, tmp_path, mocker):
         task.write(debug_file_obj, tags=[Tag.debug(), Tag.frame()])
         file_count += 1
 
-        # Write an intermediate frame that we want to transfer
-        intermediate_keep_file_obj = uuid4().hex.encode("utf8")
+        # Write an intermediate frame
+        intermediate_file_obj = uuid4().hex.encode("utf8")
         task.write(
-            intermediate_keep_file_obj,
+            intermediate_file_obj,
             tags=[Tag.intermediate(), Tag.frame(), Tag.task("DUMMY")],
         )
         file_count += 1
 
-        # Write an intermediate frame that we don't want to transfer
-        intermediate_discard_file_obj = uuid4().hex.encode("utf8")
-        task.write(
-            intermediate_discard_file_obj,
-            tags=[Tag.intermediate(), Tag.frame(), Tag.task("WHO_CARES")],
-        )
-
         # An output frame
         output_file_obj = uuid4().hex.encode("utf8")
         task.write(output_file_obj, tags=[Tag.output(), Tag.frame()])
@@ -723,12 +716,6 @@ def trial_output_task(recipe_run_id, tmp_path, mocker):
         task.write(quality_report_file_obj, tags=[Tag.output(), Tag.quality_report()])
         file_count += 1
 
-        # Specifically tagged files
-        task.write(uuid4().hex.encode("utf8"), tags=[Tag.frame(), "FOO", "BAR"])
-        file_count += 1
-        task.write(uuid4().hex.encode("utf8"), tags=[Tag.frame(), "BAZ"])
-        file_count += 1
-
         # This one won't get transferred
         task.write(uuid4().hex.encode("utf8"), tags=[Tag.frame(), "FOO"])
 
@@ -738,7 +725,7 @@ def trial_output_task(recipe_run_id, tmp_path, mocker):
 
 def test_transfer_test_trial_data(trial_output_task, mocker):
     """
-    Given: A TransferTestTrialData task with associated frames
+    Given: A TransferTrialData task with associated frames
     When: Running the task and building the transfer list
     Then: No errors occur and the transfer list has the correct number of items
     """
@@ -748,7 +735,7 @@ def test_transfer_test_trial_data(trial_output_task, mocker):
         "dkist_processing_common.tasks.mixin.globus.GlobusMixin.globus_transfer_scratch_to_object_store"
     )
     mocker.patch(
-        "dkist_processing_test.tasks.trial_output_data.TransferTestTrialData.remove_folder_objects"
+        "dkist_processing_common.tasks.trial_output_data.TransferTrialData.remove_folder_objects"
     )
 
     # Just make sure the thing runs with no errors

dkist_processing_test/workflows/common_tasks.py

@@ -10,6 +10,7 @@ from dkist_processing_common.tasks import SubmitDatasetMetadata
 from dkist_processing_common.tasks import Teardown
 from dkist_processing_common.tasks import TransferL0Data
 from dkist_processing_common.tasks import TransferL1Data
+from dkist_processing_common.tasks import TransferTrialData
 from dkist_processing_common.tasks import TrialTeardown
 from dkist_processing_core import Workflow
 
@@ -19,7 +20,6 @@ from dkist_processing_test.tasks import MakeTestMovieFrames
 from dkist_processing_test.tasks import ParseL0TestInputData
 from dkist_processing_test.tasks import TestAssembleQualityData
 from dkist_processing_test.tasks import TestQualityL0Metrics
-from dkist_processing_test.tasks import TransferTestTrialData
 from dkist_processing_test.tasks import WriteL1Data
 from dkist_processing_test.tasks.manual import ManualWithoutProvenance
 from dkist_processing_test.tasks.manual import ManualWithProvenance
@@ -132,7 +132,7 @@ transfer_trial_data = Workflow(
     detail="transfer-trial-data",
     workflow_package=__package__,
 )
-transfer_trial_data.add_node(task=TransferTestTrialData, upstreams=None)
+transfer_trial_data.add_node(task=TransferTrialData, upstreams=None)
 
 # SubmitDatasetMetadata Task
 submit_dataset_metadata = Workflow(

dkist_processing_test/workflows/trial_end_to_end.py

@@ -6,6 +6,7 @@ from dkist_processing_common.tasks import CreateTrialDatasetInventory
 from dkist_processing_common.tasks import CreateTrialQualityReport
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import TransferL0Data
+from dkist_processing_common.tasks import TransferTrialData
 from dkist_processing_common.tasks import TrialTeardown
 from dkist_processing_core import Workflow
 
@@ -15,7 +16,6 @@ from dkist_processing_test.tasks import MakeTestMovieFrames
 from dkist_processing_test.tasks import ParseL0TestInputData
 from dkist_processing_test.tasks import TestAssembleQualityData
 from dkist_processing_test.tasks import TestQualityL0Metrics
-from dkist_processing_test.tasks import TransferTestTrialData
 from dkist_processing_test.tasks import WriteL1Data
 
 trial = Workflow(
@@ -51,7 +51,7 @@ trial.add_node(
 
 # Output flow
 trial.add_node(
-    task=TransferTestTrialData,
+    task=TransferTrialData,
     upstreams=[
         CreateTrialDatasetInventory,
         CreateTrialAsdf,
@@ -61,4 +61,4 @@ trial.add_node(
 )
 
 # goodby
-trial.add_node(task=TrialTeardown, upstreams=TransferTestTrialData)
+trial.add_node(task=TrialTeardown, upstreams=TransferTrialData)

{dkist_processing_test-1.22.0rc2.dist-info → dkist_processing_test-1.23.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-test
-Version: 1.22.0rc2
+Version: 1.23.0rc2
 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
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
-Requires-Dist: dkist-processing-common ==10.3.0
+Requires-Dist: dkist-processing-common ==10.4.0rc1
 Requires-Dist: dkist-header-validator ==5.1.1
 Requires-Dist: dkist-service-configuration ==2.2
 Requires-Dist: dkist-fits-specifications ==4.7.0

{dkist_processing_test-1.22.0rc2.dist-info → dkist_processing_test-1.23.0rc2.dist-info}/RECORD

@@ -3,33 +3,32 @@ dkist_processing_test/config.py,sha256=LF80ReTk0ggJ3eZI4NZRZCgmR6E84adWU5iP6-JN-
 dkist_processing_test/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_test/models/constants.py,sha256=TxHYZHl3YQXN7-Voj7QgjgAajbxxB_qR8tRI9iTdERI,726
 dkist_processing_test/models/parameters.py,sha256=OLrS1O_xZptjdNW882Otx5cHWyd4FH7nzi8fkZnj9GM,1778
-dkist_processing_test/tasks/__init__.py,sha256=ZWoqlNgFrn2auTMGNX9YWmHW_3JwQzn04XE_FmCAU24,517
+dkist_processing_test/tasks/__init__.py,sha256=mzbjxWY9fdNKUyfXDC_vXuSaB7G0-iwrumCUlq6keoA,457
 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=VszLjR6hzS4S16KbaM5jsWkRXjVjaXuKVwuu6bbLJX4,4374
+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
 dkist_processing_test/tasks/noop.py,sha256=txgpa0DYrjYPKBDfwfjHt7X9Dna4yaJeMCabu3p2Zmo,235
 dkist_processing_test/tasks/parse.py,sha256=4bDKnPaWeZkQbUpYWCWk1O-Fjzu6WWRboFef3NFJDMs,2713
 dkist_processing_test/tasks/quality.py,sha256=9QynI9R5mkYueb46wNBUhK62QSd2n791L0_w6nVxBjc,895
-dkist_processing_test/tasks/trial_output_data.py,sha256=T34kGFxyR0IVaYnJhP3s9kv1_ExSNlnxx0n76cN32NU,1553
 dkist_processing_test/tasks/write_l1.py,sha256=lpNyCI3kH_pnL0Wi1LHhNRjRHNxu6q76xccCNHm7uwA,2074
 dkist_processing_test/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=1hlnoX3DkgHnfZSyTKtaPP1g0y0cyQ3sYj5Kw4SeZ90,27451
+dkist_processing_test/tests/test_tasks.py,sha256=woNEolAfahLowR7T9nTaZgNJidkGmGpfU6Xyc4LXbqQ,26857
 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
+dkist_processing_test/workflows/common_tasks.py,sha256=UpUTt-QhD-jkzBB3p1ECRbtqY3wjP6Lfsy4TdvxZKQ8,6837
 dkist_processing_test/workflows/end_to_end.py,sha256=XzSe7XtPF0e3fLXWL90LOZ0WKCoCKA4SL43N0CzgpCQ,2328
 dkist_processing_test/workflows/exercise_numba.py,sha256=phpPYcIXEsmc0X1yls_YbXoKS6VXxhHe_8vNd_GyajU,347
 dkist_processing_test/workflows/fail.py,sha256=KGhyAF7gKYYutP4aGa-1tDqPsC7Nr4xKYY0z-HByWi0,326
 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.0rc2.dist-info/METADATA,sha256=M4zvsWuG3JbdcWx6G3UyCZa7la08R4xE9wdJEppIBBo,3295
-dkist_processing_test-1.22.0rc2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-dkist_processing_test-1.22.0rc2.dist-info/top_level.txt,sha256=Hs4oTIrG_r-svhk_RGFTEO4e3vqQoYlBzdv5mvJVF24,22
-dkist_processing_test-1.22.0rc2.dist-info/RECORD,,
+dkist_processing_test/workflows/trial_end_to_end.py,sha256=4QSphBegbetDben5PdA5_J64hWJVV8ciVdF90qkyZCo,2415
+dkist_processing_test-1.23.0rc2.dist-info/METADATA,sha256=K5m8u0183_VdfQvAlolrafX43mumoDgnNzwaSrfHOqY,3298
+dkist_processing_test-1.23.0rc2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+dkist_processing_test-1.23.0rc2.dist-info/top_level.txt,sha256=Hs4oTIrG_r-svhk_RGFTEO4e3vqQoYlBzdv5mvJVF24,22
+dkist_processing_test-1.23.0rc2.dist-info/RECORD,,

{dkist_processing_test-1.22.0rc2.dist-info → dkist_processing_test-1.23.0rc2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dkist_processing_test/tasks/trial_output_data.py

@@ -1,46 +0,0 @@
-"""Trial tasks"""
-from dkist_processing_common.tasks.mixin.globus import GlobusTransferItem
-from dkist_processing_common.tasks.trial_output_data import TransferTrialDataBase
-from dkist_service_configuration.logging import logger
-
-__all__ = ["TransferTestTrialData"]
-
-
-class TransferTestTrialData(TransferTrialDataBase):
-    @property
-    def intermediate_task_names(self) -> list[str]:
-        """Return a list of intermediate tasks we want to transfer.
-
-        Just a dummy task for testing.
-        """
-        return ["DUMMY"]
-
-    def build_transfer_list(self) -> list[GlobusTransferItem]:
-        """
-        Build a list containing all files we want to transfer to the trial environment.
-
-        For the purposes of testing we try to exercise all of the provided helper methods.
-        """
-        transfer_list = []
-
-        transfer_list += self.build_debug_frame_transfer_list()
-
-        transfer_list += self.build_intermediate_frame_transfer_list()
-
-        transfer_list += self.build_output_frame_transfer_list()
-
-        transfer_list += self.build_output_dataset_inventory_transfer_list()
-
-        transfer_list += self.build_output_asdf_transfer_list()
-
-        transfer_list += self.build_output_quality_data_transfer_list()
-
-        transfer_list += self.build_output_quality_report_transfer_list()
-
-        transfer_list += self.build_output_movie_transfer_list()
-
-        transfer_list += self.build_transfer_list_from_tag_lists([["FOO", "BAR"], ["BAZ"]])
-
-        logger.info(f"{transfer_list = }")
-
-        return transfer_list