jdaviz 4.5 updates (#210)

Author: kecnry

CHANGES.rst

@@ -4,6 +4,7 @@
 1.2.2 (unreleased)
 ------------------
 
+* Update jdaviz requirement to 4.5, including support for popping out and showing viewers inline. [#210]
 
 1.2.1 (09-26-2025)
 ------------------

lcviz/helper.py

@@ -9,6 +9,7 @@
 from glue.config import settings as glue_settings
 from glue.core.link_helpers import LinkSame
 from glue.core.units import unit_converter
+from jdaviz.configs.default.plugins.viewers import JdavizViewerWindow
 from jdaviz.core.helpers import ConfigHelper
 
 from lcviz import __version__
@@ -41,7 +42,7 @@ def to_unit(self, data, cid, values, original_units, target_units):
 
 
 def _get_range_subset_bounds(self, subset_state, *args, **kwargs):
-    viewer = self._jdaviz_helper.default_time_viewer._obj
+    viewer = self._jdaviz_helper.default_time_viewer._obj.glue_viewer
     light_curve = viewer.data()[0]
     reference_time = light_curve.meta['reference_time']
     if viewer:
@@ -83,7 +84,7 @@ def _get_display_unit(app, axis):
         if axis == 'time':
             return u.d
         elif axis == 'flux':
-            return app._jdaviz_helper.default_time_viewer._obj.data()[0].flux.unit
+            return app._jdaviz_helper.default_time_viewer._obj.glue_viewer.data()[0].flux.unit
         else:
             raise ValueError(f"could not find units for axis='{axis}'")
     try:
@@ -204,7 +205,7 @@ def default_time_viewer(self):
                if isinstance(viewer, TimeScatterView)]
         if not len(tvs):
             raise ValueError("no time viewers exist")
-        return tvs[0].user_api
+        return JdavizViewerWindow(tvs[0], app=self.app).user_api
 
     @property
     def _has_cube_data(self):

lcviz/plugins/ephemeris/ephemeris.py

@@ -8,6 +8,7 @@
 
 from glue.core.link_helpers import LinkSame
 from glue.core.message import DataCollectionAddMessage
+from jdaviz.configs.default.plugins.viewers import JdavizViewerWindow
 from jdaviz.core.custom_traitlets import FloatHandleEmpty
 from jdaviz.core.events import (NewViewerMessage, ViewerAddedMessage, ViewerRemovedMessage)
 from jdaviz.core.registries import tray_registry
@@ -390,7 +391,7 @@ def create_phase_viewer(self, ephem_component=None):
 
         self._set_viewer_to_ephem_component(pv, ephem_component=ephem_component)
 
-        return pv.user_api
+        return JdavizViewerWindow(pv, app=self.app).user_api
 
     def vue_create_phase_viewer(self, *args):
         if not self.phase_viewer_exists:

lcviz/plugins/time_selector/time_selector.py

@@ -1,7 +1,7 @@
 from traitlets import observe
 
 from jdaviz.core.template_mixin import ViewerSelectMixin
-from jdaviz.configs.cubeviz.plugins import Slice
+from jdaviz.configs.cubeviz.plugins import BaseSlicePlugin
 from jdaviz.core.registries import tray_registry
 
 from lcviz.events import EphemerisChangedMessage
@@ -11,7 +11,7 @@
 
 
 @tray_registry('time-selector', label="Time Selector", category='app:options')
-class TimeSelector(Slice, ViewerSelectMixin):
+class TimeSelector(BaseSlicePlugin, ViewerSelectMixin):
     """
     See the :ref:`Time Selector Plugin Documentation <time-selector>` for more details.
 
@@ -53,13 +53,6 @@ def __init__(self, *args, **kwargs):
         self.viewer.add_filter(lambda viewer: isinstance(viewer, (TimeScatterView, PhaseScatterView, CubeView)))  # noqa
         self._set_relevant()
 
-    @observe('viewer_items')
-    def _set_relevant(self, *args):
-        if not len(self.viewer_items):
-            self.irrelevant_msg = 'No valid viewers'
-        else:
-            self.irrelevant_msg = ''
-
     @observe('vdocs')
     def _update_docs_link(self, *args):
         self.docs_link = f"https://lcviz.readthedocs.io/en/{self.vdocs}/plugins.html#time-selector"

lcviz/tests/test_parser.py

@@ -19,7 +19,7 @@ def test_kepler_via_mast_local_file(helper):
     )  # 188 KB
 
     path = download_file(url, cache=True, timeout=100)
-    helper.load_data(path)
+    helper.load(path)
 
     data = helper.app.data_collection[0]
     flux_arr = data['flux']
@@ -39,7 +39,7 @@ def test_kepler_via_mast_preparsed(helper):
     )  # 188 KB
 
     light_curve = kepler.read_kepler_lightcurve(url)
-    helper.load_data(light_curve)
+    helper.load(light_curve)
 
     data = helper.app.data_collection[0]
     flux_arr = data['flux']
@@ -57,7 +57,7 @@ def test_kepler_tpf_via_lightkurve(helper):
                                  mission="Kepler",
                                  cadence="long",
                                  quarter=10).download()
-    helper.load_data(tpf)
+    helper.load(tpf)
     assert helper.get_data().shape == (4447, 4, 6)  # (time, x, y)
     assert helper.app.data_collection[0].get_object(cls=KeplerTargetPixelFile).shape == (4447, 4, 6)
 
@@ -68,8 +68,8 @@ def test_mult_lc_reftime(helper):
                             cadence="long", quarter=9).download()
     lc2 = search_lightcurve("HAT-P-11", mission="Kepler",
                             cadence="long", quarter=10).download()
-    helper.load_data(lc1, data_label='Q9')
-    helper.load_data(lc2, data_label='Q10')
+    helper.load(lc1, data_label='Q9')
+    helper.load(lc2, data_label='Q10')
     assert helper.app.data_collection[0].meta.get('reference_time') == helper.app.data_collection[1].meta.get('reference_time')  # noqa
 
 
@@ -78,7 +78,7 @@ def test_synthetic_lc(helper):
     flux = np.ones(len(time)) * u.electron / u.s
     flux_err = 0.1 * np.ones_like(flux)
     lc = LightCurve(time=time, flux=flux, flux_err=flux_err)
-    helper.load_data(lc)
+    helper.load(lc)
 
     data = helper.app.data_collection[0]
     flux_arr = data['flux']
@@ -92,8 +92,8 @@ def test_synthetic_lc(helper):
 
 def test_apply_xrangerois(helper, light_curve_like_kepler_quarter):
     lc = light_curve_like_kepler_quarter
-    helper.load_data(lc)
-    viewer = helper.default_time_viewer._obj
+    helper.load(lc)
+    viewer = helper.default_time_viewer._obj.glue_viewer
     subset_plugin = helper.plugins['Subset Tools']
 
     # the min/max of temporal regions can be defined in two ways:
@@ -117,8 +117,8 @@ def test_apply_xrangerois(helper, light_curve_like_kepler_quarter):
 
 def test_apply_yrangerois(helper, light_curve_like_kepler_quarter):
     lc = light_curve_like_kepler_quarter
-    helper.load_data(lc)
-    viewer = helper.default_time_viewer._obj
+    helper.load(lc)
+    viewer = helper.default_time_viewer._obj.glue_viewer
     subset_plugin = helper.plugins['Subset Tools']
 
     subset_plugin._obj.subset_selected = "Create New"
@@ -135,11 +135,11 @@ def test_apply_yrangerois(helper, light_curve_like_kepler_quarter):
 
 def test_data_label(helper, light_curve_like_kepler_quarter):
     # add data without specifying data label:
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
     object_name = helper.app.data_collection[-1].meta['OBJECT']
     assert helper.app.data_collection[-1].label == f'{object_name} [Q10]'
 
     # specify label, check that quarter isn't appended:
     data_label = 'Cool target'
-    helper.load_data(light_curve_like_kepler_quarter, data_label=data_label)
+    helper.load(light_curve_like_kepler_quarter, data_label=data_label)
     assert helper.app.data_collection[-1].label == data_label

lcviz/tests/test_plugin_binning.py

@@ -20,8 +20,8 @@ def test_docs_snippets(helper, light_curve_like_kepler_quarter):
 
 
 def test_plugin_binning(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
-    tv = helper.default_time_viewer._obj
+    helper.load(light_curve_like_kepler_quarter)
+    tv = helper.default_time_viewer._obj.glue_viewer
 
     b = helper.plugins['Binning']
     b._obj.plugin_opened = True

lcviz/tests/test_plugin_ephemeris.py

@@ -14,7 +14,7 @@ def test_docs_snippets(helper, light_curve_like_kepler_quarter):
 
 
 def test_plugin_ephemeris(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
     ephem = helper.plugins['Ephemeris']
 
     assert len(helper.app.get_viewer_ids()) == 1
@@ -82,24 +82,26 @@ def test_plugin_ephemeris(helper, light_curve_like_kepler_quarter):
 
 
 def test_cloned_phase_viewer(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
     ephem = helper.plugins['Ephemeris']
 
     assert len(ephem._obj._get_phase_viewers()) == 0
     pv1 = ephem.create_phase_viewer()
     assert len(ephem._obj._get_phase_viewers()) == 1
-    pv2 = pv1._obj.clone_viewer()
+    pv2 = pv1._obj.glue_viewer.clone_viewer()
     assert len(ephem._obj._get_phase_viewers()) == 2
     assert len(helper.viewers) == 3
-    assert pv1._obj.reference_id == 'flux-vs-phase:default'
-    assert pv1._obj._ephemeris_component == 'default'
+    assert pv1._obj.glue_viewer.reference_id == 'flux-vs-phase:default'
+    assert pv1._obj.glue_viewer._ephemeris_component == 'default'
+    # NOTE: this should be updated once upstream changes to return the JdavizViewerWindow user_api
     assert pv2._obj.reference_id == 'flux-vs-phase:default[1]'
     assert pv2._obj._ephemeris_component == 'default'
 
     # renaming ephemeris should update both labels
     ephem.rename_component('default', 'renamed')
-    assert pv1._obj.reference_id == 'flux-vs-phase:renamed'
-    assert pv1._obj._ephemeris_component == 'renamed'
+    assert pv1._obj.glue_viewer.reference_id == 'flux-vs-phase:renamed'
+    assert pv1._obj.glue_viewer._ephemeris_component == 'renamed'
+    # NOTE: this should be updated once upstream changes to return the JdavizViewerWindow user_api
     assert pv2._obj.reference_id == 'flux-vs-phase:renamed[1]'
     assert pv2._obj._ephemeris_component == 'renamed'
     assert len(ephem._obj._get_phase_viewers()) == 2
@@ -109,7 +111,7 @@ def test_cloned_phase_viewer(helper, light_curve_like_kepler_quarter):
 
 
 def test_create_phase_viewer(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
     ephem = helper.plugins['Ephemeris']
     vc = helper._tray_tools['g-viewer-creator']
 
@@ -136,7 +138,7 @@ def test_create_phase_viewer(helper, light_curve_like_kepler_quarter):
 
 
 def test_ephemeris_queries(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
     ephem = helper.plugins['Ephemeris']
 
     ephem.query_for_ephemeris()
@@ -151,7 +153,7 @@ def test_ephemeris_query_no_name(helper, light_curve_like_kepler_quarter):
     # test that the query successfully falls back on the RA/Dec:
     light_curve_like_kepler_quarter.meta['OBJECT'] = ''
 
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
     ephem = helper.plugins['Ephemeris']
 
     ephem.query_for_ephemeris()

lcviz/tests/test_plugin_flatten.py

@@ -24,11 +24,11 @@ def test_docs_snippets(helper, light_curve_like_kepler_quarter):
 
 
 def test_plugin_flatten(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
-    tv = helper.default_time_viewer._obj
+    helper.load(light_curve_like_kepler_quarter)
+    tv = helper.default_time_viewer._obj.glue_viewer
 
     ephem = helper.plugins['Ephemeris']
-    pv = ephem.create_phase_viewer()._obj
+    pv = ephem.create_phase_viewer()._obj.glue_viewer
     f = helper.plugins['Flatten']
 
     # no marks until plugin opened/active
@@ -73,7 +73,7 @@ def test_plugin_flatten(helper, light_curve_like_kepler_quarter):
 
 
 def test_unnormalize(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
 
     f = helper.plugins['Flatten']
 

lcviz/tests/test_plugin_flux_column.py

@@ -14,7 +14,7 @@ def test_docs_snippets(helper, light_curve_like_kepler_quarter):
 
 
 def test_plugin_flux_column(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
 
     fo = helper.plugins['Flux Column']
     assert len(fo.flux_column.choices) == 2

lcviz/tests/test_plugin_frequency_analysis.py

@@ -18,7 +18,7 @@ def test_docs_snippets(helper, light_curve_like_kepler_quarter):
 
 
 def test_plugin_frequency_analysis(helper, light_curve_like_kepler_quarter):
-    helper.load_data(light_curve_like_kepler_quarter)
+    helper.load(light_curve_like_kepler_quarter)
 
     freq = helper.plugins['Frequency Analysis']
     freq.open_in_tray()