reflect pfeed's update

Author: softwareentrepreneer

docs/CONTRIBUTING.md

@@ -69,14 +69,14 @@ e.g. there are also `pn.pane.Bokeh`, `pn.pane.Matplotlib`, `pn.pane.ECharts`, `p
 ## Example
 Your function will look something like this:
 ```python
-# tDataFrame is just a type alias for pandas, polars and dask dataframes
-from pfeed.types.core import tDataFrame
+# GenericFrame is just a type alias for pandas, polars and dask dataframes
+from pfeed.typing import GenericFrame
 from typing import Literal
 from pfund_plot.renderer import render
 
 
 def your_plot(
-    data: tDataFrame,
+    data: GenericFrame,
     streaming: bool = False,
     display_mode: Literal['notebook', 'browser', 'desktop'] = "notebook",
     raw_figure: bool = False,  # add this if your function uses hvplot

pfund_plot/cli/commands/config.py

@@ -1,6 +1,6 @@
 import click
 
-from pfeed.const.enums import DataTool
+from pfeed.enums import DataTool
 from pfund_plot.const.paths import PROJ_NAME
 
 

pfund_plot/plots/candlestick.py

@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from narwhals.typing import IntoFrame, Frame
-    from pfeed.types.core import tDataFrame
+    from pfeed.typing import GenericFrame
     from pfeed.feeds.base_feed import BaseFeed
     from pfund_plot.types.literals import tDISPLAY_MODE
     from pfund_plot.types.core import tOutput
@@ -92,7 +92,7 @@ def _create_hover_tool(df: Frame) -> HoverTool:
 
 
 def candlestick_plot(
-    data: tDataFrame | BaseFeed, 
+    data: GenericFrame | BaseFeed, 
     streaming: bool = False, 
     display_mode: tDISPLAY_MODE = "notebook", 
     num_data: int = 100,
@@ -147,7 +147,7 @@ def candlestick_plot(
 
     # Main Component: candlestick plot
     def _create_plot(_df: Frame, _num_data: int):
-        plot_df: tDataFrame = _df.tail(_num_data).to_native()
+        plot_df: GenericFrame = _df.tail(_num_data).to_native()
         return (
             plot_df
             .hvplot

pfund_plot/plots/dataframe.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
-    from pfeed.types.core import tDataFrame
+    from pfeed.typing import GenericFrame
     from pfeed.feeds.base_feed import BaseFeed
     from pfund_plot.types.literals import tDISPLAY_MODE, tDATAFRAME_BACKEND
     from pfund_plot.types.core import tOutput
@@ -12,7 +12,7 @@
 from bokeh.models.widgets.tables import DateFormatter
 
 from pfund import print_warning
-from pfeed.etl import convert_to_pandas_df
+from pfeed._etl.base import convert_to_pandas_df
 from pfund_plot.const.enums import DisplayMode, DataType, DataFrameBackend, NotebookType
 from pfund_plot.utils.validate import validate_data_type
 from pfund_plot.utils.utils import get_notebook_type, get_sizing_mode
@@ -34,7 +34,7 @@
 
 # EXTEND: maybe add some common functionalities here, e.g. search, sort, filter etc. not sure what users want for now.
 def dataframe_plot(
-    data: tDataFrame | BaseFeed,
+    data: GenericFrame | BaseFeed,
     display_mode: tDISPLAY_MODE = "notebook",
     backend: tDATAFRAME_BACKEND = "tabulator",
     streaming: bool = False,

pfund_plot/plots/orderbook.py

@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from narwhals.typing import IntoFrame, Frame
-    from pfeed.types.core import tDataFrame
+    from pfeed.typing import GenericFrame
     from pfeed.feeds.base_feed import BaseFeed
     from pfund_plot.types.literals import tDISPLAY_MODE, tDATAFRAME_BACKEND
     from pfund_plot.types.core import tOutput
@@ -19,7 +19,7 @@
 
 # TODO: use perspective to plot orderbook
 def orderbook_plot(
-    data: tDataFrame | BaseFeed,
+    data: GenericFrame | BaseFeed,
     display_mode: tDISPLAY_MODE = 'notebook',
     streaming: bool = False,
     streaming_freq: int = 1000,  # in milliseconds

pfund_plot/templates/dashboard.py

@@ -1,4 +1,4 @@
-from pfeed.types.literals import tDATA_SOURCE
+from pfeed.typing import tDATA_SOURCE
 from pfund_plot.templates.template import Template
 from pfund_plot.const.enums import DashboardType
 

pfund_plot/templates/notebook.py

@@ -1,6 +1,6 @@
 from typing import Literal
 
-from pfeed.types.literals import tDATA_SOURCE
+from pfeed.typing import tDATA_SOURCE
 from pfund_plot.templates.template import Template
 from pfund_plot.const.enums import NotebookType
 

pfund_plot/templates/template.py

@@ -1,5 +1,5 @@
-from pfeed.types.literals import tDATA_SOURCE
-from pfeed.const.enums import DataSource
+from pfeed.typing import tDATA_SOURCE
+from pfeed.enums import DataSource
 
 
 

pfund_plot/utils/validate.py

@@ -11,13 +11,13 @@
     dd = None
 import pandas as pd
 
-from pfeed.types.core import tDataFrame, is_dataframe
+from pfeed.typing import GenericFrame, is_dataframe
 from pfeed.feeds.base_feed import BaseFeed
 
 from pfund_plot.const.enums import DataType
 
 
-def _import_hvplot(data: tDataFrame | BaseFeed) -> None:
+def _import_hvplot(data: GenericFrame | BaseFeed) -> None:
     if is_dataframe(data):
         if isinstance(data, pd.DataFrame):
             import hvplot.pandas
@@ -33,7 +33,7 @@ def _import_hvplot(data: tDataFrame | BaseFeed) -> None:
         raise ValueError("Input data must be a dataframe or pfeed's feed object")
 
 
-def validate_data_type(data: tDataFrame | BaseFeed, streaming: bool, import_hvplot: bool = True) -> DataType:
+def validate_data_type(data: GenericFrame | BaseFeed, streaming: bool, import_hvplot: bool = True) -> DataType:
     if is_dataframe(data):
         data_type = DataType.dataframe
     elif isinstance(data, BaseFeed):