dkist-processing-common 14.4.0__tar.gz → 14.5.0rc1__tar.gz

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 14.4.0
+Version: 14.5.0rc1
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -16,7 +16,7 @@ Description-Content-Type: text/x-rst
 Requires-Dist: asdf<6.0,>=3.5.0
 Requires-Dist: astropy>=7.0.0
 Requires-Dist: dkist-fits-specifications<5.0,>=4.24.0
-Requires-Dist: dkist-header-validator<6.0,>=5.3.0
+Requires-Dist: dkist-header-validator==v5.4.1rc1
 Requires-Dist: dkist-processing-core==7.5.0
 Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<5.0,>=4.3.0

dkist_processing_common-14.5.0rc1/changelog/348.misc.1.rst

@@ -0,0 +1 @@
+Simplify calls to `dkist-header-validator` methods in the Write L1 and Write Extras tasks.

dkist_processing_common-14.5.0rc1/changelog/348.misc.2.rst

@@ -0,0 +1,2 @@
+Remove call to `remove_extra_axis_keys` in the Write L1 task.  The function was not
+working as desired and has been deleted.

dkist_processing_common-14.5.0rc1/changelog/348.misc.rst

@@ -0,0 +1,2 @@
+Replace `validate_and_translate_to_214_l0` methods in tests by instantiating the
+Dataset with "level0_spec214" file schema.

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/dkist_processing_common/tasks/write_extra.py

@@ -342,8 +342,7 @@ class WriteL1DatasetExtras(WriteL1Base, ABC):
         if self.validate_l1_on_write:
             # Replace this logic with the fits_header_decoder once FITS library keys have been removed from the SPEC
             with fits.open(self.scratch.absolute_path(filename)) as hdul:
-                header = hdul[1].header
-                spec_extras_validator.validate(header, extra=False)
+                spec_extras_validator.validate(hdul, extra=False)
 
         logger.info(f"Wrote dataset extra to {filename}.")
 

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/dkist_processing_common/tasks/write_l1.py

@@ -15,7 +15,6 @@ from astropy.time import Time
 from dkist_fits_specifications import __version__ as spec_version
 from dkist_fits_specifications.utils.formatter import reformat_spec214_header
 from dkist_header_validator import spec214_validator
-from dkist_header_validator.translator import remove_extra_axis_keys
 from dkist_header_validator.translator import remove_spec_122_keys_and_spec_214_l0_keys
 from dkist_spectral_lines.search import get_closest_spectral_line
 from dkist_spectral_lines.search import get_spectral_lines
@@ -104,8 +103,7 @@ class WriteL1Frame(WriteL1Base, ABC):
                 if self.validate_l1_on_write:
                     # Replace this logic with the fits_header_decoder once FITS library keys have been removed from the SPEC
                     with fits.open(self.scratch.absolute_path(relative_path)) as hdul:
-                        header = hdul[1].header
-                        spec214_validator.validate(header, extra=False)
+                        spec214_validator.validate(hdul, extra=False)
 
     def replace_header_values(self, header: fits.Header, data: np.ndarray) -> fits.Header:
         """Replace header values that should already exist with new values."""
@@ -349,9 +347,7 @@ class WriteL1Frame(WriteL1Base, ABC):
         # Add the spectral line headers
         header = self.add_spectral_line_headers(header=header)
         # Remove any headers not contained in spec 214
-        header = remove_spec_122_keys_and_spec_214_l0_keys(input_headers=header)
-        # Remove any keys referring to axes that don't exist
-        header = remove_extra_axis_keys(input_headers=header)
+        header = remove_spec_122_keys_and_spec_214_l0_keys(header)
         return header
 
     def add_doc_headers(self, header: fits.Header) -> fits.Header:

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/dkist_processing_common/tests/conftest.py

@@ -112,6 +112,7 @@ class CommonDataset(Spec122Dataset):
             dataset_shape=(2, 10, 10),
             instrument="visp",
             start_time=datetime(2020, 1, 1, 0, 0, 0, 0),
