plotly-extend-wrapper 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

plotly_extend_wrapper/wrapper.py

@@ -5,6 +5,7 @@ from plotly_extend_wrapper.common import check_directory
 from plotly import graph_objects as go
 from scipy.interpolate import griddata
 import numpy as np
+from copy import deepcopy
 
 
 def Plot_pie(data: pd.DataFrame, target: str, **kwargs):
@@ -112,7 +113,8 @@ class Plot_bubble_chart:
         if len(grouper) == 0:
             return vc
         else:
-            max_probs = vc.groupby(grouper)["count"].max().reset_index(name="max")
+            max_probs = vc.groupby(
+                grouper)["count"].max().reset_index(name="max")
             max_value = max_probs["max"].max()
             max_probs["ratio"] = max_value / max_probs["max"]
             smooth_dict = max_probs.set_index(grouper)["ratio"].to_dict()
@@ -125,7 +127,8 @@ class Plot_bubble_chart:
 
     def _value_counts(self):
         cols = [self.x, self.y]
-        grouper = list(filter(None, [self.color, self.facet_col, self.facet_row]))
+        grouper = list(
+            filter(None, [self.color, self.facet_col, self.facet_row]))
         if len(grouper) == 0:
             vc = self.df.value_counts(
                 subset=cols, normalize=self.normalize
@@ -156,13 +159,15 @@ class Plot_bubble_chart:
                         )
 
             for col, decimal in zip(self.rounded, self.decimals):
-                df.loc[:, f"{col}_rounded"] = df.loc[:, col].round(decimals=decimal)
+                df.loc[:, f"{col}_rounded"] = df.loc[:,
+                                                     col].round(decimals=decimal)
                 if self.x == col:
                     self.x = f"{col}_rounded"
                 elif self.y == col:
                     self.y = f"{col}_rounded"
                 else:
-                    raise ValueError(f"{col} is not indicated. Check parameters")
+                    raise ValueError(
+                        f"{col} is not indicated. Check parameters")
 
         return df
 
