dkist-processing-visp 3.2.4__tar.gz → 3.2.6__tar.gz

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/CHANGELOG.rst

@@ -1,3 +1,21 @@
+v3.2.6 (2025-06-02)
+===================
+
+Misc
+----
+
+- Remove use of input dataset mixin imported from dkist-processing-common. (`#212 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/212>`__)
+
+
+v3.2.5 (2025-05-30)
+===================
+
+Misc
+----
+
+- Update `dkist-fits-specifications` to v4.17.0 (`#224 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/224>`__)
+
+
 v3.2.4 (2025-05-28)
 ===================
 

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 3.2.4
+Version: 3.2.6
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,11 +13,11 @@ 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.9.0
 Requires-Dist: dkist-processing-math==2.2.0
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-header-validator==5.2.1
-Requires-Dist: dkist-fits-specifications==4.16.0
+Requires-Dist: dkist-fits-specifications==4.17.0
 Requires-Dist: dkist-service-configuration==2.2
 Requires-Dist: dkist-spectral-lines==3.0.0
 Requires-Dist: astropy==7.0.2
@@ -90,7 +90,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.2; extra == "frozen"
+Requires-Dist: aiohttp==3.12.7; 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"
@@ -116,16 +116,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.24; extra == "frozen"
-Requires-Dist: botocore==1.38.24; extra == "frozen"
+Requires-Dist: boto3==1.38.28; extra == "frozen"
+Requires-Dist: botocore==1.38.28; 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"
@@ -146,14 +146,14 @@ 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.9.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==5.1.1; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-visp==3.2.4; extra == "frozen"
+Requires-Dist: dkist-processing-visp==3.2.6; extra == "frozen"
 Requires-Dist: dkist-service-configuration==2.2; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
-Requires-Dist: dkist_fits_specifications==4.16.0; extra == "frozen"
+Requires-Dist: dkist_fits_specifications==4.17.0; extra == "frozen"
 Requires-Dist: dnspython==2.7.0; extra == "frozen"
 Requires-Dist: ecs-logging==2.2.0; extra == "frozen"
 Requires-Dist: elastic-apm==6.23.0; extra == "frozen"
@@ -167,7 +167,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"
@@ -185,7 +186,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: lazy_loader==0.4; extra == "frozen"
 Requires-Dist: limits==5.2.0; extra == "frozen"
@@ -205,7 +206,7 @@ Requires-Dist: more-itertools==10.7.0; extra == "frozen"
 Requires-Dist: moviepy==2.1.2; extra == "frozen"
 Requires-Dist: multidict==6.4.4; extra == "frozen"
 Requires-Dist: nbformat==5.10.4; extra == "frozen"
-Requires-Dist: networkx==3.4.2; extra == "frozen"
+Requires-Dist: networkx==3.5; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==0.1.2; extra == "frozen"
 Requires-Dist: opentelemetry-api==1.33.1; extra == "frozen"
@@ -229,10 +230,10 @@ 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.4; extra == "frozen"
+Requires-Dist: protobuf==5.29.5; extra == "frozen"
 Requires-Dist: psutil==7.0.0; extra == "frozen"
 Requires-Dist: psycopg2-binary==2.9.10; extra == "frozen"
 Requires-Dist: py==1.11.0; extra == "frozen"
@@ -263,7 +264,7 @@ Requires-Dist: scikit-learn==1.6.1; 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"
@@ -275,12 +276,12 @@ Requires-Dist: tenacity==9.1.2; extra == "frozen"
 Requires-Dist: termcolor==3.1.0; extra == "frozen"
 Requires-Dist: text-unidecode==1.3; extra == "frozen"
 Requires-Dist: threadpoolctl==3.6.0; extra == "frozen"
-Requires-Dist: tifffile==2025.5.26; extra == "frozen"
+Requires-Dist: tifffile==2025.6.1; extra == "frozen"
 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_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tasks/parse.py

@@ -17,7 +17,6 @@ from dkist_processing_common.parsers.time import TaskReadoutExpTimesBud
 from dkist_processing_common.parsers.unique_bud import UniqueBud
 from dkist_processing_common.parsers.wavelength import ObserveWavelengthBud
 from dkist_processing_common.tasks import ParseL0InputDataBase
