dkist-processing-test 1.9.2__tar.gz → 1.9.3__tar.gz

{dkist-processing-test-1.9.2/dkist_processing_test.egg-info → dkist-processing-test-1.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-test
-Version: 1.9.2
+Version: 1.9.3
 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.9.2 → dkist-processing-test-1.9.3}/dkist_processing_test/tasks/fake_science.py

@@ -4,10 +4,11 @@ Fake science task
 import numpy as np
 from astropy.io import fits
 from dkist_processing_common.codecs.fits import fits_array_encoder
+from dkist_processing_common.codecs.fits import fits_hdu_decoder
+from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 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.fits import FitsDataMixin
 from dkist_processing_common.tasks.mixin.input_dataset import InputDatasetMixin
 
 from dkist_processing_test.models.parameters import TestParameters
@@ -15,7 +16,7 @@ from dkist_processing_test.models.parameters import TestParameters
 __all__ = ["GenerateCalibratedData"]
 
 
-class GenerateCalibratedData(WorkflowTaskBase, FitsDataMixin, InputDatasetMixin):
+class GenerateCalibratedData(WorkflowTaskBase, InputDatasetMixin):
 
     record_provenance = True
 
@@ -58,7 +59,7 @@ class GenerateCalibratedData(WorkflowTaskBase, FitsDataMixin, InputDatasetMixin)
 
         with self.apm_task_step("Loop over inputs"):
             count = 1  # keep a running count to increment the dsps repeat number
-            for hdu in self.fits_data_read_hdu(tags=Tag.input()):
+            for hdu in self.read(tags=Tag.input(), decoder=fits_hdu_decoder):
                 header = hdu.header
                 with self.apm_processing_step("Doing some calculations"):
                     header["DSPSNUM"] = count
@@ -83,13 +84,14 @@ class GenerateCalibratedData(WorkflowTaskBase, FitsDataMixin, InputDatasetMixin)
 
                 with self.apm_writing_step("Writing data"):
                     output_hdul = fits.HDUList([output_hdu])
