Update app.py

app.py

@@ -1,38 +1,44 @@
-# app.py
-
 import streamlit as st
 import pandas as pd
 from datetime import datetime, timedelta
 
-# Import your modules here
-from yfinance_data.fetcher import fetch_data_for_indicators
-from indicators.sma import add_sma_columns
+# Import our custom modules
+from yfinance_data.fetcher import fetch_stock_data
+from indicators.sma import calculate_21_50_sma
 from indicators.bollinger_bands import calculate_bollinger_bands
-from signals.strategy import generate_buy_signals, generate_sell_signals
-from utils.plotting import plot_stock_data
-
-# Initialize the app with Streamlit
-st.title('StockSwingApp: Stock Signal Generator')
-
-# User input for the stock symbol
-symbol = st.text_input('Enter the stock symbol:', value='AAPL')
-
-# Fetch the stock data
-data_4h, data_1h = fetch_data_for_indicators(symbol, days=90)  # Fetching more days to ensure we have enough data
-
-# Calculate indicators
-add_sma_columns(data_4h)
-add_sma_columns(data_1h)
-calculate_bollinger_bands(data_4h)
-
-# Generate signals
-buy_signals = generate_buy_signals(data_4h, data_1h)
-sell_signals = generate_sell_signals(data_4h)
-
-# Plotting
-st.write(f"Displaying indicators and signals for: {symbol}")
-plot_stock_data(data_4h, buy_signals=buy_signals, sell_signals=sell_signals, title=f"{symbol} Stock Analysis")
+from signals.strategy import generate_signals
+from utils.plotting import plot_stock_data_with_signals
+
+# Streamlit app title
+st.title('StockSwingApp: Stock Trading Signal Generator')
+
+# User inputs
+st.sidebar.header('User Input Parameters')
+default_symbol = 'AAPL'
+symbol = st.sidebar.text_input('Stock Symbol', value=default_symbol, max_chars=5).upper()
+start_date = st.sidebar.date_input('Start Date', value=datetime.now() - timedelta(days=365))
+end_date = st.sidebar.date_input('End Date', value=datetime.now())
+
+# Fetch stock data
+st.write(f"Fetching data for {symbol} from {start_date} to {end_date}...")
+stock_data = fetch_stock_data(symbol, start_date.strftime('%Y-%m-%d'), end_date.strftime('%Y-%m-%d'), interval='1d')
+
+if not stock_data.empty:
+    # Calculate indicators
+    stock_data_with_indicators = calculate_21_50_sma(stock_data)
+    stock_data_with_indicators = calculate_bollinger_bands(stock_data_with_indicators)
+
+    # Generate signals
+    signals_data = generate_signals(stock_data_with_indicators)
+
+    # Display the chart
+    st.write(f"Displaying data for {symbol}")
+    plot_stock_data_with_signals(signals_data)
+
+    # Optionally, display the data table
+    show_data = st.checkbox('Show Data Table')
+    if show_data:
+        st.write(signals_data)
+else:
+    st.write("No data available for the given inputs. Please try different parameters.")
 
-# Instructions for running the app
-st.markdown("""
-To run this app, ensure you have Streamlit and all required packages installed. Then, navigate to the directory containing this script and run: """)