Update app.py

app.py

@@ -1,6 +1,6 @@
 import numpy as np
-import pandas as pd
 import yfinance as yf
+import pandas as pd
 import plotly.graph_objects as go
 import streamlit as st
 from datetime import datetime, timedelta
@@ -9,7 +9,6 @@ from sklearn.cluster import KMeans
 import matplotlib.pyplot as plt
 
 # Streamlit app
-
 st.set_page_config(page_title="Identifying Key Support and Resistance In Price Levels", layout="wide")
 st.title('Key Support and Resistance In Price Levels')
 
@@ -31,8 +30,6 @@ with st.expander("Click here to read the description of each method:", expanded=
 # Sidebar: How to use and Input Parameters
 st.sidebar.title('Input Parameters')
 
-#st.sidebar.subheader('How to use:')
-
 with st.sidebar.expander("How to use:", expanded=False):
     st.markdown("""
     1. **Enter Ticker**: Specify a stock ticker or crypto pair.
@@ -41,14 +38,12 @@ with st.sidebar.expander("How to use:", expanded=False):
     4. **Run Analysis**: Click 'Run' to generate results.
     """)
 
-# Expander for ticker and date settings
 with st.sidebar.expander("Ticker and Date Settings", expanded=True):
     st.write("Specify the ticker and date range for analysis.")
     ticker = st.text_input('Stock Ticker or Crypto Pair', 'AAPL', help="Enter stock ticker (e.g., AAPL) or crypto pair (e.g., BTC-USD).")
     start_date = st.date_input('Start Date', pd.to_datetime('2023-01-01'))
     end_date = st.date_input('End Date', datetime.now() + timedelta(days=1))
 
-# Expander for methodology-specific parameters
 with st.sidebar.expander("Pivot Points and Levels", expanded=True):
     window_period = st.slider('Window Period for Pivot Points and Levels', min_value=10, max_value=60, value=30, help="Set the window period for calculating pivot points and support/resistance levels.")
 
@@ -59,15 +54,24 @@ with st.sidebar.expander("Volume Profile and KMeans", expanded=True):
     n_days = st.slider('Lookback Period for Volume Profile and KMeans (Days)', min_value=30, max_value=365, value=60, help="Set the number of days for calculating volume profile and KMeans clustering.")
     num_clusters = st.slider('Number of Clusters for KMeans', min_value=2, max_value=10, value=3, help="Set the number of clusters for KMeans analysis.")
 
-# Define functions for different analyses
+# --- Helper function to ensure a column is a Series ---
+def get_series(col):
+    if isinstance(col, pd.DataFrame):
+        return col.iloc[:, 0]
+    return col
+
+# Adjusted Pivot Points function
 def calculate_pivot_points(df, window):
-    df['Pivot'] = df['Close'].rolling(window=window).mean()
-    # Ensure that the min/max calculations return a Series, not a DataFrame with extra dimensions
-    df['R1'] = (2 * df['Pivot'] - df['Low'].rolling(window=window).min()).squeeze()
-    df['S1'] = (2 * df['Pivot'] - df['High'].rolling(window=window).max()).squeeze()
-    df['R2'] = (df['Pivot'] + (df['High'].rolling(window=window).max() - df['Low'].rolling(window=window).min())).squeeze()
-    df['S2'] = (df['Pivot'] - (df['High'].rolling(window=window).max() - df['Low'].rolling(window=window).min())).squeeze()
+    # Ensure each column is a Series
+    close = get_series(df['Close'])
+    low = get_series(df['Low'])
+    high = get_series(df['High'])
     
+    df['Pivot'] = close.rolling(window=window).mean()
+    df['R1'] = 2 * df['Pivot'] - low.rolling(window=window).min()
+    df['S1'] = 2 * df['Pivot'] - high.rolling(window=window).max()
+    df['R2'] = df['Pivot'] + (high.rolling(window=window).max() - low.rolling(window=window).min())
+    df['S2'] = df['Pivot'] - (high.rolling(window=window).max() - low.rolling(window=window).min())
     return df
 
 def find_levels(data, window):
@@ -137,11 +141,11 @@ if st.sidebar.button('Run Analysis'):
         # Plot Pivot Points
         st.write("### Pivot Points")
         st.markdown("""
-        **Pivot Points** are short-term trend indicators used to determine potential support and resistance levels. The central pivot point, as well as derived support and resistance levels, are calculated using the high, low, and close prices of a previous period (usually the previous day for day trading).
+        **Pivot Points** are short-term trend indicators used to determine potential support and resistance levels based on the high, low, and close prices of previous periods.
         - **Pivot Point (P)**: The average of the high, low, and close of the previous trading period. 
         - **First Resistance (R1)**: Calculated by doubling the pivot point and then subtracting the previous low.
         - **First Support (S1)**: Derived by doubling the pivot point and then subtracting the previous high.
-        - **Second Resistance (R2)**: Obtained by adding the difference of high and low (the range) to the pivot point.
+        - **Second Resistance (R2)**: Obtained by adding the range (High - Low) to the pivot point.
         - **Second Support (S2)**: Found by subtracting the range from the pivot point.
         """)
         
@@ -157,18 +161,15 @@ if st.sidebar.button('Run Analysis'):
             xaxis_title='Date',
             yaxis_title='Price',
             legend_title='Legend',
-            width=1200,  # Set desired width
-            height=600   # Set desired height
+            width=1200,
+            height=600
         )
         st.plotly_chart(fig1, use_container_width=True)
 
         # Plot Support and Resistance Levels using Rolling Midpoint Range
         st.write("### Rolling Midpoint Range")
         st.markdown("""
-        **Support and Resistance Levels** This method uses a rolling window to identify these levels. This provides a dynamic approach to pinpointing key price levels.
-        - **Support Level**: Calculated as the rolling minimum price over the specified window period. It acts as a floor where buying interest is strong enough to prevent further price declines.
-        - **Resistance Level**: Calculated as the rolling maximum price over the specified window period. It acts as a ceiling where selling interest prevents the price from rising further.
-        In this analysis, the support and resistance levels are determined using a rolling window approach. Significant breaks above resistance and below support are highlighted, especially when accompanied by higher-than-average trading volumes, which could indicate potential breakout or breakdown scenarios.
+        **Support and Resistance Levels** are determined using a rolling window approach to calculate the dynamic minimum (support) and maximum (resistance) prices over a given period.
         """)
         
         fig2 = go.Figure()
