dkist-processing-common 10.8.1rc1__py3-none-any.whl → 10.8.2__py3-none-any.whl

dkist_processing_common/tasks/write_l1.py

@@ -295,10 +295,14 @@ class WriteL1Frame(WorkflowTaskBase, MetadataStoreMixin, ABC):
         header["SOLARRAD"] = self.calculate_solar_angular_radius(obstime=obstime)
         header["SPECSYS"] = "TOPOCENT"  # no wavelength correction made due to doppler velocity
         header["VELOSYS"] = 0.0  # no wavelength correction made due to doppler velocity
-        header["WAVEBAND"] = get_closest_spectral_line(wavelength=header["LINEWAV"] * u.nm).name
         wavelength_range = self.get_wavelength_range(header=header)
         header["WAVEMIN"] = wavelength_range.min.to_value(u.nm)
         header["WAVEMAX"] = wavelength_range.max.to_value(u.nm)
+        waveband: str | None = self.get_waveband(
+            wavelength=header["LINEWAV"] * u.nm, wavelength_range=wavelength_range
+        )
+        if waveband:
+            header["WAVEBAND"] = waveband
         return header
 
     def l1_filename(self, header: fits.Header, stokes: Literal["I", "Q", "U", "V"]):
@@ -515,3 +519,18 @@ class WriteL1Frame(WorkflowTaskBase, MetadataStoreMixin, ABC):
         if header.get("AO_LOCK") is not True:
             header.pop("ATMOS_R0", None)
         return header
+
+    @staticmethod
+    def get_waveband(wavelength: u.Quantity, wavelength_range: WavelengthRange) -> str | None:
+        """
+        Get the spectral line information of the closest spectral line to the wavelength argument.
+
+        If the spectral line rest wavelength in air does not fall in the wavelength range of the data,
+        do not populate the keyword.
+        """
+        print(wavelength_range)
+        closest_line = get_closest_spectral_line(wavelength=wavelength)
+        rest_wavelength = closest_line.rest_wavelength_in_air
+        if rest_wavelength < wavelength_range.min or rest_wavelength > wavelength_range.max:
+            return None
+        return closest_line.name

dkist_processing_common/tests/conftest.py

@@ -45,6 +45,7 @@ from dkist_processing_common.models.graphql import RecipeRunStatusResponse
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.parsers.l0_fits_access import L0FitsAccess
 from dkist_processing_common.tasks import WorkflowTaskBase
+from dkist_processing_common.tasks.mixin.input_dataset import InputDatasetMixin
 
 TILE_SIZE = 64
 
@@ -358,7 +359,7 @@ class FakeGQLClient:
                 {
                     "parameterValueId": 1,
                     "parameterValue": json.dumps([[1, 2, 3], [4, 5, 6], [7, 8, 9]]),
-                    "parameterValueStartDate": datetime(2000, 1, 1).isoformat(),
+                    "parameterValueStartDate": "2000-01-01",
                 }
             ],
         },
@@ -375,7 +376,7 @@ class FakeGQLClient:
                             }
                         }
                     ),
-                    "parameterValueStartDate": datetime(2000, 1, 1).isoformat(),
+                    "parameterValueStartDate": "2000-01-01",
                 },
                 {
                     "parameterValueId": 3,
@@ -387,7 +388,7 @@ class FakeGQLClient:
                             }
                         }
                     ),
-                    "parameterValueStartDate": datetime(2000, 1, 2).isoformat(),
+                    "parameterValueStartDate": "2000-01-02",
                 },
             ],
         },
@@ -399,7 +400,7 @@ class FakeGQLClient:
                     "parameterValue": json.dumps(
                         {"a": 1, "b": 3.14159, "c": "foo", "d": [1, 2, 3]}
                     ),
-                    "parameterValueStartDate": datetime(2000, 1, 1).isoformat(),
+                    "parameterValueStartDate": "2000-01-01",
                 }
             ],
         },