+            file_schema="level0_spec214",
         )
 
         self.add_constant_key("TELEVATN", 6.28)
@@ -150,13 +151,7 @@ def complete_common_header():
     A header with some common by-frame keywords
     """
     ds = CommonDataset()
-    header_list = [
-        spec122_validator.validate_and_translate_to_214_l0(d.header(), return_type=fits.HDUList)[
-            0
-        ].header
-        for d in ds
-    ]
-
+    header_list = [fits.Header(d.header()) for d in ds]
     return header_list[0]
 
 
@@ -166,12 +161,7 @@ def complete_polarimetric_header():
     A header with some common by-frame keywords
     """
     ds = CommonDataset(polarimetric=True)
-    header_list = [
-        spec122_validator.validate_and_translate_to_214_l0(d.header(), return_type=fits.HDUList)[
-            0
-        ].header
-        for d in ds
-    ]
+    header_list = [fits.Header(d.header()) for d in ds]
 
     return header_list[0]
 
@@ -237,6 +227,7 @@ class CalibrationSequenceDataset(Spec122Dataset):
             time_delta,
             instrument=instrument,
             start_time=datetime(2020, 1, 1, 0, 0, 0),
+            file_schema="level0_spec214",
         )
         self.add_constant_key("DKIST004", "polcal")
         self.add_constant_key("TELEVATN", 6.28)
@@ -281,6 +272,7 @@ class NonPolCalDataset(Spec122Dataset):
             time_delta=1,
             instrument="visp",
             start_time=datetime(2020, 1, 1, 0, 0, 0),
+            file_schema="level0_spec214",
         )  # Instrument doesn't matter
         self.add_constant_key("DKIST004", "dark")  # Anything that's not polcal
         self.add_constant_key("ID___013", "PROPOSAL_ID1")
@@ -339,12 +331,8 @@ def grouped_cal_sequence_fits_objs(
         num_frames_per_CS_step=num_frames_per_cs_step,
         num_modstates=num_modstates,
     )
-    header_list = [
-        spec122_validator.validate_and_translate_to_214_l0(d.header(), return_type=fits.HDUList)[
-            0
-        ].header
-        for d in ds
-    ]
+    header_list = [fits.Header(d.header()) for d in ds]
+
     expected_cs_dict = defaultdict(list)
     for i in range(ds.num_steps):
         for m in range(ds.num_modstates):
@@ -367,12 +355,8 @@ def grouped_cal_sequence_modstate_fits_objs(
         num_frames_per_CS_step=num_frames_per_cs_step,
         num_modstates=num_modstates,
     )
-    header_list = [
-        spec122_validator.validate_and_translate_to_214_l0(d.header(), return_type=fits.HDUList)[
-            0
-        ].header
-        for d in ds
-    ]
+    header_list = [fits.Header(d.header()) for d in ds]
+
     expected_cs_dict = defaultdict(lambda: defaultdict(list))
     for i in range(ds.num_steps):
         for m in range(ds.num_modstates):
@@ -387,12 +371,7 @@ def grouped_cal_sequence_modstate_fits_objs(
 @pytest.fixture(scope="session")
 def non_polcal_fits_objs() -> list[L0FitsAccess]:
     ds = NonPolCalDataset()
-    header_list = [
-        spec122_validator.validate_and_translate_to_214_l0(d.header(), return_type=fits.HDUList)[
-            0
-        ].header
-        for d in ds
-    ]
+    header_list = [fits.Header(d.header()) for d in ds]
     obj_list = [L0FitsAccess(header=h) for h in header_list]
     return obj_list
 
@@ -447,7 +426,12 @@ class CalibrationSequenceStepDataset(Spec122Dataset):
         self.dark_status = dark_status
         dataset_shape = (self.num_mod,) + array_shape[1:]
         super().__init__(
-            dataset_shape, array_shape, time_delta, instrument=instrument, start_time=start_time
+            dataset_shape,
+            array_shape,
+            time_delta,
+            instrument=instrument,
+            start_time=start_time,
+            file_schema="level0_spec214",
         )
         self.add_constant_key("DKIST004", "polcal")
         self.add_constant_key("WAVELNTH", 666.0)
@@ -564,12 +548,7 @@ def cs_with_correct_geometry(cs_data_shape):
             start_time=start_time,
             num_mod=10,
         )
