refactor DRY

Author: bbcho

ggplotly/geoms/geom_abline.py

@@ -10,6 +10,8 @@ class geom_abline(Geom):
 
     __name__ = "geom_abline"
 
+    default_params = {"size": 1}
+
     def __init__(self, data=None, mapping=None, **params):
         """
         Draw lines defined by slope and intercept (y = intercept + slope * x).
@@ -48,9 +50,7 @@ def __init__(self, data=None, mapping=None, **params):
         self.slope = params.get('slope', 1)
         self.intercept = params.get('intercept', 0)
 
-    def draw(self, fig, data=None, row=1, col=1):
-        if "size" not in self.params:
-            self.params["size"] = 1
+    def _draw_impl(self, fig, data, row, col):
 
         # Get color from params, or use theme default
         color = self.params.get("color", None)

ggplotly/geoms/geom_area.py

@@ -27,24 +27,21 @@ class geom_area(Geom):
         >>> ggplot(df, aes(x='x', y='y', fill='group')) + geom_area(alpha=0.5)
     """
 
-    def draw(self, fig, data=None, row=1, col=1):
+    default_params = {"size": 1}
+
+    def _draw_impl(self, fig, data, row, col):
         """
         Draw area plot(s) on the figure.
 
         Parameters:
             fig (Figure): Plotly figure object.
-            data (DataFrame, optional): Data subset for faceting.
-            row (int): Row position in subplot. Default is 1.
-            col (int): Column position in subplot. Default is 1.
+            data (DataFrame): Data (already transformed by stats).
+            row (int): Row position in subplot.
+            col (int): Column position in subplot.
 
         Returns:
             None: Modifies the figure in place.
         """
-        data = data if data is not None else self.data
-
-        # Set default line width to 1 for area borders if not specified
-        if "size" not in self.params:
-            self.params["size"] = 1
 
         # Remove size from mapping if present - area lines can't have variable widths
         # Only use size from params (literal values)

ggplotly/geoms/geom_bar.py

@@ -35,7 +35,15 @@ class geom_bar(Geom):
         >>> ggplot(df, aes(x='category')) + geom_bar(width=0.5)  # narrower bars
     """
 
-    def draw(self, fig, data=None, row=1, col=1):
+    def _apply_stats(self, data):
+        """Add default stat_count if no stats and stat='count'."""
+        if self.stats == []:
+            stat = self.params.get("stat", "count")
+            if stat == "count":
+                self.stats.append(stat_count(mapping=self.mapping))
+        return super()._apply_stats(data)
+
+    def _draw_impl(self, fig, data, row, col):
         """
         Draws a bar plot on the given figure.
 
@@ -44,33 +52,20 @@ def draw(self, fig, data=None, row=1, col=1):
 
         Parameters:
             fig (Figure): Plotly figure object.
-            data (DataFrame): Optional data subset for faceting.
+            data (DataFrame): Data (already transformed by stats).
             row (int): Row position in subplot (for faceting).
             col (int): Column position in subplot (for faceting).
         """
         payload = dict()
-
-        # need this in case data is passed directly to the geom
-        data = data if data is not None else self.data
         data = pd.DataFrame(data)
 
-        if self.stats == []:
-            stat = self.params.get("stat", "count")
-
-            if stat == "count":
-                self = self + stat_count()
-
         if ("x" in self.mapping) & ("y" not in self.mapping):
             payload["orientation"] = "v"
         elif ("y" in self.mapping) & ("x" not in self.mapping):
             payload["orientation"] = "h"
 
         plot = go.Bar
 
-        for comp in self.stats:
-            # stack all stats on the data
-            data, self.mapping = comp.compute(data)
-
         payload["name"] = self.params.get("name", "Bar")
 
         # Apply width parameter (default 0.9 to match ggplot2)

ggplotly/geoms/geom_base.py

@@ -24,6 +24,9 @@ class Geom:
         >>> ggplot(df, aes(x='x', y='y')) + geom_point(color='red', size=3)
     """
 
