aplotly 1.1.18__tar.gz → 1.1.20__tar.gz

{aplotly-1.1.18/aplotly.egg-info → aplotly-1.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aplotly
-Version: 1.1.18
+Version: 1.1.20
 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:
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: plotly>=5.18.0
 Requires-Dist: pandas>=2.1.3
+Dynamic: license-file
 
 # aplotly
 

{aplotly-1.1.18 → aplotly-1.1.20}/aplotly/colors.py

@@ -88,7 +88,7 @@ def greys():
 def night():
     line_colors = {
         "green": "#00FF41",
-        "grey": "#6E6E73",
+        # "grey": "#6E6E73",
         "white": "#F5F5F7",
         "red": "FF4500",
         "yellow": "FFD700",

{aplotly-1.1.18 → aplotly-1.1.20}/aplotly/plots.py

@@ -169,6 +169,146 @@ def plot_multiple_lines(
     return fig
 
 
+def plot_multiple_lines_with_distribution(
+    series: List[pd.Series],
+    ylabel: str,
+    xlabel: str,
+    labels: list = None,
+    visible: list = None,
+    styles: list = None,
+    legend: bool = True,
+    color_palette: str = "",
+    group_title: str = "",
+    plot_title: str = "",
+    hist_width: float = 0.2,
+    n_bins: int = 10,
+) -> go.Figure:
+    """Plot multiple line charts with a distribution histogram of final values.
+
+    Args:
+        series (List[pd.Series]): list of data for the line charts, the index is the x-axis and the values are the y-axis.
+        ylabel (str): y-axis label.
+        xlabel (str): x-axis label.
+        labels (list, optional): name of each line. Defaults to None (doesn't label of the lines).
+        visible (list, optional): if the lines should be visible by default. Defaults to None (all lines are visible).
+        styles (list, optional): list of line style dictionaries. Defaults to None.
+        legend (bool, optional): if the legend should be shown. Defaults to True.
+        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).
+        hist_width (float, optional): relative width of histogram panel. Defaults to 0.2.
+        n_bins (int, optional): number of bins for the histogram. Defaults to 10.
+
+    Returns:
+        go.Figure: plotly figure containing the line charts and distribution histogram.
+    """
+    if labels is None:
+        labels = [None] * len(series)
+
+    if visible is None:
+        visible = [True] * len(series)
+
+    if styles is None:
+        styles = [{"width": 2}] * len(series)
+
+    if any(visible) is False:
+        legend = True
+
+    configure_plotly(subplots=1, color_palette=color_palette)
+
+    # Create subplot with shared y-axis
+    fig = make_subplots(
+        rows=1, cols=2, column_widths=[1 - hist_width, hist_width], shared_yaxes=True, horizontal_spacing=0.02
+    )
+
+    # Add line traces
+    final_values = []
+    for data, label, visibility, style in zip(series, labels, visible, styles):
+        fig.add_trace(
+            go.Scatter(
+                x=data.index,
+                y=data.values,
+                mode="lines",
+                name=label,
+                legendgroup=1,
+                legendgrouptitle_text=group_title,
+                visible=visibility,
+                line=style,
+            ),
+            row=1,
+            col=1,
+        )
+        if visibility:
+            final_values.append(data.iloc[-1])
+
+    # Calculate statistics
+    mean_val = sum(final_values) / len(final_values)
+    std_val = (sum((x - mean_val) ** 2 for x in final_values) / len(final_values)) ** 0.5
+
+    # Add single histogram trace for all final values
+    hist_trace = go.Histogram(
+        y=final_values,
+        name="Distribution",
+        legendgroup=1,
+        showlegend=False,
+        orientation="h",
+        nbinsy=n_bins,
+        marker_color="rgb(192, 192, 192)",  # Light grey color
+    )
+    fig.add_trace(hist_trace, row=1, col=2)
+
+    # Calculate max count using numpy's histogram
+    import numpy as np
+
+    counts, _ = np.histogram(final_values, bins=n_bins)
+    max_count = max(counts)
+
+    # Add mean line with extended range
+    fig.add_trace(
+        go.Scatter(
+            x=[-0.1 * max_count, 1.1 * max_count],
+            y=[mean_val, mean_val],
+            mode="lines",
+            line=dict(color="black", width=2),
+            name="Mean",
+            showlegend=False,
+        ),
+        row=1,
+        col=2,
+    )
+
+    # Add std lines with extended range
+    for std_level in [mean_val - std_val, mean_val + std_val]:
+        fig.add_trace(
+            go.Scatter(
+                x=[-0.1 * max_count, 1.1 * max_count],
+                y=[std_level, std_level],
+                mode="lines",
+                line=dict(color="black", width=1, dash="dash"),
+                name="±1 std",
+                showlegend=False,
+            ),
+            row=1,
+            col=2,
+        )
+
+    # Update layout
+    fig.update_xaxes(title_text=xlabel, row=1, col=1)
+    fig.update_yaxes(title_text=ylabel, row=1, col=1)
+    fig.update_xaxes(title_text="Count", row=1, col=2)
+    fig.update_layout(
+        showlegend=legend,
+        title_text=plot_title,
+        bargap=0,  # Remove gaps between bars
+        bargroupgap=0,  # Remove gaps between groups
+    )
+
+    # Set x-axis range for histogram panel
+    fig.update_xaxes(range=[0, max_count], row=1, col=2)
+
+    return fig
+
+
 def plot_performance(
     performance: pd.Series,
     drawdown: pd.Series,

{aplotly-1.1.18 → aplotly-1.1.20/aplotly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aplotly
-Version: 1.1.18
+Version: 1.1.20
 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:
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: plotly>=5.18.0
 Requires-Dist: pandas>=2.1.3
+Dynamic: license-file
 
 # aplotly
 

{aplotly-1.1.18 → aplotly-1.1.20}/aplotly.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ examples/plot_gauge.py
 examples/plot_line.py
 examples/plot_line_and_save.py
 examples/plot_lines.py
+examples/plot_lines_with_dist.py
 examples/plot_multiple_performance.py
 examples/plot_performance.py
 examples/plot_performance_by_trade.py

aplotly-1.1.20/examples/plot_lines_with_dist.py

@@ -0,0 +1,14 @@
+import numpy as np
+import pandas as pd
+
+from aplotly.plots import plot_multiple_lines_with_distribution
+
+fig = plot_multiple_lines_with_distribution(
+    [pd.Series(np.random.rand(100), index=np.arange(100)) for _ in range(100)],
+    labels=[f"Test {i}" for i in range(100)],
+    styles=[{"shape": "hv"} for _ in range(100)],
+    xlabel="X",
+    ylabel="Y",
+    hist_width=0.2,
+)
+fig.show()

{aplotly-1.1.18 → aplotly-1.1.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aplotly"
-version = "1.1.18"
+version = "1.1.20"
 readme = "README.md"
 license = { file = "LICENSE" }
 classifiers = [
@@ -19,12 +19,13 @@ dependencies = [
 requires-python = ">=3.10"
 
 [tool.bumpver]
-current_version = "1.1.18"
+current_version = "1.1.20"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true
 tag             = true
 push            = false
 
+
 [tool.bumpver.file_patterns]
 "pyproject.toml" = ['current_version = "{version}"', 'version = "{version}"']