-from dkist_processing_common.tasks.mixin.input_dataset import InputDatasetMixin
 
 from dkist_processing_visp.models.constants import VispBudName
 from dkist_processing_visp.models.parameters import VispParsingParameters
@@ -36,7 +35,7 @@ S = TypeVar("S", bound=Stem)
 __all__ = ["ParseL0VispInputData"]
 
 
-class ParseL0VispInputData(ParseL0InputDataBase, InputDatasetMixin):
+class ParseL0VispInputData(ParseL0InputDataBase):
     """
     Parse input ViSP data. Subclassed from the ParseL0InputDataBase task in dkist_processing_common to add ViSP specific parameters.
 
@@ -62,7 +61,7 @@ class ParseL0VispInputData(ParseL0InputDataBase, InputDatasetMixin):
             workflow_name=workflow_name,
             workflow_version=workflow_version,
         )
-        self.parameters = VispParsingParameters(self.input_dataset_parameters)
+        self.parameters = VispParsingParameters(scratch=self.scratch)
 
     @property
     def fits_parsing_class(self):

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tasks/visp_base.py

@@ -2,13 +2,12 @@
 from abc import ABC
 
 from dkist_processing_common.tasks import WorkflowTaskBase
-from dkist_processing_common.tasks.mixin.input_dataset import InputDatasetMixin
 
 from dkist_processing_visp.models.constants import VispConstants
 from dkist_processing_visp.models.parameters import VispParameters
 
 
-class VispTaskBase(WorkflowTaskBase, InputDatasetMixin, ABC):
+class VispTaskBase(WorkflowTaskBase, ABC):
     """
     Task class for base ViSP tasks.
 
@@ -42,7 +41,7 @@ class VispTaskBase(WorkflowTaskBase, InputDatasetMixin, ABC):
             workflow_version=workflow_version,
         )
         self.parameters = VispParameters(
-            self.input_dataset_parameters,
+            scratch=self.scratch,
             obs_ip_start_time=self.constants.obs_ip_start_time,
             wavelength=self.constants.wavelength,
         )

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tests/conftest.py

@@ -12,8 +12,10 @@ from astropy.io import fits
 from dkist_data_simulator.spec122 import Spec122Dataset
 from dkist_header_validator.translator import sanitize_to_spec214_level1
 from dkist_header_validator.translator import translate_spec122_to_spec214_l0
+from dkist_processing_common.codecs.basemodel import basemodel_encoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
+from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.tasks import WorkflowTaskBase
 
 from dkist_processing_visp.models.constants import VispConstants
@@ -161,7 +163,7 @@ def testing_obs_ip_start_time() -> str:
 def input_dataset_document_simple_parameters_part():
     """Convert a dataclass of parameterValues into an actual input dataset parameters part."""
 
-    def get_input_dataset_parameters_part(parameter_values: dataclass):
+    def make_input_dataset_parameters_part(parameter_values: dataclass):
         parameters_list = []
         value_id = randint(1000, 2000)
         for pn, pv in asdict(parameter_values).items():
@@ -178,7 +180,7 @@ def input_dataset_document_simple_parameters_part():
             parameters_list.append(parameter)
         return parameters_list
 
-    return get_input_dataset_parameters_part
+    return make_input_dataset_parameters_part
 
 
 @pytest.fixture(scope="session")
@@ -186,17 +188,20 @@ def assign_input_dataset_doc_to_task(
     input_dataset_document_simple_parameters_part, testing_obs_ip_start_time, testing_wavelength
 ):
     def update_task(
-        task,
+        task: WorkflowTaskBase,
         parameter_values,
         parameter_class=VispParameters,
         obs_ip_start_time=testing_obs_ip_start_time,
     ):