+    # Default parameters for this geom. Subclasses should override this.
+    default_params: dict = {}
+
     def __init__(self, data=None, mapping=None, **params):
         """
         Initialize the geom.
@@ -41,7 +44,8 @@ def __init__(self, data=None, mapping=None, **params):
             self.data = data
             self.mapping = mapping.mapping if mapping else {}
 
-        self.params = params
+        # Merge default params with user-provided params (user params take precedence)
+        self.params = {**self.default_params, **params}
         self.stats = []
         self.layers = []
         # Track whether this geom has explicit data or inherited from plot
@@ -89,6 +93,9 @@ def draw(self, fig, data=None, row=1, col=1):
         """
         Draw the geometry on the figure.
 
+        This method applies any attached stats to transform the data,
+        then delegates to _draw_impl for the actual rendering.
+
         Parameters:
             fig (Figure): Plotly figure object.
             data (DataFrame, optional): Data subset for faceting.
@@ -97,11 +104,64 @@ def draw(self, fig, data=None, row=1, col=1):
 
         Returns:
             None: Modifies the figure in place.
+        """
+        data = data if data is not None else self.data
+
+        # Apply any stats to transform the data
+        data = self._apply_stats(data)
+
+        # Delegate to subclass implementation
+        self._draw_impl(fig, data, row, col)
+
+    def _apply_stats(self, data):
+        """
+        Apply all attached stats to transform the data.
+
+        Parameters:
+            data (DataFrame): Input data.
+
+        Returns:
+            DataFrame: Transformed data after all stats applied.
+        """
+        for stat in self.stats:
+            data, self.mapping = stat.compute(data)
+        return data
+
+    def _draw_impl(self, fig, data, row, col):
+        """
+        Implementation of the actual drawing logic.
+
+        Subclasses should override this method instead of draw().
+
+        Parameters:
+            fig (Figure): Plotly figure object.
+            data (DataFrame): Data (already transformed by stats).
+            row (int): Row position in subplot (for faceting).
+            col (int): Column position in subplot (for faceting).
 
         Raises:
             NotImplementedError: Must be implemented by subclasses.
         """
-        raise NotImplementedError("The draw method must be implemented by subclasses.")
+        raise NotImplementedError("The _draw_impl method must be implemented by subclasses.")
+
+    def _get_style_props(self, data):
+        """
+        Get style properties from aesthetic mapper.
+
+        This is a convenience method to reduce boilerplate in geom subclasses.
+
+        Parameters:
+            data (DataFrame): The data to use for aesthetic mapping.
+
+        Returns:
+            dict: Style properties from AestheticMapper.
+        """
+        mapper = AestheticMapper(
+            data, self.mapping, self.params, self.theme,
+            global_color_map=self._global_color_map,
+            global_shape_map=self._global_shape_map
+        )
+        return mapper.get_style_properties()
 
     def _apply_color_targets(self, target_props: dict, style_props: dict, value_key=None, data_mask=None, shape_key=None) -> dict:
         """

ggplotly/geoms/geom_boxplot.py

@@ -109,7 +109,7 @@ def _shape_to_plotly_symbol(self, shape):
         }
         return shape_map.get(shape, 'circle')
 
-    def draw(self, fig, data=None, row=1, col=1):
+    def _draw_impl(self, fig, data, row, col):
         """
         Draw boxplot(s) on the figure.
 
@@ -124,7 +124,6 @@ def draw(self, fig, data=None, row=1, col=1):
         col : int, default=1
             Column position in subplot.
         """
-        data = data if data is not None else self.data
 
         plot = go.Box
 

ggplotly/geoms/geom_candlestick.py

@@ -55,7 +55,7 @@ def __init__(self, data=None, mapping=None, **params):
         if 'decreasing_color' not in self.params:
             self.params['decreasing_color'] = '#EF5350'  # Red
 
-    def draw(self, fig, data=None, row=1, col=1):
+    def _draw_impl(self, fig, data, row, col):
         """
         Draw candlestick chart on the figure.
 
@@ -68,7 +68,6 @@ def draw(self, fig, data=None, row=1, col=1):
         Returns:
             None: Modifies the figure in place.
         """
-        data = data if data is not None else self.data
 
         # Validate required aesthetics
         required = ['x', 'open', 'high', 'low', 'close']
@@ -170,7 +169,7 @@ def __init__(self, data=None, mapping=None, **params):
         if 'decreasing_color' not in self.params:
             self.params['decreasing_color'] = '#EF5350'
 
