dkist-processing-common 11.2.0__py3-none-any.whl → 11.2.1rc1__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.
- changelog/262.misc.rst +1 -0
- dkist_processing_common/models/graphql.py +1 -0
- dkist_processing_common/models/quality.py +1 -1
- dkist_processing_common/tasks/mixin/metadata_store.py +1 -0
- dkist_processing_common/tasks/mixin/quality/_metrics.py +1 -1
- dkist_processing_common/tests/test_assemble_quality.py +5 -5
- dkist_processing_common/tests/test_quality_mixin.py +2 -2
- {dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1rc1.dist-info}/METADATA +2 -2
- {dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1rc1.dist-info}/RECORD +11 -10
- {dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1rc1.dist-info}/WHEEL +0 -0
- {dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1rc1.dist-info}/top_level.txt +0 -0
changelog/262.misc.rst
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
Update database name for vertical multi-pane plot metric data. It's now called "multi_plot_data".
|
|
@@ -190,6 +190,7 @@ class QualityCreation(GraphqlBaseModel):
|
|
|
190
190
|
warnings: str | None = None
|
|
191
191
|
# JSON objects
|
|
192
192
|
plotData: str | None = None
|
|
193
|
+
multiPlotData: str | None = None
|
|
193
194
|
tableData: str | None = None
|
|
194
195
|
histogramData: str | None = None
|
|
195
196
|
modmatData: str | None = None
|
|
@@ -112,7 +112,7 @@ class ReportMetric(BaseModel):
|
|
|
112
112
|
facet: str | None = None
|
|
113
113
|
statement: str | list[str] | None = None
|
|
114
114
|
plot_data: Plot2D | list[Plot2D] | None = None
|
|
115
|
-
|
|
115
|
+
multi_plot_data: VerticalMultiPanePlot2D | None = None
|
|
116
116
|
histogram_data: PlotHistogram | list[PlotHistogram] | None = None
|
|
117
117
|
table_data: SimpleTable | list[SimpleTable] | None = None
|
|
118
118
|
modmat_data: ModulationMatrixHistograms | None = None
|
|
@@ -171,6 +171,7 @@ class MetadataStoreMixin:
|
|
|
171
171
|
warnings=json.dumps(metric.get("warnings")),
|
|
172
172
|
# JSON objects
|
|
173
173
|
plotData=json.dumps(metric.get("plot_data"), cls=QualityDataEncoder),
|
|
174
|
+
multiPlotData=json.dumps(metric.get("multi_plot_data"), cls=QualityDataEncoder),
|
|
174
175
|
tableData=json.dumps(metric.get("table_data"), cls=QualityDataEncoder),
|
|
175
176
|
histogramData=json.dumps(metric.get("histogram_data"), cls=QualityDataEncoder),
|
|
176
177
|
modmatData=json.dumps(metric.get("modmat_data"), cls=QualityDataEncoder),
|
|
@@ -1458,7 +1458,7 @@ class _WavecalQualityMixin:
|
|
|
1458
1458
|
"The top plot shows the input and best-fit spectra along with the best-fit atlas, which is "
|
|
1459
1459
|
"a combination of Solar and Telluric spectra. The bottom plot shows the fit residuals.",
|
|
1460
1460
|
metric_code=MetricCode.wavecal_fit,
|
|
1461
|
-
|
|
1461
|
+
multi_plot_data=full_plot,
|
|
1462
1462
|
)
|
|
1463
1463
|
|
|
1464
1464
|
return metric.model_dump()
|
|
@@ -259,11 +259,11 @@ def plot_data_expected() -> Callable[[str], bool]:
|
|
|
259
259
|
|
|
260
260
|
|
|
261
261
|
@pytest.fixture()
|
|
262
|
-
def
|
|
262
|
+
def multi_plot_data_expected() -> Callable[[str], bool]:
|
|
263
263
|
"""
|
|
264
264
|
Tightly coupled with quality_metrics fixture and resultant report metric name
|
|
265
265
|
"""
|
|
266
|
-
# names where
|
|
266
|
+
# names where multi_plot_data is expected to be populated
|
|
267
267
|
names = {"Wavelength Calibration Results"}
|
|
268
268
|
|
|
269
269
|
def expected(name: str) -> bool:
|
|
@@ -451,7 +451,7 @@ def test_assemble_quality_data(
|
|
|
451
451
|
assemble_quality_data_task,
|
|
452
452
|
recipe_run_id,
|
|
453
453
|
plot_data_expected,
|
|
454
|
-
|
|
454
|
+
multi_plot_data_expected,
|
|
455
455
|
table_data_expected,
|
|
456
456
|
modmat_data_expected,
|
|
457
457
|
histogram_data_expected,
|
|
@@ -481,8 +481,8 @@ def test_assemble_quality_data(
|
|
|
481
481
|
assert isinstance(rm.description, str)
|
|
482
482
|
if plot_data_expected(rm.name):
|
|
483
483
|
assert rm.plot_data
|
|
484
|
-
if
|
|
485
|
-
assert rm.
|
|
484
|
+
if multi_plot_data_expected(rm.name):
|
|
485
|
+
assert rm.multi_plot_data
|
|
486
486
|
if table_data_expected(rm.name):
|
|
487
487
|
assert rm.table_data
|
|
488
488
|
if modmat_data_expected(rm.name):
|
|
@@ -114,7 +114,7 @@ def test_create_2d_plot_with_datetime_metric(quality_task):
|
|
|
114
114
|
"facet",
|
|
115
115
|
"statement",
|
|
116
116
|
"plot_data",
|
|
117
|
-
"
|
|
117
|
+
"multi_plot_data",
|
|
118
118
|
"histogram_data",
|
|
119
119
|
"table_data",
|
|
120
120
|
"modmat_data",
|
|
@@ -1317,7 +1317,7 @@ def test_build_wavecal_results(quality_task, wavecal_data_json):
|
|
|
1317
1317
|
assert metric["raincloud_data"] is None
|
|
1318
1318
|
assert metric["warnings"] is None
|
|
1319
1319
|
|
|
1320
|
-
multi_plot_data = metric["
|
|
1320
|
+
multi_plot_data = metric["multi_plot_data"]
|
|
1321
1321
|
assert multi_plot_data["match_x_axes"] is True
|
|
1322
1322
|
assert multi_plot_data["no_gap"] is True
|
|
1323
1323
|
assert (
|
{dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1rc1.dist-info}/METADATA
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: dkist-processing-common
|
|
3
|
-
Version: 11.2.
|
|
3
|
+
Version: 11.2.1rc1
|
|
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
|
|
@@ -61,7 +61,7 @@ Requires-Dist: dkist-inventory<2.0,>=1.6.0; extra == "inventory"
|
|
|
61
61
|
Provides-Extra: asdf
|
|
62
62
|
Requires-Dist: dkist-inventory[asdf]<2.0,>=1.6.0; extra == "asdf"
|
|
63
63
|
Provides-Extra: quality
|
|
64
|
-
Requires-Dist: dkist-quality<
|
|
64
|
+
Requires-Dist: dkist-quality<3.0,>=2.0.0rc1; extra == "quality"
|
|
65
65
|
|
|
66
66
|
dkist-processing-common
|
|
67
67
|
=======================
|
{dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1rc1.dist-info}/RECORD
RENAMED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
|
+
changelog/262.misc.rst,sha256=CfgmKrtFRUUGF0-Dsj_0KL7Vx_DU2_rFy1_PhCEMP44,98
|
|
2
3
|
dkist_processing_common/__init__.py,sha256=490Fwm_GgqpwriQlsYfKcLUZNhZ6GkINtJqcYSIEKoU,319
|
|
3
4
|
dkist_processing_common/config.py,sha256=IcpaD_NvHZU-aLlUNOTdRC4V7ADIvVQwrZ2dHhIr4NY,4247
|
|
4
5
|
dkist_processing_common/manual.py,sha256=mrW__HupEZMYOxUxfKsdsTI3TfOrOrWHS9yXC_835W4,7023
|
|
@@ -26,13 +27,13 @@ dkist_processing_common/models/dkist_location.py,sha256=3cbN6As60tJa0uoOSNFNnz2s
|
|
|
26
27
|
dkist_processing_common/models/fits_access.py,sha256=Au9JROwhVla9zb_u0dN8mIWiSJd_Pca0oOr4N1hN0HY,4113
|
|
27
28
|
dkist_processing_common/models/flower_pot.py,sha256=59C5uGYKyMyncqQYxhzDZWl8k1DRZFB6s9RF-HFp9mY,5128
|
|
28
29
|
dkist_processing_common/models/fried_parameter.py,sha256=ro_H2Eo3I88lRf1wJjZfTc_XOjhgLt4whIQR_sjAFbM,1609
|
|
29
|
-
dkist_processing_common/models/graphql.py,sha256=
|
|
30
|
+
dkist_processing_common/models/graphql.py,sha256=_dcVUYrzQ6CceMJFXYS_bc8lknop5n0erL5I8kuj32g,5911
|
|
30
31
|
dkist_processing_common/models/input_dataset.py,sha256=stQa_lbFPr2tmOUpQgpDuwM0-DiIDV3zYwyawh01cKc,4172
|
|
31
32
|
dkist_processing_common/models/message.py,sha256=DRW7Qhl01dF5KagcqLta5U-uzdOMewrsHvMatDT6jnk,1684
|
|
32
33
|
dkist_processing_common/models/message_queue_binding.py,sha256=ROQ2ZQE3TCr4gVbz4WggvUSExAiWP8SD_GjjQl482M8,1012
|
|
33
34
|
dkist_processing_common/models/metric_code.py,sha256=mF-i0nuzko7K949aS01hEsssGes_PIF5B0b_mVqwoL4,847
|
|
34
35
|
dkist_processing_common/models/parameters.py,sha256=dTup7mPTEmySXP0O3j4sPPY8Jqe2zf-3sr2hjeMatEY,9649
|
|
35
|
-
dkist_processing_common/models/quality.py,sha256=
|
|
36
|
+
dkist_processing_common/models/quality.py,sha256=niNHA4fh_22Xsk_gMRs2YvvT33paD8ByUCGy1IYmn30,3980
|
|
36
37
|
dkist_processing_common/models/tags.py,sha256=ykOYqWMU7_ffvRCv84-avjXyty9pHBo7EXwsjIjStjs,12058
|
|
37
38
|
dkist_processing_common/models/task_name.py,sha256=NL0n92A9vVYBV-yvh8d-qFOCxVy0X2GECDmLgIzrmOY,565
|
|
38
39
|
dkist_processing_common/models/wavelength.py,sha256=Wtmu5QhjPpsqIGfUQ0Wh-3PQlGeRdGV9BfFAy23HLGg,966
|
|
@@ -67,16 +68,16 @@ dkist_processing_common/tasks/write_l1.py,sha256=KSb62iTYP21XBqIYVQVx6X8vhpcLn40
|
|
|
67
68
|
dkist_processing_common/tasks/mixin/__init__.py,sha256=-g-DQbU7m1bclJYuFe3Yh757V-35GIDTbstardKQ7nU,68
|
|
68
69
|
dkist_processing_common/tasks/mixin/globus.py,sha256=QAV8VElxMAqxJ2KSB_bJaraceovYfjHXjOdocrTCkIA,6592
|
|
69
70
|
dkist_processing_common/tasks/mixin/interservice_bus.py,sha256=I7BUh0o8AEX-FZv7gxCts6is0uq9lycWjtTB2KqwBrU,1080
|
|
70
|
-
dkist_processing_common/tasks/mixin/metadata_store.py,sha256=
|
|
71
|
+
dkist_processing_common/tasks/mixin/metadata_store.py,sha256=jD7UYnua2nmjYZP7sBcono1zyy5ldoJT-poYG-4XVcA,11715
|
|
71
72
|
dkist_processing_common/tasks/mixin/object_store.py,sha256=Vn4l2XuCimii9Fc3gM-pQGIkTKMv_ldqljlxkLesZLU,3236
|
|
72
73
|
dkist_processing_common/tasks/mixin/quality/__init__.py,sha256=Bgu-DHW7yXLiehglldOCWluEkAP5qh0Hp1F30rh5NFw,383
|
|
73
74
|
dkist_processing_common/tasks/mixin/quality/_base.py,sha256=U1AEhj6OtF4YEdTkKWcgmoH6zrz6tYNjNXnmVU24L70,8491
|
|
74
|
-
dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=
|
|
75
|
+
dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=BJHgj6DbTh50PCGvnzp7IXLlrmLdivZcmms4p4ytS20,60196
|
|
75
76
|
dkist_processing_common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
76
77
|
dkist_processing_common/tests/conftest.py,sha256=xTmu87MZSPIcucg9UCH88OimdqgjE5VSc-n-fSFbtjI,22319
|
|
77
78
|
dkist_processing_common/tests/mock_metadata_store.py,sha256=ZVxAtVoW8ayEceafeR8yJbGdFZsw13Eyf1Z2-rwGZDM,8260
|
|
78
79
|
dkist_processing_common/tests/test_assemble_movie.py,sha256=RI7Kitd-XNmba-o5pUgqURocXPFi15T-mEvWaSbsN6U,4125
|
|
79
|
-
dkist_processing_common/tests/test_assemble_quality.py,sha256
|
|
80
|
+
dkist_processing_common/tests/test_assemble_quality.py,sha256=-F22jMY6mPy65VZ1TZY2r1vsxMXOPmZHArGx70OD3BA,17832
|
|
80
81
|
dkist_processing_common/tests/test_base.py,sha256=EQsIkeWoOtjk0yxr_oPkhW3Uc0p8cMsknSMwKgrJI9E,7078
|
|
81
82
|
dkist_processing_common/tests/test_codecs.py,sha256=FGhldrTdc28YD9FKrsW3lZ34LtvzecGP1qNi9fGHVGQ,22173
|
|
82
83
|
dkist_processing_common/tests/test_constants.py,sha256=Kc9k5TdYy5QkRRlGav6kfI2dy5HHKqtpf9qOuaAfDZU,5903
|
|
@@ -94,7 +95,7 @@ dkist_processing_common/tests/test_parameters.py,sha256=kNzX89vfrNRJ8d9rusMVv4DM
|
|
|
94
95
|
dkist_processing_common/tests/test_parse_l0_input_data.py,sha256=SMNV1qyQTvnMx94MCNsiA-RyS9uxaxIABEDDxsuVzqY,10629
|
|
95
96
|
dkist_processing_common/tests/test_publish_catalog_messages.py,sha256=l6Wga1s2wNBIf4wGZ78ZIO_rtqjdidmtvlN9nMnQUAs,3222
|
|
96
97
|
dkist_processing_common/tests/test_quality.py,sha256=vomy2YSPadKqJj2tG8sCs-UkQVvfKus7Cum7_Hpee4I,10257
|
|
97
|
-
dkist_processing_common/tests/test_quality_mixin.py,sha256=
|
|
98
|
+
dkist_processing_common/tests/test_quality_mixin.py,sha256=v-QhBp-xjwlkIBeCCtEEF48ew9hslkyyNwZ3BH-fSVY,55201
|
|
98
99
|
dkist_processing_common/tests/test_scratch.py,sha256=7f28FMiSskSNX-bkRSrpJf2u1HQIbSvYajbjkeGMF9s,16481
|
|
99
100
|
dkist_processing_common/tests/test_stems.py,sha256=ini5dylLT5ioWKKWd1uu6kwx8Tf3aEnKKaGjf46a_GI,32649
|
|
100
101
|
dkist_processing_common/tests/test_submit_dataset_metadata.py,sha256=LHEyjoIxJHXXssqKkr8Qn1NzzHD1FLJiD3lP8yaLiXU,3764
|
|
@@ -116,7 +117,7 @@ docs/landing_page.rst,sha256=aPAuXFhBx73lEZ59B6E6JXxkK0LlxzD0n-HXqHrfumQ,746
|
|
|
116
117
|
docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
|
|
117
118
|
docs/requirements.txt,sha256=Kbl_X4c7RQZw035YTeNB63We6I7pvXFU4T0Uflp2yDY,29
|
|
118
119
|
licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
|
|
119
|
-
dkist_processing_common-11.2.
|
|
120
|
-
dkist_processing_common-11.2.
|
|
121
|
-
dkist_processing_common-11.2.
|
|
122
|
-
dkist_processing_common-11.2.
|
|
120
|
+
dkist_processing_common-11.2.1rc1.dist-info/METADATA,sha256=JRyQrfMW0GmB-s9TMX7-GC0ZwR-RXwjhPqi61YoeNqs,7207
|
|
121
|
+
dkist_processing_common-11.2.1rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
122
|
+
dkist_processing_common-11.2.1rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
|
|
123
|
+
dkist_processing_common-11.2.1rc1.dist-info/RECORD,,
|
{dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1rc1.dist-info}/WHEEL
RENAMED
|
File without changes
|
|
File without changes
|