-        doc_path = task.scratch.workflow_base_path / "dataset_parameters.json"
-        with open(doc_path, "w") as f:
-            f.write(json.dumps(input_dataset_document_simple_parameters_part(parameter_values)))
-        task.tag(doc_path, VispTag.input_dataset_parameters())
+        task.write(
+            data=InputDatasetPartDocumentList(
+                doc_list=input_dataset_document_simple_parameters_part(parameter_values)
+            ),
+            tags=VispTag.input_dataset_parameters(),
+            encoder=basemodel_encoder,
+        )
         task.parameters = parameter_class(
-            task.input_dataset_parameters,
+            scratch=task.scratch,
             obs_ip_start_time=obs_ip_start_time,
             wavelength=testing_wavelength,
         )

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tests/local_trial_workflows/l0_cals_only.py

@@ -6,7 +6,9 @@ from dataclasses import asdict
 from datetime import datetime
 from random import randint
 
+from dkist_processing_common.codecs.basemodel import basemodel_encoder
 from dkist_processing_common.manual import ManualProcessing
+from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_service_configuration.logging import logger
 
@@ -64,11 +66,16 @@ class DatetimeEncoder(json.JSONEncoder):
 
 class CreateInputDatasetParameterDocument(WorkflowTaskBase):
     def run(self) -> None:
-        doc_path = self.scratch.workflow_base_path / "input_dataset_parameters.json"
-        with open(doc_path, "w") as f:
-            f.write(json.dumps(self.input_dataset_document_simple_parameters_part))
-        self.tag(doc_path, VispTag.input_dataset_parameters())
-        logger.info(f"Wrote input dataset doc to {doc_path}")
+        relative_path = "input_dataset_parameters.json"
+        self.write(
+            data=InputDatasetPartDocumentList(
+                doc_list=self.input_dataset_document_simple_parameters_part
+            ),
+            relative_path=relative_path,
+            tags=VispTag.input_dataset_parameters(),
+            encoder=basemodel_encoder,
+        )
+        logger.info(f"Wrote input dataset parameter doc to {relative_path}")
 
     @property
     def input_dataset_document_simple_parameters_part(self):

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tests/local_trial_workflows/l0_solar_gain_as_science.py

@@ -7,7 +7,9 @@ from datetime import datetime
 from pathlib import Path
 from random import randint
 
+from dkist_processing_common.codecs.basemodel import basemodel_encoder
 from dkist_processing_common.manual import ManualProcessing
+from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.tasks import CreateTrialQualityReport
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import WorkflowTaskBase
@@ -108,11 +110,16 @@ class DatetimeEncoder(json.JSONEncoder):
 
 class CreateInputDatasetParameterDocument(WorkflowTaskBase):
     def run(self) -> None:
-        doc_path = self.scratch.workflow_base_path / "input_dataset_parameters.json"
-        with open(doc_path, "w") as f:
-            f.write(json.dumps(self.input_dataset_document_simple_parameters_part))
-        self.tag(doc_path, VispTag.input_dataset_parameters())
-        logger.info(f"Wrote input dataset doc to {doc_path}")
+        relative_path = "input_dataset_parameters.json"
+        self.write(
+            data=InputDatasetPartDocumentList(
+                doc_list=self.input_dataset_document_simple_parameters_part
+            ),
+            relative_path=relative_path,
+            tags=VispTag.input_dataset_parameters(),
+            encoder=basemodel_encoder,
+        )
+        logger.info(f"Wrote input dataset parameter doc to {relative_path}")
 
     @property
     def input_dataset_document_simple_parameters_part(self):

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tests/local_trial_workflows/l0_to_l1.py

@@ -7,8 +7,10 @@ from pathlib import Path
 from random import randint
 
 from dkist_header_validator import spec214_validator
+from dkist_processing_common.codecs.basemodel import basemodel_encoder
 from dkist_processing_common.codecs.fits import fits_access_decoder
 from dkist_processing_common.manual import ManualProcessing
+from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.tasks import CreateTrialAsdf
 from dkist_processing_common.tasks import CreateTrialQualityReport
 from dkist_processing_common.tasks import QualityL1Metrics
@@ -81,11 +83,16 @@ if QUALITY:
 
 class CreateInputDatasetParameterDocument(WorkflowTaskBase):
     def run(self) -> None:
