MatplotLibAPI 3.2.7__tar.gz → 3.2.8__tar.gz

{matplotlibapi-3.2.7 → matplotlibapi-3.2.8}/MatplotLibAPI/Composite.py

@@ -1,15 +1,14 @@
 # Hint for Visual Code Python Interactive window
 # %%
-from typing import Optional, Tuple, List, Union, Dict
+from typing import Optional, Tuple, List
 import pandas as pd
 import matplotlib.pyplot as plt
-from matplotlib.pyplot import GridSpec
 from matplotlib.figure import Figure
-from matplotlib.axes import Axes
 import plotly.graph_objects as go
+from plotly.subplots import make_subplots
 from .Bubble import aplot_bubble, BUBBLE_STYLE_TEMPLATE
 from .Table import aplot_table
-from .Treemap import fplot_treemap, TREEMAP_STYLE_TEMPLATE
+from .Treemap import aplot_treemap, TREEMAP_STYLE_TEMPLATE
 from .StyleTemplate import StyleTemplate, format_func, validate_dataframe
 
 
@@ -91,7 +90,7 @@ def plot_composite_bubble(
     return fig
 
 
-def fplot_treemaps(pd_dfs: List[pd.DataFrame],
+def plot_composite_treemap(pd_dfs: List[pd.DataFrame],
                    path: str,
                    values: str,
                    style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
@@ -101,7 +100,6 @@ def fplot_treemaps(pd_dfs: List[pd.DataFrame],
                    ascending: bool = False,
                    max_values: int = 100) -> go.Figure:
 
-    trms = []
     num_dimensions = len(pd_dfs)
     if num_dimensions > 0:
         fig = make_subplots(
@@ -110,9 +108,9 @@ def fplot_treemaps(pd_dfs: List[pd.DataFrame],
             specs=[[{'type': 'domain'}] for _ in range(num_dimensions)],
             vertical_spacing=0.02
         )
-        current_row = 0
+        current_row = 1
         for pd_df in pd_dfs:
-            trm = fplot_treemap(pd_df=pd_df,
+            trm = aplot_treemap(pd_df=pd_df,
                                 path=path,
                                 values=values,
                                 title=title,
@@ -120,7 +118,7 @@ def fplot_treemaps(pd_dfs: List[pd.DataFrame],
                                 color=color,
                                 sort_by=sort_by,
                                 ascending=ascending,
-                                max_values=max_values,
-                                fig=fig)
-            trms.append(trm)
+                                max_values=max_values)
+            fig.add_trace(trm,row=current_row, col=1)
             current_row += 1
+        return fig

{matplotlibapi-3.2.7 → matplotlibapi-3.2.8}/MatplotLibAPI/Treemap.py

@@ -2,11 +2,10 @@
 # %%
 from typing import Optional
 import pandas as pd
-from pandas import CategoricalDtype,BooleanDtype
+from pandas import CategoricalDtype, BooleanDtype
 import plotly.graph_objects as go
 
-from .StyleTemplate import StyleTemplate, string_formatter, percent_formatter,validate_dataframe
-
+from .StyleTemplate import StyleTemplate, string_formatter, percent_formatter, validate_dataframe
 
 
 TREEMAP_STYLE_TEMPLATE = StyleTemplate(
@@ -19,16 +18,15 @@ TREEMAP_STYLE_TEMPLATE = StyleTemplate(
 )
 
 
-def fplot_treemap(pd_df: pd.DataFrame,
-                 path: str,
-                 values: str,
-                 style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
-                 title: Optional[str] = None,
-                 color: Optional[str] = None,
-                 sort_by: Optional[str] = None,
-                 ascending: bool = False,
-                 max_values: int = 100,
-                 fig: Optional[go.Figure] = None) -> go.Figure:
+def aplot_treemap(pd_df: pd.DataFrame,
+                  path: str,
+                  values: str,
+                  style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+                  title: Optional[str] = None,
+                  color: Optional[str] = None,
+                  sort_by: Optional[str] = None,
+                  ascending: bool = False,
+                  max_values: int = 100) -> go.Trace:
     cols = [path, values]
     if color:
         cols.append(color)
@@ -57,7 +55,33 @@ def fplot_treemap(pd_df: pd.DataFrame,
         data['marker'] = dict(colorscale="Viridis",
                               colors=color_data.to_list())
 
-    g = go.Treemap(data)
+    g = go.Treemap(data,
+                   root_color=style.background_color
+                   )
+
+    return g
+
+
+def fplot_treemap(pd_df: pd.DataFrame,
+                  path: str,
+                  values: str,
+                  style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+                  title: Optional[str] = None,
+                  color: Optional[str] = None,
+                  sort_by: Optional[str] = None,
+                  ascending: bool = False,
+                  max_values: int = 100,
+                  fig: Optional[go.Figure] = None) -> go.Figure:
+
+    g = aplot_treemap(pd_df=pd_df,
+                      path=path,
+                      values=values,
+                      title=title,
+                      style=style,
+                      color=color,
+                      sort_by=sort_by,
+                      ascending=ascending,
+                      max_values=max_values)
 
     if not fig:
         fig = go.Figure(g)

{matplotlibapi-3.2.7 → matplotlibapi-3.2.8}/MatplotLibAPI/__init__.py

@@ -5,7 +5,7 @@ from .Composite import plot_composite_bubble
 from .Timeserie import aplot_timeserie, fplot_timeserie, TIMESERIE_STYLE_TEMPLATE
 from .Table import aplot_table, fplot_table, TABLE_STYLE_TEMPLATE
 from .Network import aplot_network, aplot_network_components, fplot_network, NETWORK_STYLE_TEMPLATE
-from .Treemap import fplot_treemap, TREEMAP_STYLE_TEMPLATE
+from .Treemap import fplot_treemap, aplot_treemap, TREEMAP_STYLE_TEMPLATE
 from typing import List, Optional, Tuple
 import pandas as pd
 from pandas.api.extensions import register_dataframe_accessor
@@ -274,6 +274,26 @@ class DataFrameAccessor:
                              max_values=max_values,
                              fig=fig)
 
+    def aplot_treemap(self,
+                      path: str,
+                      values: str,
+                      style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+                      title: Optional[str] = None,
+                      color: Optional[str] = None,
+                      sort_by: Optional[str] = None,
+                      max_values: int = 100,
+                      ascending: bool = False,
+                      fig: Optional[go.Figure] = None) -> go.Figure:
+        return aplot_treemap(pd_df=self._obj,
+                             path=path,
+                             values=values,
+                             title=title,
+                             style=style,
+                             color=color,
+                             sort_by=sort_by,
+                             ascending=ascending,
+                             max_values=max_values)
+
 
 __all__ = ["validate_dataframe", "aplot_bubble", "aplot_timeserie", "aplot_table", "aplot_network", "aplot_network_components", "fplot_network",
-           "plot_pivotbar", "fplot_treemap", "plot_composite_bubble", "StyleTemplate", "DataFrameAccessor"]
+           "plot_pivotbar", "fplot_treemap", "aplot_treemap", "plot_composite_bubble", "StyleTemplate", "DataFrameAccessor"]

{matplotlibapi-3.2.7 → matplotlibapi-3.2.8/MatplotLibAPI.egg-info}/PKG-INFO

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

{matplotlibapi-3.2.7/MatplotLibAPI.egg-info → matplotlibapi-3.2.8}/PKG-INFO

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

{matplotlibapi-3.2.7 → matplotlibapi-3.2.8}/pyproject.toml

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