Update app.py

app.py

@@ -52,14 +52,22 @@ def buy_sell_signals(data, rsi, macd, signal_line):
     return buy_signals, sell_signals
 
 
-def plot_data(data, buy_signals, sell_signals, filename="plot.png"):
-    fig = make_subplots(rows=2, cols=1)
-    fig.add_trace(go.Candlestick(x=data.index, open=data['Open'], high=data['High'], low=data['Low'], close=data['Close'], name='Candlesticks'), row=1, col=1)
-    fig.add_trace(go.Scatter(x=data.index, y=buy_signals, mode='markers', marker_symbol='triangle-up', marker_color='green', name='Buy Signal'), row=1, col=1)
-    fig.add_trace(go.Scatter(x=data.index, y=sell_signals, mode='markers', marker_symbol='triangle-down', marker_color='red', name='Sell Signal'), row=1, col=1)
-    fig.update_layout(title='Candlestick Chart with Buy and Sell Signals', xaxis_rangeslider_visible=False)
-    fig.write_image(filename)
-    return filename
+def plot_with_gr_plot(data, buy_signals_rsi, sell_signals_rsi, buy_signals_macd, sell_signals_macd):
+    fig = make_subplots(rows=2, cols=1, shared_xaxes=True)
+    
+    # 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)
+    
+    fig.add_trace(go.Scatter(x=list(buy_signals_rsi.keys()), y=list(buy_signals_rsi.values()), mode='markers', marker_symbol='triangle-up', marker_color='green', name='Buy Signal RSI', text=["RSI Buy"]*len(buy_signals_rsi), hoverinfo='text+y'), row=1, col=1)
+    fig.add_trace(go.Scatter(x=list(sell_signals_rsi.keys()), y=list(sell_signals_rsi.values()), mode='markers', marker_symbol='triangle-down', marker_color='red', name='Sell Signal RSI', text=["RSI Sell"]*len(sell_signals_rsi), hoverinfo='text+y'), row=1, col=1)
+    
+    fig.add_trace(go.Scatter(x=list(buy_signals_macd.keys()), y=list(buy_signals_macd.values()), mode='markers', marker=dict(symbol='triangle-up', color='blue', size=10), name='Buy Signal MACD', text=["MACD Buy"]*len(buy_signals_macd), hoverinfo='text+y'), row=1, col=1)
+    fig.add_trace(go.Scatter(x=list(sell_signals_macd.keys()), y=list(sell_signals_macd.values()), mode='markers', marker=dict(symbol='triangle-down', color='purple', size=10), name='Sell Signal MACD', text=["MACD Sell"]*len(sell_signals_macd), hoverinfo='text+y'), row=1, col=1)
+    
+    # Update layout if needed
+    fig.update_layout(title='Stock Analysis with RSI and MACD Signals')
+    
+    return fig
 
 def main_interface(ticker, period):
     data = fetch_data(ticker, period)
@@ -72,7 +80,7 @@ def main_interface(ticker, period):
 # Step 7: Set Up Gradio Interface with corrected type parameter
 iface = gr.Interface(fn=main_interface,
                      inputs=[gr.Textbox(label="Asset Ticker"), gr.Textbox(label="Period: (e.g., 1y, 2y, 5y)")],
-                     outputs=gr.Image(type="filepath"),  # Corrected type parameter
+                     outputs=gr.Plot(type="filepath"),  # Corrected type parameter
                      title="Stock Analysis Tool",
                      description="Enter a stock ticker and period to analyze buy/sell signals based on RSI and MACD.")