dkist-processing-vbi 1.25.2__tar.gz → 1.25.4__tar.gz

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/CHANGELOG.rst

@@ -1,3 +1,21 @@
+v1.25.4 (2025-12-02)
+====================
+
+Misc
+----
+
+- Bump `dkist-processing-common` to v11.8.1. Doesn't affect VBI. (`#157 <https://bitbucket.org/dkistdc/dkist-processing-vbi/pull-requests/157>`__)
+
+
+v1.25.3 (2025-11-04)
+====================
+
+Misc
+----
+
+- Replace metadata key strings with members of the string enum VbiMetadataKey. (`#152 <https://bitbucket.org/dkistdc/dkist-processing-vbi/pull-requests/152>`__)
+
+
 v1.25.2 (2025-11-03)
 ====================
 

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-vbi
-Version: 1.25.2
+Version: 1.25.4
 Summary: Processing code for the VBI instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
-Requires-Dist: dkist-processing-common==11.8.0
+Requires-Dist: dkist-processing-common==11.8.1
 Requires-Dist: dkist-processing-math==2.2.1
 Requires-Dist: dkist-header-validator==5.2.1
 Requires-Dist: dkist-fits-specifications==4.17.0
@@ -68,6 +68,7 @@ Requires-Dist: Flask-Login==0.6.3; extra == "frozen"
 Requires-Dist: Flask-SQLAlchemy==2.5.1; extra == "frozen"
 Requires-Dist: Flask-Session==0.5.0; extra == "frozen"
 Requires-Dist: Flask-WTF==1.2.2; extra == "frozen"
+Requires-Dist: ImageIO==2.37.2; extra == "frozen"
 Requires-Dist: Jinja2==3.1.6; extra == "frozen"
 Requires-Dist: Mako==1.3.10; extra == "frozen"
 Requires-Dist: MarkupSafe==3.0.3; extra == "frozen"
@@ -85,44 +86,44 @@ Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
 Requires-Dist: aiohttp==3.13.2; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: aiosmtplib==5.0.0; extra == "frozen"
-Requires-Dist: alembic==1.17.1; extra == "frozen"
+Requires-Dist: alembic==1.17.2; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
 Requires-Dist: annotated-types==0.7.0; extra == "frozen"
-Requires-Dist: anyio==4.11.0; extra == "frozen"
+Requires-Dist: anyio==4.12.0; extra == "frozen"
 Requires-Dist: apache-airflow==2.11.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-celery==3.10.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-compat==1.8.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-io==1.6.4; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-sql==1.28.2; extra == "frozen"
+Requires-Dist: apache-airflow-providers-celery==3.13.1; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-compat==1.10.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-io==1.7.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-sql==1.29.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-fab==1.5.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-ftp==3.13.2; extra == "frozen"
-Requires-Dist: apache-airflow-providers-http==5.4.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-imap==3.9.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-postgres==6.4.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-smtp==2.3.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-sqlite==4.1.2; extra == "frozen"
-Requires-Dist: apispec==6.8.4; extra == "frozen"
+Requires-Dist: apache-airflow-providers-ftp==3.14.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-http==5.6.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-imap==3.10.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-postgres==6.5.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-smtp==2.4.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-sqlite==4.2.0; extra == "frozen"
+Requires-Dist: apispec==6.9.0; extra == "frozen"
 Requires-Dist: argcomplete==3.6.3; extra == "frozen"
 Requires-Dist: asdf==3.5.0; extra == "frozen"
 Requires-Dist: asdf_standard==1.4.0; extra == "frozen"
 Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
-Requires-Dist: asgiref==3.10.0; extra == "frozen"
-Requires-Dist: asteval==1.0.6; extra == "frozen"
+Requires-Dist: asgiref==3.11.0; extra == "frozen"
+Requires-Dist: asteval==1.0.7; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2025.11.3.0.38.37; extra == "frozen"
-Requires-Dist: asyncpg==0.30.0; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2025.12.1.0.45.12; extra == "frozen"
+Requires-Dist: asyncpg==0.31.0; extra == "frozen"
 Requires-Dist: attrs==25.4.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