-    def draw(self, fig, data=None, row=1, col=1):
+    def _draw_impl(self, fig, data, row, col):
         """
         Draw OHLC chart on the figure.
 
@@ -183,7 +182,6 @@ def draw(self, fig, data=None, row=1, col=1):
         Returns:
             None: Modifies the figure in place.
         """
-        data = data if data is not None else self.data
 
         # Validate required aesthetics
         required = ['x', 'open', 'high', 'low', 'close']

ggplotly/geoms/geom_col.py

@@ -22,7 +22,7 @@ class geom_col(Geom):
         >>> ggplot(df, aes(x='category', y='value', fill='group')) + geom_col()
     """
 
-    def draw(self, fig, data=None, row=1, col=1):
+    def _draw_impl(self, fig, data, row, col):
         """
         Draw column(s) on the figure.
 
@@ -35,7 +35,6 @@ def draw(self, fig, data=None, row=1, col=1):
         Returns:
             None: Modifies the figure in place.
         """
-        data = data if data is not None else self.data
 
         payload = dict()
         payload["name"] = self.params.get("name", "Column")

ggplotly/geoms/geom_contour.py

@@ -2,14 +2,15 @@
 
 import plotly.graph_objects as go
 
-from ..aesthetic_mapper import AestheticMapper
 from ..stats.stat_contour import stat_contour
 from .geom_base import Geom
 
 
 class geom_contour(Geom):
     """Geom for drawing contour lines from 2D data."""
 
+    default_params = {"size": 1}
+
     def __init__(self, data=None, mapping=None, **params):
         """
         Draw contour lines from 2D data.
@@ -79,14 +80,8 @@ def _compute_contour_grid(self, data):
         result, _ = contour_stat.compute(data)
         return result
 
-    def draw(self, fig, data=None, row=1, col=1):
-        data = data if data is not None else self.data
-
-        if "size" not in self.params:
-            self.params["size"] = 1
-
-        mapper = AestheticMapper(data, self.mapping, self.params, self.theme)
-        style_props = mapper.get_style_properties()
+    def _draw_impl(self, fig, data, row, col):
+        style_props = self._get_style_props(data)
 
         x_col = self.mapping.get("x")
         y_col = self.mapping.get("y")

ggplotly/geoms/geom_contour_filled.py

@@ -2,14 +2,15 @@
 
 import plotly.graph_objects as go
 
-from ..aesthetic_mapper import AestheticMapper
 from ..stats.stat_contour import stat_contour
 from .geom_base import Geom
 
 
 class geom_contour_filled(Geom):
     """Geom for drawing filled contours from 2D data."""
 
+    default_params = {"alpha": 0.8}
+
     def __init__(self, data=None, mapping=None, **params):
         """
         Draw filled contours from 2D data.
@@ -79,14 +80,8 @@ def _compute_contour_grid(self, data):
         result, _ = contour_stat.compute(data)
         return result
 
-    def draw(self, fig, data=None, row=1, col=1):
-        data = data if data is not None else self.data
-
-        if "alpha" not in self.params:
-            self.params["alpha"] = 0.8
-
-        mapper = AestheticMapper(data, self.mapping, self.params, self.theme)
-        style_props = mapper.get_style_properties()
+    def _draw_impl(self, fig, data, row, col):
+        style_props = self._get_style_props(data)
 
         x_col = self.mapping.get("x")
         y_col = self.mapping.get("y")

ggplotly/geoms/geom_density.py

@@ -11,6 +11,8 @@
 class geom_density(Geom):
     """Geom for drawing density plots."""
 
+    default_params = {"size": 2}
+
     def __init__(self, data=None, mapping=None, bw='nrd0', adjust=1, kernel='gaussian',
                  n=512, trim=False, **params):
         """
@@ -121,11 +123,7 @@ def _compute_density_for_group(self, x_data, x_col, na_rm=False):
 
         return result_df['x'].values, result_df['density'].values
 
-    def draw(self, fig, data=None, row=1, col=1):
-        if "size" not in self.params:
-            self.params["size"] = 2
-        data = data if data is not None else self.data
-
+    def _draw_impl(self, fig, data, row, col):
         # Remove size from mapping if present - density lines can't have variable widths
         # Only use size from params (literal values)
         if "size" in self.mapping: