MatplotLibAPI 3.2.0__tar.gz → 3.2.1__tar.gz

{matplotlibapi-3.2.0 → matplotlibapi-3.2.1}/MatplotLibAPI/__init__.py

@@ -4,7 +4,7 @@ from .Bubble import plot_bubble, BUBBLE_STYLE_TEMPLATE
 from .Composite import plot_composite_bubble
 from .Timeserie import plot_timeserie, TIMESERIE_STYLE_TEMPLATE
 from .Table import plot_table, TABLE_STYLE_TEMPLATE
-from .Network import Graph
+from .Network import plot_network, plot_network_components, NETWORK_STYLE_TEMPLATE
 from .Treemap import plot_treemap, TREEMAP_STYLE_TEMPLATE
 from typing import List, Optional
 import pandas as pd
@@ -15,9 +15,6 @@ from matplotlib.figure import Figure
 import plotly.graph_objects as go
 
 
-
-
-
 @register_dataframe_accessor("mpl")
 class DataFrameAccessor:
 
@@ -34,7 +31,8 @@ class DataFrameAccessor:
                     max_values: int = 50,
                     center_to_mean: bool = False,
                     sort_by: Optional[str] = None,
-                    ascending: bool = False) -> Axes:
+                    ascending: bool = False,
+                    ax: Optional[Axes] = None) -> Axes:
 
         return plot_bubble(pd_df=self._obj,
                            label=label,
@@ -46,7 +44,8 @@ class DataFrameAccessor:
                            max_values=max_values,
                            center_to_mean=center_to_mean,
                            sort_by=sort_by,
-                           ascending=ascending)
+                           ascending=ascending,
+                           ax=ax)
 
     def plot_composite_bubble(self,
                               label: str,
@@ -58,7 +57,8 @@ class DataFrameAccessor:
                               max_values: int = 100,
                               center_to_mean: bool = False,
                               sort_by: Optional[str] = None,
-                              ascending: bool = False) -> Figure:
+                              ascending: bool = False,
+                              ax: Optional[Axes] = None) -> Figure:
 
         return plot_composite_bubble(pd_df=self._obj,
                                      label=label,
@@ -70,7 +70,8 @@ class DataFrameAccessor:
                                      max_values=max_values,
                                      center_to_mean=center_to_mean,
                                      sort_by=sort_by,
-                                     ascending=ascending)
+                                     ascending=ascending,
+                                     ax=ax)
 
     def plot_table(self,
                    cols: List[str],
@@ -78,7 +79,8 @@ class DataFrameAccessor:
                    style: StyleTemplate = TABLE_STYLE_TEMPLATE,
                    max_values: int = 20,
                    sort_by: Optional[str] = None,
-                   ascending: bool = False) -> Axes:
+                   ascending: bool = False,
+                   ax: Optional[Axes] = None) -> Axes:
 
         return plot_table(pd_df=self._obj,
                           cols=cols,
@@ -86,7 +88,8 @@ class DataFrameAccessor:
                           style=style,
                           max_values=max_values,
                           sort_by=sort_by,
-                          ascending=ascending)
+                          ascending=ascending,
+                          ax=ax)
 
     def plot_timeserie(self,
                        label: str,
@@ -96,7 +99,8 @@ class DataFrameAccessor:
                        style: StyleTemplate = TIMESERIE_STYLE_TEMPLATE,
                        max_values: int = 100,
                        sort_by: Optional[str] = None,
-                       ascending: bool = False) -> Axes:
+                       ascending: bool = False,
+                       ax: Optional[Axes] = None) -> Axes:
 
         return plot_timeserie(pd_df=self._obj,
                               label=label,
@@ -106,24 +110,52 @@ class DataFrameAccessor:
                               style=style,
                               max_values=max_values,
                               sort_by=sort_by,
-                              ascending=ascending)
+                              ascending=ascending,
+                              ax=ax)
 
     def plot_network(self,
                      source: str = "source",
                      target: str = "target",
                      weight: str = "weight",
                      title: Optional[str] = None,
-                     style: StyleTemplate = TIMESERIE_STYLE_TEMPLATE,
-                     max_values: int = 20,
+                     style: StyleTemplate = NETWORK_STYLE_TEMPLATE,
                      sort_by: Optional[str] = None,
-                     ascending: bool = False) -> Axes:
-
-        graph = Graph.from_pandas_edgelist(df=self._obj,
-                                           source=source,
-                                           target=target,
-                                           weight=weight)
-
-        return graph.plotX(title, style)
+                     ascending: bool = False,
+                     node_list: Optional[List] = None,
+                     ax: Optional[Axes] = None) -> Axes:
+
+        return plot_network(df=self._obj,
+                            source=source,
+                            target=target,
+                            weight=weight,
+                            title=title,
+                            style=style,
+                            sort_by=sort_by,
+                            ascending=ascending,
+                            node_list=node_list,
+                            ax=ax)
+
+    def plot_network_components(self,
+                                source: str = "source",
+                                target: str = "target",
+                                weight: str = "weight",
+                                title: Optional[str] = None,
+                                style: StyleTemplate = NETWORK_STYLE_TEMPLATE,
+                                sort_by: Optional[str] = None,
+                                ascending: bool = False,
+                                node_list: Optional[List] = None,
+                                ax: Optional[Axes] = None) -> Axes:
+
+        return plot_network_components(df=self._obj,
+                                       source=source,
+                                       target=target,
+                                       weight=weight,
+                                       title=title,
+                                       style=style,
+                                       sort_by=sort_by,
+                                       ascending=ascending,
+                                       node_list=node_list,
+                                       ax=ax)
 
     def plot_treemap(self,
                      path: str,

{matplotlibapi-3.2.0 → matplotlibapi-3.2.1/MatplotLibAPI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MatplotLibAPI
-Version: 3.2.0
+Version: 3.2.1
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE

{matplotlibapi-3.2.0/MatplotLibAPI.egg-info → matplotlibapi-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MatplotLibAPI
-Version: 3.2.0
+Version: 3.2.1
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE

{matplotlibapi-3.2.0 → matplotlibapi-3.2.1}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "MatplotLibAPI"
-version="v3.2.0"
+version="v3.2.1"
 readme = "README.md"
 requires-python=">=3.7"
 dependencies = ["pandas","matplotlib","networkx","plotly","seaborn","scikit-learn","kaleido","nbformat"]