-Requires-Dist: billiard==4.2.2; extra == "frozen"
+Requires-Dist: billiard==4.2.4; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.40.64; extra == "frozen"
-Requires-Dist: botocore==1.40.64; extra == "frozen"
+Requires-Dist: boto3==1.42.1; extra == "frozen"
+Requires-Dist: botocore==1.42.1; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
-Requires-Dist: celery==5.3.1; extra == "frozen"
-Requires-Dist: certifi==2025.10.5; extra == "frozen"
+Requires-Dist: celery==5.6.0; extra == "frozen"
+Requires-Dist: certifi==2025.11.12; extra == "frozen"
 Requires-Dist: cffi==2.0.0; extra == "frozen"
 Requires-Dist: charset-normalizer==3.4.4; extra == "frozen"
-Requires-Dist: click==8.3.0; extra == "frozen"
+Requires-Dist: click==8.3.1; extra == "frozen"
 Requires-Dist: click-didyoumean==0.3.1; extra == "frozen"
 Requires-Dist: click-plugins==1.1.1.2; extra == "frozen"
 Requires-Dist: click-repl==0.3.0; extra == "frozen"
@@ -139,24 +140,25 @@ Requires-Dist: dacite==1.9.2; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
-Requires-Dist: dkist-processing-common==11.8.0; extra == "frozen"
+Requires-Dist: dkist-processing-common==11.8.1; extra == "frozen"
 Requires-Dist: dkist-processing-core==6.0.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-vbi==1.25.2; extra == "frozen"
+Requires-Dist: dkist-processing-vbi==1.25.4; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.1.7; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.17.0; extra == "frozen"
 Requires-Dist: dnspython==2.8.0; extra == "frozen"
 Requires-Dist: email-validator==2.3.0; extra == "frozen"
+Requires-Dist: exceptiongroup==1.3.1; extra == "frozen"
 Requires-Dist: fastjsonschema==2.21.2; extra == "frozen"
 Requires-Dist: flower==2.0.1; extra == "frozen"
-Requires-Dist: fonttools==4.60.1; extra == "frozen"
+Requires-Dist: fonttools==4.61.0; extra == "frozen"
 Requires-Dist: frozenlist==1.8.0; extra == "frozen"
 Requires-Dist: fsspec==2025.10.0; extra == "frozen"
 Requires-Dist: globus-sdk==3.65.0; extra == "frozen"
-Requires-Dist: google-re2==1.1.20250805; extra == "frozen"
-Requires-Dist: googleapis-common-protos==1.71.0; extra == "frozen"
+Requires-Dist: google-re2==1.1.20251105; extra == "frozen"
+Requires-Dist: googleapis-common-protos==1.72.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
 Requires-Dist: greenlet==3.2.4; extra == "frozen"
 Requires-Dist: grpcio==1.76.0; extra == "frozen"
@@ -166,7 +168,6 @@ Requires-Dist: httpcore==1.0.9; extra == "frozen"
 Requires-Dist: httpx==0.28.1; extra == "frozen"
 Requires-Dist: humanize==4.14.0; extra == "frozen"
 Requires-Dist: idna==3.11; extra == "frozen"
-Requires-Dist: imageio==2.37.0; extra == "frozen"
 Requires-Dist: imageio-ffmpeg==0.6.0; extra == "frozen"
 Requires-Dist: importlib_metadata==8.7.0; extra == "frozen"
 Requires-Dist: inflection==0.5.1; extra == "frozen"
@@ -176,7 +177,7 @@ Requires-Dist: jsonschema==4.25.1; extra == "frozen"
 Requires-Dist: jsonschema-specifications==2025.9.1; extra == "frozen"
 Requires-Dist: jupyter_core==5.9.1; extra == "frozen"
 Requires-Dist: kiwisolver==1.4.9; extra == "frozen"
-Requires-Dist: kombu==5.6.0; extra == "frozen"
+Requires-Dist: kombu==5.6.1; extra == "frozen"
 Requires-Dist: lazy-object-proxy==1.12.0; extra == "frozen"
 Requires-Dist: lazy_loader==0.4; extra == "frozen"
 Requires-Dist: limits==5.6.0; extra == "frozen"
@@ -196,7 +197,7 @@ Requires-Dist: more-itertools==10.8.0; extra == "frozen"
 Requires-Dist: moviepy==2.1.2; extra == "frozen"
 Requires-Dist: multidict==6.7.0; extra == "frozen"
 Requires-Dist: nbformat==5.10.4; extra == "frozen"
