Update app.py

app.py

@@ -38,7 +38,13 @@ with st.sidebar.expander("Asset Settings", expanded=True):
 # Download data
 @st.cache_data
 def download_data(ticker, start, end):
-    data = yf.download(ticker, start=start, end=end)
+    data = yf.download(ticker, start=start, end=end, auto_adjust=False)
+    if isinstance(data.columns, pd.MultiIndex):
+        data.columns = data.columns.get_level_values(0)
+    if data.empty:
+        raise ValueError(f"No data retrieved for {ticker}")
+    if len(data) < 24:  # Minimum needed for 24-period Pivot Point calculation
+        raise ValueError(f"Insufficient data points for {ticker}. Need at least 24 days.")
     return data
 
 # Function to execute and cache strategy results
@@ -149,19 +155,22 @@ run_button = st.sidebar.button("Run Strategy")
 
 # Running the strategy
 if run_button:
-    # Download data
-    data = download_data(ticker, start_date, end_date)
+    try:
+        # Download data
+        data = download_data(ticker, start_date, end_date)
 
-    # Execute the strategy with optimized parameters
-    data_with_signals, profit, equity_curve, _, best_params = execute_strategy(data, optimized_params)
+        # Execute the strategy with optimized parameters
+        data_with_signals, profit, equity_curve, _, best_params = execute_strategy(data, optimized_params)
 
-    # Cache results in session state
-    st.session_state['data_with_signals'] = data_with_signals
-    st.session_state['equity_curve'] = equity_curve
-    st.session_state['best_params'] = best_params
+        # Cache results in session state
+        st.session_state['data_with_signals'] = data_with_signals
+        st.session_state['equity_curve'] = equity_curve
+        st.session_state['best_params'] = best_params
 
-    # Display optimized parameters
-    st.json(best_params)
+        # Display optimized parameters
+        st.json(best_params)
+    except Exception as e:
+        st.error(f"An error occurred while running the analysis: {e}")
 
 # If session state contains data, allow for post-run parameter adjustments
 if 'data_with_signals' in st.session_state:
@@ -188,7 +197,7 @@ if 'data_with_signals' in st.session_state:
     # Plotting with adjustments for easier comparison of x-axis
     fig = make_subplots(rows=3, cols=1, shared_xaxes=True,
                         subplot_titles=("Price and Bollinger Bands", "RSI", "Equity Curve"),
-                        vertical_spacing=0.20)  # Increased vertical spacing
+                        vertical_spacing=0.20)
 
     # Price and signal plot
     fig.add_trace(go.Scatter(x=updated_data.index, y=updated_data['Close'], mode='lines', name='Close Price'))
@@ -199,16 +208,16 @@ if 'data_with_signals' in st.session_state:
     buy_signals = updated_data[updated_data['signal'] == 'Buy']
     sell_signals = updated_data[updated_data['signal'] == 'Sell']
     fig.add_trace(go.Scatter(x=buy_signals.index, y=buy_signals['Close'], mode='markers', name='Buy Signal', 
-                             marker=dict(color='green', symbol='triangle-up', size=12)))  # Increased size
+                             marker=dict(color='green', symbol='triangle-up', size=12)))
     fig.add_trace(go.Scatter(x=sell_signals.index, y=sell_signals['Close'], mode='markers', name='Sell Signal', 
-                             marker=dict(color='red', symbol='triangle-down', size=12)))  # Increased size
+                             marker=dict(color='red', symbol='triangle-down', size=12)))
 
     # RSI Plot with black line, red upper threshold, and green lower threshold
     fig.add_trace(go.Scatter(x=updated_data.index, y=updated_data['rsi'], mode='lines', name='RSI', line=dict(color='white')), row=2, col=1)
     fig.add_shape(type="line", x0=updated_data.index[0], x1=updated_data.index[-1], y0=30, y1=30, 
-                  line=dict(dash='dash', color='green'), row=2, col=1)  # Lower threshold in green
+                  line=dict(dash='dash', color='green'), row=2, col=1)
     fig.add_shape(type="line", x0=updated_data.index[0], x1=updated_data.index[-1], y0=70, y1=70, 
-                  line=dict(dash='dash', color='red'), row=2, col=1)  # Upper threshold in red
+                  line=dict(dash='dash', color='red'), row=2, col=1)
 
     # Equity Curve Plot
     fig.add_trace(go.Scatter(x=updated_data.index, y=st.session_state['equity_curve'], mode='lines', name='Equity Curve'), row=3, col=1)
@@ -219,11 +228,10 @@ if 'data_with_signals' in st.session_state:
         xaxis_title='Date',
         yaxis_title='Price',
         legend=dict(orientation="h", yanchor="bottom", y=1.15, xanchor="center", x=0.5, traceorder='normal', valign='top', borderwidth=0),
-        height=1000,  # Increase the height for better visibility
-        margin=dict(t=30, b=30),  # Adjust margins for better spacing
-        font=dict(size=12),  # Adjust font size for better readability
-        # Subplot title style adjustment for black color
-        annotations=[dict(font=dict(color="white", size=14)) for _ in range(3)]  # Adjusts all subplot titles to black
+        height=1000,
+        margin=dict(t=30, b=30),
+        font=dict(size=12),
+        annotations=[dict(font=dict(color="white", size=14)) for _ in range(3)]
     )
 
     # Display the chart
@@ -235,4 +243,4 @@ hide_streamlit_style = """
 footer {visibility: hidden;}
 </style>
 """
-st.markdown(hide_streamlit_style, unsafe_allow_html=True)
+st.markdown(hide_streamlit_style, unsafe_allow_html=True)