Update app.py

app.py

@@ -3,96 +3,115 @@ import pandas as pd
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
 from io import BytesIO
-import gradio as gr
-from PIL import Image
 from PIL import Image
+import gradio as gr
 
-# Fetch MEXC OHLCV data
-def fetch_ohlcv(symbol='BTC/USDT', timeframe='1h', limit=100):
+# 📊 Fetch data from MEXC
+def fetch_ohlcv(symbol='BTC/USDT', timeframe='1h', limit=150):
     exchange = ccxt.mexc()
     ohlcv = exchange.fetch_ohlcv(symbol, timeframe=timeframe, limit=limit)
     df = pd.DataFrame(ohlcv, columns=['timestamp', 'open', 'high', 'low', 'close', 'volume'])
     df['timestamp'] = pd.to_datetime(df['timestamp'], unit='ms')
     return df
 
-# Calculate indicators
-def calculate_rsi(df, period=14):
-    delta = df['close'].diff()
-    gain = delta.clip(lower=0)
-    loss = -delta.clip(upper=0)
-
-    avg_gain = gain.rolling(window=period).mean()
-    avg_loss = loss.rolling(window=period).mean()
-
-    rs = avg_gain / avg_loss
-    rsi = 100 - (100 / (1 + rs))
-    return rsi
-
-def calculate_macd(df):
-    ema12 = df['close'].ewm(span=12, adjust=False).mean()
-    ema26 = df['close'].ewm(span=26, adjust=False).mean()
-    macd = ema12 - ema26
-    signal = macd.ewm(span=9, adjust=False).mean()
-    return macd, signal
-
-def generate_signal(df):
-    rsi = calculate_rsi(df)
-    macd, signal = calculate_macd(df)
-
-    if len(rsi) < 1 or len(macd) < 1 or len(signal) < 1:
-        return "Not enough data"
-
-    latest_rsi = rsi.iloc[-1]
-    latest_macd = macd.iloc[-1]
-    latest_signal = signal.iloc[-1]
-
-    if latest_rsi < 30 and latest_macd > latest_signal:
-        return "BUY"
-    elif latest_rsi > 70 and latest_macd < latest_signal:
-        return "SELL"
+# 📈 Calculate indicators
+def calculate_ema(df, span):
+    return df['close'].ewm(span=span, adjust=False).mean()
+
+def calculate_supertrend(df, period=10, multiplier=3):
+    atr = df['high'].rolling(period).max() - df['low'].rolling(period).min()
+    atr = atr.rolling(period).mean()
+    
+    hl2 = (df['high'] + df['low']) / 2
+    upperband = hl2 + multiplier * atr
+    lowerband = hl2 - multiplier * atr
+
+    supertrend = [True]  # True for bullish, False for bearish
+    for i in range(1, len(df)):
+        if df['close'][i] > upperband[i - 1]:
+            supertrend.append(True)
+        elif df['close'][i] < lowerband[i - 1]:
+            supertrend.append(False)
+        else:
+            supertrend.append(supertrend[i - 1])
+    return supertrend
+
+# 🔍 Generate signal logic
+def generate_combined_signal(df):
+    df['ema_50'] = calculate_ema(df, 50)
+    df['ema_200'] = calculate_ema(df, 200)
+    df['supertrend'] = calculate_supertrend(df)
+
+    ema_signal = None
+    if df['ema_50'].iloc[-1] > df['ema_200'].iloc[-1]:
+        ema_signal = 'BULLISH'
+    elif df['ema_50'].iloc[-1] < df['ema_200'].iloc[-1]:
+        ema_signal = 'BEARISH'
+
+    supertrend_signal = 'BULLISH' if df['supertrend'].iloc[-1] else 'BEARISH'
+
+    if ema_signal == 'BULLISH' and supertrend_signal == 'BULLISH':
+        return "🔥 STRONG BUY"
+    elif ema_signal == 'BEARISH' and supertrend_signal == 'BEARISH':
+        return "💀 STRONG SELL"
+    elif ema_signal == supertrend_signal:
+        return f"⚠️ {ema_signal}"
     else:
-        return "HOLD"
+        return "🤔 NEUTRAL / HOLD"
 
