Update chart_builder.py

chart_builder.py

@@ -1,60 +1,80 @@
 # chart_builder.py
-import pandas as pd
-import plotly.graph_objs as go
+import plotly.graph_objects as go
 from plotly.subplots import make_subplots
+import pandas as pd
 
-def build_chart(df, indicators=None):
+def build_chart(df, indicators):
     """
-    df: OHLCV dataframe
-    indicators: dict of indicator_name -> DataFrame
-    Returns HTML string of chart
+    df: OHLCV DataFrame with ['Open','High','Low','Close','Volume']
+    indicators: dict from indicater.py
+    Returns: HTML string of Plotly chart with JS toggles
     """
+    # --- Create subplots ---
     fig = make_subplots(
-        rows=2,
+        rows=2 + sum(1 for k in indicators if k not in ['SMA_5','SMA_10','SMA_20','SMA_50','EMA_5','EMA_10','EMA_20','EMA_50','Volume']),
         cols=1,
         shared_xaxes=True,
-        row_heights=[0.7, 0.3],
         vertical_spacing=0.03,
-        subplot_titles=("Price & Indicators", "Volume / Subplots")
+        row_heights=[0.5, 0.2] + [0.2]*sum(1 for k in indicators if k not in ['SMA_5','SMA_10','SMA_20','SMA_50','EMA_5','EMA_10','EMA_20','EMA_50','Volume'])
     )
 
-    # Main OHLC
+    # --- Main Candle Chart ---
     fig.add_trace(go.Candlestick(
-        x=df.index, open=df['Open'], high=df['High'], low=df['Low'], close=df['Close'], name="Price"
+        x=df.index, open=df['Open'], high=df['High'], low=df['Low'], close=df['Close'],
+        name='Price'
     ), row=1, col=1)
 
-    # Default volume subplot
+    # --- Add MA/EMA overlays on main chart ---
+    for key in ['SMA_5','SMA_10','SMA_20','SMA_50','EMA_5','EMA_10','EMA_20','EMA_50']:
+        if key in indicators:
+            fig.add_trace(go.Scatter(
+                x=df.index, y=indicators[key],
+                mode='lines', name=key, visible=False  # initially hidden
+            ), row=1, col=1)
+
+    # --- Volume subplot ---
     fig.add_trace(go.Bar(
-        x=df.index, y=df['Volume'], name="Volume", marker_color='lightblue'
+        x=df.index, y=df['Volume'], name='Volume'
     ), row=2, col=1)
 
-    # Overlay indicators
-    if indicators:
-        for name, ind_df in indicators.items():
-            if ind_df is None:
-                continue
-            if name.lower() in ['sma20','sma50','ema20','ema50','bb_upper','bb_middle','bb_lower','supertrend']:
-                # Overlay on main chart
-                for col in ind_df.columns:
-                    fig.add_trace(go.Scatter(
-                        x=ind_df.index, y=ind_df[col], mode='lines', name=col,
-                        visible='legendonly'  # hidden by default
-                    ), row=1, col=1)
-            else:
-                # Other indicators like MACD/RSI as subplots
-                for col in ind_df.columns:
-                    fig.add_trace(go.Scatter(
-                        x=ind_df.index, y=ind_df[col], mode='lines', name=col,
-                        visible='legendonly'
-                    ), row=2, col=1)
+    # --- Other indicators in separate subplots ---
+    row_counter = 3
+    for key, series in indicators.items():
+        if key in ['SMA_5','SMA_10','SMA_20','SMA_50','EMA_5','EMA_10','EMA_20','EMA_50','Volume']:
+            continue
+        fig.add_trace(go.Scatter(
+            x=df.index, y=series,
+            mode='lines', name=key, visible=False
+        ), row=row_counter, col=1)
+        row_counter += 1
+
+    fig.update_layout(
+        height=600 + 200*(row_counter-3),
+        showlegend=True,
+        margin=dict(l=40, r=40, t=40, b=40),
+        xaxis_rangeslider_visible=False
+    )
+
+    # --- Inject JS buttons to toggle visibility ---
+    buttons = []
+    for i, trace in enumerate(fig.data):
+        buttons.append(dict(
+            label=trace.name,
+            method='restyle',
+            args=['visible', [j==i for j in range(len(fig.data))]],
+        ))
 
     fig.update_layout(
-        xaxis_rangeslider_visible=False,
-        height=800,
-        template='plotly_dark',
-        legend=dict(orientation='h', y=1.02)
+        updatemenus=[dict(
+            type="dropdown",
+            direction="down",
+            buttons=buttons,
+            showactive=True,
+            x=1.02,
+            xanchor="left",
+            y=1.15,
+            yanchor="top"
+        )]
     )
 
-    # Inject JS for toggling indicators (all by legend click)
-    html_chart = fig.to_html(full_html=False, include_plotlyjs='cdn')
-    return html_chart
+    return fig.to_html(full_html=False)