change to return holoviews figure when raw_figure=True

Author: softwareentrepreneer

docs/customization.ipynb

@@ -13,6 +13,7 @@
     candlestick_plot as ohlc,
     candlestick_plot as kline,
 )
+from pfund_plot.layout import layout_plot as layout
 
 
 hvplot.extension('bokeh', 'plotly')

pfund_plot/__init__.py

@@ -0,0 +1,5 @@
+
+
+
+def layout_plot():
+    pass

pfund_plot/layout.py

@@ -13,7 +13,7 @@
 import narwhals as nw
 from bokeh.models import HoverTool, CrosshairTool
 
-from pfund_plot.const.enums import DisplayMode, PlottingBackend, DataType
+from pfund_plot.const.enums import DisplayMode, DataType
 from pfund_plot.utils.validate import validate_data_type
 from pfund_plot.renderer import render
 
@@ -129,7 +129,7 @@ def candlestick_plot(
     # TODO: using tick data to update the current candlestick
 
 
-    display_mode, plotting_backend = DisplayMode[display_mode.lower()], PlottingBackend.bokeh
+    display_mode = DisplayMode[display_mode.lower()]
     data_type: DataType = validate_data_type(data, streaming, import_hvplot=True)
     if data_type == DataType.datafeed:
         # TODO: get streaming data in the format of dataframe, and then call _validate_df
@@ -231,4 +231,4 @@ def _update_plot():
             sizing_mode='stretch_both',
             name=DEFAULT_STYLE['title'],
         )
-    return render(fig, display_mode, raw_figure=raw_figure, plotting_backend=plotting_backend, periodic_callback=periodic_callback)
+    return render(fig, display_mode, raw_figure=raw_figure, periodic_callback=periodic_callback)

pfund_plot/mosaic.py

