aplotly 1.1.23__tar.gz → 1.1.25__tar.gz

{aplotly-1.1.23/aplotly.egg-info → aplotly-1.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aplotly
-Version: 1.1.23
+Version: 1.1.25
 License: MIT License
         
         Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

{aplotly-1.1.23 → aplotly-1.1.25}/aplotly/colors.py

@@ -126,8 +126,30 @@ def dark_mode():
     return line_colors, chart_colors
 
 
+def contrast():
+    line_colors = {
+        "orange": "#F26451",
+        "yellow": "#FFD700",
+        "purple": "#9B4F96",
+        "teal": "#2A9D8F",
+        "indigo": "#4B0082",
+        "grey": "#CCCCCC",
+        "blue": "#00BFFF",
+        "mint": "#98FF98",
+    }
+
+    chart_colors = {
+        "background": "#000000",
+        "grid": "#333333",
+        "text": "#E5E5E5",
+        "axes": "#E5E5E5",
+    }
+
+    return line_colors, chart_colors
+
+
 def available_palettes():
-    return ["default", "greys", "night", "dark_mode"]
+    return ["default", "greys", "night", "dark_mode", "contrast"]
 
 
 def select_palette(name, color_type="hex") -> Tuple[dict, dict]:
@@ -167,5 +189,10 @@ def select_palette(name, color_type="hex") -> Tuple[dict, dict]:
             return convert_palette_to_rgba(dark_mode()[0]), convert_palette_to_rgba(dark_mode()[1])
         else:
             return dark_mode()
+    elif name == "contrast":
+        if color_type == "rgba":
+            return convert_palette_to_rgba(contrast()[0]), convert_palette_to_rgba(contrast()[1])
+        else:
+            return contrast()
     else:
         raise ValueError("palette name not found")

{aplotly-1.1.23 → aplotly-1.1.25}/aplotly/plots.py

@@ -119,6 +119,7 @@ def plot_multiple_lines(
     color_palette: str = "",
     group_title: str = "",
     plot_title: str = "",
+    fade_secondary_lines: bool = False,
 ) -> go.Figure:
     """Plot multiple line charts.
 
@@ -134,6 +135,7 @@ def plot_multiple_lines(
         color_palette (str, optional): name of the color palette to use. Defaults to "" (default color palette).
         group_title (str, optional): name of the legend group. Defaults to "" (no group name).
         plot_title (str, optional): title for the plot. Defaults to "" (no title).
+        fade_secondary_lines (bool, optional): if True, all lines after the first one will have 40% transparency. Defaults to False.
 
     Returns:
         go.Figure: plotly figure containing the line charts.
@@ -155,11 +157,41 @@ def plot_multiple_lines(
 
     configure_plotly(subplots=1, color_palette=color_palette)
     fig = go.Figure()
-    for data, label, visibility, style, color in zip(series, labels, visible, styles, colors):
+
+    # Plot first line first with Scattergl
+    if series and labels and visible and styles and colors:
+        if colors[0] is not None:
+            styles[0] = styles[0].copy() if styles[0] is not None else {}
+            styles[0]["color"] = colors[0]
+
+        fig.add_trace(
+            go.Scattergl(
+                x=series[0].index,
+                y=series[0].values,
+                mode="lines",
+                name=labels[0],
+                legendgroup=1,
+                legendgrouptitle_text=group_title,
+                visible=visible[0],
+                line=styles[0],
+                opacity=1.0,
+            )
+        )
+
+        # Update colors to ensure consistency
+        fig.for_each_trace(lambda trace: trace.update(line=dict(color=trace.marker.color)))
+
+    # Plot secondary lines after
+    for i, (data, label, visibility, style, color) in enumerate(
+        zip(series[1:], labels[1:], visible[1:], styles[1:], colors[1:])
+    ):
         if color is not None:
             style = style.copy() if style is not None else {}
             style["color"] = color
-            
+
+        # Set opacity based on whether this is the first line and if fading is enabled
+        opacity = 0.4 if fade_secondary_lines else 1.0
+
         fig.add_trace(
             go.Scatter(
                 x=data.index,
@@ -170,8 +202,10 @@ def plot_multiple_lines(
                 legendgrouptitle_text=group_title,
                 visible=visibility,
                 line=style,
+                opacity=opacity,
             )
         )
+
     fig.update_xaxes(title_text=xlabel)
     fig.update_yaxes(title_text=ylabel)
     fig.update_layout(showlegend=legend, title_text=plot_title)
@@ -410,6 +444,7 @@ def plot_multiple_performance(
     row_heights: list = [0.7, 0.3],
     vertical_spacing: float = 0.02,
     plot_title: str = "",
+    fade_secondary_lines: bool = True,
 ) -> go.Figure:
     """Plot the performance and drawdown of multiple strategies.
 
@@ -429,6 +464,7 @@ def plot_multiple_performance(
         row_heights (list, optional): height of each row. Defaults to [0.7, 0.3].
         vertical_spacing (float, optional): vertical spacing between rows. Defaults to 0.02.
         plot_title (str, optional): title for the plot. Defaults to "" (no title).
+        fade_secondary_lines (bool, optional): if True, all lines after the first one will have 40% transparency. Defaults to True.
 
     Returns:
         go.Figure: plotly figure containing the performance and drawdown.
@@ -442,9 +478,48 @@ def plot_multiple_performance(
 
     configure_plotly(subplots=2, color_palette=color_palette)
     fig = make_subplots(rows=2, cols=1, shared_xaxes=True, vertical_spacing=vertical_spacing, row_heights=row_heights)
-    for _performance, _drawdown, label in zip(performance, drawdown, labels):
+
+    # Plot first line first
+    if performance and drawdown and labels:
+        fig.add_trace(
+            go.Scatter(
+                x=performance[0].index,
+                y=performance[0],
+                mode="lines",
+                name=labels[0],
+                legendgroup=1,
+                legendgrouptitle_text=performance_group_title,
+                line=dict(width=2),
+                opacity=1.0,
+            ),
+            row=1,
+            col=1,
+        )
+
+        fig.for_each_trace(lambda trace: trace.update(line=dict(color=trace.marker.color)))
+
         fig.add_trace(
             go.Scatter(
+                x=drawdown[0].index,
+                y=drawdown[0],
+                mode="lines",
+                name=labels[0],
+                legendgroup=2,
+                legendgrouptitle_text=drawdown_group_title,
+                line=dict(width=2),
+                opacity=1.0,
+            ),
+            row=2,
+            col=1,
+        )
+
+    # Plot secondary lines using Scattergl to ensure they're on top
+    for i, (_performance, _drawdown, label) in enumerate(zip(performance[1:], drawdown[1:], labels[1:])):
+        # Set opacity based on whether this is the first line and if transparency is enabled
+        opacity = 0.4 if fade_secondary_lines else 1.0
+
+        fig.add_trace(
+            go.Scattergl(
                 x=_performance.index,
                 y=_performance,
                 mode="lines",
@@ -452,6 +527,7 @@ def plot_multiple_performance(
                 legendgroup=1,
                 legendgrouptitle_text=performance_group_title,
                 line=dict(width=2),
+                opacity=opacity,
             ),
             row=1,
             col=1,
@@ -460,7 +536,7 @@ def plot_multiple_performance(
         fig.for_each_trace(lambda trace: trace.update(line=dict(color=trace.marker.color)))
 
         fig.add_trace(
-            go.Scatter(
+            go.Scattergl(
                 x=_drawdown.index,
                 y=_drawdown,
                 mode="lines",
@@ -468,6 +544,7 @@ def plot_multiple_performance(
                 legendgroup=2,
                 legendgrouptitle_text=drawdown_group_title,
                 line=dict(width=2),
+                opacity=opacity,
             ),
             row=2,
             col=1,
@@ -1125,7 +1202,7 @@ def plot_benchmark_portfolio_returns(
     portfolio_name: str = "Portfolio",
 ) -> go.Figure:
     """Plot a double bar chart showing benchmark returns and portfolio returns for either positive or negative months.
-    
+
     Args:
         benchmark_returns (pd.Series): Series containing benchmark returns data.
         portfolio_returns (pd.Series): Series containing portfolio returns data.
@@ -1134,23 +1211,23 @@ def plot_benchmark_portfolio_returns(
         plot_title (str, optional): Title for the plot. Defaults to None (no title).
         benchmark_name (str, optional): Name of the benchmark for display. Defaults to "Benchmark".
         portfolio_name (str, optional): Name of the portfolio for display. Defaults to "Portfolio".
-        
+
     Returns:
         go.Figure: Plotly figure containing the double bar chart.
     """
     # Configure plotly style
     configure_plotly(subplots=2, color_palette=color_palette)
-    
+
     # Create subplot with shared x-axis and small gap
     fig = make_subplots(
-        rows=2, 
-        cols=1, 
-        shared_xaxes=True, 
+        rows=2,
+        cols=1,
+        shared_xaxes=True,
         vertical_spacing=0.05,  # Add small gap between plots
         row_heights=[0.5, 0.5],
-        subplot_titles=("", "")  # Remove subplot titles from top
+        subplot_titles=("", ""),  # Remove subplot titles from top
     )
-    
+
     # Filter for positive or negative months based on benchmark returns
     if positive_months:
         filtered_months = benchmark_returns[benchmark_returns > 0].index
@@ -1158,16 +1235,16 @@ def plot_benchmark_portfolio_returns(
     else:
         filtered_months = benchmark_returns[benchmark_returns < 0].index
         title_suffix = "Negative"
-    
+
     # Get the filtered data
     filtered_benchmark = benchmark_returns.loc[filtered_months]
     filtered_portfolio = portfolio_returns.loc[filtered_months]
-    
+
     # Define colors
     benchmark_color = "orange"
     portfolio_color = "blue"
     portfolio_negative_color = "darkblue"  # Darker blue for negative portfolio returns
-    
+
     # Add benchmark returns bar chart
     fig.add_trace(
         go.Bar(
@@ -1176,13 +1253,14 @@ def plot_benchmark_portfolio_returns(
             name=f"{benchmark_name} Returns",
             marker_color=benchmark_color,
         ),
-        row=1, col=1
+        row=1,
+        col=1,
     )
-    
+
     # Split portfolio returns into positive and negative for different colors
     positive_portfolio = filtered_portfolio[filtered_portfolio > 0]
     negative_portfolio = filtered_portfolio[filtered_portfolio < 0]
-    
+
     # Add positive portfolio returns bar chart
     if not positive_portfolio.empty:
         fig.add_trace(
@@ -1192,9 +1270,10 @@ def plot_benchmark_portfolio_returns(
                 name=f"{portfolio_name} Positive Returns",
                 marker_color=portfolio_color,
             ),
-            row=2, col=1
+            row=2,
+            col=1,
         )
-    
+
     # Add negative portfolio returns bar chart with darker color
     if not negative_portfolio.empty:
         fig.add_trace(
@@ -1204,40 +1283,41 @@ def plot_benchmark_portfolio_returns(
                 name=f"{portfolio_name} Negative Returns",
                 marker_color=portfolio_negative_color,
             ),
-            row=2, col=1
+            row=2,
+            col=1,
         )
-    
+
     # Update layout
     if plot_title is not None:
         title_text = f"{plot_title} ({title_suffix} {benchmark_name} Months)"
     else:
         title_text = None
-        
+
     fig.update_layout(
         title_text=title_text,
         showlegend=False,
         height=800,
         margin=dict(l=50, r=50, t=50, b=50),  # Standard margins
     )
-    
+
     # Update x-axis label
     fig.update_xaxes(title_text="Month", row=2, col=1)
-    
+
     # Add y-axis labels with custom colors
     fig.update_yaxes(
-        title_text=f"{benchmark_name} Return (%)", 
-        row=1, 
+        title_text=f"{benchmark_name} Return (%)",
+        row=1,
         col=1,
         title_font=dict(color=benchmark_color),
-        title_standoff=15
+        title_standoff=15,
     )
-    
+
     fig.update_yaxes(
-        title_text=f"{portfolio_name} Return (%)", 
-        row=2, 
+        title_text=f"{portfolio_name} Return (%)",
+        row=2,
         col=1,
         title_font=dict(color=portfolio_color),
-        title_standoff=15
+        title_standoff=15,
     )
-    
+
     return fig

{aplotly-1.1.23 → aplotly-1.1.25/aplotly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aplotly
-Version: 1.1.23
+Version: 1.1.25
 License: MIT License
         
         Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

{aplotly-1.1.23 → aplotly-1.1.25}/examples/plot_lines.py

@@ -4,11 +4,12 @@ import pandas as pd
 from aplotly.plots import plot_multiple_lines
 
 fig = plot_multiple_lines(
-    [pd.Series(np.random.rand(100), index=np.arange(100)) for _ in range(3)],
-    labels=["Test 1", "Test 2", "Test 3"],
-    styles=[{"shape": "hv"}, {"shape": "vh"}, {"shape": "linear"}],
+    [pd.Series(np.random.rand(100), index=np.arange(100)) for _ in range(8)],
+    labels=["Test 1", "Test 2", "Test 3", "Test 4", "Test 5", "Test 6", "Test 7", "Test 8"],
+    styles=[{"shape": "hv"}, {"shape": "vh"}, {"shape": "linear"}, {"shape": "hv"}, {"shape": "vh"}, {"shape": "linear"}, {"shape": "hv"}, {"shape": "vh"}],
     xlabel="X",
     ylabel="Y",
-    colors=["rgba(255, 0, 0, 1.0)", "rgba(0, 255, 0, 0.5)", "rgba(0, 0, 255, 0.25)"],
+    color_palette="contrast",
+    fade_secondary_lines=True,
 )
 fig.show()

{aplotly-1.1.23 → aplotly-1.1.25}/examples/plot_multiple_performance.py

@@ -8,5 +8,6 @@ fig = plot_multiple_performance(
     [pd.Series(np.random.rand(100), index=np.arange(100)) for _ in range(3)],
     labels=["Test 1", "Test 2", "Test 3"],
     xlabel="X",
+    color_palette="contrast",
 )
 fig.show()

{aplotly-1.1.23 → aplotly-1.1.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aplotly"
-version = "1.1.23"
+version = "1.1.25"
 readme = "README.md"
 license = { file = "LICENSE" }
 classifiers = [
@@ -19,7 +19,7 @@ dependencies = [
 requires-python = ">=3.10"
 
 [tool.bumpver]
-current_version = "1.1.23"
+current_version = "1.1.25"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true