dkist-processing-common 11.2.0__py3-none-any.whl → 11.2.1__py3-none-any.whl

dkist_processing_common/models/graphql.py

@@ -190,6 +190,7 @@ class QualityCreation(GraphqlBaseModel):
     warnings: str | None = None
     # JSON objects
     plotData: str | None = None
+    multiPlotData: str | None = None
     tableData: str | None = None
     histogramData: str | None = None
     modmatData: str | None = None

dkist_processing_common/models/quality.py

@@ -112,7 +112,7 @@ class ReportMetric(BaseModel):
     facet: str | None = None
     statement: str | list[str] | None = None
     plot_data: Plot2D | list[Plot2D] | None = None
-    vertical_multi_pane_plot_data: VerticalMultiPanePlot2D | None = None
+    multi_plot_data: VerticalMultiPanePlot2D | None = None
     histogram_data: PlotHistogram | list[PlotHistogram] | None = None
     table_data: SimpleTable | list[SimpleTable] | None = None
     modmat_data: ModulationMatrixHistograms | None = None

dkist_processing_common/tasks/mixin/metadata_store.py

@@ -171,6 +171,7 @@ class MetadataStoreMixin:
                 warnings=json.dumps(metric.get("warnings")),
                 # JSON objects
                 plotData=json.dumps(metric.get("plot_data"), cls=QualityDataEncoder),
+                multiPlotData=json.dumps(metric.get("multi_plot_data"), cls=QualityDataEncoder),
                 tableData=json.dumps(metric.get("table_data"), cls=QualityDataEncoder),
                 histogramData=json.dumps(metric.get("histogram_data"), cls=QualityDataEncoder),
                 modmatData=json.dumps(metric.get("modmat_data"), cls=QualityDataEncoder),

dkist_processing_common/tasks/mixin/quality/_metrics.py

@@ -1401,10 +1401,20 @@ class _WavecalQualityMixin:
             "Input Spectrum": [input_wave_list, input_spectrum_list],
             "Best Fit Atlas": [best_fit_wave_list, best_fit_atlas_list],
         }
+
+        # Set the colors and zorder here manually because the JSON-ization of the quality data means we can't be sure of
+        # the order these will be plotted in and thus can't rely on the default color-cycler in `dkist-quality`.
         fit_plot_kwargs = {
-            "Best Fit Observations": {"ls": "-", "lw": 4, "alpha": 0.8, "ms": 0},
-            "Input Spectrum": {"ls": "-", "alpha": 0.4, "ms": 0},
-            "Best Fit Atlas": {"color": "k", "ls": "-", "ms": 0},
+            "Best Fit Observations": {
+                "ls": "-",
+                "lw": 4,
+                "alpha": 0.8,
+                "ms": 0,
+                "color": "#FAA61C",
+                "zorder": 2,
+            },
+            "Input Spectrum": {"ls": "-", "alpha": 0.4, "ms": 0, "color": "#1E317A", "zorder": 2.1},
+            "Best Fit Atlas": {"color": "k", "ls": "-", "ms": 0, "zorder": 2.2},
         }
 
         fit_plot = Plot2D(
@@ -1458,7 +1468,7 @@ class _WavecalQualityMixin:
             "The top plot shows the input and best-fit spectra along with the best-fit atlas, which is "
             "a combination of Solar and Telluric spectra. The bottom plot shows the fit residuals.",
             metric_code=MetricCode.wavecal_fit,
-            vertical_multi_pane_plot_data=full_plot,
+            multi_plot_data=full_plot,
         )
 
         return metric.model_dump()

dkist_processing_common/tests/test_assemble_quality.py

@@ -259,11 +259,11 @@ def plot_data_expected() -> Callable[[str], bool]:
 
 
 @pytest.fixture()
-def vertical_multi_pane_plot_data_expected() -> Callable[[str], bool]:
+def multi_plot_data_expected() -> Callable[[str], bool]:
     """
     Tightly coupled with quality_metrics fixture and resultant report metric name
     """