-                    self.fits_data_write(
-                        hdu_list=output_hdul,
+                    self.write(
+                        data=output_hdul,
                         tags=[
                             Tag.calibrated(),
                             Tag.frame(),
                             Tag.stokes("I"),
                             Tag.dsps_repeat(count),
                         ],
+                        encoder=fits_hdulist_encoder,
                     )
                 count += 1

{dkist-processing-test-1.9.2 → dkist-processing-test-1.9.3}/dkist_processing_test/tasks/movie.py

@@ -1,19 +1,21 @@
 """
 Fake MakeMovieFrames and AssembleTestMovie
 """
+import numpy as np
 from astropy.io import fits
+from dkist_processing_common.codecs.fits import fits_hdu_decoder
+from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.parsers.l1_fits_access import L1FitsAccess
 from dkist_processing_common.tasks import AssembleMovie
 from dkist_processing_common.tasks import WorkflowTaskBase
-from dkist_processing_common.tasks.mixin.fits import FitsDataMixin
 from PIL import ImageDraw
 
 
 __all__ = ["MakeTestMovieFrames", "AssembleTestMovie"]
 
 
-class MakeTestMovieFrames(WorkflowTaskBase, FitsDataMixin):
+class MakeTestMovieFrames(WorkflowTaskBase):
     """
     Take each output frame, copy the header and data and write out
     as a movie frame
@@ -22,16 +24,19 @@ class MakeTestMovieFrames(WorkflowTaskBase, FitsDataMixin):
     def run(self):
         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.fits_data_read_hdu(tags=[Tag.output(), Tag.dsps_repeat(d)]):
+                for hdu in self.read(
+                    tags=[Tag.output(), Tag.dsps_repeat(d)], decoder=fits_hdu_decoder
+                ):
                     header = hdu.header
-                    data = hdu.data
+                    data = np.squeeze(hdu.data)
                     output_hdu = fits.PrimaryHDU(data=data, header=header)
                     output_hdul = fits.HDUList([output_hdu])
 
                     with self.apm_writing_step("Writing data"):
-                        self.fits_data_write(
-                            hdu_list=output_hdul,
+                        self.write(
+                            data=output_hdul,
                             tags=[Tag.movie_frame(), Tag.dsps_repeat(d)],
+                            encoder=fits_hdulist_encoder,
                         )
 
 

{dkist-processing-test-1.9.2 → dkist-processing-test-1.9.3}/dkist_processing_test/tests/test_tasks.py

@@ -15,6 +15,7 @@ from dkist_data_simulator.spec122 import Spec122Dataset
 from dkist_header_validator import spec122_validator
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_hdu_decoder
+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 import logger
@@ -109,11 +110,15 @@ def generate_calibrated_data_task(
             hdu.header["DSPSNUM"] = 1
             hdul = fits.HDUList([hdu])
             file_name = f"input_{idx}.fits"
-            task.fits_data_write(hdu_list=hdul, tags=Tag.input(), relative_path=file_name)
+            task.write(
+                data=hdul, tags=Tag.input(), relative_path=file_name, encoder=fits_hdulist_encoder
+            )
 
         # Write parameter file
         hdul = random_parameter_hdulist[0]
-        task.fits_data_write(hdu_list=hdul, tags=Tag.parameter(parameter_file_object_key))
+        task.write(
+            data=hdul, tags=Tag.parameter(parameter_file_object_key), encoder=fits_hdulist_encoder
+        )
 
         # This needs to be after we've tagged the parameter file
         assign_input_dataset_doc_to_task(task)
@@ -293,9 +298,10 @@ def write_l1_task(complete_common_header, request):
         logger.info(f"{num_of_stokes_params=}")
         hdul = fits.HDUList([hdu])
         for i in range(num_of_stokes_params):
-            task.fits_data_write(
-                hdu_list=hdul,
+            task.write(
+                data=hdul,
                 tags=[Tag.calibrated(), Tag.frame(), Tag.stokes(stokes_params[i])],
+                encoder=fits_hdulist_encoder,
             )
         task.constants._update(
             asdict(
@@ -351,15 +357,16 @@ def make_movie_frames_task(tmp_path, recipe_run_id):
         )
         header_generator = (d.header() for d in ds)
         for d, header in enumerate(header_generator):
-            data = np.ones((10, 10))
-            data[: d * 10, :] = 0.0
+            data = np.ones((1, 10, 10))
+            data[:, : d * 10, :] = 0.0
             hdl = generate_214_l0_fits_frame(data=data, s122_header=header)
-            task.fits_data_write(
-                hdu_list=hdl,
+            task.write(
+                data=hdl,
                 tags=[
                     Tag.output(),
                     Tag.dsps_repeat(d + 1),
                 ],
+                encoder=fits_hdulist_encoder,
             )
         yield task
         task._purge()
@@ -381,6 +388,8 @@ def test_make_movie_frames_task(make_movie_frames_task, mocker):
     assert len(movie_frames) == task.testing_num_dsps_repeats
     for frame in movie_frames:
         assert frame.exists()
+        hdul = fits.open(frame)
+        assert len(hdul[0].data.shape) == 2
 
 
 @pytest.fixture()
@@ -406,12 +415,13 @@ def assemble_test_movie_task(tmp_path, recipe_run_id):
             data = np.ones((10, 10))
             data[: d * 10, :] = 0.0
             hdl = generate_214_l0_fits_frame(data=data, s122_header=header)
-            task.fits_data_write(
-                hdu_list=hdl,
+            task.write(
+                data=hdl,
                 tags=[
                     Tag.movie_frame(),
                     Tag.dsps_repeat(d + 1),
                 ],
+                encoder=fits_hdulist_encoder,
             )
         yield task
         task._purge()

{dkist-processing-test-1.9.2 → dkist-processing-test-1.9.3/dkist_processing_test.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-test
-Version: 1.9.2
+Version: 1.9.3
 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.9.2 → dkist-processing-test-1.9.3}/dkist_processing_test.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dkist-processing-common==5.1.1
+dkist-processing-common==6.0.0
 dkist-header-validator==5.1.0
 dkist-service-configuration==1.1.0
 dkist-fits-specifications==4.1.0

{dkist-processing-test-1.9.2 → dkist-processing-test-1.9.3}/setup.cfg

@@ -17,7 +17,7 @@ setup_requires = setuptools_scm
 packages = find:
 include_package_data = True
 install_requires = 
-	dkist-processing-common == 5.1.1
+	dkist-processing-common == 6.0.0
 	dkist-header-validator == 5.1.0
 	dkist-service-configuration == 1.1.0
 	dkist-fits-specifications == 4.1.0