-Requires-Dist: networkx==3.5; extra == "frozen"
+Requires-Dist: networkx==3.6; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==1.0.0; extra == "frozen"
 Requires-Dist: opentelemetry-api==1.38.0; extra == "frozen"
@@ -241,13 +242,13 @@ Requires-Dist: proglog==0.1.12; extra == "frozen"
 Requires-Dist: prometheus_client==0.23.1; extra == "frozen"
 Requires-Dist: prompt_toolkit==3.0.52; extra == "frozen"
 Requires-Dist: propcache==0.4.1; extra == "frozen"
-Requires-Dist: protobuf==6.33.0; extra == "frozen"
+Requires-Dist: protobuf==6.33.1; extra == "frozen"
 Requires-Dist: psutil==7.1.3; extra == "frozen"
 Requires-Dist: psycopg2-binary==2.9.11; extra == "frozen"
 Requires-Dist: pycparser==2.23; extra == "frozen"
-Requires-Dist: pydantic==2.12.3; extra == "frozen"
-Requires-Dist: pydantic-settings==2.11.0; extra == "frozen"
-Requires-Dist: pydantic_core==2.41.4; extra == "frozen"
+Requires-Dist: pydantic==2.12.5; extra == "frozen"
+Requires-Dist: pydantic-settings==2.12.0; extra == "frozen"
+Requires-Dist: pydantic_core==2.41.5; extra == "frozen"
 Requires-Dist: pyerfa==2.0.1.5; extra == "frozen"
 Requires-Dist: pyparsing==3.2.5; extra == "frozen"
 Requires-Dist: python-daemon==3.1.2; extra == "frozen"
@@ -263,17 +264,16 @@ Requires-Dist: requests-toolbelt==1.0.0; extra == "frozen"
 Requires-Dist: rfc3339-validator==0.1.4; extra == "frozen"
 Requires-Dist: rich==13.9.4; extra == "frozen"
 Requires-Dist: rich-argparse==1.7.2; extra == "frozen"
-Requires-Dist: rpds-py==0.28.0; extra == "frozen"
-Requires-Dist: s3transfer==0.14.0; extra == "frozen"
+Requires-Dist: rpds-py==0.30.0; extra == "frozen"
+Requires-Dist: s3transfer==0.16.0; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
 Requires-Dist: semantic-version==2.10.0; extra == "frozen"
 Requires-Dist: setproctitle==1.3.7; extra == "frozen"
 Requires-Dist: six==1.17.0; extra == "frozen"
-Requires-Dist: sniffio==1.3.1; extra == "frozen"
-Requires-Dist: solar-wavelength-calibration==1.0.1; extra == "frozen"
+Requires-Dist: solar-wavelength-calibration==2.0.0; extra == "frozen"
 Requires-Dist: sqids==0.5.1; extra == "frozen"
-Requires-Dist: sqlparse==0.5.3; extra == "frozen"
+Requires-Dist: sqlparse==0.5.4; extra == "frozen"
 Requires-Dist: sunpy==6.1.1; extra == "frozen"
 Requires-Dist: tabulate==0.9.0; extra == "frozen"
 Requires-Dist: talus==1.3.4; extra == "frozen"
@@ -287,16 +287,17 @@ Requires-Dist: traitlets==5.14.3; extra == "frozen"
 Requires-Dist: typing-inspection==0.4.2; extra == "frozen"
 Requires-Dist: typing_extensions==4.15.0; extra == "frozen"
 Requires-Dist: tzdata==2025.2; extra == "frozen"
+Requires-Dist: tzlocal==5.3.1; extra == "frozen"
 Requires-Dist: uc-micro-py==1.0.3; extra == "frozen"
 Requires-Dist: uncertainties==3.2.3; extra == "frozen"
-Requires-Dist: universal_pathlib==0.3.4; extra == "frozen"
+Requires-Dist: universal_pathlib==0.3.6; extra == "frozen"
 Requires-Dist: urllib3==2.5.0; extra == "frozen"
 Requires-Dist: vine==5.1.0; extra == "frozen"
 Requires-Dist: voluptuous==0.15.2; extra == "frozen"
 Requires-Dist: wcwidth==0.2.14; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
 Requires-Dist: wrapt==1.17.3; extra == "frozen"