-# Plot candlestick chart
-def plot_candlestick(df):
-    df = df.tail(50).copy()
+# 📊 Candlestick + indicator chart
+def plot_chart(df):
+    df = df.copy().tail(100)
     df['timestamp'] = pd.to_datetime(df['timestamp'])
 
-    fig, ax = plt.subplots(figsize=(8, 4))
+    df['ema_50'] = calculate_ema(df, 50)
+    df['ema_200'] = calculate_ema(df, 200)
+    df['supertrend'] = calculate_supertrend(df)
+
+    fig, ax = plt.subplots(figsize=(10, 5))
 
+    # Plot candles
     for _, row in df.iterrows():
         color = 'green' if row['close'] >= row['open'] else 'red'
-        ax.plot([row['timestamp'], row['timestamp']], [row['low'], row['high']], color='black')
-        ax.plot([row['timestamp'], row['timestamp']], [row['open'], row['close']], color=color, linewidth=5)
-
-    ax.xaxis.set_major_formatter(mdates.DateFormatter('%H:%M'))
-    ax.xaxis.set_major_locator(mdates.AutoDateLocator())
+        ax.plot([row['timestamp'], row['timestamp']], [row['low'], row['high']], color='black', linewidth=1)
+        ax.plot([row['timestamp'], row['timestamp']], [row['open'], row['close']], color=color, linewidth=4)
+
+    # Plot EMAs
+    ax.plot(df['timestamp'], df['ema_50'], label='EMA 50', color='orange', linewidth=1.5)
+    ax.plot(df['timestamp'], df['ema_200'], label='EMA 200', color='purple', linewidth=1.5)
+
+    # Plot Supertrend as dots
+    for i in range(1, len(df)):
+        if df['supertrend'].iloc[i]:
+            ax.scatter(df['timestamp'].iloc[i], df['low'].iloc[i] - 0.5, color='green', marker='^', label='Buy' if i == 1 else "", s=60)
+        else:
+            ax.scatter(df['timestamp'].iloc[i], df['high'].iloc[i] + 0.5, color='red', marker='v', label='Sell' if i == 1 else "", s=60)
+
+    ax.xaxis.set_major_formatter(mdates.DateFormatter('%m-%d %H:%M'))
+    ax.legend()
     plt.xticks(rotation=45)
-    plt.title('Candlestick Chart (MEXC)')
+    plt.title("Crypto Chart with LuxAlgo-Inspired Signals")
     plt.tight_layout()
 
-    # Save chart to image object
     buf = BytesIO()
     plt.savefig(buf, format='png')
     buf.seek(0)
     plt.close(fig)
     return Image.open(buf)
 
-
-# Main function
+# 🔁 Main analysis
 def analyze(pair, timeframe):
     try:
-        df = fetch_ohlcv(symbol=pair, timeframe=timeframe)
+        df = fetch_ohlcv(pair, timeframe)
         if df.empty:
-            return "❌ No data returned from MEXC", None
-
-        signal = generate_signal(df)
-        chart = plot_candlestick(df)
-        return f"📊 Signal: {signal}", chart
+            return "❌ No data available", None
+        signal = generate_combined_signal(df)
+        chart = plot_chart(df)
+        return signal, chart
     except Exception as e:
         return f"❌ Error: {str(e)}", None
 
-# Gradio UI
+# 🌐 Gradio UI
 pairs = ['BTC/USDT', 'ETH/USDT', 'MX/USDT', 'SOL/USDT']
 timeframes = ['1m', '5m', '15m', '1h', '4h']
 
@@ -103,9 +122,9 @@ gr.Interface(
         gr.Dropdown(choices=timeframes, label="Timeframe")
     ],
     outputs=[
-        gr.Text(label="Trading Signal"),
-        gr.Image(label="Candlestick Chart")
+        gr.Text(label="LuxAlgo-Inspired Signal"),
+        gr.Image(label="Chart with Indicators")
     ],
-    title="🧠 Crypto Signal Generator (MEXC)",
-    description="Live BUY / SELL / HOLD signals based on RSI & MACD indicators using MEXC data."
+    title="💡 Crypto Signal Generator (Inspired by LuxAlgo)",
+    description="Signals based on EMA Cross & SuperTrend, visualized with candlestick chart and arrows."
 ).launch()