dkist-processing-test 1.14.1__tar.gz → 1.15.0__tar.gz

{dkist-processing-test-1.14.1/dkist_processing_test.egg-info → dkist-processing-test-1.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-test
-Version: 1.14.1
+Version: 1.15.0
 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.14.1 → dkist-processing-test-1.15.0}/dkist_processing_test/models/parameters.py

@@ -1,5 +1,6 @@
+from datetime import datetime
+
 import numpy as np
-from astropy.io import fits
 from dkist_processing_common.models.parameters import ParameterBase
 from dkist_processing_common.models.parameters import ParameterWavelengthMixin
 
@@ -10,19 +11,21 @@ class TestParameters(ParameterBase, ParameterWavelengthMixin):
     @property
     def randomness(self) -> (float, float):
         """A dummy parameter that requires loading a file."""
-        with open(self._find_most_recent_past_value("test_random_data")["param_path"], "rb") as f:
-            data = fits.open(f)[0].data
-            mean = np.nanmean(data)
-            std = np.nanstd(data)
+        param_dict = self._find_most_recent_past_value(
+            "test_random_data", start_date=datetime.now()
+        )
+        data = self._load_param_value_from_fits(param_dict)
+        mean = np.nanmean(data)
+        std = np.nanstd(data)
 
         return mean, std
 
     @property
     def constant(self) -> float:
         """A dummy parameter that depends on the same file as a different parameter."""
-        with open(self._find_most_recent_past_value("test_random_data")["param_path"], "rb") as f:
-            data = fits.open(f)[1].data
-            constant = np.median(data)
+        param_dict = self._find_most_recent_past_value("test_random_data")
+        data = self._load_param_value_from_fits(param_dict, hdu=1)
+        constant = np.median(data)
 
         return float(constant)
 

{dkist-processing-test-1.14.1 → dkist-processing-test-1.15.0}/dkist_processing_test/tasks/fake_science.py

@@ -31,7 +31,11 @@ class GenerateCalibratedData(WorkflowTaskBase, InputDatasetMixin):
             workflow_name=workflow_name,
             workflow_version=workflow_version,
         )
-        self.parameters = TestParameters(self.input_dataset_parameters, wavelength=2.0)
+        self.parameters = TestParameters(
+            self.input_dataset_parameters,
+            obs_ip_start_time=self.constants.obs_ip_start_time,
+            wavelength=2.0,
+        )
 
     def run(self):
         rng = np.random.default_rng()

{dkist-processing-test-1.14.1 → dkist-processing-test-1.15.0}/dkist_processing_test/tests/test_parameters.py

@@ -70,7 +70,9 @@ def task_with_parameters(parameter_dict_with_path):
                 workflow_name=workflow_name,
                 workflow_version=workflow_version,
             )
-            self.parameters = TestParameters(parameter_dict_with_path, wavelength=2.0)
+            self.parameters = TestParameters(
+                parameter_dict_with_path, wavelength=2.0, obs_ip_start_time="2024-06-11T12:00:00"
+            )
 
         def run(self):
             """Do stuff."""

{dkist-processing-test-1.14.1 → dkist-processing-test-1.15.0}/dkist_processing_test/tests/test_tasks.py

@@ -4,6 +4,7 @@ Tests for the tasks defined in this repo
 import json
 from dataclasses import asdict
 from dataclasses import dataclass
+from dataclasses import is_dataclass
 from datetime import datetime
 from random import randint
 from uuid import uuid4
@@ -16,6 +17,7 @@ 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.constants import ConstantsBase
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.tests.conftest import FakeGQLClient
 from dkist_service_configuration.logging import logger
@@ -36,6 +38,7 @@ from dkist_processing_test.tests.conftest import S122Headers
 @dataclass
 class FakeConstantDb:
     NUM_DSPS_REPEATS: int = 2
+    OBS_IP_START_TIME: str = "2024-06-12T12:00:00"
     INSTRUMENT: str = "TEST"
     AVERAGE_CADENCE: float = 10.0
     MINIMUM_CADENCE: float = 10.0
@@ -85,16 +88,19 @@ def generate_calibrated_data_task(
     tmp_path,
     recipe_run_id,
     assign_input_dataset_doc_to_task,
+    link_constants_db,
     parameter_file_object_key,
     random_parameter_hdulist,
 ):
     number_of_frames = 10
