dkist-processing-common 11.0.0rc1__py3-none-any.whl → 11.0.1__py3-none-any.whl

dkist_processing_common/tasks/assemble_movie.py

@@ -2,10 +2,10 @@
 import logging
 from abc import ABC
 from abc import abstractmethod
+from importlib.resources import files
 from typing import Literal
 
 import numpy as np
-import pkg_resources
 from matplotlib import colormaps
 from moviepy import VideoClip
 from PIL import Image
@@ -66,7 +66,7 @@ class AssembleMovie(WorkflowTaskBase, ABC):
     MINIMUM_DURATION = 10  # seconds
     MAXIMUM_DURATION = 60  # seconds
     FPS = 15
-    FONT_FILE = pkg_resources.resource_filename("dkist_processing_common", "fonts/Lato-Regular.ttf")
+    FONT_FILE = files("dkist_processing_common").joinpath("fonts/Lato-Regular.ttf")
     TEXT_MARGIN_PX = 5
     MPL_COLOR_MAP = "viridis"
 

dkist_processing_common/tasks/mixin/quality/_metrics.py

@@ -1365,13 +1365,22 @@ class _WavecalQualityMixin:
         wcs = WCS(best_fit_header)
         best_fit_wavelength = wcs.spectral.pixel_to_world(np.arange(input_spectrum.size))
 
+        finite_idx = (
+            np.isfinite(input_wavelength)
+            * np.isfinite(input_spectrum)
+            * np.isfinite(best_fit_wavelength)
+            * np.isfinite(best_fit_atlas)
+            * np.isfinite(normalized_residuals)
+            * np.isfinite(weight_data)
+        )
+
         data = {
-            "input_wavelength_nm": input_wavelength.to_value(u.nm).tolist(),
-            "input_spectrum": input_spectrum.tolist(),
-            "best_fit_wavelength_nm": best_fit_wavelength.to_value(u.nm).tolist(),
-            "best_fit_atlas": best_fit_atlas.tolist(),
-            "normalized_residuals": normalized_residuals.tolist(),
-            "weights": None if weights is None else weight_data.tolist(),
+            "input_wavelength_nm": input_wavelength.to_value(u.nm)[finite_idx].tolist(),
+            "input_spectrum": input_spectrum[finite_idx].tolist(),
+            "best_fit_wavelength_nm": best_fit_wavelength.to_value(u.nm)[finite_idx].tolist(),
+            "best_fit_atlas": best_fit_atlas[finite_idx].tolist(),
+            "normalized_residuals": normalized_residuals[finite_idx].tolist(),
+            "weights": None if weights is None else weight_data[finite_idx].tolist(),
         }
 
         self._record_values(values=data, tags=[Tag.quality(MetricCode.wavecal_fit)])
@@ -1447,7 +1456,7 @@ class _WavecalQualityMixin:
             name="Wavelength Calibration Results",
             description="These plots show the wavelength solution computed based on fits to a Solar FTS atlas. "
             "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 fir residuals.",
+            "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,
         )

dkist_processing_common/tests/test_assemble_quality.py

