dkist-processing-test 1.19.0rc1__tar.gz → 1.20.0rc1__tar.gz

{dkist-processing-test-1.19.0rc1/dkist_processing_test.egg-info → dkist-processing-test-1.20.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-test
-Version: 1.19.0rc1
+Version: 1.20.0rc1
 Summary: Example Instrument code that is used by the DKIST Science Data Processing pipelines to test processing infrastructure.
 Home-page: https://bitbucket.org/dkistdc/dkist-processing-test/src/main/
 Author: NSO / AURA

{dkist-processing-test-1.19.0rc1 → dkist-processing-test-1.20.0rc1}/dkist_processing_test/tasks/movie.py

@@ -25,7 +25,7 @@ class MakeTestMovieFrames(WorkflowTaskBase):
         for d in range(1, self.constants.num_dsps_repeats + 1):
             with self.apm_task_step(f"Workign on dsps repeat {d}"):
                 for hdu in self.read(
-                    tags=[Tag.output(), Tag.dsps_repeat(d)], decoder=fits_hdu_decoder
+                    tags=[Tag.calibrated(), Tag.dsps_repeat(d)], decoder=fits_hdu_decoder
                 ):
                     header = hdu.header
                     data = np.squeeze(hdu.data)

{dkist-processing-test-1.19.0rc1 → dkist-processing-test-1.20.0rc1}/dkist_processing_test/tests/test_tasks.py

@@ -518,7 +518,7 @@ def make_movie_frames_task(tmp_path, recipe_run_id):
             task.write(
                 data=hdl,
                 tags=[
-                    Tag.output(),
+                    Tag.calibrated(),
                     Tag.dsps_repeat(d + 1),
                 ],
                 encoder=fits_hdulist_encoder,

{dkist-processing-test-1.19.0rc1 → dkist-processing-test-1.20.0rc1}/dkist_processing_test/workflows/end_to_end.py

@@ -26,23 +26,33 @@ end_to_end = Workflow(
     workflow_package=__package__,
 )
 end_to_end.add_node(task=TransferL0Data, upstreams=None)
+
+# Science flow
 end_to_end.add_node(task=ParseL0TestInputData, upstreams=TransferL0Data)
-end_to_end.add_node(task=TestQualityL0Metrics, upstreams=ParseL0TestInputData)
 end_to_end.add_node(
     task=GenerateCalibratedData,
     resource_queue=ResourceQueue.HIGH_MEMORY,
     upstreams=ParseL0TestInputData,
 )
 end_to_end.add_node(task=WriteL1Data, upstreams=GenerateCalibratedData)
-end_to_end.add_node(task=QualityL1Metrics, upstreams=WriteL1Data)
+
+# Movie flow
+end_to_end.add_node(task=MakeTestMovieFrames, upstreams=GenerateCalibratedData)
+end_to_end.add_node(task=AssembleTestMovie, upstreams=MakeTestMovieFrames)
+
+# Quality flow
+end_to_end.add_node(task=TestQualityL0Metrics, upstreams=ParseL0TestInputData)
+end_to_end.add_node(task=QualityL1Metrics, upstreams=GenerateCalibratedData)
 end_to_end.add_node(
     task=TestAssembleQualityData, upstreams=[TestQualityL0Metrics, QualityL1Metrics]
 )
-end_to_end.add_node(task=MakeTestMovieFrames, upstreams=WriteL1Data)
-end_to_end.add_node(task=AssembleTestMovie, upstreams=MakeTestMovieFrames)
+
+# Output flow
+end_to_end.add_node(task=SubmitDatasetMetadata, upstreams=[WriteL1Data, TestAssembleQualityData])
+end_to_end.add_node(task=TransferL1Data, upstreams=[WriteL1Data, AssembleTestMovie])
 end_to_end.add_node(
-    task=SubmitDatasetMetadata, upstreams=[AssembleTestMovie, TestAssembleQualityData]
+    task=PublishCatalogAndQualityMessages, upstreams=[TransferL1Data, SubmitDatasetMetadata]
 )
-end_to_end.add_node(task=TransferL1Data, upstreams=SubmitDatasetMetadata)
-end_to_end.add_node(task=PublishCatalogAndQualityMessages, upstreams=TransferL1Data)
+
+# goodby
 end_to_end.add_node(task=Teardown, upstreams=PublishCatalogAndQualityMessages)

{dkist-processing-test-1.19.0rc1 → dkist-processing-test-1.20.0rc1}/dkist_processing_test/workflows/trial_end_to_end.py

@@ -27,19 +27,29 @@ trial = Workflow(
 )
 
 trial.add_node(task=TransferL0Data, upstreams=None)
+
+# Science flow
 trial.add_node(task=ParseL0TestInputData, upstreams=TransferL0Data)
-trial.add_node(task=TestQualityL0Metrics, upstreams=ParseL0TestInputData)
 trial.add_node(task=GenerateCalibratedData, upstreams=ParseL0TestInputData)
 trial.add_node(task=WriteL1Data, upstreams=GenerateCalibratedData)
-trial.add_node(task=QualityL1Metrics, upstreams=WriteL1Data)
-trial.add_node(task=MakeTestMovieFrames, upstreams=WriteL1Data)
+
+# Movie flow
+trial.add_node(task=MakeTestMovieFrames, upstreams=GenerateCalibratedData)
 trial.add_node(task=AssembleTestMovie, upstreams=MakeTestMovieFrames)
+
+# Quality flow
+trial.add_node(task=TestQualityL0Metrics, upstreams=ParseL0TestInputData)
+trial.add_node(task=QualityL1Metrics, upstreams=GenerateCalibratedData)
 trial.add_node(task=TestAssembleQualityData, upstreams=[TestQualityL0Metrics, QualityL1Metrics])
+
+# Trial data generation
 trial.add_node(task=CreateTrialDatasetInventory, upstreams=WriteL1Data, pip_extras=["inventory"])
 trial.add_node(task=CreateTrialAsdf, upstreams=WriteL1Data, pip_extras=["asdf"])
 trial.add_node(
     task=CreateTrialQualityReport, upstreams=TestAssembleQualityData, pip_extras=["quality"]
 )
+
+# Output flow
 trial.add_node(
     task=TransferTestTrialData,
     upstreams=[
@@ -49,4 +59,6 @@ trial.add_node(
         AssembleTestMovie,
     ],
 )
+
+# goodby
 trial.add_node(task=TrialTeardown, upstreams=TransferTestTrialData)

{dkist-processing-test-1.19.0rc1 → dkist-processing-test-1.20.0rc1/dkist_processing_test.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-test
-Version: 1.19.0rc1
+Version: 1.20.0rc1
 Summary: Example Instrument code that is used by the DKIST Science Data Processing pipelines to test processing infrastructure.
 Home-page: https://bitbucket.org/dkistdc/dkist-processing-test/src/main/
 Author: NSO / AURA

{dkist-processing-test-1.19.0rc1 → dkist-processing-test-1.20.0rc1}/dkist_processing_test.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dkist-processing-common==9.1.0rc1
+dkist-processing-common==10.0.0rc1
 dkist-header-validator==5.1.1
 dkist-service-configuration==2.2
 dkist-fits-specifications==4.6.0
@@ -16,7 +16,7 @@ dkist-processing-common[inventory]
 dkist-inventory==1.4.0
 
 [quality]
-dkist-quality==1.0.4
+dkist-quality==1.1.1
 
 [test]
 pytest
@@ -28,4 +28,4 @@ dkist-processing-common[inventory]
 dkist-inventory==1.4.0
 dkist-processing-common[asdf]
 dkist-inventory[asdf]==1.4.0
-dkist-quality==1.0.4
+dkist-quality==1.1.1

{dkist-processing-test-1.19.0rc1 → dkist-processing-test-1.20.0rc1}/setup.cfg

@@ -17,7 +17,7 @@ setup_requires = setuptools_scm
 packages = find:
 include_package_data = True
 install_requires = 
-	dkist-processing-common == 9.1.0rc1
+	dkist-processing-common == 10.0.0rc1
 	dkist-header-validator == 5.1.1
 	dkist-service-configuration == 2.2
 	dkist-fits-specifications == 4.6.0
@@ -43,7 +43,7 @@ asdf =
 	dkist-processing-common[asdf]
 	dkist-inventory[asdf]==1.4.0
 quality = 
-	dkist-quality == 1.0.4
+	dkist-quality == 1.1.1
 
 [tool:pytest]
 markers =