dkist-processing-test 1.26.5__py3-none-any.whl → 1.26.6rc1__py3-none-any.whl

dkist_processing_test/models/parameters.py

@@ -2,6 +2,8 @@ import json
 from datetime import datetime
 
 import numpy as np
+from dkist_processing_common.codecs.json import json_decoder
+from dkist_processing_common.models.input_dataset import InputDatasetFilePointer
 from dkist_processing_common.models.parameters import ParameterBase
 from dkist_processing_common.models.parameters import ParameterWavelengthMixin
 
@@ -9,6 +11,12 @@ from dkist_processing_common.models.parameters import ParameterWavelengthMixin
 class TestParameters(ParameterBase, ParameterWavelengthMixin):
     """Class to test loading parameters from a file."""
 
+    def _load_param_value_from_json_file(self, param_obj: InputDatasetFilePointer) -> np.ndarray:
+        """Return the data associated with a tagged parameter file saved with a sting message."""
+        tag = param_obj.file_pointer.tag
+        param_value = self._read_parameter_file(tag=tag, decoder=json_decoder)
+        return param_value
+
     @property
     def randomness(self) -> (float, float):
         """A dummy parameter that requires loading a file."""
@@ -44,8 +52,6 @@ class TestParameters(ParameterBase, ParameterWavelengthMixin):
     def file_message(self) -> str:
         """A dummy parameter that returns a message from a file."""
         param_dict = self._find_most_recent_past_value("test_message_file")
-        file_path = param_dict["param_path"]
-        with open(file_path, "r") as f:
-            message = json.load(f)
+        message = self._load_param_value_from_json_file(param_dict)
 
         return message

dkist_processing_test/tasks/fake_science.py

@@ -9,7 +9,6 @@ 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.input_dataset import InputDatasetMixin
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_test.models.parameters import TestParameters
@@ -17,7 +16,7 @@ from dkist_processing_test.models.parameters import TestParameters
 __all__ = ["GenerateCalibratedData"]
 
 
-class GenerateCalibratedData(WorkflowTaskBase, InputDatasetMixin):
+class GenerateCalibratedData(WorkflowTaskBase):
 
     record_provenance = True
 
@@ -33,7 +32,7 @@ class GenerateCalibratedData(WorkflowTaskBase, InputDatasetMixin):
             workflow_version=workflow_version,
         )
         self.parameters = TestParameters(
-            self.input_dataset_parameters,
+            scratch=self.scratch,
             obs_ip_start_time=self.constants.obs_ip_start_time,
             wavelength=2.0,
         )

dkist_processing_test/tests/test_tasks.py

@@ -16,11 +16,17 @@ from astropy.io import fits
 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.basemodel import basemodel_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.constants import BudName
 from dkist_processing_common.models.constants import ConstantsBase
+from dkist_processing_common.models.input_dataset import InputDatasetFilePointer
+from dkist_processing_common.models.input_dataset import InputDatasetObject
+from dkist_processing_common.models.input_dataset import InputDatasetParameter
+from dkist_processing_common.models.input_dataset import InputDatasetParameterValue
+from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.tasks import TransferTrialData
@@ -38,10 +44,6 @@ from dkist_processing_test.tasks.noop import NoOpTask
 from dkist_processing_test.tasks.write_l1 import WriteL1Data
 from dkist_processing_test.tests.conftest import generate_214_l0_fits_frame
 from dkist_processing_test.tests.conftest import S122Headers
-from dkist_processing_test.tests.parameter_models import MultipleParameterValues
-from dkist_processing_test.tests.parameter_models import ParameterValue
-from dkist_processing_test.tests.parameter_models import RawFileParameterValue
-from dkist_processing_test.tests.parameter_models import TestParameterValues
 
 
 @dataclass
@@ -143,7 +145,7 @@ def generate_calibrated_data_task(
             )
 
         # Write parameter files