@@ -795,7 +796,7 @@ def post_fit_polcal_fitter(
     return fitter
 
 
-class InputDatasetTask(WorkflowTaskBase):
+class InputDatasetTask(WorkflowTaskBase, InputDatasetMixin):
     def run(self):
         pass
 
@@ -823,7 +824,7 @@ def task_with_input_dataset(
         task.scratch.workflow_base_path = tmp_path / str(recipe_run_id)
         for part, tag in input_dataset_parts:
             file_path = task.scratch.workflow_base_path / Path(f"{uuid4().hex[:6]}.ext")
-            file_path.write_text(data=json.dumps({"doc_list": part}))
+            file_path.write_text(data=json.dumps(part))
             task.tag(path=file_path, tags=tag)
         yield task
 
@@ -850,24 +851,6 @@ def create_parameter_files(
             task.tag(path=file_path, tags=Tag.parameter(param_path))
 
 
-def create_input_frames(
-    task: WorkflowTaskBase,
-    input_frame_docs: list[dict] = FakeGQLClient.observe_frames_doc_object
-    + FakeGQLClient.calibration_frames_doc_object,
-):
-    """
-    Create the observe and calibration frame files specified in the input dataset documents
-    returned by the metadata store.
-    """
-    for frame in input_frame_docs:
-        for object_key in frame["object_keys"]:
-            file_path = task.scratch.workflow_base_path / Path(object_key)
-            if not file_path.parent.exists():
-                file_path.parent.mkdir(parents=True, exist_ok=True)
-            file_path.write_text(data="")
-            task.tag(path=file_path, tags=[Tag.frame(), Tag.input()])
-
-
 @pytest.fixture()
 def fake_constants_db() -> dict:
     """

dkist_processing_common/tests/test_codecs.py

@@ -19,15 +19,10 @@ from astropy.io.fits import CompImageHDU
 from astropy.io.fits import HDUList
 from astropy.io.fits import Header
 from astropy.io.fits import PrimaryHDU
-from pydantic import BaseModel
-from pydantic import create_model
-from pydantic import Field
 
 from dkist_processing_common.codecs.asdf import asdf_decoder
 from dkist_processing_common.codecs.asdf import asdf_encoder
 from dkist_processing_common.codecs.asdf import asdf_fileobj_encoder
-from dkist_processing_common.codecs.basemodel import basemodel_decoder
-from dkist_processing_common.codecs.basemodel import basemodel_encoder
 from dkist_processing_common.codecs.bytes import bytes_decoder
 from dkist_processing_common.codecs.bytes import bytes_encoder
 from dkist_processing_common.codecs.fits import fits_access_decoder
@@ -105,14 +100,6 @@ def path_to_json(dictionary, tmp_file) -> Path:
     return tmp_file
 
 
-@pytest.fixture
-def pydantic_basemodel() -> BaseModel:
-    class Foo(BaseModel):
-        bar: int
-
-    return Foo(bar=123)
-
-
 @pytest.fixture
 def string() -> str:
     return "string"
@@ -369,7 +356,6 @@ class DummyFitsAccess(FitsAccessBase):
         pytest.param("primary_hdu_list", fits_hdulist_encoder, id="fits uncompressed HDUList"),
         pytest.param("compressed_hdu_list", fits_hdulist_encoder, id="fits compressed HDUList"),
         pytest.param("dictionary", json_encoder, id="json"),
-        pytest.param("pydantic_basemodel", basemodel_encoder, id="pydantic basemodel"),
         pytest.param("string", str_encoder, id="str"),
         pytest.param("asdf_tree", asdf_encoder, id="asdf"),
         pytest.param("asdf_obj", asdf_fileobj_encoder, id="asdf_obj"),
@@ -614,30 +600,6 @@ def test_json_encoder_invalid(python_object: Any, expected_exception_type: type[
         json_encoder(python_object)
 
 
-def test_basemodel_decoder(valid_json_codec, path_to_text_file):
-    """
-    Given: a python object that can be validated to a Pydantic BaseModel object is written to file as json
-    When: basemodel decoding is applied to the json file
-    Then: the string gets decoded to the correct Pydantic BaseModel object
-    """
-    # write python object to file as json string
-    python_object = valid_json_codec["python_object"]
-    path = path_to_text_file(json.dumps({"foo": python_object}))
-
-    # create basemodel on the fly
-    DynamicBaseModel = create_model(
-        "DynamicBaseModel", foo=(Any, Field(default_factory=type(python_object)))
-    )
-
-    # get the same object via the basemodel decoder
-    decoded_obj = basemodel_decoder(path, model=DynamicBaseModel)
-    if python_object is nan:
-        # By definition, nan != nan
-        assert isnan(decoded_obj.foo)
-    else:
-        assert decoded_obj.foo == python_object
-
-
 def test_quality_data_encoder_valid(valid_quality_codec):
     """
     Given: a python object that can be encoded as a json string