-        doc_path = self.scratch.workflow_base_path / "input_dataset_parameters.json"
-        with open(doc_path, "w") as f:
-            f.write(json.dumps(self.input_dataset_document_simple_parameters_part))
-        self.tag(doc_path, VispTag.input_dataset_parameters())
-        logger.info(f"Wrote input dataset doc to {doc_path}")
+        relative_path = "input_dataset_parameters.json"
+        self.write(
+            data=InputDatasetPartDocumentList(
+                doc_list=self.input_dataset_document_simple_parameters_part
+            ),
+            relative_path=relative_path,
+            tags=VispTag.input_dataset_parameters(),
+            encoder=basemodel_encoder,
+        )
+        logger.info(f"Wrote input dataset parameter doc to {relative_path}")
 
     @property
     def input_dataset_document_simple_parameters_part(self):

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tests/local_trial_workflows/local_trial_helpers.py

@@ -24,7 +24,6 @@ from dkist_processing_common.parsers.time import TaskReadoutExpTimesBud
 from dkist_processing_common.tasks import ParseL0InputDataBase
 from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_processing_common.tasks.mixin.globus import GlobusTransferItem
-from dkist_processing_common.tasks.mixin.input_dataset import InputDatasetMixin
 from dkist_processing_common.tasks.trial_output_data import TransferTrialData
 from dkist_processing_math.statistics import average_numpy_arrays
 from loguru import logger
@@ -380,7 +379,7 @@ class SetNumModstates(VispTaskBase):
         self.constants._update({BudName.num_modstates.value: 10})
 
 
-class ParseCalOnlyL0InputData(ParseL0InputDataBase, InputDatasetMixin):
+class ParseCalOnlyL0InputData(ParseL0InputDataBase):
     """
     Parse input ViSP data. Subclassed from the ParseL0InputDataBase task in dkist_processing_common to add ViSP specific parameters.
 
@@ -406,7 +405,7 @@ class ParseCalOnlyL0InputData(ParseL0InputDataBase, InputDatasetMixin):
             workflow_name=workflow_name,
             workflow_version=workflow_version,
         )
-        self.parameters = VispParsingParameters(self.input_dataset_parameters)
+        self.parameters = VispParsingParameters(scratch=self.scratch)
 
     @property
     def fits_parsing_class(self):

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tests/test_background_light.py

@@ -351,7 +351,7 @@ def constants_bad_exp_times() -> VispConstantsDb:
 
 
 @pytest.fixture(scope="session")
-def constatns_nor_polarimetric() -> VispConstantsDb:
+def constants_nor_polarimetric() -> VispConstantsDb:
     return VispConstantsDb(
         SOLAR_EXPOSURE_TIMES=(10.0,),
         OBSERVE_EXPOSURE_TIMES=(10.0,),
@@ -361,38 +361,42 @@ def constatns_nor_polarimetric() -> VispConstantsDb:
 
 
 @pytest.fixture(scope="function")
-def background_light_calibration_task(
+def background_light_calibration_task_factory(
     tmp_path,
-    assign_input_dataset_doc_to_task,
     init_visp_constants_db,
+    default_constants,
     recipe_run_id,
+    assign_input_dataset_doc_to_task,
     background_testing_parameter_values,
 ):
-    constants_db = VispConstantsDb()
-    init_visp_constants_db(recipe_run_id, constants_db)
-    with BackgroundLightCalibration(
-        recipe_run_id=recipe_run_id,
-        workflow_name="background_light_calibration",
-        workflow_version="vX.Y",
-    ) as task:
-        try:  # This try... block is here to make sure the dbs get cleaned up if there's a failure in the fixture
-            task.scratch = WorkflowFileSystem(
-                scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
-            )
-            assign_input_dataset_doc_to_task(task, background_testing_parameter_values())
+    def make_task(background_on: bool = True, constants: VispConstantsDb = default_constants):
+        constants_db = VispConstantsDb()
+        init_visp_constants_db(recipe_run_id, constants_db)
+        with BackgroundLightCalibration(
+            recipe_run_id=recipe_run_id,
+            workflow_name="background_light_calibration",
+            workflow_version="vX.Y",
+        ) as task:
+            try:  # This try... block is here to make sure the dbs get cleaned up if there's a failure in the fixture
+                task.scratch = WorkflowFileSystem(
+                    scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
+                )
+                init_visp_constants_db(task.recipe_run_id, constants)
+                assign_input_dataset_doc_to_task(
+                    task, background_testing_parameter_values(background_on=background_on)
+                )
+                yield task
+            except:
+                raise
+            finally:
+                task._purge()
 
-            yield task
-        except:
-            raise
-        finally:
-            task._purge()
+    return make_task
 
 
 def test_background_light_calibration_task(
-    background_light_calibration_task,
+    background_light_calibration_task_factory,
     write_background_input_files_to_task,
-    default_constants,
-    init_visp_constants_db,
     total_polcal_files,
     num_polcal_dark_files,
     background_light,
@@ -406,8 +410,8 @@ def test_background_light_calibration_task(
     mocker.patch(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
     )
-    task = background_light_calibration_task
-    init_visp_constants_db(task.recipe_run_id, default_constants)
+    task_generator = background_light_calibration_task_factory()
+    task = next(task_generator)
     write_background_input_files_to_task(task)
     task()
 
@@ -435,7 +439,9 @@ def test_background_light_calibration_task(
 
 
 def test_background_light_bad_exposure_times(
-    background_light_calibration_task, constants_bad_exp_times, init_visp_constants_db, mocker
+    background_light_calibration_task_factory,
+    constants_bad_exp_times,
+    mocker,
 ):
     """
     Given: A set of data where the polcal exposure times don't match those of solar gain and observe