-Requires-Dist: yamale==6.0.0; extra == "frozen"
+Requires-Dist: yamale==6.1.0; extra == "frozen"
 Requires-Dist: yarl==1.22.0; extra == "frozen"
 Requires-Dist: zipp==3.23.0; extra == "frozen"
 

dkist_processing_vbi-1.25.4/dkist_processing_vbi/models/fits_access.py

@@ -0,0 +1,13 @@
+"""VBI control of FITS key names and values."""
+
+from enum import StrEnum
+
+
+class VbiMetadataKey(StrEnum):
+    """Controlled list of names for FITS metadata header keys."""
+
+    spatial_step_pattern = "VBISTPAT"
+    number_of_spatial_steps = "VBINSTP"
+    current_spatial_step = "VBISTP"
+    number_of_exp_per_mosaic_step = "VBINFRAM"
+    current_mosaic_step_exp = "VBICFRAM"

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/dkist_processing_vbi/parsers/spatial_step_pattern.py

@@ -4,6 +4,7 @@ from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
 
 from dkist_processing_vbi.models.constants import VbiBudName
+from dkist_processing_vbi.models.fits_access import VbiMetadataKey
 
 
 class SpatialStepPatternBud(TaskUniqueBud):
@@ -23,7 +24,7 @@ class SpatialStepPatternBud(TaskUniqueBud):
     def __init__(self):
         super().__init__(
             constant_name=VbiBudName.spatial_step_pattern.value,
-            metadata_key="spatial_step_pattern",
+            metadata_key=VbiMetadataKey.spatial_step_pattern,
             ip_task_types=TaskName.observe.value,
         )
 

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/dkist_processing_vbi/parsers/vbi_l0_fits_access.py

@@ -3,6 +3,8 @@
 from astropy.io import fits
 from dkist_processing_common.parsers.l0_fits_access import L0FitsAccess
 
+from dkist_processing_vbi.models.fits_access import VbiMetadataKey
+
 
 class VbiL0FitsAccess(L0FitsAccess):
     """
@@ -30,8 +32,10 @@ class VbiL0FitsAccess(L0FitsAccess):
     ):
         super().__init__(hdu=hdu, name=name, auto_squeeze=auto_squeeze)
 
-        self.spatial_step_pattern: str = self.header["VBISTPAT"]
-        self.number_of_spatial_steps: int = self.header.get("VBINSTP")
-        self.current_spatial_step: int = self.header.get("VBISTP")
-        self.number_of_exp_per_mosaic_step: int = self.header.get("VBINFRAM")
-        self.current_mosaic_step_exp: int = self.header.get("VBICFRAM")
+        self.spatial_step_pattern: str = self.header[VbiMetadataKey.spatial_step_pattern]
+        self.number_of_spatial_steps: int = self.header.get(VbiMetadataKey.number_of_spatial_steps)
+        self.current_spatial_step: int = self.header.get(VbiMetadataKey.current_spatial_step)
+        self.number_of_exp_per_mosaic_step: int = self.header.get(
+            VbiMetadataKey.number_of_exp_per_mosaic_step
+        )
+        self.current_mosaic_step_exp: int = self.header.get(VbiMetadataKey.current_mosaic_step_exp)

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/dkist_processing_vbi/parsers/vbi_l1_fits_access.py

@@ -3,6 +3,8 @@
 from astropy.io import fits
 from dkist_processing_common.parsers.l1_fits_access import L1FitsAccess
 
+from dkist_processing_vbi.models.fits_access import VbiMetadataKey
+
 
 class VbiL1FitsAccess(L1FitsAccess):
     """
@@ -30,5 +32,5 @@ class VbiL1FitsAccess(L1FitsAccess):
     ):
         super().__init__(hdu=hdu, name=name, auto_squeeze=auto_squeeze)
 
-        self.number_of_spatial_steps: int = self.header.get("VBINSTP")
-        self.current_spatial_step: int = self.header.get("VBISTP")
+        self.number_of_spatial_steps: int = self.header.get(VbiMetadataKey.number_of_spatial_steps)
+        self.current_spatial_step: int = self.header.get(VbiMetadataKey.current_spatial_step)

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/dkist_processing_vbi/tasks/parse.py

