Update app.py

app.py

@@ -3,10 +3,15 @@ import yfinance as yf
 import pandas as pd
 import plotly.graph_objs as go
 
+
 def fetch_data(ticker, start_date, end_date):
     data = yf.download(ticker, start=start_date, end=end_date)
     return data
 
+def fetch_weekly_data(ticker, start_date, end_date):
+    data = yf.download(ticker, start=start_date, end=end_date, interval='1wk')
+    return data
+
 def calculate_indicators(data):
     # Bollinger Bands
     data['Middle Band'] = data['Close'].rolling(window=20).mean()
@@ -19,11 +24,25 @@ def calculate_indicators(data):
     
     return data
 
-def identify_signals(data):
+def identify_signals(data, weekly_data):
+    # Calculate Buy and Sell signals on daily data
     data['Buy Signal'] = ((data['Close'] < data['Lower Band']) & (data['Close'].shift(1) > data['Lower Band'])) | \
                          ((data['Close'] > data['MA5']) & (data['Close'].shift(1) < data['MA5']))
     data['Sell Signal'] = ((data['Close'] > data['Upper Band']) & (data['Close'].shift(1) < data['Upper Band'])) | \
                           ((data['Close'] < data['MA5']) & (data['Close'].shift(1) > data['MA5']))
+
+    # Filter signals by volume
+    avg_volume = data['Volume'].rolling(window=20).mean()
+    data['Buy Signal'] = data['Buy Signal'] & (data['Volume'] > avg_volume)
+    data['Sell Signal'] = data['Sell Signal'] & (data['Volume'] > avg_volume)
+
+    # Confirm signals with weekly data
+    weekly_data = calculate_indicators(weekly_data)
+    data['Weekly Buy Signal'] = weekly_data['Buy Signal'].reindex(data.index, method='ffill')
+    data['Weekly Sell Signal'] = weekly_data['Sell Signal'].reindex(data.index, method='ffill')
+    data['Buy Signal'] = data['Buy Signal'] & data['Weekly Buy Signal']
+    data['Sell Signal'] = data['Sell Signal'] & data['Weekly Sell Signal']
+
     return data
 
 def plot_data(data):
@@ -61,8 +80,9 @@ def main():
     
     if st.button("Analyze"):
         data = fetch_data(ticker, start_date, end_date)
+        weekly_data = fetch_weekly_data(ticker, start_date, end_date)
         data = calculate_indicators(data)
-        data = identify_signals(data)
+        data = identify_signals(data, weekly_data)
         fig = plot_data(data)
         st.plotly_chart(fig, use_container_width=True)