-        hdul = random_parameter_hdulist[0]
+        hdul, _, _, _ = random_parameter_hdulist
         task.write(
             data=hdul,
             tags=Tag.parameter(array_parameter_file_object_key),
@@ -171,69 +173,169 @@ def generate_calibrated_data_task(
 
 
 @pytest.fixture(scope="session")
-def input_dataset_document_parameters_part_json(
-    array_parameter_file_object_key,
-    early_json_parameter_file_object_key,
-    late_json_parameter_file_object_key,
-    early_value_message_str,
-    late_value_message_str,
-    early_date,
-    late_date,
+def array_file_parameter(
+    random_parameter_hdulist, array_parameter_file_object_key
+) -> tuple[list[InputDatasetParameterValue], float, float, float]:
+    hdul, mu, std, const = random_parameter_hdulist
+
+    parameter_array_file_values = [
+        InputDatasetParameterValue(
+            parameterValueId=randint(1000, 2000),
+            parameterValue=InputDatasetFilePointer(
+                file_pointer=InputDatasetObject(
+                    objectKey=array_parameter_file_object_key,
+                    bucket="not_used",
+                    tag=Tag.parameter(array_parameter_file_object_key),
+                )
+            ).model_dump_json(),
+            parameterValueStartDate=datetime(1946, 11, 20),
+        )
+    ]
+    return parameter_array_file_values, mu, std, const
+
+
+@pytest.fixture(scope="session")
+def wavelength_parameter() -> list[InputDatasetParameterValue]:
+    value = {"wavelength": (1.0, 2.0, 3.0), "values": ("one", "two", "three")}
+
+    parameter_value = [
+        InputDatasetParameterValue(
+            parameter_value_id=randint(1000, 2000),
+            parameter_value=json.dumps(value),
+            parameter_value_start_date=datetime(1946, 11, 20),
+        )
+    ]
+    return parameter_value
+
+
+@pytest.fixture(scope="session")
+def message_parameters(
+    early_value_message_str, late_value_message_str, early_date, late_date
+) -> list[InputDatasetParameterValue]:
+    parameter_values = [
+        InputDatasetParameterValue(
+            parameterValueId=randint(1000, 2000),
+            parameterValue=json.dumps(early_value_message_str),
+            parameterValueStartDate=early_date,
+        ),
+        InputDatasetParameterValue(
+            parameterValueId=randint(1000, 2000),
+            parameterValue=json.dumps(late_value_message_str),
+            parameterValueStartDate=late_date,
+        ),
+    ]
+    return parameter_values
+
+
+@pytest.fixture(scope="session")
+def message_file_parameters(
+    early_json_parameter_file_object_key, late_json_parameter_file_object_key, early_date, late_date
+) -> list[InputDatasetParameterValue]:
+    parameter_values = [
+        InputDatasetParameterValue(
+            parameterValueId=randint(1000, 2000),
+            parameterValue=InputDatasetFilePointer(
+                file_pointer=InputDatasetObject(
+                    objectKey=early_json_parameter_file_object_key,
+                    bucket="not_used",
+                    tag=Tag.parameter(early_json_parameter_file_object_key),
+                )
+            ).model_dump_json(),
+            parameterValueStartDate=early_date,
+        ),
+        InputDatasetParameterValue(
+            parameterValueId=randint(1000, 2000),
+            parameterValue=InputDatasetFilePointer(
+                file_pointer=InputDatasetObject(
+                    objectKey=late_json_parameter_file_object_key,
+                    bucket="not_used",
+                    tag=Tag.parameter(late_json_parameter_file_object_key),
+                )
+            ).model_dump_json(),
+            parameterValueStartDate=late_date,
+        ),
+    ]
+    return parameter_values
+
+
+@pytest.fixture(scope="session")
+def input_dataset_document_parameters_part_basemodel(
+    array_file_parameter,
+    wavelength_parameter,
+    message_parameters,
+    message_file_parameters,
 ):
+    parameter_array_file_values, _, _, _ = array_file_parameter
+
+    parameter_wavelength_values = wavelength_parameter
+
+    parameter_message_values = message_parameters
 
-    message_file_values = MultipleParameterValues(
-        parameter_value_list=[
-            ParameterValue(
-                parameterValue=RawFileParameterValue(
-                    objectKey=early_json_parameter_file_object_key
-                ),
-                parameterValueStartDate=early_date,
+    parameter_file_values = message_file_parameters
+
+    parameters_obj = InputDatasetPartDocumentList(
+        doc_list=[
+            InputDatasetParameter(
+                parameter_name="test_random_data", parameter_values=parameter_array_file_values
             ),
-            ParameterValue(
-                parameterValue=RawFileParameterValue(objectKey=late_json_parameter_file_object_key),
-                parameterValueStartDate=late_date,
+            InputDatasetParameter(
+                parameter_name="test_wavelength_category",
+                parameter_values=parameter_wavelength_values,
             ),
-        ]
-    )
-    message_value_values = MultipleParameterValues(
-        parameter_value_list=[
-            ParameterValue(
-                parameterValue=early_value_message_str,
-                parameterValueStartDate=early_date,
+            InputDatasetParameter(
+                parameter_name="test_message", parameter_values=parameter_message_values
             ),
-            ParameterValue(
-                parameterValue=late_value_message_str,
-                parameterValueStartDate=late_date,
+            InputDatasetParameter(
+                parameter_name="test_message_file", parameter_values=parameter_file_values
             ),
         ]
     )
-    parameters_obj = TestParameterValues(
-        test_random_data=RawFileParameterValue(objectKey=array_parameter_file_object_key),
-        test_message_file=message_file_values,
-        test_message=message_value_values,
-    )
-
-    part_json_str = parameters_obj.model_dump_json()
 
-    return part_json_str
+    return parameters_obj
 
 
 @pytest.fixture(scope="session")
 def assign_input_dataset_doc_to_task(
-    input_dataset_document_parameters_part_json,
+    input_dataset_document_parameters_part_basemodel,
 ):
     def update_task(task, obs_ip_start_time=None):
-        doc_path = task.scratch.workflow_base_path / "dataset_parameters.json"
-        with open(doc_path, "w") as f:
-            f.write(input_dataset_document_parameters_part_json)
-        task.tag(doc_path, Tag.input_dataset_parameters())
+        task.write(
+            data=input_dataset_document_parameters_part_basemodel,
+            tags=Tag.input_dataset_parameters(),
+            encoder=basemodel_encoder,
+        )
         task.parameters = TestParameters(
-            task.input_dataset_parameters, wavelength=2.0, obs_ip_start_time=obs_ip_start_time
+            scratch=task.scratch, wavelength=2.0, obs_ip_start_time=obs_ip_start_time
         )
 
     return update_task
 
 
+@pytest.mark.parametrize("early_or_late", [pytest.param("early")])
+def test_generate_calibrated_data_parameters(
+    generate_calibrated_data_task,
+    array_file_parameter,
+    early_file_message_str,
+    early_value_message_str,
+    early_or_late,
+):
+    """
+    Given: A GenerateCalibratedData task
+    When: Accessing the task's parameters
+    Then: The correct values are returned
+    """
+    task, _ = generate_calibrated_data_task
+    _, mu, std, const = array_file_parameter
+
+    assert type(task.parameters.randomness) is tuple
+    np.testing.assert_allclose(np.array(task.parameters.randomness), np.array([mu, std]), rtol=1)
+
+    assert task.parameters.constant == const
+    assert task.parameters.wavelength_category == "two"
+    assert task.parameters.value_message == early_value_message_str
+    assert task.parameters.file_message == early_file_message_str
+
+
 @pytest.fixture
 def link_constants_db():
     return constants_linker

{dkist_processing_test-1.26.5.dist-info → dkist_processing_test-1.26.6rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-test
-Version: 1.26.5
+Version: 1.26.6rc1
 Summary: Example instrument code used by the DKIST science data processing pipelines to test processing infrastructure
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
-Requires-Dist: dkist-processing-common==10.8.3
+Requires-Dist: dkist-processing-common==10.8.4rc1
 Requires-Dist: dkist-header-validator==5.2.1
 Requires-Dist: dkist-service-configuration==2.3.0
 Requires-Dist: dkist-fits-specifications==4.17.0
@@ -63,7 +63,7 @@ Requires-Dist: WTForms==3.2.1; extra == "frozen"
 Requires-Dist: Werkzeug==2.2.3; extra == "frozen"
 Requires-Dist: aioftp==0.25.1; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
-Requires-Dist: aiohttp==3.12.4; extra == "frozen"
+Requires-Dist: aiohttp==3.12.6; extra == "frozen"
 Requires-Dist: aiosignal==1.3.2; extra == "frozen"
 Requires-Dist: alembic==1.16.1; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
@@ -89,16 +89,16 @@ Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
 Requires-Dist: asgiref==3.8.1; extra == "frozen"
 Requires-Dist: asteval==1.0.6; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2025.5.26.0.37.21; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2025.6.2.0.38.23; extra == "frozen"
 Requires-Dist: asyncpg==0.30.0; extra == "frozen"
 Requires-Dist: attrs==25.3.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.1; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.38.26; extra == "frozen"
-Requires-Dist: botocore==1.38.26; extra == "frozen"
+Requires-Dist: boto3==1.38.27; extra == "frozen"
+Requires-Dist: botocore==1.38.27; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
-Requires-Dist: celery==5.5.2; extra == "frozen"
+Requires-Dist: celery==5.5.3; extra == "frozen"
 Requires-Dist: certifi==2025.4.26; extra == "frozen"
 Requires-Dist: cffi==1.17.1; extra == "frozen"
 Requires-Dist: charset-normalizer==3.4.2; extra == "frozen"
@@ -119,10 +119,10 @@ 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==10.8.3; extra == "frozen"
+Requires-Dist: dkist-processing-common==10.8.4rc1; extra == "frozen"
 Requires-Dist: dkist-processing-core==5.1.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-test==1.26.5; extra == "frozen"
+Requires-Dist: dkist-processing-test==1.26.6rc1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==2.3.0; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.17.0; extra == "frozen"
@@ -139,7 +139,8 @@ Requires-Dist: globus-sdk==3.56.1; extra == "frozen"
 Requires-Dist: google-re2==1.1.20240702; extra == "frozen"
 Requires-Dist: googleapis-common-protos==1.70.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
-Requires-Dist: grpcio==1.71.0; extra == "frozen"
+Requires-Dist: greenlet==3.2.2; extra == "frozen"
+Requires-Dist: grpcio==1.72.1; extra == "frozen"
 Requires-Dist: gunicorn==23.0.0; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
 Requires-Dist: httpcore==1.0.9; extra == "frozen"
@@ -156,7 +157,7 @@ Requires-Dist: jsonschema==4.24.0; extra == "frozen"
 Requires-Dist: jsonschema-specifications==2025.4.1; extra == "frozen"
 Requires-Dist: jupyter_core==5.8.1; extra == "frozen"
 Requires-Dist: kiwisolver==1.4.8; extra == "frozen"
-Requires-Dist: kombu==5.5.3; extra == "frozen"
+Requires-Dist: kombu==5.5.4; extra == "frozen"
 Requires-Dist: lazy-object-proxy==1.11.0; extra == "frozen"
 Requires-Dist: limits==5.2.0; extra == "frozen"
 Requires-Dist: linkify-it-py==2.0.3; extra == "frozen"
@@ -200,7 +201,7 @@ Requires-Dist: platformdirs==4.3.8; extra == "frozen"
 Requires-Dist: pluggy==1.6.0; extra == "frozen"
 Requires-Dist: prison==0.2.1; extra == "frozen"
 Requires-Dist: proglog==0.1.12; extra == "frozen"
-Requires-Dist: prometheus_client==0.22.0; extra == "frozen"
+Requires-Dist: prometheus_client==0.22.1; extra == "frozen"
 Requires-Dist: prompt_toolkit==3.0.51; extra == "frozen"
 Requires-Dist: propcache==0.3.1; extra == "frozen"
 Requires-Dist: protobuf==5.29.5; extra == "frozen"
@@ -232,7 +233,7 @@ Requires-Dist: s3transfer==0.13.0; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
 Requires-Dist: semantic-version==2.10.0; extra == "frozen"
 Requires-Dist: setproctitle==1.3.6; extra == "frozen"
-Requires-Dist: setuptools==69.2.0; extra == "frozen"
+Requires-Dist: setuptools==65.5.0; extra == "frozen"
 Requires-Dist: six==1.17.0; extra == "frozen"
 Requires-Dist: sniffio==1.3.1; extra == "frozen"
 Requires-Dist: sqids==0.5.1; extra == "frozen"
@@ -247,7 +248,7 @@ Requires-Dist: tornado==6.5.1; extra == "frozen"
 Requires-Dist: tqdm==4.67.1; extra == "frozen"
 Requires-Dist: traitlets==5.14.3; extra == "frozen"
 Requires-Dist: typing-inspection==0.4.1; extra == "frozen"
-Requires-Dist: typing_extensions==4.13.2; extra == "frozen"
+Requires-Dist: typing_extensions==4.14.0; extra == "frozen"
 Requires-Dist: tzdata==2025.2; extra == "frozen"
 Requires-Dist: uc-micro-py==1.0.3; extra == "frozen"
 Requires-Dist: uncertainties==3.2.3; extra == "frozen"

{dkist_processing_test-1.26.5.dist-info → dkist_processing_test-1.26.6rc1.dist-info}/RECORD

@@ -2,11 +2,11 @@ dkist_processing_test/__init__.py,sha256=t-Daj1wOIg5dgI1gklg6suSnI-xi6DKSb6DxHDW
 dkist_processing_test/config.py,sha256=LF80ReTk0ggJ3eZI4NZRZCgmR6E84adWU5iP6-JN-XY,383
 dkist_processing_test/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_test/models/constants.py,sha256=TxHYZHl3YQXN7-Voj7QgjgAajbxxB_qR8tRI9iTdERI,726
-dkist_processing_test/models/parameters.py,sha256=OLrS1O_xZptjdNW882Otx5cHWyd4FH7nzi8fkZnj9GM,1778
+dkist_processing_test/models/parameters.py,sha256=gF1wC5BfTHgdrCjMytvwWqjk3Qmimb7IySexvPGUzyU,2212
 dkist_processing_test/tasks/__init__.py,sha256=mzbjxWY9fdNKUyfXDC_vXuSaB7G0-iwrumCUlq6keoA,457
 dkist_processing_test/tasks/exercise_numba.py,sha256=XfMVffPUgeiPoxSgo39tIjzFBJKKt3fnIYGaDFyBibc,1437
 dkist_processing_test/tasks/fail.py,sha256=jiOiuqoX_JR5hx81REgvcSvb0GBlVKc9MIXKUO0Nhr4,245
-dkist_processing_test/tasks/fake_science.py,sha256=-DMjAtQbtTly0PAv78lIgD8T_HVMo5mmBjyLiYQF0Ko,4555
+dkist_processing_test/tasks/fake_science.py,sha256=rz4SK5F0xatMtUJJqwCFfZJE80LoEQwSSazNSuSBl4M,4447
 dkist_processing_test/tasks/high_memory.py,sha256=J3vBsivFkqs8eZZwBPpEORlHnFX1bGsbO3CjllJMRsc,540
 dkist_processing_test/tasks/manual.py,sha256=gjol_EieMbclv0ZDkVqR2Xd7abutali6KNwoqaCJiAI,583
 dkist_processing_test/tasks/movie.py,sha256=uFPWQlRFP5zzzYGT58IXebbG49su2I4AEpN2bIy7vGc,1831
@@ -16,9 +16,7 @@ dkist_processing_test/tasks/quality.py,sha256=9QynI9R5mkYueb46wNBUhK62QSd2n791L0
 dkist_processing_test/tasks/write_l1.py,sha256=lpNyCI3kH_pnL0Wi1LHhNRjRHNxu6q76xccCNHm7uwA,2074
 dkist_processing_test/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_test/tests/conftest.py,sha256=9H8_tqNKofHnl1IRqYM2-M2_K_TJ3b6oaIfb1dVkbsg,2728
-dkist_processing_test/tests/parameter_models.py,sha256=c-SqCBqHP4KkFs0_Y7HLED4mH4oMCpAYu-rYVlTHy1M,4635
-dkist_processing_test/tests/test_parameters.py,sha256=KGeEUOhtC_l-LN6hjB2jgwUZIWAMBx8wlmEeIja-eKo,4572
-dkist_processing_test/tests/test_tasks.py,sha256=PPsEMMvLAE47mTTKBUGhxb7u9F-2lG-1PTgVaf6Cz_Q,26857
+dkist_processing_test/tests/test_tasks.py,sha256=1s8OXE7Lga7B0_VCPQewylE_FtXn9e4cR3EZh4qMS9Q,30579
 dkist_processing_test/tests/test_workflows.py,sha256=NqRkstqcqwH80cKJ1uDw16G4MsDOuOiZRWdfH0STarQ,286
 dkist_processing_test/workflows/__init__.py,sha256=Ryn_HXsVkZM_lLKyVteXC909Td2geylmz_1Z-8SE8c8,78
 dkist_processing_test/workflows/common_tasks.py,sha256=UpUTt-QhD-jkzBB3p1ECRbtqY3wjP6Lfsy4TdvxZKQ8,6837
@@ -28,7 +26,7 @@ dkist_processing_test/workflows/fail.py,sha256=KGhyAF7gKYYutP4aGa-1tDqPsC7Nr4xKY
 dkist_processing_test/workflows/noop.py,sha256=k2-6BpRkl1JDGaHPavxDzIlVx11KQtxKmsHmHTNQ9o0,666
 dkist_processing_test/workflows/resource_queue.py,sha256=_jOT99O0MFN_ACne6i8T5ZIwe_lBQqGz2Ccb8JlqQMI,500
 dkist_processing_test/workflows/trial_end_to_end.py,sha256=4QSphBegbetDben5PdA5_J64hWJVV8ciVdF90qkyZCo,2415
-dkist_processing_test-1.26.5.dist-info/METADATA,sha256=8BcGRSutdgxPpzt19Dz-SIEVW3BZntqjUu4Hol7ru1Y,16448
-dkist_processing_test-1.26.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_test-1.26.5.dist-info/top_level.txt,sha256=Hs4oTIrG_r-svhk_RGFTEO4e3vqQoYlBzdv5mvJVF24,22
-dkist_processing_test-1.26.5.dist-info/RECORD,,
+dkist_processing_test-1.26.6rc1.dist-info/METADATA,sha256=L97WN5v7teLmXIiNDsKZ6qSXLxamQGQNvT5VIap_npk,16509
+dkist_processing_test-1.26.6rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_test-1.26.6rc1.dist-info/top_level.txt,sha256=Hs4oTIrG_r-svhk_RGFTEO4e3vqQoYlBzdv5mvJVF24,22
+dkist_processing_test-1.26.6rc1.dist-info/RECORD,,

dkist_processing_test/tests/parameter_models.py

@@ -1,130 +0,0 @@
-import json
-from datetime import datetime
-from random import randint
-from typing import Any
-from typing import Union
-
-from pydantic import BaseModel
-from pydantic import ConfigDict
-from pydantic import Field
-from pydantic import field_serializer
-from pydantic import field_validator
-from pydantic import model_serializer
-
-param_value_type_hint = Union[
-    int, str, list, tuple, "WavelengthParameterValue", "RawFileParameterValue"
-]
-multi_str_type = Union[str, "MultipleParameterValues"]
-multi_file_type = Union["RawFileParameterValue", "MultipleParameterValues"]
-multi_wave_type = Union["WavelengthParameterValue", "MultipleParameterValues"]
-
-
-class ParameterValue(BaseModel):
-    """A single parameterValue entry"""
-
-    parameterValue: param_value_type_hint
-    parameterValueId: int = Field(default_factory=lambda: randint(1000, 2000))
-    parameterValueStartDate: datetime = datetime(1946, 11, 20)
-
-    @field_serializer("parameterValue")
-    def json_parameter_value(self, parameter_value: param_value_type_hint) -> str:
-        """Encode the actual value in a JSON string."""
-        try:
-            parameter_value = parameter_value.model_dump()
-        except:
-            # If the value is just a basic type (i.e., not a `BaseModel`)
-            pass
-        return json.dumps(parameter_value)
-
-    @field_serializer("parameterValueStartDate")
-    def datetime_iso_format(self, start_datetime: datetime) -> str:
-        """Encode the start date as an ISO-formatted string."""
-        return start_datetime.isoformat()
-
-
-class MultipleParameterValues(BaseModel):
-    """
-    Container for a list of parameterValues.
-
-    This exists to be different than a raw `list`, which is a valid `parameterValue.parameterValue` type
-    """
-
-    parameter_value_list: list[ParameterValue]
-
-    @field_validator("parameter_value_list", mode="before")
-    @classmethod
-    def ensure_list_of_parameter_values(cls, input_list: list) -> list[ParameterValue]:
-        """Convert any raw types to `ParameterValue` objects."""
-        output_list = []
-        for parameter_value in input_list:
-            if not isinstance(parameter_value, ParameterValue):
-                parameter_value = ParameterValue(parameterValue=parameter_value)
-
-            output_list.append(parameter_value)
-
-        return output_list
-
-    @field_validator("parameter_value_list")
-    @classmethod
-    def no_repeat_start_dates(
-        cls, parameter_value_list: list[ParameterValue]
-    ) -> list[ParameterValue]:
-        """Fail validation if any of the `ParameterValues` have the same `parameterValueStartDate."""
-        start_dates = [pv.parameterValueStartDate for pv in parameter_value_list]
-        if len(set(start_dates)) != len(start_dates):
-            raise ValueError(
-                f"parameterValueStartDates must be unique. Got {set(start_dates)} over {len(start_dates)} parameters."
-            )
-
-        return parameter_value_list
-
-    @model_serializer
-    def parameter_value_list(self):
-        """Return just the list of `ParameterValues`."""
-        return self.parameter_value_list
-
-
-class WavelengthParameterValue(BaseModel):
-    values: tuple
-    wavelength: tuple = (1.0, 2.0, 3.0)
-
-
-class RawFileParameterValue(BaseModel):
-    """
-    For parameters that are files on disk.
-
-    "Raw" in the sense that it still has the `__file__`-level dictionary.
-    """
-
-    objectKey: str
-    bucket: str = "doesn't_matter"
-
-    @model_serializer
-    def file_dict(self) -> dict:
-        """Wrap the input values in a `__file__` dict."""
-        return {"__file__": dict(self)}
-
-
-class TestParameterValues(BaseModel):
-    test_random_data: multi_file_type = RawFileParameterValue(objectKey="")
-    test_wavelength_category: multi_wave_type = WavelengthParameterValue(
-        values=("one", "two", "three")
-    )
-    test_message: multi_str_type = "Weird?"
-    test_message_file: multi_file_type = RawFileParameterValue(objectKey="")
-
-    model_config = ConfigDict(validate_default=True)
-
-    @field_validator("*")
-    @classmethod
-    def ensure_parameter_value_lists(cls, parameter: Any) -> MultipleParameterValues:
-        """Convert all values to `MultipleParameterValues`, if they aren't already."""
-        if not isinstance(parameter, MultipleParameterValues):
-            return MultipleParameterValues(parameter_value_list=[parameter])
-
-        return parameter
-
-    @model_serializer
-    def input_dataset_document_parameters_part(self) -> list:
-        """Place all parameters into higher-level dictionaries required by the input dataset document."""
-        return [{"parameterName": f, "parameterValues": v} for f, v in self]

dkist_processing_test/tests/test_parameters.py

@@ -1,151 +0,0 @@
-import json
-from datetime import datetime
-
-import numpy as np
-import pytest
-from dkist_processing_common.tasks import WorkflowTaskBase
-from dkist_processing_common.tasks.mixin.input_dataset import InputDatasetParameterValue
-
-from dkist_processing_test.models.parameters import TestParameters
-
-
-@pytest.fixture(scope="session")
-def array_file_parameter(
-    tmp_path_factory, random_parameter_hdulist, array_parameter_file_object_key
-) -> tuple[InputDatasetParameterValue, float, float, float]:
-    hdul, mu, std, const = random_parameter_hdulist
-    file_path = tmp_path_factory.mktemp("parameters") / array_parameter_file_object_key
-    hdul.writeto(file_path)
-
-    value = {
-        "bucket": "raw",
-        "objectKey": array_parameter_file_object_key,
-        "param_path": file_path,
-        "is_file": True,
-    }
-
-    parameter_value = InputDatasetParameterValue(
-        parameter_value_id=1,
-        parameter_value=value,
-        parameter_value_start_date=datetime(1946, 11, 20),
-    )
-    return parameter_value, mu, std, const
-
-
-@pytest.fixture(scope="session")
-def message_file_parameter(
-    tmp_path_factory, early_file_message_str, early_json_parameter_file_object_key
-):
-
-    file_path = tmp_path_factory.mktemp("parameters") / early_json_parameter_file_object_key
-    with open(file_path, "w") as f:
-        json.dump(early_file_message_str, f)
-
-    value = {
-        "bucket": "raw",
-        "objectKey": early_json_parameter_file_object_key,
-        "param_path": file_path,
-        "is_file": True,
-    }
-
-    parameter_value = InputDatasetParameterValue(
-        parameter_value_id=2,
-        parameter_value=value,
-        parameter_value_start_date=datetime(1946, 11, 20),
-    )
-    return parameter_value
-
-
-@pytest.fixture(scope="session")
-def message_parameter(early_value_message_str):
-
-    parameter_value = InputDatasetParameterValue(
-        parameter_value_id=3,
-        parameter_value=early_value_message_str,
-        parameter_value_start_date=datetime(1946, 11, 20),
-    )
-
-    return parameter_value
-
-
-@pytest.fixture(scope="session")
-def wavelength_parameter() -> InputDatasetParameterValue:
-    value = {"wavelength": [1.0, 2.0, 3.0], "values": ["one", "two", "three"]}
-
-    parameter_value = InputDatasetParameterValue(
-        parameter_value_id=4,
-        parameter_value=value,
-        parameter_value_start_date=datetime(1946, 11, 20),
-    )
-    return parameter_value
-
-
-@pytest.fixture(scope="session")
-def parameter_dict_with_path(
-    array_file_parameter, message_file_parameter, message_parameter, wavelength_parameter
-):
-    """Enough of an input dataset parameters part to exercise file loading parameters."""
-    file_parameter_value, _, _, _ = array_file_parameter
-
-    param_dict = {
-        "test_random_data": [file_parameter_value],
-        "test_message": [message_parameter],
-        "test_message_file": [message_file_parameter],
-        "test_wavelength_category": [wavelength_parameter],
-    }
-
-    return param_dict
-
-
-@pytest.fixture(scope="session")
-def task_with_parameters(parameter_dict_with_path):
-    class TaskWithParameters(WorkflowTaskBase):
-        def __init__(
-            self,
-            recipe_run_id: int,
-            workflow_name: str,
-            workflow_version: str,
-        ):
-            super().__init__(
-                recipe_run_id=recipe_run_id,
-                workflow_name=workflow_name,
-                workflow_version=workflow_version,
-            )
-            self.parameters = TestParameters(
-                parameter_dict_with_path, wavelength=2.0, obs_ip_start_time="2024-06-11T12:00:00"
-            )
-
-        def run(self):
-            """Do stuff."""
-            pass
-
-    task = TaskWithParameters(
-        recipe_run_id=0,
-        workflow_name="do_stuff",
-        workflow_version="VX.Y",
-    )
-
-    return task
-
-
-def test_parameter(
-    task_with_parameters,
-    array_file_parameter,
-    early_file_message_str,
-    early_value_message_str,
-):
-    """
-    Given: A task with parameters that depend on files
-    When: Accessing those parameters
-    Then: The correct values are returned
-    """
-    task = task_with_parameters
-    _, mu, std, const = array_file_parameter
-
-    assert type(task.parameters.randomness) is tuple
-    np.testing.assert_allclose(np.array(task.parameters.randomness), np.array([mu, std]), rtol=1)
-
-    assert task.parameters.constant == const
-    assert task.parameters.wavelength_category == "two"
-    assert task.parameters.value_message == early_value_message_str
-    assert task.parameters.file_message == early_file_message_str