@@ -482,8 +482,7 @@ def test_assemble_quality_data(
         if plot_data_expected(rm.name):
             assert rm.plot_data
         if vertical_multi_pane_plot_data_expected(rm.name):
-            # TODO: Update this once `dkist-quality` knows about vertical multi-pane metrics
-            assert True
+            assert rm.vertical_multi_pane_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

@@ -1201,12 +1201,16 @@ def wavecal_input_wavelength() -> u.Quantity:
 
 @pytest.fixture(scope="session")
 def wavecal_input_spectrum(wavecal_input_wavelength) -> np.ndarray:
-    return (wavecal_input_wavelength.value - wavecal_input_wavelength.size // 2) ** 2 + 10.0
+    spec = (wavecal_input_wavelength.value - wavecal_input_wavelength.size // 2) ** 2 + 10.0
+    spec[spec.size // 2] = np.nan
+    return spec
 
 
 @pytest.fixture(scope="session")
 def wavecal_weights(wavecal_input_wavelength) -> np.ndarray:
-    return np.arange(wavecal_input_wavelength.size)
+    weights = np.arange(wavecal_input_wavelength.size, dtype=float)
+    weights[0] = np.inf
+    return weights
 
 
 @pytest.fixture(scope="session")
@@ -1300,7 +1304,7 @@ def test_build_wavecal_results(quality_task, wavecal_data_json):
     assert metric["description"] == (
         "These plots show the wavelength solution computed based on fits to a Solar FTS atlas. "
         "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 fir residuals."
+        "a combination of Solar and Telluric spectra. The bottom plot shows the fit residuals."
     )
     assert metric["metric_code"] == MetricCode.wavecal_fit.value
     assert metric["facet"] is None

dkist_processing_common/tests/test_workflow_task_base.py

@@ -2,12 +2,11 @@ import json
 import logging
 import re
 import tomllib
-from dataclasses import asdict
+from importlib.metadata import version
 from pathlib import Path
 from string import ascii_uppercase
 
 import pytest
-from pkg_resources import get_distribution
 from sqids import Sqids
 
 import dkist_processing_common
@@ -272,7 +271,7 @@ def test_library_versions(provenance_task, package_dependencies):
     #   installed packages.
     for package in package_dependencies:
         assert package in libraries
-        assert libraries[package] == get_distribution(package).version
+        assert libraries[package] == version(package)
 
 
 def test_record_provenance(provenance_task):

{dkist_processing_common-11.0.0rc1.dist-info → dkist_processing_common-11.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.0.0rc1
+Version: 11.0.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.0rc1; extra == "quality"
+Requires-Dist: dkist-quality<2.0,>=1.3.0; extra == "quality"
 
 dkist-processing-common
 =======================

{dkist_processing_common-11.0.0rc1.dist-info → dkist_processing_common-11.0.1.dist-info}/RECORD

@@ -1,7 +1,4 @@
 changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-changelog/256.feature.rst,sha256=i_Nf4STs2fP2MNZ3Ec4I5K4Avh0oLD8LF4i8G_x19VM,175
-changelog/257.feature.rst,sha256=5RIxMuwnHi6lrTZ_RC1GVRqx9nFHM--ShQEfdaVGqv0,90
-changelog/259.feature.rst,sha256=G2UIyD1cpP8ptpDk39bSI4TvqLt46HAyjWJIQ7VSVXs,95
 dkist_processing_common/__init__.py,sha256=490Fwm_GgqpwriQlsYfKcLUZNhZ6GkINtJqcYSIEKoU,319
 dkist_processing_common/config.py,sha256=IcpaD_NvHZU-aLlUNOTdRC4V7ADIvVQwrZ2dHhIr4NY,4247
 dkist_processing_common/manual.py,sha256=M7FW1viESaTfK1jLqHLp7JMGTGeoTxHtgCXRjZpDR8g,6990
@@ -56,7 +53,7 @@ dkist_processing_common/parsers/time.py,sha256=jcyhID_6ldkLZMBO9gqzYJ-oAD1kmFOTh
 dkist_processing_common/parsers/unique_bud.py,sha256=ht_1Oi1OL7otZOMXcoVilmDSYVCC7KZ7Fj-TfKDFcqw,3173
 dkist_processing_common/parsers/wavelength.py,sha256=Cb0opJmFRLQVPIMC5YRSDeygWjvQGS9avYrFhLsBekY,546
 dkist_processing_common/tasks/__init__.py,sha256=uH8DTiQP-cx4vMK53S4LYGZGmbip5s0kWORvZBrSNj8,624
-dkist_processing_common/tasks/assemble_movie.py,sha256=9K4sgXyRKaX7UsFBIs138pG3AtClwLLopYw3ZQY3ok4,12771
+dkist_processing_common/tasks/assemble_movie.py,sha256=6tb_vOwXZuQEhGBK8LoBaGnYQnpv_FiE9DVa_cLjreE,12771
 dkist_processing_common/tasks/base.py,sha256=k_IJR5sVV6ennX0sbeb0C6dciqshdY7CKjtWHy_adm8,13143
 dkist_processing_common/tasks/l1_output_data.py,sha256=IM-nvGaTM5r-z-9vHr2wovPVUpuNCah-cWIFMO2fcII,10576
 dkist_processing_common/tasks/output_data_base.py,sha256=CC1TnCrChi8_iuMymr425CJqpY4jCggnVUMfqzFkpnw,3682
@@ -74,11 +71,11 @@ dkist_processing_common/tasks/mixin/metadata_store.py,sha256=yTKijpQ-tNx_H2V_9Hs
 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=QUO6BWcFHZVc_QiXulGKnJk6cVzOalpFJq1Gusb7nZU,59844
+dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=kBZqvYvCKx0ar1tYw-f1AYNMORekqMERo73fsZS3QQU,60210
 dkist_processing_common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_common/tests/conftest.py,sha256=Rz1r2_by8aRZslSkS4AduEtpu3cpPxsAonZQyUCBPSQ,30867
 dkist_processing_common/tests/test_assemble_movie.py,sha256=XY_ruXSYP5k6s2gUAwlFdnhJ81eyWLSd2O9IkX4RXeo,4165
-dkist_processing_common/tests/test_assemble_quality.py,sha256=2fF2__iYj1cBShxxHMUP1sHHbDqDO8oqYICt6rg7lzo,17967
+dkist_processing_common/tests/test_assemble_quality.py,sha256=j0n67prmjxbBxkqgurmanfH4puCTYytn4thpEXe7u2s,17902
 dkist_processing_common/tests/test_base.py,sha256=4ST3__jEHitEQaQs9-0OcqtyEJfIjZsk_6PRYZFV2-U,7124
 dkist_processing_common/tests/test_codecs.py,sha256=FGhldrTdc28YD9FKrsW3lZ34LtvzecGP1qNi9fGHVGQ,22173
 dkist_processing_common/tests/test_constants.py,sha256=Kc9k5TdYy5QkRRlGav6kfI2dy5HHKqtpf9qOuaAfDZU,5903
@@ -96,7 +93,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=wB2lcAnT77yVnqO0cFWOPxGf-tZ8U62kvvpiB5roBwQ,3268
 dkist_processing_common/tests/test_quality.py,sha256=vomy2YSPadKqJj2tG8sCs-UkQVvfKus7Cum7_Hpee4I,10257
-dkist_processing_common/tests/test_quality_mixin.py,sha256=AFYLr6ZRWuxsAdPqvwwcgMfPhYCHKJRX-0oLJgoIDmg,55120
+dkist_processing_common/tests/test_quality_mixin.py,sha256=Kaj4gFglRiWrYaL_USnsyK8-5-wrMQuG36nU8YSXus0,55229
 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=F1IKBFWhjjMhONxEgs5p-cpjbQwxh7BLhDFw9b6j874,3806
@@ -108,7 +105,7 @@ dkist_processing_common/tests/test_transfer_input_data.py,sha256=B-kDsGJTUxxnamN
 dkist_processing_common/tests/test_transfer_l1_output_data.py,sha256=27PifkyH3RZg0nsM-AjmrFJ-hbYuCk5Tt_0Zx8PJBfM,2109
 dkist_processing_common/tests/test_trial_catalog.py,sha256=SZ-nyn0MXU9Lkg_94FbKER_cwiGoi06GYlzF_3AmvKg,6802
 dkist_processing_common/tests/test_trial_output_data.py,sha256=cBCj0kXyF5NEMzKh6zPVksdoXyE8ju1opJgWgjdcJWA,12790
-dkist_processing_common/tests/test_workflow_task_base.py,sha256=Z5aPW5LQtS0UWJiYho4X0r-2gPLfzpkmMwfmaoFLjMg,10517
+dkist_processing_common/tests/test_workflow_task_base.py,sha256=pxdR_qBWINty82rRhSt_nhaC0g-wBMWMoF4R3RUWSXM,10465
 dkist_processing_common/tests/test_write_l1.py,sha256=U0Ge-sSvtKT4t5YrVochbwxSb1R_Lk-fKNbheDmhjtc,26709
 docs/Makefile,sha256=qnlVz6PuBqE39NfHWuUnHhNEA-EFgT2-WJNNNy9ttfk,4598
 docs/changelog.rst,sha256=S2jPASsWlQxSlAPqdvNrYvhk9k3FcFWNXFNDYXBSjl4,120
@@ -118,7 +115,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.0.0rc1.dist-info/METADATA,sha256=hXefUjocpqT4m0fISUEKWLeBLTPJrpSeCkK6SR4p37o,7207
-dkist_processing_common-11.0.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_common-11.0.0rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
-dkist_processing_common-11.0.0rc1.dist-info/RECORD,,
+dkist_processing_common-11.0.1.dist-info/METADATA,sha256=qoa_jqYRe1IhvaZ3HLElu-Q2ncqkXkTfKRlg8Ilkzpc,7201
+dkist_processing_common-11.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_common-11.0.1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
+dkist_processing_common-11.0.1.dist-info/RECORD,,

changelog/256.feature.rst

@@ -1,2 +0,0 @@
-Move `location_of_dkist` from the `WriteL1` task to its own module (`~dkist_processing_common.models.dkist_location`).
-Also make it a constant variable instead of a function.

changelog/257.feature.rst

@@ -1 +0,0 @@
-`Stems` that only match a specific task types can now check against a list of task types.

changelog/259.feature.rst

@@ -1 +0,0 @@
-Add ability to store and build a quality metric showing the results of wavelength calibration.