Update app.py

app.py

@@ -321,7 +321,10 @@ def calculate_cci(df, window=20):
     cci = (typical_price - sma) / (0.015 * mean_deviation)
     return cci
 
-def generate_trading_signals(df):
+import numpy as np
+import pandas as pd
+
+def generate_ultra_strict_signals(df):
     # Calculate various indicators
     df['SMA_30'] = calculate_sma(df, 30)
     df['SMA_100'] = calculate_sma(df, 100)
@@ -333,34 +336,44 @@ def generate_trading_signals(df):
     df['CMF'] = calculate_cmf(df)
     df['CCI'] = calculate_cci(df)
 
-    # Generate trading signals
-    df['SMA_Signal'] = np.where(df['SMA_30'] > df['SMA_100'], 1, 0)
+    # Ultra-strict SMA Signal - Require at least 3% difference
+    df['SMA_Signal'] = np.where((df['SMA_30'] > df['SMA_100']) & 
+                                 ((df['SMA_30'] - df['SMA_100']) / df['SMA_100'] > 0.03), 1, 0)
     
     macd, signal = calculate_macd(df)
-    df['MACD_Signal'] = np.select([(macd > signal) & (macd.shift(1) <= signal.shift(1)),
-                                    (macd < signal) & (macd.shift(1) >= signal.shift(1))],[1, -1], default=0)
-
-    df['RSI_Signal'] = np.where(df['RSI'] < 25, 1, 0)
-    df['RSI_Signal'] = np.where(df['RSI'] > 90, -1, df['RSI_Signal'])
     
-    df['BB_Signal'] = np.where(df['Close'] < df['LowerBB'], 0, 0)
-    df['BB_Signal'] = np.where(df['Close'] > df['UpperBB'], -1, df['BB_Signal'])
+    # Ultra-strict MACD Signal - Require a difference of at least 1.0
+    df['MACD_Signal'] = np.select([
+        (macd > signal) & (macd.shift(1) <= signal.shift(1)) & ((macd - signal) > 1.0),
+        (macd < signal) & (macd.shift(1) >= signal.shift(1)) & ((signal - macd) > 1.0)
+    ], [1, -1], default=0)
+    
+    # Ultra-strict RSI Signal - Extreme thresholds
+    df['RSI_Signal'] = np.where(df['RSI'] < 15, 1, 0)
+    df['RSI_Signal'] = np.where(df['RSI'] > 85, -1, df['RSI_Signal'])
+    
+    # Ultra-strict Bollinger Bands Signal - Require extreme deviations
+    df['BB_Signal'] = np.where(df['Close'] < df['LowerBB'] * 0.97, 1, 0)
+    df['BB_Signal'] = np.where(df['Close'] > df['UpperBB'] * 1.03, -1, df['BB_Signal'])
     
-    df['Stochastic_Signal'] = np.where((df['SlowK'] < 15) & (df['SlowD'] < 15), 1, 0)
+    # Ultra-strict Stochastic Signal - Extreme overbought/oversold conditions
+    df['Stochastic_Signal'] = np.where((df['SlowK'] < 5) & (df['SlowD'] < 5), 1, 0)
     df['Stochastic_Signal'] = np.where((df['SlowK'] > 95) & (df['SlowD'] > 95), -1, df['Stochastic_Signal'])
     
-    df['CMF_Signal'] = np.where(df['CMF'] > 0.4, -1, np.where(df['CMF'] < -0.4, 1, 0))
+    # Ultra-strict CMF Signal - Require stronger money flow confirmation
+    df['CMF_Signal'] = np.where(df['CMF'] > 0.5, -1, np.where(df['CMF'] < -0.5, 1, 0))
+    
+    # Ultra-strict CCI Signal - Require extreme deviations
+    df['CCI_Signal'] = np.where(df['CCI'] < -250, 1, 0)
+    df['CCI_Signal'] = np.where(df['CCI'] > 250, -1, df['CCI_Signal'])
+    
+    # Combined signal for ultra-strict confirmations
+    df['Combined_Signal'] = df[['MACD_Signal', 'RSI_Signal', 'BB_Signal', 
+                                'Stochastic_Signal', 'CMF_Signal', 'CCI_Signal']].sum(axis=1)
     
-    df['CCI_Signal'] = np.where(df['CCI'] < -195, 1, 0)
-    df['CCI_Signal'] = np.where(df['CCI'] > 190, -1, df['CCI_Signal'])
-
-    # Combined signal for stronger buy/sell points
-    df['Combined_Signal'] = df[['RSI_Signal', 'BB_Signal', 
-                              'Stochastic_Signal', 'CMF_Signal', 
-                              'CCI_Signal']].sum(axis=1)
-
     return df
 
+
 def plot_combined_signals(df, ticker):
     # Create a figure
     fig = go.Figure()
@@ -451,11 +464,11 @@ def plot_individual_signals(df, ticker):
 
     
     signal_colors = {
-    'RSI_Signal': {'buy': 'blueviolet', 'sell': 'lightpink'},  # Light purple / Pale butter
-    'BB_Signal': {'buy': 'blueviolet', 'sell': 'lightpink'},    # Purple / Chiffon yellow
-    'Stochastic_Signal': {'buy': 'blueviolet', 'sell': 'lightpink'},  # Purple / Corn silk
-    'CMF_Signal': {'buy': 'blueviolet', 'sell': 'lightpink'},  # Deep purple / Lemon chiffon
-    'CCI_Signal': {'buy': 'blueviolet', 'sell': 'lightpink'}   # Dark purple / Soft maize
+    'RSI_Signal': {'buy': 'violet', 'sell': 'lightpink'},  # Light purple / Pale butter
+    'BB_Signal': {'buy': 'violet', 'sell': 'lightpink'},    # Purple / Chiffon yellow
+    'Stochastic_Signal': {'buy': 'violet', 'sell': 'lightpink'},  # Purple / Corn silk
+    'CMF_Signal': {'buy': 'violet', 'sell': 'lightpink'},  # Deep purple / Lemon chiffon
+    'CCI_Signal': {'buy': 'violet', 'sell': 'lightpink'}   # Dark purple / Soft maize
 }