Update app.py

app.py

@@ -21,17 +21,11 @@ def calculate_indicators(data):
     return data
 
 def identify_signals(data):
-    data['Buy Signal'] = ((data['Close'] < data['Lower Band']) & (data['Close'].shift(1) > data['Lower Band']))
-    data['Sell Signal'] = ((data['Close'] > data['Upper Band']) & (data['Close'].shift(1) < data['Upper Band']))
-    
-    signals = []
-    for index, row in data.iterrows():
-        if row['Buy Signal']:
-            signals.append({'Date': index, 'Signal Type': 'Entry', 'Price': row['Close']})
-        if row['Sell Signal']:
-            signals.append({'Date': index, 'Signal Type': 'Exit', 'Price': row['Close']})
-    
-    return data, pd.DataFrame(signals)
+    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']))
+    return data
 
 def plot_data(data):
     plt.figure(figsize=(10, 5))
@@ -39,6 +33,8 @@ def plot_data(data):
     plt.plot(data['Upper Band'], label='Upper Bollinger Band', linestyle='--')
     plt.plot(data['Middle Band'], label='Middle Bollinger Band', linestyle='--')
     plt.plot(data['Lower Band'], label='Lower Bollinger Band', linestyle='--')
+    plt.plot(data['MA5'], label='5-Day MA', color='green', linestyle='-.')
+    plt.plot(data['MA10'], label='10-Day MA', color='red', linestyle='-.')
     
     buy_signals = data[data['Buy Signal']]
     sell_signals = data[data['Sell Signal']]
@@ -60,16 +56,10 @@ def main():
     
     if st.button("Analyze"):
         data = fetch_data(ticker, start_date, end_date)
-        data, signals = calculate_indicators(data)
-        data, signals = identify_signals(data)
+        data = calculate_indicators(data)
+        data = identify_signals(data)
         plot_data(data)
         st.pyplot(plt)
-        if not signals.empty:
-            st.write("Trading Signals:")
-            st.dataframe(signals)
-        else:
-            st.write("No trading signals found for the selected period.")
 
 if __name__ == "__main__":
     main()
-