Update app.py

app.py

@@ -22,7 +22,7 @@ def fetch_data(ticker, period):
     data = yf.download(ticker, period=periods[period])
     return data
 
-def plot_technical_analysis(ticker, period, analysis_type, ma_length, candle_settings):
+def plot_technical_analysis(ticker, period, analysis_type, ma_length, candle_period):
     data = fetch_data(ticker, period)
     
     fig = go.Figure()
@@ -34,8 +34,7 @@ def plot_technical_analysis(ticker, period, analysis_type, ma_length, candle_set
                                      low=data['Low'],
                                      close=data['Close'],
                                      name='Candlestick',
-                                     increasing_line_color=candle_settings['increasing_color'],
-                                     decreasing_line_color=candle_settings['decreasing_color']))
+                                     xperiod=candle_period))
     
     elif analysis_type == "Moving Average":
         data[f'MA{ma_length}'] = data['Close'].rolling(window=ma_length).mean()
@@ -50,41 +49,30 @@ def plot_technical_analysis(ticker, period, analysis_type, ma_length, candle_set
         fig.add_trace(go.Scatter(x=data.index, y=data['Close'], mode='lines', name='Close Price'))
         fig.add_trace(go.Scatter(x=data.index, y=data['upper'], mode='lines', name='Upper Band'))
         fig.add_trace(go.Scatter(x=data.index, y=data['lower'], mode='lines', name='Lower Band'))
-    
-    fig.update_layout(title=f"{analysis_type} Analysis for {ticker}", xaxis_title="Date", yaxis_title="Price", xaxis_rangeslider_visible=False)
-    return fig
 
-def plot_rsi(ticker, period):
-    data = fetch_data(ticker, period)
-    delta = data['Close'].diff(1)
-    gain = delta.where(delta > 0, 0)
-    loss = -delta.where(delta < 0, 0)
+    elif analysis_type == "RSI":
+        delta = data['Close'].diff(1)
+        gain = delta.where(delta > 0, 0)
+        loss = -delta.where(delta < 0, 0)
     
-    avg_gain = gain.rolling(window=14).mean()
-    avg_loss = loss.rolling(window=14).mean()
-    
-    rs = avg_gain / avg_loss
-    rsi = 100 - (100 / (1 + rs))
-    
-    fig = go.Figure()
-    fig.add_trace(go.Scatter(x=data.index, y=rsi, mode='lines', name='RSI'))
-    fig.update_layout(title=f"RSI for {ticker}", xaxis_title="Date", yaxis_title="RSI", xaxis_rangeslider_visible=False)
+        avg_gain = gain.rolling(window=14).mean()
+        avg_loss = loss.rolling(window=14).mean()
     
-    return fig
-
-def plot_macd(ticker, period):
-    data = fetch_data(ticker, period)
+        rs = avg_gain / avg_loss
+        rsi = 100 - (100 / (1 + rs))
     
-    exp1 = data['Close'].ewm(span=12, adjust=False).mean()
-    exp2 = data['Close'].ewm(span=26, adjust=False).mean()
-    macd = exp1 - exp2
-    signal = macd.ewm(span=9, adjust=False).mean()
+        fig.add_trace(go.Scatter(x=data.index, y=rsi, mode='lines', name='RSI'))
     
-    fig = go.Figure()
-    fig.add_trace(go.Scatter(x=data.index, y=macd, mode='lines', name='MACD'))
-    fig.add_trace(go.Scatter(x=data.index, y=signal, mode='lines', name='Signal Line'))
-    fig.update_layout(title=f"MACD for {ticker}", xaxis_title="Date", yaxis_title="MACD", xaxis_rangeslider_visible=False)
+    elif analysis_type == "MACD":
+        exp1 = data['Close'].ewm(span=12, adjust=False).mean()
+        exp2 = data['Close'].ewm(span=26, adjust=False).mean()
+        macd = exp1 - exp2
+        signal = macd.ewm(span=9, adjust=False).mean()
     
+        fig.add_trace(go.Scatter(x=data.index, y=macd, mode='lines', name='MACD'))
+        fig.add_trace(go.Scatter(x=data.index, y=signal, mode='lines', name='Signal Line'))
+
+    fig.update_layout(title=f"{analysis_type} Analysis for {ticker}", xaxis_title="Date", yaxis_title="Price", xaxis_rangeslider_visible=False)
     return fig
 
 def plot_fundamental_analysis(ticker, analysis_type):
@@ -171,31 +159,26 @@ with gr.Blocks() as demo:
     gr.Markdown("# Stock Analysis Tool")
     
     with gr.Tab("Technical Analysis"):
-        ticker = gr.Textbox(label="Ticker Symbol", value="AAPL")
-        period = gr.Dropdown(label="Period", choices=list(periods.keys()), value="1 Year")
-        analysis_type = gr.Radio(label="Analysis Type", choices=["Candlestick", "Moving Average", "Bollinger Bands"], value="Candlestick")
-        ma_length = gr.Number(label="Moving Average Length", value=20)
-        candle_settings = gr.JSON(label="Candlestick Settings", value={"increasing_color": "green", "decreasing_color": "red"})
-        plot_button = gr.Button("Plot")
-        plot_output = gr.Plot()
+        with gr.Row():
+            ticker = gr.Textbox(label="Ticker Symbol", value="AAPL")
+            period = gr.Dropdown(label="Period", choices=list(periods.keys()), value="1 Year")
+        analysis_type = gr.Radio(label="Analysis Type", choices=["Candlestick", "Moving Average", "Bollinger Bands", "RSI", "MACD"], value="Candlestick")
         
-        plot_button.click(fn=plot_technical_analysis, inputs=[ticker, period, analysis_type, ma_length, candle_settings], outputs=plot_output)
-    
-    with gr.Tab("RSI"):
-        ticker = gr.Textbox(label="Ticker Symbol", value="AAPL")
-        period = gr.Dropdown(label="Period", choices=list(periods.keys()), value="1 Year")
-        plot_button = gr.Button("Plot RSI")
-        plot_output = gr.Plot()
+        ma_length = gr.Number(label="Moving Average Length", value=20, visible=False)
+        candle_period = gr.Number(label="Candlestick Period", value=1, visible=False)
         
-        plot_button.click(fn=plot_rsi, inputs=[ticker, period], outputs=plot_output)
-    
-    with gr.Tab("MACD"):
-        ticker = gr.Textbox(label="Ticker Symbol", value="AAPL")
-        period = gr.Dropdown(label="Period", choices=list(periods.keys()), value="1 Year")
-        plot_button = gr.Button("Plot MACD")
+        def update_visibility(analysis_type):
+            return (
+                gr.update(visible=analysis_type == "Moving Average"),
+                gr.update(visible=analysis_type == "Candlestick")
+            )
+        
+        analysis_type.change(fn=update_visibility, inputs=analysis_type, outputs=[ma_length, candle_period])
+        
+        plot_button = gr.Button("Plot")
         plot_output = gr.Plot()
         
-        plot_button.click(fn=plot_macd, inputs=[ticker, period], outputs=plot_output)
+        plot_button.click(fn=plot_technical_analysis, inputs=[ticker, period, analysis_type, ma_length, candle_period], outputs=plot_output)
     
     with gr.Tab("Fundamental Analysis"):
         ticker = gr.Textbox(label="Ticker Symbol", value="AAPL")