@@ -249,7 +254,8 @@ def Plot_line(
 
     plot_all_cols = pd.Series(y + secondary_y)
     if (~plot_all_cols.isin(df.columns)).any():
-        not_include_cols = plot_all_cols[~plot_all_cols.isin(df.columns)].tolist()
+        not_include_cols = plot_all_cols[~plot_all_cols.isin(
+            df.columns)].tolist()
         raise ValueError(f"{not_include_cols} columns are not in dataframe")
 
     y = [c for c in y if c not in secondary_y]
@@ -262,7 +268,8 @@ def Plot_line(
 
     subfig = make_subplots(specs=[[{"secondary_y": True}]])
     fig = px.line(df, x=x, y=y, **px_kwargs)
-    fig2 = px.line(df, x=x, y=secondary_y, line_dash_sequence=["dash"], **px_kwargs)
+    fig2 = px.line(df, x=x, y=secondary_y,
+                   line_dash_sequence=["dash"], **px_kwargs)
     fig2.update_traces(yaxis="y2")
 
     subfig.add_traces(fig.data + fig2.data)
@@ -367,10 +374,14 @@ def Plot_bubble_chart_with_line(
     )
 
     subfig = make_subplots()
-    subfig.add_traces(bubble_plot.data + line_plot.data)
-    subfig.layout.xaxis.title = xtitle
-    subfig.layout.yaxis.title = ytitle
-    subfig.update_layout(**kwargs)
+    for trace in bubble_plot.data + line_plot.data:
+        subfig.add_trace(trace)
+    if xtitle is not None:
+        subfig.layout.xaxis.title = xtitle
+    if ytitle is not None:
+        subfig.layout.yaxis.title = ytitle
+    original_layout = deepcopy(bubble_plot.layout)
+    subfig.update_layout(original_layout, **kwargs)
     return subfig
 
 
@@ -391,7 +402,7 @@ def Plot_surface(
         xi = np.linspace(x.min(), x.max(), num)
         yi = np.linspace(y.min(), y.max(), num)
         xi, yi = np.meshgrid(xi, yi)
-        zi = griddata((x,y), z, (xi.ravel(), yi.ravel()), method="cubic")
+        zi = griddata((x, y), z, (xi.ravel(), yi.ravel()), method="cubic")
         zi = zi.reshape(xi.shape)
         zi = np.nan_to_num(zi)
         return xi, yi, zi
@@ -402,13 +413,13 @@ def Plot_surface(
         Z = df[z].values
         X, Y, Z = smooth_df(X, Y, Z, smooth_point_num)
     else:
-        pivot_df = pd.pivot_table(df, index=x, columns=y, values=z, fill_value=fill_value)
+        pivot_df = pd.pivot_table(
+            df, index=x, columns=y, values=z, fill_value=fill_value)
 
         X = pivot_df.columns.values
         Y = pivot_df.index.values
         Z = pivot_df.values
 
-
     data = [go.Surface(x=X, y=Y, z=Z)]
     layout = go.Layout(
         title=title,

{plotly_extend_wrapper-1.1.0.dist-info → plotly_extend_wrapper-1.2.0.dist-info}/METADATA

@@ -1,14 +1,16 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: plotly-extend-wrapper
-Version: 1.1.0
+Version: 1.2.0
 Author-email: Laplusdestiny <prayonshootingstars@gmail.com>
 License-File: LICENSE
 Requires-Python: >=3.9
 Requires-Dist: kaleido==0.2.1
+Requires-Dist: nbformat>=4.2.0
+Requires-Dist: numpy>=1.24.0
 Requires-Dist: pandas>=2.0.0
-Requires-Dist: plotly>=5.15.0
+Requires-Dist: plotly>=5.12.0
 Requires-Dist: pyarrow>=10.0.0
-Requires-Dist: scipy>=1.12.0
+Requires-Dist: scipy>=1.8.0
 Description-Content-Type: text/markdown
 
 # plotly_extend_wrapper
@@ -29,6 +31,7 @@ You can make plot simply
 - Plotly >= 5.0.0
 - kaleido = 0.2.1
 - pandas >= 2.2.0
+- scipy >= 1.12.0
 
 ## Graph
 
@@ -37,23 +40,7 @@ You can make plot simply
 - Bubble (`wrapper.Plot_bubble_chart`)
 - Line with secondary y-axis (`wrapper.Plot_line`)
 - Bubble with linear line (`wrapper.Plot_bubble_with_line`)
-
-## Common function
-
-- updater
-  - Add options
-  - Available options
-    - x-axis title
-    - y-axis title
-    - secondary_y-axis title
-    - show legend
-    - height
-    - width
-    - marker size
-- common
-  - check_directory
-    - Check directory with pathlib
-    - Make directory if parent directory doesn't exist
+- Surface (`wrapper.Plot_surface`)
 
 
 ## Issue

plotly_extend_wrapper-1.2.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+plotly_extend_wrapper/__init__.py,sha256=0_Vut6cAmxsQUIfqkfwxf1WTG10IJseCqoEcXVGfB-Q,154
+plotly_extend_wrapper/common.py,sha256=il-4w-f7gsgKuHKHyy-lAbema6-ADdRFdHXZNTYSdhk,262
+plotly_extend_wrapper/updater.py,sha256=Q-O5FC7z_y1Xel24rBaaiN7MPOQqOy5wG7bpth_VVts,2510
+plotly_extend_wrapper/wrapper.py,sha256=T1cpVJ9hbmO_aFPQ9jtQMRWCUuxCA8h4Ndk89UG6U8w,12763
+plotly_extend_wrapper-1.2.0.dist-info/METADATA,sha256=91k2H2qgNB2G24CaXrr7KHFDAPEXy0HOKpfUG1FzhXw,1802
+plotly_extend_wrapper-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plotly_extend_wrapper-1.2.0.dist-info/licenses/LICENSE,sha256=LanHfVWzsvc8f0WfJlk8s_qAhDW1RdNJMYDjDMJvl1Y,1070
+plotly_extend_wrapper-1.2.0.dist-info/RECORD,,

{plotly_extend_wrapper-1.1.0.dist-info → plotly_extend_wrapper-1.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

plotly_extend_wrapper-1.1.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-plotly_extend_wrapper/__init__.py,sha256=0_Vut6cAmxsQUIfqkfwxf1WTG10IJseCqoEcXVGfB-Q,154
-plotly_extend_wrapper/common.py,sha256=il-4w-f7gsgKuHKHyy-lAbema6-ADdRFdHXZNTYSdhk,262
-plotly_extend_wrapper/updater.py,sha256=Q-O5FC7z_y1Xel24rBaaiN7MPOQqOy5wG7bpth_VVts,2510
-plotly_extend_wrapper/wrapper.py,sha256=sn2TngeQlY4WaHsx3ygtl6euPoyQJxG4Y_FIZuG_EWA,12427
-plotly_extend_wrapper-1.1.0.dist-info/METADATA,sha256=y86e5vkjQPTAA2sUccoxlqsl_0acdUBw5_cto9qn5Qw,2006
-plotly_extend_wrapper-1.1.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-plotly_extend_wrapper-1.1.0.dist-info/licenses/LICENSE,sha256=LanHfVWzsvc8f0WfJlk8s_qAhDW1RdNJMYDjDMJvl1Y,1070
-plotly_extend_wrapper-1.1.0.dist-info/RECORD,,