@@ -182,8 +183,8 @@ if st.sidebar.button('Run Analysis'):
             xaxis_title='Date',
             yaxis_title='Price',
             legend_title='Legend',
-            width=1200,  # Set desired width
-            height=600   # Set desired height
+            width=1200,
+            height=600
         )
         st.plotly_chart(fig2, use_container_width=True)
 
@@ -204,16 +205,15 @@ if st.sidebar.button('Run Analysis'):
             xaxis_title='Date',
             yaxis_title='Price',
             legend_title='Legend',
-            width=1200,  # Set desired width
-            height=600   # Set desired height
+            width=1200,
+            height=600
         )
         st.plotly_chart(fig3, use_container_width=True)
 
         # Plot Fibonacci Retracement Levels
         st.write("### Fibonacci Retracement Levels")
         st.markdown("""
-        **Fibonacci Retracement Levels** are horizontal lines that indicate where support and resistance are likely to occur. They are based on Fibonacci numbers and are used to predict the future movement of asset prices. 
-        - **Levels**: 23.6%, 38.2%, 50%, 61.8%, and 78.6% represent key points where the price could potentially reverse.
+        **Fibonacci Retracement Levels** are horizontal lines indicating potential support and resistance based on Fibonacci ratios.
         """)
         
         fig4 = go.Figure()
@@ -226,20 +226,15 @@ if st.sidebar.button('Run Analysis'):
             xaxis_title='Date',
             yaxis_title='Price',
             legend_title='Legend',
-            width=1200,  # Set desired width
-            height=600   # Set desired height
+            width=1200,
+            height=600
         )
         st.plotly_chart(fig4, use_container_width=True)
 
         # Plot Trendlines
         st.write("### Trendlines with Regression Analysis")
         st.markdown("""
-        **Trendlines** are straight lines drawn on a price chart to connect two or more price points. They help identify the direction of the market trend and potential areas of support and resistance. In this analysis, trendlines are determined using regression analysis to fit the lines through swing highs and lows.
-        - **Upper Trendline**: Connects higher highs using linear regression to fit a line through these points. This line acts as a resistance level.
-        - **Lower Trendline**: Connects lower lows using linear regression to fit a line through these points. This line acts as a support level.
-        1. **Swing Highs and Lows Identification**: First, local maxima (swing highs) and minima (swing lows) are identified using a specified lookback period.
-        2. **Linear Regression**: A linear regression is then applied to the swing highs to form the upper trendline and to the swing lows to form the lower trendline. 
-        3. **Visualization**: The trendlines are plotted along with the stock's closing prices to represent of potential resistance and support levels.
+        **Trendlines** are drawn using regression on swing highs and lows to indicate potential support and resistance.
         """)
         
         fig5 = go.Figure()
@@ -261,16 +256,15 @@ if st.sidebar.button('Run Analysis'):
             xaxis_title='Date',
             yaxis_title='Price',
             legend_title='Legend',
-            width=1200,  # Set desired width
-            height=600   # Set desired height
+            width=1200,
+            height=600
         )
         st.plotly_chart(fig5, use_container_width=True)
 
         # Plot Volume Profile
         st.write("### Volume Profile")
         st.markdown("""
-        **Volume Profile** is a charting tool that shows the amount of volume traded at different price levels over a specified period. It helps identify areas of high trading activity, which can act as support or resistance. 
-        - **High Volume Areas**: Indicate significant trading activity and can act as strong support or resistance levels.
+        **Volume Profile** shows the amount of volume traded at different price levels over a specified period.
         """)
         
         fig6, (ax1, ax2) = plt.subplots(nrows=1, ncols=2, figsize=(20, 5), gridspec_kw={'width_ratios': [3, 1]})
@@ -301,8 +295,7 @@ if st.sidebar.button('Run Analysis'):
         # Plot KMeans Clusters
         st.write("### KMeans Clusters")
         st.markdown("""
-        **KMeans Clustering** is a machine learning algorithm used to partition a dataset into clusters. In the context of stock prices, it helps identify patterns and group similar price movements together.
-        - **Clusters**: Represent different regimes or phases in the stock price movements.
+        **KMeans Clustering** partitions the price data into clusters to identify significant price levels.
         """)
         
         fig7 = go.Figure()
@@ -317,8 +310,8 @@ if st.sidebar.button('Run Analysis'):
             xaxis_title='Date',
             yaxis_title='Price',
             legend_title='Legend',
-            width=1200,  # Set desired width
-            height=600   # Set desired height
+            width=1200,
+            height=600
         )
         st.plotly_chart(fig7, use_container_width=True)
 
@@ -331,4 +324,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)