+    link_constants_db(
+        recipe_run_id=recipe_run_id, constants_obj=FakeConstantDb(NUM_DSPS_REPEATS=number_of_frames)
+    )
     with GenerateCalibratedData(
         recipe_run_id=recipe_run_id, workflow_name="GenerateCalibratedData", workflow_version="VX.Y"
     ) as task:
         # configure input data
         task.scratch = WorkflowFileSystem(scratch_base_path=tmp_path, recipe_run_id=recipe_run_id)
-        task.constants._update(asdict(FakeConstantDb(NUM_DSPS_REPEATS=number_of_frames)))
         input_frame_set = Spec122Dataset(
             instrument="vbi",
             dataset_shape=(number_of_frames, 512, 512),
@@ -121,7 +127,7 @@ def generate_calibrated_data_task(
         )
 
         # This needs to be after we've tagged the parameter file
-        assign_input_dataset_doc_to_task(task)
+        assign_input_dataset_doc_to_task(task, obs_ip_start_time=task.constants.obs_ip_start_time)
 
         # result
         yield task, number_of_frames
@@ -172,7 +178,7 @@ def assign_input_dataset_doc_to_task(
     input_dataset_document_parameters_part_with_file,
     input_dataset_document_parameters_part_with_wavelength,
 ):
-    def update_task(task):
+    def update_task(task, obs_ip_start_time=None):
         doc_path = task.scratch.workflow_base_path / "dataset_parameters.json"
         full_parameters = (
             input_dataset_document_parameters_part_with_file
@@ -181,11 +187,28 @@ def assign_input_dataset_doc_to_task(
         with open(doc_path, "w") as f:
             f.write(json.dumps(full_parameters))
         task.tag(doc_path, Tag.input_dataset_parameters())
-        task.parameters = TestParameters(task.input_dataset_parameters, wavelength=2.0)
+        task.parameters = TestParameters(
+            task.input_dataset_parameters, wavelength=2.0, obs_ip_start_time=obs_ip_start_time
+        )
 
     return update_task
 
 
+@pytest.fixture
+def link_constants_db():
+    return constants_linker
+
+
+def constants_linker(recipe_run_id: int, constants_obj):
+    """Take a dataclass (or dict) containing a constants DB and link it to a specific recipe run id."""
+    if is_dataclass(constants_obj):
+        constants_obj = asdict(constants_obj)
+    constants = ConstantsBase(recipe_run_id=recipe_run_id, task_name="test")
+    constants._purge()
+    constants._update(constants_obj)
+    return
+
+
 def test_generate_calibrated_data(generate_calibrated_data_task, mocker):
     """
     Given: A GenerateCalibratedData task

{dkist-processing-test-1.14.1 → dkist-processing-test-1.15.0/dkist_processing_test.egg-info}/PKG-INFO

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

@@ -1,10 +1,10 @@
-dkist-processing-common==7.0.0
+dkist-processing-common==8.0.0
 dkist-header-validator==5.1.0
 dkist-service-configuration==2.2
-dkist-fits-specifications==4.2.0
-numba==0.57.1
-astropy==5.3.0
-numpy==1.24.3
+dkist-fits-specifications==4.3.0
+numba==0.59.1
+astropy==6.1.0
+numpy==1.26.4
 dkist-spectral-lines==3.0.0
 
 [asdf]

{dkist-processing-test-1.14.1 → dkist-processing-test-1.15.0}/setup.cfg

@@ -17,13 +17,13 @@ setup_requires = setuptools_scm
 packages = find:
 include_package_data = True
 install_requires = 
-	dkist-processing-common == 7.0.0
+	dkist-processing-common == 8.0.0
 	dkist-header-validator == 5.1.0
 	dkist-service-configuration == 2.2
-	dkist-fits-specifications == 4.2.0
-	numba == 0.57.1
-	astropy == 5.3.0
-	numpy == 1.24.3
+	dkist-fits-specifications == 4.3.0
+	numba == 0.59.1
+	astropy == 6.1.0
+	numpy == 1.26.4
 	dkist-spectral-lines == 3.0.0
 
 [options.extras_require]