-        header_list = [
-            spec122_validator.validate_and_translate_to_214_l0(
-                d.header(), return_type=fits.HDUList
-            )[0].header
-            for d in ds
-        ]
+        header_list = [fits.Header(d.header()) for d in ds]
         hdu_list = []
         for m in range(ds.num_mod):
             hdu_list.append(

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 14.4.0
+Version: 14.5.0rc1
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -16,7 +16,7 @@ Description-Content-Type: text/x-rst
 Requires-Dist: asdf<6.0,>=3.5.0
 Requires-Dist: astropy>=7.0.0
 Requires-Dist: dkist-fits-specifications<5.0,>=4.24.0
-Requires-Dist: dkist-header-validator<6.0,>=5.3.0
+Requires-Dist: dkist-header-validator==v5.4.1rc1
 Requires-Dist: dkist-processing-core==7.5.0
 Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<5.0,>=4.3.0

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/dkist_processing_common.egg-info/SOURCES.txt

@@ -8,6 +8,9 @@ bitbucket-pipelines.yml
 pyproject.toml
 .rovodev/.review-agent.md
 changelog/.gitempty
+changelog/348.misc.1.rst
+changelog/348.misc.2.rst
+changelog/348.misc.rst
 dkist_processing_common/__init__.py
 dkist_processing_common/config.py
 dkist_processing_common/manual.py

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/dkist_processing_common.egg-info/requires.txt

@@ -1,7 +1,7 @@
 asdf<6.0,>=3.5.0
 astropy>=7.0.0
 dkist-fits-specifications<5.0,>=4.24.0
-dkist-header-validator<6.0,>=5.3.0
+dkist-header-validator==v5.4.1rc1
 dkist-processing-core==7.5.0
 dkist-processing-pac<4.0,>=3.1
 dkist-service-configuration<5.0,>=4.3.0

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/dkist_processing_common.egg-info/scm_file_list.json

@@ -9,6 +9,9 @@
     "README.rst",
     "bitbucket-pipelines.yml",
     "changelog/.gitempty",
+    "changelog/348.misc.1.rst",
+    "changelog/348.misc.2.rst",
+    "changelog/348.misc.rst",
     "dkist_processing_common/__init__.py",
     "dkist_processing_common/_util/__init__.py",
     "dkist_processing_common/_util/constants.py",

dkist_processing_common-14.5.0rc1/dkist_processing_common.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "14.5.0rc1",
+  "distance": 0,
+  "node": "g53558c6ddfeb75f20897f6a78ef9ab07ed24e4e5",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-28"
+}

{dkist_processing_common-14.4.0 → dkist_processing_common-14.5.0rc1}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
   "asdf >= 3.5.0, <6.0",
   "astropy  >= 7.0.0",
   "dkist-fits-specifications >= 4.24.0, <5.0",
-  "dkist-header-validator >= 5.3.0, <6.0",
+  "dkist-header-validator == v5.4.1rc1", # TODO: change to >6.0"
   "dkist-processing-core == 7.5.0",
   "dkist-processing-pac >= 3.1, <4.0",
   "dkist-service-configuration >= 4.3.0, <5.0",

dkist_processing_common-14.4.0/dkist_processing_common.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "14.4.0",
-  "distance": 0,
-  "node": "g03f7e0aad3e664b565bb1157eae944f016af3c30",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-25"
-}