MatplotLibAPI 3.0.2__tar.gz → 3.1.0__tar.gz

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/MatplotLibAPI/Bubble.py

@@ -15,9 +15,7 @@ BUBBLE_STYLE_TEMPLATE = StyleTemplate(
                   "y": percent_formatter,
                   "label": string_formatter,
                   "z": bmk_formatter},
-    yscale="log",
-    y_ticks=8,
-    x_ticks=8
+    yscale="log"
 )
 
 

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/MatplotLibAPI/Composite.py

@@ -6,7 +6,7 @@ import pandas as pd
 from .Bubble import plot_bubble, BUBBLE_STYLE_TEMPLATE
 from .Table import plot_table
 from typing import Optional, Tuple
-from .Style import StyleTemplate, _validate_panda,format_func
+from .Style import StyleTemplate, _validate_panda, format_func
 
 
 def plot_composite_bubble(
@@ -19,18 +19,27 @@ def plot_composite_bubble(
         style: StyleTemplate = BUBBLE_STYLE_TEMPLATE,
         max_values: int = 50,
         center_to_mean: bool = False,
+        filter_by:Optional[str] = None,
         sort_by: Optional[str] = None,
         ascending: bool = False,
         table_rows: int = 10,
         figsize: Tuple[float, float] = (19.2, 10.8)) -> Figure:
 
     _validate_panda(pd_df, cols=[label, x, y, z], sort_by=sort_by)
-    style.format_funcs=format_func(style.format_funcs,label=label,x=x,y=y)
+
+    if not sort_by:
+        sort_by = z
+    if not filter_by:
+        filter_by = z
+    plot_df = pd_df.sort_values(by=filter_by,
+                                ascending=ascending)[[label, x, y, z]].head(max_values)
+    style.format_funcs = format_func(
+        style.format_funcs, label=label, x=x, y=y, z=z)
     fig = plt.figure(figsize=figsize)
     fig.patch.set_facecolor("black")
     grid = plt.GridSpec(2, 2, height_ratios=[2, 1], width_ratios=[1, 1])
     ax = fig.add_subplot(grid[0, 0:])
-    ax = plot_bubble(pd_df=pd_df,
+    ax = plot_bubble(pd_df=plot_df,
                      label=label,
                      x=x,
                      y=y,
@@ -54,7 +63,7 @@ def plot_composite_bubble(
 
     ax2 = fig.add_subplot(grid[1, 0])
     ax2 = plot_table(
-        pd_df=pd_df,
+        pd_df=plot_df,
         cols=[label, z, y, x],
         title=f"Top {table_rows}",
         ax=ax2,
@@ -65,7 +74,7 @@ def plot_composite_bubble(
     )
     ax3 = fig.add_subplot(grid[1, 1])
     ax3 = plot_table(
-        pd_df=pd_df,
+        pd_df=plot_df,
         cols=[label, z, y, x],
         title=f"Worst {table_rows}",
         ax=ax3,

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/MatplotLibAPI/Timeserie.py

@@ -5,7 +5,7 @@ import pandas as pd
 import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 import seaborn as sns
-from .Style import DynamicFuncFormatter, StyleTemplate, string_formatter, _validate_panda, bmk_formatter,format_func
+from .Style import DynamicFuncFormatter, StyleTemplate, string_formatter, _validate_panda, bmk_formatter, format_func
 from typing import Optional
 
 TIMESERIE_STYLE_TEMPLATE = StyleTemplate(
@@ -15,20 +15,19 @@ TIMESERIE_STYLE_TEMPLATE = StyleTemplate(
 
 # region Line
 
-
 def plot_timeserie(pd_df: pd.DataFrame,
                    label: str,
                    x: str,
                    y: str,
                    title: Optional[str] = None,
                    style: StyleTemplate = TIMESERIE_STYLE_TEMPLATE,
+                   max_values: int = 100,
                    sort_by: Optional[str] = None,
                    ascending: bool = False,
                    ax: Optional[Axes] = None) -> Axes:
 
     _validate_panda(pd_df, cols=[label, x, y], sort_by=sort_by)
-    style.format_funcs=format_func(style.format_funcs,label=label,x=x,y=y)
-
+    style.format_funcs = format_func(style.format_funcs, label=label, x=x, y=y)
 
     df = pd_df[[label, x, y]].sort_values(by=[label, x])
     df[x] = pd.to_datetime(df[x])

matplotlibapi-3.1.0/MatplotLibAPI/Treemap.py

@@ -0,0 +1,59 @@
+from typing import List, Optional
+import pandas as pd
+import plotly.graph_objects as go
+from .Style import DynamicFuncFormatter, StyleTemplate, generate_ticks, string_formatter, _validate_panda, percent_formatter, format_func
+
+TREEMAP_STYLE_TEMPLATE = StyleTemplate(
+    background_color='black',
+    fig_border='darkgrey',
+    font_color='white',
+    palette='magma',
+    format_funcs={"y": percent_formatter,
+                  "label": string_formatter}
+)
+
+
+def plot_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:
+    cols = [path, values]
+    if color:
+        cols.append(color)
+    _validate_panda(df, cols=cols, sort_by=sort_by)
+    if not sort_by:
+        sort_by = values
+    df = pd_df.sort_values(by=sort_by, ascending=ascending)[
+        cols].head(max_values)
+    data = {"labels": df[path],
+            "parents": [""] * len(df),
+            "values": df[values],
+            "textinfo": "label",
+            "name": title}
+
+    if color:
+        df['color'] = df[color]
+
+    if not fig:
+        fig = go.Figure(data=data)
+    else:
+        fig.add_trace(go.Treemap(data))
+    
+    fig.update_layout(
+        paper_bgcolor=style.background_color,
+        plot_bgcolor=style.background_color,
+        font=dict(color=style.font_color),
+        margin=dict(t=50, l=25, r=25, b=25))
+
+    # Apply color scale
+    fig.update_traces(
+        marker=dict(colorscale=style.palette)
+    )
+
+    return fig

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/MatplotLibAPI/__init__.py

@@ -5,9 +5,10 @@ from .Timeserie import plot_timeserie
 from .Bubble import plot_bubble
 from .Network import plot_network
 from .Pivot import plot_pivotbar
+from .Treemap import plot_treemap
 from .Composite import plot_composite_bubble
 from .pdAccessor import MatPlotLibAccessor
 from .Style import StyleTemplate
 
 __all__ = ["plot_bubble", "plot_timeserie", "plot_table", "plot_network",
-           "plot_pivotbar", "plot_composite_bubble", "StyleTemplate", "MatPlotLibAccessor"]
+           "plot_pivotbar", "plot_treemap","plot_composite_bubble", "StyleTemplate", "MatPlotLibAccessor"]

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/MatplotLibAPI/pdAccessor.py

@@ -1,17 +1,20 @@
 
 import logging
 import warnings
+
 from typing import Optional, List
+import pandas as pd
+
 from matplotlib.axes import Axes
 from matplotlib.figure import Figure
-import pandas as pd
+import plotly.graph_objects as go
 from .Style import StyleTemplate
 from .Bubble import plot_bubble, BUBBLE_STYLE_TEMPLATE
 from .Composite import plot_composite_bubble
-from .Timeserie import plot_timeserie,TIMESERIE_STYLE_TEMPLATE
+from .Timeserie import plot_timeserie, TIMESERIE_STYLE_TEMPLATE
 from .Table import plot_table, TABLE_STYLE_TEMPLATE
-from .Network import (Graph)
-
+from .Network import Graph
+from .Treemap import plot_treemap, TREEMAP_STYLE_TEMPLATE
 
 warnings.filterwarnings('ignore')
 logging.getLogger().setLevel(logging.WARNING)
@@ -28,7 +31,7 @@ class MatPlotLibAccessor:
                     x: str,
                     y: str,
                     z: str,
-                    title: str = "Test",
+                    title: Optional[str] = None,
                     style: StyleTemplate = BUBBLE_STYLE_TEMPLATE,
                     max_values: int = 50,
                     center_to_mean: bool = False,
@@ -47,14 +50,14 @@ class MatPlotLibAccessor:
                            sort_by=sort_by,
                            ascending=ascending)
 
-    def plot_bubble_composite(self,
+    def plot_composite_bubble(self,
                               label: str,
                               x: str,
                               y: str,
                               z: str,
                               title: Optional[str] = None,
                               style: StyleTemplate = BUBBLE_STYLE_TEMPLATE,
-                              max_values: int = 50,
+                              max_values: int = 100,
                               center_to_mean: bool = False,
                               sort_by: Optional[str] = None,
                               ascending: bool = False) -> Figure:
@@ -88,24 +91,24 @@ class MatPlotLibAccessor:
                           ascending=ascending)
 
     def plot_timeserie(self,
-                  label: str,
-                  x: str,
-                  y: str,
-                  title: Optional[str] = None,
-                  style: StyleTemplate = TIMESERIE_STYLE_TEMPLATE,
-                  max_values: int = 20,
-                  sort_by: Optional[str] = None,
-                  ascending: bool = False) -> Axes:
+                       label: str,
+                       x: str,
+                       y: str,
+                       title: Optional[str] = None,
+                       style: StyleTemplate = TIMESERIE_STYLE_TEMPLATE,
+                       max_values: int = 100,
+                       sort_by: Optional[str] = None,
+                       ascending: bool = False) -> Axes:
 
         return plot_timeserie(pd_df=self._obj,
-                         label=label,
-                         x=x,
-                         y=y,
-                         title=title,
-                         style=style,
-                         max_values=max_values,
-                          sort_by=sort_by,
-                          ascending=ascending)
+                              label=label,
+                              x=x,
+                              y=y,
+                              title=title,
+                              style=style,
+                              max_values=max_values,
+                              sort_by=sort_by,
+                              ascending=ascending)
 
     def plot_network(self,
                      source: str = "source",
@@ -123,3 +126,22 @@ class MatPlotLibAccessor:
                                            weight=weight)
 
         return graph.plotX(title, style)
+    
+    def plot_treemap(self,
+                 path: str,
+                 values: str,
+                 style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+                 title: Optional[str] = None,
+                 color: Optional[str] = None, 
+                 max_values: int = 100,
+                 sort_by: Optional[str] = None,
+                 ascending: bool = False) ->go.Figure:
+        return plot_treemap(pd_df=self._obj,
+                              path=path,
+                              values=values,
+                              title=title,
+                              style=style,
+                              color=color,
+                              max_values=max_values,
+                              sort_by=sort_by,
+                              ascending=ascending)

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/MatplotLibAPI.egg-info/PKG-INFO

@@ -1,13 +1,15 @@
 Metadata-Version: 2.1
 Name: MatplotLibAPI
-Version: 3.0.2
+Version: 3.1.0
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas
 Requires-Dist: matplotlib
+Requires-Dist: networkx
+Requires-Dist: plotly
 Requires-Dist: seaborn
 Requires-Dist: scikit-learn
-Requires-Dist: networkx
 
 # MatplotLibAPI
 Simple Wrapper

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/MatplotLibAPI.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-setup.py
 MatplotLibAPI/Bubble.py
 MatplotLibAPI/Composite.py
 MatplotLibAPI/Network.py
@@ -9,6 +8,7 @@ MatplotLibAPI/Pivot.py
 MatplotLibAPI/Style.py
 MatplotLibAPI/Table.py
 MatplotLibAPI/Timeserie.py
+MatplotLibAPI/Treemap.py
 MatplotLibAPI/__init__.py
 MatplotLibAPI/pdAccessor.py
 MatplotLibAPI.egg-info/PKG-INFO

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/MatplotLibAPI.egg-info/requires.txt

@@ -1,5 +1,6 @@
 pandas
 matplotlib
+networkx
+plotly
 seaborn
 scikit-learn
-networkx

{matplotlibapi-3.0.2 → matplotlibapi-3.1.0}/PKG-INFO

@@ -1,13 +1,15 @@
 Metadata-Version: 2.1
 Name: MatplotLibAPI
-Version: 3.0.2
+Version: 3.1.0
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas
 Requires-Dist: matplotlib
+Requires-Dist: networkx
+Requires-Dist: plotly
 Requires-Dist: seaborn
 Requires-Dist: scikit-learn
-Requires-Dist: networkx
 
 # MatplotLibAPI
 Simple Wrapper

matplotlibapi-3.1.0/pyproject.toml

@@ -0,0 +1,11 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+[project]
+name = "MatplotLibAPI"
+version="v3.1.0"
+readme = "README.md"
+requires-python=">=3.7"
+dependencies = ["pandas","matplotlib","networkx","plotly","seaborn","scikit-learn",]
+
+

matplotlibapi-3.0.2/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"

matplotlibapi-3.0.2/setup.py

@@ -1,19 +0,0 @@
-import os
-from setuptools import setup, find_packages
-
-requirements = []
-requirements_file = 'requirements.txt'
-
-# Check if the file exists
-if os.path.exists(requirements_file):
-    with open(requirements_file) as f:
-        requirements = f.read().splitlines()
-
-setup(
-    name='MatplotLibAPI',
-    version='v3.0.2',
-    packages=find_packages(),
-    install_requires=requirements,
-    long_description=open('README.md').read(),
-    long_description_content_type='text/markdown',
-)