@@ -1,5 +1,6 @@
 """VBI parse task."""
 
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.tags import StemName
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.single_value_single_key_flower import (
@@ -13,6 +14,7 @@ from dkist_processing_common.tasks import ParseL0InputDataBase
 from dkist_processing_common.tasks.parse_l0_input_data import S
 
 from dkist_processing_vbi.models.constants import VbiBudName
+from dkist_processing_vbi.models.fits_access import VbiMetadataKey
 from dkist_processing_vbi.models.tags import VbiStemName
 from dkist_processing_vbi.parsers.mosaic_repeats import MosaicRepeatNumberFlower
 from dkist_processing_vbi.parsers.mosaic_repeats import TotalMosaicRepeatsBud
@@ -50,7 +52,7 @@ class ParseL0VbiInputData(ParseL0InputDataBase):
         return super().constant_buds + [
             UniqueBud(
                 constant_name=VbiBudName.num_spatial_steps.value,
-                metadata_key="number_of_spatial_steps",
+                metadata_key=VbiMetadataKey.number_of_spatial_steps,
             ),
             SpatialStepPatternBud(),
             ObsIpStartTimeBud(),
@@ -69,10 +71,10 @@ class ParseL0VbiInputData(ParseL0InputDataBase):
         return super().tag_flowers + [
             SingleValueSingleKeyFlower(
                 tag_stem_name=VbiStemName.current_spatial_step.value,
-                metadata_key="current_spatial_step",
+                metadata_key=VbiMetadataKey.current_spatial_step,
             ),
             SingleValueSingleKeyFlower(
-                tag_stem_name=StemName.task.value, metadata_key="ip_task_type"
+                tag_stem_name=StemName.task.value, metadata_key=MetadataKey.ip_task_type
             ),
             MosaicRepeatNumberFlower(),
             ExposureTimeFlower(),

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/dkist_processing_vbi/tasks/write_l1.py

@@ -9,6 +9,7 @@ from astropy.io import fits
 from astropy.time import Time
 from astropy.time import TimeDelta
 from dkist_processing_common.models.constants import ConstantsBase
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.tasks.write_l1 import WavelengthRange
 from dkist_processing_common.tasks.write_l1 import WriteL1Frame
 from dkist_service_configuration.logging import logger
@@ -19,6 +20,8 @@ from dkist_processing_vbi.models.filter import find_associated_filter
 
 __all__ = ["VbiWriteL1Frame"]
 
+from dkist_processing_vbi.models.fits_access import VbiMetadataKey
+
 
 class VbiWriteL1Frame(WriteL1Frame):
     """
@@ -85,7 +88,7 @@ class VbiWriteL1Frame(WriteL1Frame):
 
         # ---Temporal---
         if self.constants.num_mosaic_repeats > 1:
-            num_exp_per_dsp = header["VBINFRAM"]
+            num_exp_per_dsp = header[VbiMetadataKey.number_of_exp_per_mosaic_step]
             header["DNAXIS3"] = self.constants.num_mosaic_repeats * num_exp_per_dsp
             header["DTYPE3"] = "TEMPORAL"
             header["DPNAME3"] = "time"
@@ -93,7 +96,7 @@ class VbiWriteL1Frame(WriteL1Frame):
             header["DUNIT3"] = "s"
             # Temporal position in dataset
             current_mosaic_number = header["VBICMOSC"]
-            current_exposure = header["VBICFRAM"]
+            current_exposure = header[VbiMetadataKey.current_mosaic_step_exp]
             header["DINDEX3"] = (current_mosaic_number - 1) * num_exp_per_dsp + current_exposure
 
         # ---Wavelength Info---
@@ -101,8 +104,8 @@ class VbiWriteL1Frame(WriteL1Frame):
         header["WAVEREF"] = "Air"
 
         # --- Mosaic ---
-        number_of_spatial_steps = int(header["VBINSTP"])
-        current_step = int(header["VBISTP"])
+        number_of_spatial_steps = int(header[VbiMetadataKey.number_of_spatial_steps])
+        current_step = int(header[VbiMetadataKey.current_spatial_step])
         if number_of_spatial_steps not in [1, 4, 5, 9]:  # not a known number of spatial steps
             raise ValueError(
                 f"Mosaic grid must be a known configuration (steps in 1, 4, 5, 9). "
@@ -151,7 +154,9 @@ class VbiWriteL1Frame(WriteL1Frame):
         """
         return (
             Time(header["DATE-BEG"], format="isot", precision=6)
-            + TimeDelta(float(header["TEXPOSUR"]) / 1000, format="sec")
+            + TimeDelta(
+                float(header[MetadataKey.sensor_readout_exposure_time_ms]) / 1000, format="sec"
+            )
         ).to_value("isot")
 
     def get_wavelength_range(self, header: fits.Header) -> WavelengthRange:
@@ -160,7 +165,7 @@ class VbiWriteL1Frame(WriteL1Frame):
 
         Range is the wavelengths at the edges of the filter bandpass.
         """
-        vbi_filter = find_associated_filter(wavelength=header["LINEWAV"] * u.nm)
+        vbi_filter = find_associated_filter(wavelength=header[MetadataKey.wavelength] * u.nm)
         return WavelengthRange(min=vbi_filter.min, max=vbi_filter.max)
 
     def get_waveband(self, wavelength: u.Quantity, wavelength_range: WavelengthRange) -> str:

dkist_processing_vbi-1.25.4/dkist_processing_vbi/tests/test_fits_access.py

@@ -0,0 +1,41 @@
+import pytest
+from astropy.io import fits
+from dkist_header_validator import spec122_validator
+
+from dkist_processing_vbi.models.fits_access import VbiMetadataKey
+from dkist_processing_vbi.parsers.vbi_l0_fits_access import VbiL0FitsAccess
+from dkist_processing_vbi.parsers.vbi_l1_fits_access import VbiL1FitsAccess
+from dkist_processing_vbi.tests.conftest import Vbi122ObserveFrames
+
+
+@pytest.fixture(scope="function")
+def header():
+    ds = Vbi122ObserveFrames(array_shape=(1, 2, 2), num_steps=1)
+    header_list = [
+        spec122_validator.validate_and_translate_to_214_l0(d.header(), return_type=fits.HDUList)[
+            0
+        ].header
+        for d in ds
+    ]
+    return header_list[0]
+
+
+def test_metadata_keys_in_access_bases(header):
+    """
+    Given: the set of metadata key names in VbiMetadataKey
+    When: the VBI FITS access classes define a set of new attributes
+    Then: the sets are the same the attributes have the correct values
+    """
+    vbi_metadata_key_names = {vmk.name for vmk in VbiMetadataKey}
+    all_vbi_fits_access_attrs = set()
+    for access_class in [VbiL0FitsAccess, VbiL1FitsAccess]:
+        fits_obj = access_class.from_header(header)
+        vbi_instance_attrs = set(vars(fits_obj).keys())
+        parent_class = access_class.mro()[1]
+        parent_fits_obj = parent_class.from_header(header)
+        parent_instance_attrs = set(vars(parent_fits_obj).keys())
+        vbi_fits_access_attrs = vbi_instance_attrs - parent_instance_attrs
+        for attr in vbi_fits_access_attrs:
+            assert getattr(fits_obj, attr) == fits_obj.header[VbiMetadataKey[attr]]
+        all_vbi_fits_access_attrs |= vbi_fits_access_attrs
+    assert vbi_metadata_key_names == all_vbi_fits_access_attrs

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/dkist_processing_vbi/tests/test_make_movie_frames.py

@@ -9,8 +9,10 @@ from dkist_processing_common.codecs.fits import fits_access_decoder
 from dkist_processing_common.codecs.fits import fits_array_decoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.models.fits_access import FitsAccessBase
+from dkist_processing_common.models.fits_access import MetadataKey
 
 from dkist_processing_vbi.models.constants import VbiConstants
+from dkist_processing_vbi.models.fits_access import VbiMetadataKey
 from dkist_processing_vbi.models.tags import VbiTag
 from dkist_processing_vbi.parsers.vbi_l1_fits_access import VbiL1FitsAccess
 from dkist_processing_vbi.tasks.make_movie_frames import MakeVbiMovieFrames
@@ -57,8 +59,8 @@ def raw_make_movie_frames_task(tmp_path, recipe_run_id, init_vbi_constants_db):
                     hdl[1].header["CDELT2"] = 1.0
                     hdl[1].header["CRPIX1"] = (s % 2) * 7
                     hdl[1].header["CRPIX2"] = -1 * ((s - 1) // 2 - 1) * 7
-                    hdl[1].header["DSPSNUM"] = m
-                    hdl[1].header["VBISTP"] = s
+                    hdl[1].header[MetadataKey.current_dsps_repeat] = m
+                    hdl[1].header[VbiMetadataKey.current_spatial_step] = s
                     task.write(
                         data=hdl,
                         tags=[
@@ -116,8 +118,8 @@ def make_movie_frames_task_with_averages(tmp_path_factory):
                 hdl[1].header["CDELT2"] = 1.0
                 hdl[1].header["CRPIX1"] = (s % 2) * 7
                 hdl[1].header["CRPIX2"] = -1 * ((s - 1) // 2 - 1) * 7
-                hdl[1].header["DSPSNUM"] = m
-                hdl[1].header["VBISTP"] = s
+                hdl[1].header[MetadataKey.current_dsps_repeat] = m
+                hdl[1].header[VbiMetadataKey.current_spatial_step] = s
                 task.write(
                     data=hdl,
                     tags=[

{dkist_processing_vbi-1.25.2 → dkist_processing_vbi-1.25.4}/dkist_processing_vbi/tests/test_write_l1.py

@@ -9,10 +9,12 @@ from dkist_fits_specifications import __version__ as spec_version
 from dkist_header_validator import spec122_validator
 from dkist_header_validator import spec214_validator
 from dkist_processing_common.codecs.fits import fits_array_encoder
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.tags import Tag
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_vbi.models.constants import VbiConstants
+from dkist_processing_vbi.models.fits_access import VbiMetadataKey
 from dkist_processing_vbi.tasks.write_l1 import VbiWriteL1Frame
 from dkist_processing_vbi.tests.conftest import Vbi122ObserveFrames
 from dkist_processing_vbi.tests.conftest import VbiConstantsDb
@@ -34,25 +36,25 @@ def calibrated_header(is_mosaic: bool, camera_str: Literal["red", "blue", "red_a
     header["CUNIT3"] = "s"
     if is_mosaic:
         if camera_str == "blue":
-            header["VBINSTP"] = 9
-            header["VBISTP"] = 5
+            header[VbiMetadataKey.number_of_spatial_steps] = 9
+            header[VbiMetadataKey.current_spatial_step] = 5
         elif camera_str == "red_all":
-            header["VBINSTP"] = 5
-            header["VBISTP"] = 5
+            header[VbiMetadataKey.number_of_spatial_steps] = 5
+            header[VbiMetadataKey.current_spatial_step] = 5
         else:
-            header["VBINSTP"] = 4
-            header["VBISTP"] = 3
+            header[VbiMetadataKey.number_of_spatial_steps] = 4
+            header[VbiMetadataKey.current_spatial_step] = 3
     else:
-        header["VBINSTP"] = 1
-        header["VBISTP"] = 1
-        header["VBISTPAT"] = "5"
-    header["VBINFRAM"] = 3
-    header["VBICFRAM"] = 2
+        header[VbiMetadataKey.number_of_spatial_steps] = 1
+        header[VbiMetadataKey.current_spatial_step] = 1
+        header[VbiMetadataKey.spatial_step_pattern] = "5"
+    header[VbiMetadataKey.number_of_exp_per_mosaic_step] = 3
+    header[VbiMetadataKey.current_mosaic_step_exp] = 2
     header["VBINMOSC"] = 3
     header["VBICMOSC"] = 2
-    header["DSPSNUM"] = 1002  # To mimic a large offset
+    header[MetadataKey.current_dsps_repeat] = 1002  # To mimic a large offset
     header["DATE-BEG"] = "2025-07-11T00:00:00"
-    header["TEXPOSUR"] = 100
+    header[MetadataKey.sensor_readout_exposure_time_ms] = 100
     return header
 
 
@@ -141,7 +143,10 @@ def test_write_l1_frame(
 
         if num_mosaic_repeats > 1:
             assert header["DEAXES"] == 1
-            assert header["DNAXIS3"] == header["VBINFRAM"] * header["VBINMOSC"]
+            assert (
+                header["DNAXIS3"]
+                == header[VbiMetadataKey.number_of_exp_per_mosaic_step] * header["VBINMOSC"]
+            )
             assert header["DTYPE3"] == "TEMPORAL"
             assert header["DUNIT3"] == "s"
             assert header["DPNAME3"] == "time"