Update app.py

app.py

@@ -48,21 +48,25 @@ def plot_data(data, buy_signals_rsi, sell_signals_rsi, buy_signals_macd, sell_si
     # Add the candlestick chart
     fig.add_trace(go.Candlestick(x=data.index, open=data['Open'], high=data['High'], low=data['Low'], close=data['Close'], name='Market Data'), row=1, col=1)
     
-    # Plot RSI signals with labels
-    for date, price in buy_signals_rsi:
-        fig.add_trace(go.Scatter(x=[date], y=[price], mode='markers', marker_symbol='triangle-up', marker_color='green', name='Buy Signal RSI', hovertext="RSI Buy", hoverinfo='text'), row=1, col=1)
-    for date, price in sell_signals_rsi:
-        fig.add_trace(go.Scatter(x=[date], y=[price], mode='markers', marker_symbol='triangle-down', marker_color='red', name='Sell Signal RSI', hovertext="RSI Sell", hoverinfo='text'), row=1, col=1)
+    # Combine all buy signals into one list and create a custom hover text list
+    buy_dates = [date for date, _ in buy_signals_rsi + buy_signals_macd]
+    buy_prices = [price for _, price in buy_signals_rsi + buy_signals_macd]
+    buy_text = ["RSI Buy" for _ in buy_signals_rsi] + ["MACD Buy" for _ in buy_signals_macd]
     
-    # Plot MACD signals with labels
-    for date, price in buy_signals_macd:
-        fig.add_trace(go.Scatter(x=[date], y=[price], mode='markers', marker=dict(symbol='triangle-up', color='blue'), name='Buy Signal MACD', hovertext="MACD Buy", hoverinfo='text'), row=1, col=1)
-    for date, price in sell_signals_macd:
-        fig.add_trace(go.Scatter(x=[date], y=[price], mode='markers', marker=dict(symbol='triangle-down', color='purple'), name='Sell Signal MACD', hovertext="MACD Sell", hoverinfo='text'), row=1, col=1)
+    fig.add_trace(go.Scatter(x=buy_dates, y=buy_prices, mode='markers', marker_symbol='triangle-up', marker_color='green', name='Buy Signals', text=buy_text, hoverinfo='text'))
+    
+    # Combine all sell signals into one list and create a custom hover text list
+    sell_dates = [date for date, _ in sell_signals_rsi + sell_signals_macd]
+    sell_prices = [price for _, price in sell_signals_rsi + sell_signals_macd]
+    sell_text = ["RSI Sell" for _ in sell_signals_rsi] + ["MACD Sell" for _ in sell_signals_macd]
+    
+    fig.add_trace(go.Scatter(x=sell_dates, y=sell_prices, mode='markers', marker_symbol='triangle-down', marker_color='red', name='Sell Signals', text=sell_text, hoverinfo='text'))
+    
+    fig.update_layout(title='Stock Analysis with RSI and MACD Signals', xaxis_title='Date', yaxis_title='Price')
     
-    fig.update_layout(title='Stock Analysis with RSI and MACD Signals')
     return fig
 
+
 def main_interface(ticker, period):
     data = fetch_data(ticker, period)
     rsi = compute_rsi(data)