dkist-processing-common 10.6.1rc4__py3-none-any.whl → 10.6.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- dkist_processing_common/manual.py +1 -1
- dkist_processing_common/models/graphql.py +3 -3
- dkist_processing_common/tests/test_manual_processing.py +34 -0
- {dkist_processing_common-10.6.1rc4.dist-info → dkist_processing_common-10.6.2.dist-info}/METADATA +6 -1
- {dkist_processing_common-10.6.1rc4.dist-info → dkist_processing_common-10.6.2.dist-info}/RECORD +7 -8
- {dkist_processing_common-10.6.1rc4.dist-info → dkist_processing_common-10.6.2.dist-info}/WHEEL +1 -1
- changelog/236.misc.1.rst +0 -2
- changelog/236.misc.rst +0 -3
- {dkist_processing_common-10.6.1rc4.dist-info → dkist_processing_common-10.6.2.dist-info}/top_level.txt +0 -0
|
@@ -182,7 +182,7 @@ def writing_metadata_store_record_provenance(self, is_task_manual: bool, library
|
|
|
182
182
|
workflowVersion=self.workflow_version,
|
|
183
183
|
)
|
|
184
184
|
self.write(
|
|
185
|
-
data=
|
|
185
|
+
data=params.model_dump(),
|
|
186
186
|
encoder=json_encoder,
|
|
187
187
|
tags=["PROVENANCE_RECORD"],
|
|
188
188
|
relative_path=f"{self.task_name}_provenance.json",
|
|
@@ -103,14 +103,14 @@ class RecipeRunResponse(BaseModel):
|
|
|
103
103
|
recipeInstance: RecipeInstanceResponse
|
|
104
104
|
recipeInstanceId: int
|
|
105
105
|
recipeRunProvenances: list[RecipeRunProvenanceResponse]
|
|
106
|
-
configuration: Json[
|
|
106
|
+
configuration: Json[dict] | None
|
|
107
107
|
|
|
108
108
|
@field_validator("configuration", mode="after")
|
|
109
109
|
@classmethod
|
|
110
|
-
def
|
|
110
|
+
def _use_recipe_run_configuration_model(cls, value):
|
|
111
111
|
if value is None:
|
|
112
112
|
return RecipeRunConfiguration()
|
|
113
|
-
return value
|
|
113
|
+
return RecipeRunConfiguration.model_validate(value)
|
|
114
114
|
|
|
115
115
|
|
|
116
116
|
class RecipeRunMutationResponse(BaseModel):
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import pytest
|
|
2
|
+
|
|
3
|
+
from dkist_processing_common.manual import ManualProcessing
|
|
4
|
+
from dkist_processing_common.tasks import WorkflowTaskBase
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
class ProvenanceTask(WorkflowTaskBase):
|
|
8
|
+
record_provenance = True
|
|
9
|
+
|
|
10
|
+
def run(self):
|
|
11
|
+
...
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
@pytest.fixture(scope="function")
|
|
15
|
+
def manual_processing_run(tmp_path, recipe_run_id):
|
|
16
|
+
with ManualProcessing(
|
|
17
|
+
recipe_run_id=recipe_run_id,
|
|
18
|
+
workflow_path=tmp_path,
|
|
19
|
+
workflow_name="manual",
|
|
20
|
+
workflow_version="manual",
|
|
21
|
+
) as manual_processing_run:
|
|
22
|
+
yield manual_processing_run
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
def test_manual_record_provenance(tmp_path, recipe_run_id, manual_processing_run):
|
|
26
|
+
"""
|
|
27
|
+
Given: A WorkflowTaskBase subclass with provenance recording turned on
|
|
28
|
+
When: Running the task with the ManualProcessing wrapper
|
|
29
|
+
Then: The provenance record exists on disk
|
|
30
|
+
"""
|
|
31
|
+
manual_processing_run.run_task(task=ProvenanceTask)
|
|
32
|
+
directory = tmp_path / str(recipe_run_id)
|
|
33
|
+
provenance_file = directory / "ProvenanceTask_provenance.json"
|
|
34
|
+
assert provenance_file.exists()
|
{dkist_processing_common-10.6.1rc4.dist-info → dkist_processing_common-10.6.2.dist-info}/METADATA
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.2
|
|
2
2
|
Name: dkist-processing-common
|
|
3
|
-
Version: 10.6.
|
|
3
|
+
Version: 10.6.2
|
|
4
4
|
Summary: Common task classes used by the DKIST science data processing pipelines
|
|
5
5
|
Author-email: NSO / AURA <dkistdc@nso.edu>
|
|
6
6
|
License: BSD-3-Clause
|
|
@@ -65,6 +65,8 @@ Requires-Dist: dkist-quality<2.0,>=1.2.1; extra == "quality"
|
|
|
65
65
|
dkist-processing-common
|
|
66
66
|
=======================
|
|
67
67
|
|
|
68
|
+
|codecov|
|
|
69
|
+
|
|
68
70
|
This repository works in concert with `dkist-processing-core <https://pypi.org/project/dkist-processing-core/>`_ and `dkist-processing-*instrument*` to
|
|
69
71
|
form the DKIST calibration processing stack.
|
|
70
72
|
|
|
@@ -173,3 +175,6 @@ then the Bitbucket pipeline will fail. To be able to use the same tag you must d
|
|
|
173
175
|
# Re-tag with the same version
|
|
174
176
|
git tag vWHATEVER.THE.VERSION
|
|
175
177
|
git push --tags origin main
|
|
178
|
+
|
|
179
|
+
.. |codecov| image:: https://codecov.io/bb/dkistdc/dkist-processing-common/graph/badge.svg?token=3QSLGSEF3O
|
|
180
|
+
:target: https://codecov.io/bb/dkistdc/dkist-processing-common
|
{dkist_processing_common-10.6.1rc4.dist-info → dkist_processing_common-10.6.2.dist-info}/RECORD
RENAMED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
|
-
changelog/236.misc.1.rst,sha256=wN9uYenjgu25jpjAcLtCxLIAlLz658rqAV6sIvWBulI,158
|
|
3
|
-
changelog/236.misc.rst,sha256=V_aMXk7hePoQxIaiXCh7IKrvqe3Z0R_JYotQRMBAg9o,315
|
|
4
2
|
dkist_processing_common/__init__.py,sha256=490Fwm_GgqpwriQlsYfKcLUZNhZ6GkINtJqcYSIEKoU,319
|
|
5
3
|
dkist_processing_common/config.py,sha256=IcpaD_NvHZU-aLlUNOTdRC4V7ADIvVQwrZ2dHhIr4NY,4247
|
|
6
|
-
dkist_processing_common/manual.py,sha256=
|
|
4
|
+
dkist_processing_common/manual.py,sha256=IH72QxdGlr-BuWq2EDrfC9yStegO-elUWrobQqT4710,7042
|
|
7
5
|
dkist_processing_common/_util/__init__.py,sha256=xf6JNpMKQgbhE2Jivymt-WO0WF6PpGt9rl604YpuTWk,92
|
|
8
6
|
dkist_processing_common/_util/constants.py,sha256=b0zlRaT09aGj2RU72OQ5J-8u6Z_RevPXtcyx5tlnf-Y,3244
|
|
9
7
|
dkist_processing_common/_util/graphql.py,sha256=qjsvLWDHqb1X7hDLA8uqbpOIDjZZ2mjsSIL0Wkt1TJc,3420
|
|
@@ -24,7 +22,7 @@ dkist_processing_common/models/__init__.py,sha256=6LMqemdzVZ87fRrpAsbEnTtWZ02_Gu
|
|
|
24
22
|
dkist_processing_common/models/constants.py,sha256=1Eb8RDeuCr6brl237iGKxYLWCH49I6bOUEj_Tv-zFbQ,5441
|
|
25
23
|
dkist_processing_common/models/fits_access.py,sha256=Au9JROwhVla9zb_u0dN8mIWiSJd_Pca0oOr4N1hN0HY,4113
|
|
26
24
|
dkist_processing_common/models/flower_pot.py,sha256=59C5uGYKyMyncqQYxhzDZWl8k1DRZFB6s9RF-HFp9mY,5128
|
|
27
|
-
dkist_processing_common/models/graphql.py,sha256=
|
|
25
|
+
dkist_processing_common/models/graphql.py,sha256=t2PYEjEwSq08zq0HcVH2RG5FX4PVXgs4BdM2gunJ8fs,4747
|
|
28
26
|
dkist_processing_common/models/message.py,sha256=DRW7Qhl01dF5KagcqLta5U-uzdOMewrsHvMatDT6jnk,1684
|
|
29
27
|
dkist_processing_common/models/message_queue_binding.py,sha256=ROQ2ZQE3TCr4gVbz4WggvUSExAiWP8SD_GjjQl482M8,1012
|
|
30
28
|
dkist_processing_common/models/metric_code.py,sha256=McXAEF1Sa0_YlR1niXYLJWLFHhdLQhmYw9Xtpr5FGws,815
|
|
@@ -83,6 +81,7 @@ dkist_processing_common/tests/test_flower_pot.py,sha256=X9_UI3maa3ZQncV3jYHgovWn
|
|
|
83
81
|
dkist_processing_common/tests/test_input_dataset.py,sha256=AI5uqaDea4kOwpwAU5qQdzUbxMpBwD20YCAvB7nzD5o,18766
|
|
84
82
|
dkist_processing_common/tests/test_interservice_bus.py,sha256=M_iv2CLmx5TnCB1VUN4YjkQ2LEUjfCKk7-ZlkV62XEQ,3000
|
|
85
83
|
dkist_processing_common/tests/test_interservice_bus_mixin.py,sha256=8TTl0aypkq5gBPeyqSaQHbz_jmt5RmSD2oI8kT4Q1ZA,4195
|
|
84
|
+
dkist_processing_common/tests/test_manual_processing.py,sha256=wAZJztsF33jzJE3m3vJ6cJT0ujgIkMg01jGq-Ys_a4c,1045
|
|
86
85
|
dkist_processing_common/tests/test_output_data_base.py,sha256=Y9MFz5xw11tAnKjpHH7qrzsRYP1rZM_Trt4AylY0S6k,3120
|
|
87
86
|
dkist_processing_common/tests/test_parameters.py,sha256=Tr0Wu8-_rj9Lp7CkUVmJjSouW7CAL_ZwhShK_U1GzVs,12384
|
|
88
87
|
dkist_processing_common/tests/test_parse_l0_input_data.py,sha256=SMNV1qyQTvnMx94MCNsiA-RyS9uxaxIABEDDxsuVzqY,10629
|
|
@@ -110,7 +109,7 @@ docs/landing_page.rst,sha256=aPAuXFhBx73lEZ59B6E6JXxkK0LlxzD0n-HXqHrfumQ,746
|
|
|
110
109
|
docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
|
|
111
110
|
docs/requirements.txt,sha256=Kbl_X4c7RQZw035YTeNB63We6I7pvXFU4T0Uflp2yDY,29
|
|
112
111
|
licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
|
|
113
|
-
dkist_processing_common-10.6.
|
|
114
|
-
dkist_processing_common-10.6.
|
|
115
|
-
dkist_processing_common-10.6.
|
|
116
|
-
dkist_processing_common-10.6.
|
|
112
|
+
dkist_processing_common-10.6.2.dist-info/METADATA,sha256=xBQvt5JjVSsGXLINVfL3RZKU4Cx8oyxiXh5uKxc9MHY,7154
|
|
113
|
+
dkist_processing_common-10.6.2.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
|
|
114
|
+
dkist_processing_common-10.6.2.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
|
|
115
|
+
dkist_processing_common-10.6.2.dist-info/RECORD,,
|
changelog/236.misc.1.rst
DELETED
changelog/236.misc.rst
DELETED
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
Convert dataclasses in the graphql model to Pydantic BaseModels for additional validation. In the
|
|
2
|
-
RecipeRunResponse class, configuration is converted from a JSON dictionary to its own Pydantic BaseModel.
|
|
3
|
-
In the InputDatasetPartResponse class, the inputDatasetPartDocument is now returned as a list of dictionaries.
|
|
File without changes
|