-    # names where vertical_multi_pane_plot_data is expected to be populated
+    # names where multi_plot_data is expected to be populated
     names = {"Wavelength Calibration Results"}
 
     def expected(name: str) -> bool:
@@ -451,7 +451,7 @@ def test_assemble_quality_data(
     assemble_quality_data_task,
     recipe_run_id,
     plot_data_expected,
-    vertical_multi_pane_plot_data_expected,
+    multi_plot_data_expected,
     table_data_expected,
     modmat_data_expected,
     histogram_data_expected,
@@ -481,8 +481,8 @@ def test_assemble_quality_data(
         assert isinstance(rm.description, str)
         if plot_data_expected(rm.name):
             assert rm.plot_data
-        if vertical_multi_pane_plot_data_expected(rm.name):
-            assert rm.vertical_multi_pane_plot_data
+        if multi_plot_data_expected(rm.name):
+            assert rm.multi_plot_data
         if table_data_expected(rm.name):
             assert rm.table_data
         if modmat_data_expected(rm.name):

dkist_processing_common/tests/test_quality_mixin.py

@@ -114,7 +114,7 @@ def test_create_2d_plot_with_datetime_metric(quality_task):
         "facet",
         "statement",
         "plot_data",
-        "vertical_multi_pane_plot_data",
+        "multi_plot_data",
         "histogram_data",
         "table_data",
         "modmat_data",
@@ -1317,7 +1317,7 @@ def test_build_wavecal_results(quality_task, wavecal_data_json):
     assert metric["raincloud_data"] is None
     assert metric["warnings"] is None
 
-    multi_plot_data = metric["vertical_multi_pane_plot_data"]
+    multi_plot_data = metric["multi_plot_data"]
     assert multi_plot_data["match_x_axes"] is True
     assert multi_plot_data["no_gap"] is True
     assert (
@@ -1339,9 +1339,16 @@ def test_build_wavecal_results(quality_task, wavecal_data_json):
         "Best Fit Atlas": [[1001.5, 1002.6, 1003.7, 1004.8], [1.0, 1.0, 0.4, 1.0]],
     }
     assert fit_plot["plot_kwargs"] == {
-        "Input Spectrum": {"ls": "-", "alpha": 0.4, "ms": 0},
-        "Best Fit Observations": {"ls": "-", "lw": 4, "alpha": 0.8, "ms": 0},
-        "Best Fit Atlas": {"color": "k", "ls": "-", "ms": 0},
+        "Input Spectrum": {"ls": "-", "alpha": 0.4, "ms": 0, "color": "#1E317A", "zorder": 2.1},
+        "Best Fit Observations": {
+            "ls": "-",
+            "lw": 4,
+            "alpha": 0.8,
+            "ms": 0,
+            "color": "#FAA61C",
+            "zorder": 2.0,
+        },
+        "Best Fit Atlas": {"color": "k", "ls": "-", "ms": 0, "zorder": 2.2},
     }
 
     residuals_plot = plot_list[1]

{dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.2.0
+Version: 11.2.1
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -61,7 +61,7 @@ Requires-Dist: dkist-inventory<2.0,>=1.6.0; extra == "inventory"
 Provides-Extra: asdf
 Requires-Dist: dkist-inventory[asdf]<2.0,>=1.6.0; extra == "asdf"
 Provides-Extra: quality
-Requires-Dist: dkist-quality<2.0,>=1.3.0; extra == "quality"
+Requires-Dist: dkist-quality<3.0,>=2.0.0; extra == "quality"
 
 dkist-processing-common
 =======================

{dkist_processing_common-11.2.0.dist-info → dkist_processing_common-11.2.1.dist-info}/RECORD

@@ -26,13 +26,13 @@ dkist_processing_common/models/dkist_location.py,sha256=3cbN6As60tJa0uoOSNFNnz2s
 dkist_processing_common/models/fits_access.py,sha256=Au9JROwhVla9zb_u0dN8mIWiSJd_Pca0oOr4N1hN0HY,4113
 dkist_processing_common/models/flower_pot.py,sha256=59C5uGYKyMyncqQYxhzDZWl8k1DRZFB6s9RF-HFp9mY,5128
 dkist_processing_common/models/fried_parameter.py,sha256=ro_H2Eo3I88lRf1wJjZfTc_XOjhgLt4whIQR_sjAFbM,1609
-dkist_processing_common/models/graphql.py,sha256=ahCGiDZlbx31_SFfOLyS-qzVzxYvd18zUEAGZWYGjCM,5874
+dkist_processing_common/models/graphql.py,sha256=_dcVUYrzQ6CceMJFXYS_bc8lknop5n0erL5I8kuj32g,5911
 dkist_processing_common/models/input_dataset.py,sha256=stQa_lbFPr2tmOUpQgpDuwM0-DiIDV3zYwyawh01cKc,4172
 dkist_processing_common/models/message.py,sha256=DRW7Qhl01dF5KagcqLta5U-uzdOMewrsHvMatDT6jnk,1684
 dkist_processing_common/models/message_queue_binding.py,sha256=ROQ2ZQE3TCr4gVbz4WggvUSExAiWP8SD_GjjQl482M8,1012
 dkist_processing_common/models/metric_code.py,sha256=mF-i0nuzko7K949aS01hEsssGes_PIF5B0b_mVqwoL4,847
 dkist_processing_common/models/parameters.py,sha256=dTup7mPTEmySXP0O3j4sPPY8Jqe2zf-3sr2hjeMatEY,9649
-dkist_processing_common/models/quality.py,sha256=wI779KvakvZNOJXq8qgdsF8u9sVYAzd8ezhoXpiccqQ,3994
+dkist_processing_common/models/quality.py,sha256=niNHA4fh_22Xsk_gMRs2YvvT33paD8ByUCGy1IYmn30,3980
 dkist_processing_common/models/tags.py,sha256=ykOYqWMU7_ffvRCv84-avjXyty9pHBo7EXwsjIjStjs,12058
 dkist_processing_common/models/task_name.py,sha256=NL0n92A9vVYBV-yvh8d-qFOCxVy0X2GECDmLgIzrmOY,565
 dkist_processing_common/models/wavelength.py,sha256=Wtmu5QhjPpsqIGfUQ0Wh-3PQlGeRdGV9BfFAy23HLGg,966
@@ -67,16 +67,16 @@ dkist_processing_common/tasks/write_l1.py,sha256=KSb62iTYP21XBqIYVQVx6X8vhpcLn40
 dkist_processing_common/tasks/mixin/__init__.py,sha256=-g-DQbU7m1bclJYuFe3Yh757V-35GIDTbstardKQ7nU,68
 dkist_processing_common/tasks/mixin/globus.py,sha256=QAV8VElxMAqxJ2KSB_bJaraceovYfjHXjOdocrTCkIA,6592
 dkist_processing_common/tasks/mixin/interservice_bus.py,sha256=I7BUh0o8AEX-FZv7gxCts6is0uq9lycWjtTB2KqwBrU,1080
-dkist_processing_common/tasks/mixin/metadata_store.py,sha256=yTKijpQ-tNx_H2V_9HsZjMzkrzBDSQaSKkySV6VnnOM,11618
+dkist_processing_common/tasks/mixin/metadata_store.py,sha256=jD7UYnua2nmjYZP7sBcono1zyy5ldoJT-poYG-4XVcA,11715
 dkist_processing_common/tasks/mixin/object_store.py,sha256=Vn4l2XuCimii9Fc3gM-pQGIkTKMv_ldqljlxkLesZLU,3236
 dkist_processing_common/tasks/mixin/quality/__init__.py,sha256=Bgu-DHW7yXLiehglldOCWluEkAP5qh0Hp1F30rh5NFw,383
 dkist_processing_common/tasks/mixin/quality/_base.py,sha256=U1AEhj6OtF4YEdTkKWcgmoH6zrz6tYNjNXnmVU24L70,8491
-dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=kBZqvYvCKx0ar1tYw-f1AYNMORekqMERo73fsZS3QQU,60210
+dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=g2iGGi2d_o2qEKWhNGZFq1XLHDhcgwYUhVJ1MfKJTcA,60625
 dkist_processing_common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_common/tests/conftest.py,sha256=xTmu87MZSPIcucg9UCH88OimdqgjE5VSc-n-fSFbtjI,22319
 dkist_processing_common/tests/mock_metadata_store.py,sha256=ZVxAtVoW8ayEceafeR8yJbGdFZsw13Eyf1Z2-rwGZDM,8260
 dkist_processing_common/tests/test_assemble_movie.py,sha256=RI7Kitd-XNmba-o5pUgqURocXPFi15T-mEvWaSbsN6U,4125
-dkist_processing_common/tests/test_assemble_quality.py,sha256=j0n67prmjxbBxkqgurmanfH4puCTYytn4thpEXe7u2s,17902
+dkist_processing_common/tests/test_assemble_quality.py,sha256=-F22jMY6mPy65VZ1TZY2r1vsxMXOPmZHArGx70OD3BA,17832
 dkist_processing_common/tests/test_base.py,sha256=EQsIkeWoOtjk0yxr_oPkhW3Uc0p8cMsknSMwKgrJI9E,7078
 dkist_processing_common/tests/test_codecs.py,sha256=FGhldrTdc28YD9FKrsW3lZ34LtvzecGP1qNi9fGHVGQ,22173
 dkist_processing_common/tests/test_constants.py,sha256=Kc9k5TdYy5QkRRlGav6kfI2dy5HHKqtpf9qOuaAfDZU,5903
@@ -94,7 +94,7 @@ dkist_processing_common/tests/test_parameters.py,sha256=kNzX89vfrNRJ8d9rusMVv4DM
 dkist_processing_common/tests/test_parse_l0_input_data.py,sha256=SMNV1qyQTvnMx94MCNsiA-RyS9uxaxIABEDDxsuVzqY,10629
 dkist_processing_common/tests/test_publish_catalog_messages.py,sha256=l6Wga1s2wNBIf4wGZ78ZIO_rtqjdidmtvlN9nMnQUAs,3222
 dkist_processing_common/tests/test_quality.py,sha256=vomy2YSPadKqJj2tG8sCs-UkQVvfKus7Cum7_Hpee4I,10257
-dkist_processing_common/tests/test_quality_mixin.py,sha256=Kaj4gFglRiWrYaL_USnsyK8-5-wrMQuG36nU8YSXus0,55229
+dkist_processing_common/tests/test_quality_mixin.py,sha256=qanm3SXEiLb0OJDawbh8ixVAG9uRglFMzwxTeYxkDsM,55369
 dkist_processing_common/tests/test_scratch.py,sha256=7f28FMiSskSNX-bkRSrpJf2u1HQIbSvYajbjkeGMF9s,16481
 dkist_processing_common/tests/test_stems.py,sha256=ini5dylLT5ioWKKWd1uu6kwx8Tf3aEnKKaGjf46a_GI,32649
 dkist_processing_common/tests/test_submit_dataset_metadata.py,sha256=LHEyjoIxJHXXssqKkr8Qn1NzzHD1FLJiD3lP8yaLiXU,3764
@@ -116,7 +116,7 @@ docs/landing_page.rst,sha256=aPAuXFhBx73lEZ59B6E6JXxkK0LlxzD0n-HXqHrfumQ,746
 docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
 docs/requirements.txt,sha256=Kbl_X4c7RQZw035YTeNB63We6I7pvXFU4T0Uflp2yDY,29
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_common-11.2.0.dist-info/METADATA,sha256=B6nAxP9DTElEykVWOBFt9SEAsq_CJS2NIxneZXBaj6c,7201
-dkist_processing_common-11.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_common-11.2.0.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
-dkist_processing_common-11.2.0.dist-info/RECORD,,
+dkist_processing_common-11.2.1.dist-info/METADATA,sha256=i7X-5yyAWI3r4Vs9vs7c5BU2USGO8fji19NMwCIyiTY,7201
+dkist_processing_common-11.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_common-11.2.1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
+dkist_processing_common-11.2.1.dist-info/RECORD,,