@@ -445,14 +451,16 @@ def test_background_light_bad_exposure_times(
     mocker.patch(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
     )
-    task = background_light_calibration_task
-    init_visp_constants_db(task.recipe_run_id, constants_bad_exp_times)
+    task_generator = background_light_calibration_task_factory(constants=constants_bad_exp_times)
+    task = next(task_generator)
     with pytest.raises(ValueError, match="do not all have the same FPA exposure time"):
         task()
 
 
 def test_background_light_non_polarimetric_dataset(
-    background_light_calibration_task, constatns_nor_polarimetric, init_visp_constants_db, mocker
+    background_light_calibration_task_factory,
+    constants_nor_polarimetric,
+    mocker,
 ):
     """
     Given: A dataset that is non-polarimetric (i.e., Stokes-I only)
@@ -462,8 +470,9 @@ def test_background_light_non_polarimetric_dataset(
     mocker.patch(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
     )
-    task = background_light_calibration_task
-    init_visp_constants_db(task.recipe_run_id, constatns_nor_polarimetric)
+
+    task_generator = background_light_calibration_task_factory(constants=constants_nor_polarimetric)
+    task = next(task_generator)
     task()
 
     # Test that no BACKGROUND files were created
@@ -474,11 +483,7 @@ def test_background_light_non_polarimetric_dataset(
 
 
 def test_background_light_switch_off(
-    background_light_calibration_task,
-    default_constants,
-    init_visp_constants_db,
-    assign_input_dataset_doc_to_task,
-    background_testing_parameter_values,
+    background_light_calibration_task_factory,
     mocker,
 ):
     """
@@ -489,9 +494,8 @@ def test_background_light_switch_off(
     mocker.patch(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
     )
-    task = background_light_calibration_task
-    init_visp_constants_db(task.recipe_run_id, default_constants)
-    assign_input_dataset_doc_to_task(task, background_testing_parameter_values(background_on=False))
+    task_generator = background_light_calibration_task_factory(background_on=False)
+    task = next(task_generator)
     task()
 
     # Test that no BACKGROUND files were created

{dkist_processing_visp-3.2.4 → dkist_processing_visp-3.2.6}/dkist_processing_visp/tests/test_downsample.py

@@ -26,6 +26,7 @@ def task_with_downsample_mixin(
     assign_input_dataset_doc_to_task(task, VispInputDatasetParameterValues())
 
     yield task
+    task._purge()
 
 
 @pytest.fixture(scope="session")