MatplotLibAPI 3.1.2__py3-none-any.whl → 3.2.1__py3-none-any.whl

MatplotLibAPI/Bubble.py

@@ -6,7 +6,7 @@ import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 import seaborn as sns
 
-from . import DynamicFuncFormatter, StyleTemplate, generate_ticks, string_formatter, bmk_formatter, percent_formatter, format_func,validate_dataframe
+from .StyleTemplate import DynamicFuncFormatter, StyleTemplate, generate_ticks, string_formatter, bmk_formatter, percent_formatter, format_func,validate_dataframe
 
 BUBBLE_STYLE_TEMPLATE = StyleTemplate(
     format_funcs={"label": string_formatter,

MatplotLibAPI/Composite.py

@@ -8,7 +8,7 @@ from matplotlib.figure import Figure
 from .Network import plot_network, plot_network_components, DEFAULT
 from .Bubble import plot_bubble, BUBBLE_STYLE_TEMPLATE
 from .Table import plot_table
-from . import StyleTemplate, format_func, validate_dataframe
+from .StyleTemplate import StyleTemplate, format_func, validate_dataframe
 
 
 def plot_composite_bubble(

MatplotLibAPI/Network.py

@@ -13,7 +13,7 @@ from networkx import Graph
 from networkx.classes.graph import Graph
 
 
-from . import StyleTemplate, string_formatter, format_func,validate_dataframe
+from .StyleTemplate import StyleTemplate, string_formatter, format_func,validate_dataframe
 
 NETWORK_STYLE_TEMPLATE = StyleTemplate(
 )

MatplotLibAPI/StyleTemplate.py

@@ -0,0 +1,169 @@
+
+
+from typing import List, Optional, Dict, Callable, Union
+from dataclasses import dataclass
+import pandas as pd
+import numpy as np
+
+from matplotlib.dates import num2date
+from matplotlib.ticker import FuncFormatter
+
+# region Utils
+
+def validate_dataframe(pd_df: pd.DataFrame,
+                       cols: List[str],
+                       sort_by: Optional[str] = None):
+    _columns = cols.copy()
+    if sort_by and sort_by not in _columns:
+        _columns.append(sort_by)
+    for col in _columns:
+        if col not in pd_df.columns:
+            raise AttributeError(f"{col} is not a DataFrame's column")
+
+
+def format_func(
+        format_funcs: Optional[Dict[str, Optional[Callable[[Union[int, float, str]], str]]]],
+        label: Optional[str] = None,
+        x: Optional[str] = None,
+        y: Optional[str] = None,
+        z: Optional[str] = None):
+
+    if label and "label" in format_funcs:
+        format_funcs[label] = format_funcs["label"]
+    if x and "x" in format_funcs:
+        format_funcs[x] = format_funcs["x"]
+    if y and "y" in format_funcs:
+        format_funcs[y] = format_funcs["y"]
+    if z and "z" in format_funcs:
+        format_funcs[z] = format_funcs["z"]
+    return format_funcs
+
+# endregion
+
+# region Style
+
+
+MAX_RESULTS = 50
+X_COL = "index"
+Y_COL = "overlap"
+Z_COL = "users"
+FIG_SIZE = (19.2, 10.8)
+BACKGROUND_COLOR = 'black'
+TEXT_COLOR = 'white'
+PALETTE = "Greys_r"
+FONT_SIZE = 14
+
+
+@dataclass
+class StyleTemplate:
+    background_color: str = BACKGROUND_COLOR
+    fig_border: str = BACKGROUND_COLOR
+    font_name: str = 'Arial'
+    font_size: int = FONT_SIZE
+    font_color: str = TEXT_COLOR
+    palette: str = PALETTE
+    legend: bool = True
+    xscale: Optional[str] = None
+    x_ticks: int = 10
+    yscale: Optional[str] = None
+    y_ticks: int = 5
+    format_funcs: Optional[Dict[str, Optional[Callable[[
+        Union[int, float, str]], str]]]] = None
+    col_widths: Optional[List[float]] = None
+
+    @property
+    def font_mapping(self):
+        return {0: self.font_size-3,
+                1: self.font_size-1,
+                2: self.font_size,
+                3: self.font_size+1,
+                4: self.font_size+3}
+
+
+class DynamicFuncFormatter(FuncFormatter):
+    def __init__(self, func_name):
+        super().__init__(func_name)
+
+
+def percent_formatter(val, pos: Optional[int] = None):
+    if val*100 <= 0.1:  # For 0.1%
+        return f"{val*100:.2f}%"
+    elif val*100 <= 1:  # For 1%
+        return f"{val*100:.1f}%"
+    else:
+        return f"{val*100:.0f}%"
+
+
+def bmk_formatter(val, pos: Optional[int] = None):
+    if val >= 1_000_000_000:  # Billions
+        return f"{val / 1_000_000_000:.2f}B"
+    elif val >= 1_000_000:  # Millions
+        return f"{val / 1_000_000:.1f}M"
+    elif val >= 1_000:  # Thousands
+        return f"{val / 1_000:.1f}K"
+    else:
+        return f"{int(val)}"
+
+
+def integer_formatter(value, pos: Optional[int] = None):
+    return f"{int(value)}"
+
+
+def string_formatter(value, pos: Optional[int] = None):
+    return str(value).replace("-", " ").replace("_", " ").title()
+
+
+def yy_mm__formatter(x, pos: Optional[int] = None):
+    return num2date(x).strftime('%Y-%m')
+
+
+def yy_mm_dd__formatter(x, pos: Optional[int] = None):
+    return num2date(x).strftime('%Y-%m-%D')
+
+
+def percent_formatter(x,  pos: Optional[int] = None):
+    return f"{x * 100:.0f}%"
+
+
+def generate_ticks(min_val, max_val, num_ticks="10"):
+    # Identify the type of the input
+    try:
+        min_val = float(min_val)
+        max_val = float(max_val)
+        is_date = False
+    except ValueError:
+        is_date = True
+
+    # Convert string inputs to appropriate numerical or date types
+    num_ticks = int(num_ticks)
+
+    if is_date:
+        min_val = pd.Timestamp(min_val).to_datetime64()
+        max_val = pd.Timestamp(max_val).to_datetime64()
+        data_range = (max_val - min_val).astype('timedelta64[D]').astype(int)
+    else:
+        data_range = max_val - min_val
+
+    # Calculate a nice step size
+    step_size = data_range / (num_ticks - 1)
+
+    # If date, convert back to datetime
+    if is_date:
+        ticks = pd.date_range(
+            start=min_val, periods=num_ticks, freq=f"{step_size}D")
+    else:
+        # Round the step size to a "nice" number
+        exponent = np.floor(np.log10(step_size))
+        fraction = step_size / 10**exponent
+        nice_fraction = round(fraction)
+
+        # Create nice step size
+        nice_step = nice_fraction * 10**exponent
+
+        # Generate the tick marks based on the nice step size
+        ticks = np.arange(min_val, max_val + nice_step, nice_step)
+
+    return ticks
+
+
+# endregion

MatplotLibAPI/Table.py

@@ -3,7 +3,7 @@ import pandas as pd
 import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 
-from . import StyleTemplate,  string_formatter,validate_dataframe
+from .StyleTemplate import StyleTemplate,  string_formatter,validate_dataframe
 
 TABLE_STYLE_TEMPLATE = StyleTemplate(
     background_color='black',

MatplotLibAPI/Timeserie.py

@@ -6,7 +6,7 @@ import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 import seaborn as sns
 
-from . import DynamicFuncFormatter, StyleTemplate, string_formatter, bmk_formatter, format_func,validate_dataframe
+from .StyleTemplate import DynamicFuncFormatter, StyleTemplate, string_formatter, bmk_formatter, format_func,validate_dataframe
 
 
 TIMESERIE_STYLE_TEMPLATE = StyleTemplate(

MatplotLibAPI/Treemap.py

@@ -5,7 +5,7 @@ import pandas as pd
 from pandas import CategoricalDtype,BooleanDtype
 import plotly.graph_objects as go
 
-from . import StyleTemplate, string_formatter, percent_formatter,validate_dataframe
+from .StyleTemplate import StyleTemplate, string_formatter, percent_formatter,validate_dataframe
 
 
 

MatplotLibAPI/__init__.py

@@ -1,184 +1,20 @@
 
-from .Treemap import plot_treemap, TREEMAP_STYLE_TEMPLATE
-from .Network import Graph
-from .Table import plot_table, TABLE_STYLE_TEMPLATE
-from .Timeserie import plot_timeserie, TIMESERIE_STYLE_TEMPLATE
-from .Composite import plot_composite_bubble
+from .StyleTemplate import StyleTemplate
 from .Bubble import plot_bubble, BUBBLE_STYLE_TEMPLATE
-from typing import List, Optional, Dict, Callable, Union
-from dataclasses import dataclass
+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 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
 from pandas.api.extensions import register_dataframe_accessor
-import numpy as np
 
 from matplotlib.axes import Axes
 from matplotlib.figure import Figure
-from matplotlib.dates import num2date
-from matplotlib.ticker import FuncFormatter
 import plotly.graph_objects as go
 
 
-# region Utils
-
-def validate_dataframe(pd_df: pd.DataFrame,
-                       cols: List[str],
-                       sort_by: Optional[str] = None):
-    _columns = cols.copy()
-    if sort_by and sort_by not in _columns:
-        _columns.append(sort_by)
-    for col in _columns:
-        if col not in pd_df.columns:
-            raise AttributeError(f"{col} is not a DataFrame's column")
-
-
-def format_func(
-        format_funcs: Optional[Dict[str, Optional[Callable[[Union[int, float, str]], str]]]],
-        label: Optional[str] = None,
-        x: Optional[str] = None,
-        y: Optional[str] = None,
-        z: Optional[str] = None):
-
-    if label and "label" in format_funcs:
-        format_funcs[label] = format_funcs["label"]
-    if x and "x" in format_funcs:
-        format_funcs[x] = format_funcs["x"]
-    if y and "y" in format_funcs:
-        format_funcs[y] = format_funcs["y"]
-    if z and "z" in format_funcs:
-        format_funcs[z] = format_funcs["z"]
-    return format_funcs
-
-# endregion
-
-# region Style
-
-
-MAX_RESULTS = 50
-X_COL = "index"
-Y_COL = "overlap"
-Z_COL = "users"
-FIG_SIZE = (19.2, 10.8)
-BACKGROUND_COLOR = 'black'
-TEXT_COLOR = 'white'
-PALETTE = "Greys_r"
-FONT_SIZE = 14
-
-
-@dataclass
-class StyleTemplate:
-    background_color: str = BACKGROUND_COLOR
-    fig_border: str = BACKGROUND_COLOR
-    font_name: str = 'Arial'
-    font_size: int = FONT_SIZE
-    font_color: str = TEXT_COLOR
-    palette: str = PALETTE
-    legend: bool = True
-    xscale: Optional[str] = None
-    x_ticks: int = 10
-    yscale: Optional[str] = None
-    y_ticks: int = 5
-    format_funcs: Optional[Dict[str, Optional[Callable[[
-        Union[int, float, str]], str]]]] = None
-    col_widths: Optional[List[float]] = None
-
-    @property
-    def font_mapping(self):
-        return {0: self.font_size-3,
-                1: self.font_size-1,
-                2: self.font_size,
-                3: self.font_size+1,
-                4: self.font_size+3}
-
-
-class DynamicFuncFormatter(FuncFormatter):
-    def __init__(self, func_name):
-        super().__init__(func_name)
-
-
-def percent_formatter(val, pos: Optional[int] = None):
-    if val*100 <= 0.1:  # For 0.1%
-        return f"{val*100:.2f}%"
-    elif val*100 <= 1:  # For 1%
-        return f"{val*100:.1f}%"
-    else:
-        return f"{val*100:.0f}%"
-
-
-def bmk_formatter(val, pos: Optional[int] = None):
-    if val >= 1_000_000_000:  # Billions
-        return f"{val / 1_000_000_000:.2f}B"
-    elif val >= 1_000_000:  # Millions
-        return f"{val / 1_000_000:.1f}M"
-    elif val >= 1_000:  # Thousands
-        return f"{val / 1_000:.1f}K"
-    else:
-        return f"{int(val)}"
-
-
-def integer_formatter(value, pos: Optional[int] = None):
-    return f"{int(value)}"
-
-
-def string_formatter(value, pos: Optional[int] = None):
-    return str(value).replace("-", " ").replace("_", " ").title()
-
-
-def yy_mm__formatter(x, pos: Optional[int] = None):
-    return num2date(x).strftime('%Y-%m')
-
-
-def yy_mm_dd__formatter(x, pos: Optional[int] = None):
-    return num2date(x).strftime('%Y-%m-%D')
-
-
-def percent_formatter(x,  pos: Optional[int] = None):
-    return f"{x * 100:.0f}%"
-
-
-def generate_ticks(min_val, max_val, num_ticks="10"):
-    # Identify the type of the input
-    try:
-        min_val = float(min_val)
-        max_val = float(max_val)
-        is_date = False
-    except ValueError:
-        is_date = True
-
-    # Convert string inputs to appropriate numerical or date types
-    num_ticks = int(num_ticks)
-
-    if is_date:
-        min_val = pd.Timestamp(min_val).to_datetime64()
-        max_val = pd.Timestamp(max_val).to_datetime64()
-        data_range = (max_val - min_val).astype('timedelta64[D]').astype(int)
-    else:
-        data_range = max_val - min_val
-
-    # Calculate a nice step size
-    step_size = data_range / (num_ticks - 1)
-
-    # If date, convert back to datetime
-    if is_date:
-        ticks = pd.date_range(
-            start=min_val, periods=num_ticks, freq=f"{step_size}D")
-    else:
-        # Round the step size to a "nice" number
-        exponent = np.floor(np.log10(step_size))
-        fraction = step_size / 10**exponent
-        nice_fraction = round(fraction)
-
-        # Create nice step size
-        nice_step = nice_fraction * 10**exponent
-
-        # Generate the tick marks based on the nice step size
-        ticks = np.arange(min_val, max_val + nice_step, nice_step)
-
-    return ticks
-
-
-# endregion
-
-
 @register_dataframe_accessor("mpl")
 class DataFrameAccessor:
 
@@ -195,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,
@@ -207,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,
@@ -219,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,
@@ -231,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],
@@ -239,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,
@@ -247,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,
@@ -257,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,
@@ -267,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.1.2.dist-info → MatplotLibAPI-3.2.1.dist-info}/METADATA

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

MatplotLibAPI-3.2.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+MatplotLibAPI/Bubble.py,sha256=haIj43o-t9P1OsIRNgS5_XVovdjCJGarMrr1V-bQWAI,3842
+MatplotLibAPI/Composite.py,sha256=-ZXJQFkBzCtMoufKZUTRdH5fbhdRkHxLkXq-vdtRLSM,2847
+MatplotLibAPI/Network.py,sha256=X-x5SKjncSFcK0bFd60e-HEbW4oBm9XIQKZtboPB4Eo,14849
+MatplotLibAPI/Pivot.py,sha256=Bo7ZpkxqoE75e8vpSsKIT5X2Q7lLdfAyy46ox1fARbc,7183
+MatplotLibAPI/StyleTemplate.py,sha256=va8_yXaun1RnjQUOEHGvsXJrKWHdzz4BhnY0CkROLW8,4599
+MatplotLibAPI/Table.py,sha256=4vgvF2pXjewd23-a7KyuLQs-Hohnv69VK1_uRPgGi_o,2005
+MatplotLibAPI/Timeserie.py,sha256=cqPONNvDmJ_7UmkOBVpBbD9oEgS79SbhEVlf1qZ3kW0,3446
+MatplotLibAPI/Treemap.py,sha256=ELkmcNZuWh-thd4gKwqkSQTisnBDutHHgxGuH1ZBzsg,2552
+MatplotLibAPI/__init__.py,sha256=O1b1kutZ_E8pUx4lkQTM2OXjZQIWQ8X7CUPScHRq5dI,7691
+MatplotLibAPI-3.2.1.dist-info/LICENSE,sha256=hMErKLb6YZR3lRR5zr-vxeFkvY69QAaafgSpZ5-P1dQ,1067
+MatplotLibAPI-3.2.1.dist-info/METADATA,sha256=6fvA8pdZp_AWIDUNVBEm1vwhCkNUQ01XP3WYiJbMgUg,462
+MatplotLibAPI-3.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+MatplotLibAPI-3.2.1.dist-info/top_level.txt,sha256=MrzbBjDEW48Vb6YhQIqpFYGOhHzQnEIM5Qy2xy2iqew,14
+MatplotLibAPI-3.2.1.dist-info/RECORD,,

MatplotLibAPI-3.1.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-MatplotLibAPI/Bubble.py,sha256=zfm5Y2YU824TzvFb_57HeeTgOXgx0oozBRcxqr6g_lo,3829
-MatplotLibAPI/Composite.py,sha256=V5VgYt6cSJkz74XtMoQHHr9VrJXojCFsmxjkqwA0oYc,2834
-MatplotLibAPI/Network.py,sha256=zdu6kVIja0peYLL4mdpw76BijLn6hAmtoKbK_YukZC0,14836
-MatplotLibAPI/Pivot.py,sha256=Bo7ZpkxqoE75e8vpSsKIT5X2Q7lLdfAyy46ox1fARbc,7183
-MatplotLibAPI/Table.py,sha256=hokyBgkiwlA0B8Irx2yPL4xCeZlI-HK0Jln79qjMwZk,1992
-MatplotLibAPI/Timeserie.py,sha256=kl7G5TgIz1MKEBegPE_hHuoPcMCS7-JkCjDyx3wuM8Q,3433
-MatplotLibAPI/Treemap.py,sha256=ImfnPagGQkPwk15Yywroir-FLbBvBzpytEb1Uw7iQi4,2539
-MatplotLibAPI/__init__.py,sha256=FoN0Qa1efBbRDK27vOxdQxT-iRMH4Hqz5WKxMdoSvZc,10430
-MatplotLibAPI-3.1.2.dist-info/LICENSE,sha256=hMErKLb6YZR3lRR5zr-vxeFkvY69QAaafgSpZ5-P1dQ,1067
-MatplotLibAPI-3.1.2.dist-info/METADATA,sha256=uH2EUAne0e9xsrALJ9TUCRnEgfi5P0NIOtsv_4PnVps,462
-MatplotLibAPI-3.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-MatplotLibAPI-3.1.2.dist-info/top_level.txt,sha256=MrzbBjDEW48Vb6YhQIqpFYGOhHzQnEIM5Qy2xy2iqew,14
-MatplotLibAPI-3.1.2.dist-info/RECORD,,