@@ -34,7 +34,7 @@
 def dataframe_plot(
     data: tDataFrame | BaseFeed,
     display_mode: tDISPLAY_MODE = "notebook",
-    dataframe_backend: tDATAFRAME_BACKEND = "tabulator",
+    backend: tDATAFRAME_BACKEND = "tabulator",
     streaming: bool = False,
     streaming_freq: int = 1000,  # in milliseconds
     max_streaming_data: int | None = None,
@@ -52,7 +52,7 @@ def dataframe_plot(
         streaming_freq: the update frequency of the streaming data in milliseconds
         max_streaming_data: maximum number of data points used when streaming.
             If None, data will continue to grow unbounded.
-        dataframe_backend: backend to use for the dataframe plot.
+        backend: backend to use for the dataframe plot.
             e.g. 'tabulator' or 'perspective'
             use Perspective if data size is large or more complicated data manipulation is needed.
         page_size: number of data points to display on each page when using Tabulator backend.
@@ -68,7 +68,7 @@ def dataframe_plot(
     and https://panel.holoviz.org/reference/panes/Perspective.html for Perspective backend.
     '''
 
-    display_mode, dataframe_backend = DisplayMode[display_mode.lower()], DataFrameBackend[dataframe_backend.lower()]
+    display_mode, backend = DisplayMode[display_mode.lower()], DataFrameBackend[backend.lower()]
     data_type: DataType = validate_data_type(data, streaming, import_hvplot=False)
     if data_type == DataType.datafeed:
         # TODO: get streaming data in the format of dataframe, and then call _validate_df
@@ -77,10 +77,10 @@ def dataframe_plot(
     else:
         df = data
     df = convert_to_pandas_df(df)
-    use_iframe_in_notebook = streaming or (dataframe_backend == DataFrameBackend.perspective)
+    use_iframe_in_notebook = streaming or (backend == DataFrameBackend.perspective)
     iframe_style = None
 
-    if dataframe_backend == DataFrameBackend.tabulator:
+    if backend == DataFrameBackend.tabulator:
         if max_streaming_data is not None and max_streaming_data < SUGGESTED_MIN_STREAMING_DATA_FOR_TABULATOR:
             # FIXME: this is a workaround for a bug in panel Tabulator, see if panel will fix it, or create a github issue
             print_warning(
@@ -109,7 +109,7 @@ def dataframe_plot(
             },
             **kwargs
         )
-    elif dataframe_backend == DataFrameBackend.perspective:
+    elif backend == DataFrameBackend.perspective:
         data_size = df.shape[0]
         if data_size > SUGGESTED_MAX_DATA_SIZE_FOR_PERSPECTIVE:
             print_warning(f"Data size is large (data_size={data_size}), consider using Tabulator backend, which supports for better performance.")
@@ -130,7 +130,7 @@ def dataframe_plot(
             **kwargs
         )
     else:
-        raise ValueError(f"Unsupported dataframe backend: {dataframe_backend}")
+        raise ValueError(f"Unsupported dataframe backend: {backend}")
 
     if not streaming:
         periodic_callback = None
@@ -144,9 +144,9 @@ def _update_table():
             new_data['symbol'] = f'AAPL_{n}'
             n += 1
 
-            if dataframe_backend == DataFrameBackend.tabulator:
+            if backend == DataFrameBackend.tabulator:
                 table.stream(new_data, follow=watch, rollover=max_streaming_data)
-            elif dataframe_backend == DataFrameBackend.perspective:
+            elif backend == DataFrameBackend.perspective:
                 table.stream(new_data, rollover=max_streaming_data)
         periodic_callback = pn.state.add_periodic_callback(_update_table, period=streaming_freq, start=False)
 

pfund_plot/plots/candlestick.py

@@ -40,7 +40,7 @@ def orderbook_plot(
         display_mode=display_mode,
         streaming=streaming,
         streaming_freq=streaming_freq,
-        dataframe_backend='perspective', 
+        backend='perspective', 
         max_streaming_data=1,
         height=height,
         **kwargs

pfund_plot/plots/dataframe.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Literal
 if TYPE_CHECKING:
-    from bokeh.plotting import figure
-    from plotly.graph_objects import Figure
     from panel.layout import Panel
     from panel.widgets import Widget
     from panel.pane import Pane
@@ -19,7 +17,7 @@
 import holoviews as hv
 
 from pfund import print_warning
-from pfund_plot.const.enums import DisplayMode, PlottingBackend, NotebookType
+from pfund_plot.const.enums import DisplayMode, NotebookType
 from pfund_plot.utils.utils import get_notebook_type, get_free_port
 
 
@@ -61,7 +59,6 @@ def render(
     fig: Overlay | Panel | Pane | Widget,
     display_mode: Literal["notebook", "browser", "desktop"] | DisplayMode,
     raw_figure: bool = False,
-    plotting_backend: Literal["bokeh", "plotly"] | PlottingBackend | None = None,
     periodic_callback: PeriodicCallback | None = None,
     use_iframe_in_notebook: bool = False,
     iframe_style: str | None = None,
@@ -84,13 +81,8 @@ def render(
     '''
     if isinstance(display_mode, str):
         display_mode = DisplayMode[display_mode.lower()]
-    if isinstance(plotting_backend, str):
-        plotting_backend = PlottingBackend[plotting_backend.lower()]
 
     if raw_figure:
-        assert plotting_backend is not None, "plotting_backend must be provided when raw_figure is True"
-        # fig is of type "Overlay" -> convert to tFigure (bokeh figure or plotly figure)
-        fig: figure | Figure = hv.render(fig, backend=plotting_backend.value)
         return fig
     else:
         if display_mode == DisplayMode.notebook:

pfund_plot/plots/orderbook.py

@@ -3,9 +3,7 @@
 from panel.widgets import Widget
 from panel.pane import Pane
 from holoviews.core.overlay import Overlay
-from bokeh.plotting import figure
-from plotly.graph_objects import Figure
 
 
-tFigure = figure | Figure | Overlay | Panel | Pane | Widget
+tFigure = Overlay | Panel | Pane | Widget
 tOutput = tFigure | StoppableThread