Update app.py

app.py

@@ -1,10 +1,3 @@
-# =========================================================
-# TALib + mplfinance + Gradio
-# 1️⃣ Load Data (Internet only)
-# 2️⃣ Pattern Selection
-# 3️⃣ Build Candlestick Chart + Pattern Marking
-# =========================================================
-
 import yfinance as yf
 import pandas as pd
 import numpy as np
@@ -14,192 +7,125 @@ import gradio as gr
 import os
 from datetime import date
 
-# ---------------------------------------------------------
-# TALib Pattern Map (UI name → TALib name)
-# ---------------------------------------------------------
-TALIB_PATTERNS = sorted([p for p in dir(talib) if p.startswith("CDL")])
+# ---------------- TALib Patterns ----------------
+TALIB_PATTERNS = sorted(p for p in dir(talib) if p.startswith("CDL"))
 PATTERN_MAP = {p.replace("CDL", ""): p for p in TALIB_PATTERNS}
-PATTERN_CHOICES = ["None"] + list(PATTERN_MAP.keys())
+PATTERNS = ["None"] + list(PATTERN_MAP.keys())
 
-# ---------------------------------------------------------
-# DATA CLEANING (MultiIndex SAFE)
-# ---------------------------------------------------------
+# ---------------- Data Cleaning ----------------
 def clean_ohlc(df):
-    if df is None or df.empty:
-        raise ValueError("Empty dataframe")
-
     df = df.copy()
 
-    # ---- MultiIndex handling ----
     if isinstance(df.columns, pd.MultiIndex):
         df.columns = df.columns.get_level_values(0)
 
-    df.columns = list(df.columns)
+    df.columns = [c.lower() for c in df.columns]
     df.index.name = None
 
-    # normalize column names
-    df.columns = [str(c).lower().strip() for c in df.columns]
-
-    # rename to mplfinance standard
-    rename_map = {
+    df = df.rename(columns={
         "open": "Open",
         "high": "High",
         "low": "Low",
         "close": "Close",
         "volume": "Volume"
-    }
-    df = df.rename(columns=rename_map)
+    })
 
-    # ensure datetime index
-    if not isinstance(df.index, pd.DatetimeIndex):
-        df.index = pd.to_datetime(df.index, errors="coerce")
+    df.index = pd.to_datetime(df.index, errors="coerce")
 
-    # numeric conversion
-    for col in ["Open", "High", "Low", "Close", "Volume"]:
-        if col in df.columns:
-            df[col] = pd.to_numeric(df[col], errors="coerce")
+    for c in ["Open", "High", "Low", "Close", "Volume"]:
+        if c in df.columns:
+            df[c] = pd.to_numeric(df[c], errors="coerce")
 
-    # drop invalid rows
     df = df.dropna(subset=["Open", "High", "Low", "Close"])
     df = df.sort_index()
 
-    if df.empty:
-        raise ValueError("No valid OHLC data after cleaning")
-
     return df
 
-# ---------------------------------------------------------
-# 1️⃣ LOAD DATA (Internet only)
-# ---------------------------------------------------------
-def load_data(symbol, start_date, end_date):
+# ---------------- Load Data ----------------
+def load_data(symbol, start, end):
     if not symbol:
         return None, "❌ Symbol required"
 
-    try:
-        df = yf.download(symbol, start=start_date, end=end_date, progress=False)
-        if df.empty:
-            return None, "❌ No data found"
-
-        df = clean_ohlc(df)
-        return df, f"✅ Data loaded ({len(df)} rows)"
+    df = yf.download(symbol, start=start, end=end, progress=False)
+    if df.empty:
+        return None, "❌ No data found"
 
-    except Exception as e:
-        return None, f"❌ Load error: {e}"
+    df = clean_ohlc(df)
+    return df, f"✅ Loaded {len(df)} rows"
 
-# ---------------------------------------------------------
-# 2️⃣ PATTERN MARKER BUILDER
-# ---------------------------------------------------------
-def build_pattern_addplots(df, pattern):
+# ---------------- Pattern Builder ----------------
+def build_pattern(df, pattern):
     if pattern == "None":
         return []
 
-    talib_name = PATTERN_MAP.get(pattern)
-    func = getattr(talib, talib_name)
+    func = getattr(talib, PATTERN_MAP[pattern])
+    res = func(df["Open"], df["High"], df["Low"], df["Close"])
+    s = pd.Series(res, index=df.index)
 
-    result = func(
-        df["Open"].values,
-        df["High"].values,
-        df["Low"].values,
-        df["Close"].values
-    )
+    aps = []
 
-    s = pd.Series(result, index=df.index)
-    addplots = []
-
-    # bullish
     if (s > 0).any():
         bull = pd.Series(np.nan, index=df.index)
         bull[s > 0] = df["Low"][s > 0] * 0.98
-        addplots.append(
-            mpf.make_addplot(
-                bull,
-                type="scatter",
-                marker="^",
-                color="green",
-                markersize=90
-            )
-        )
-
-    # bearish
+        aps.append(mpf.make_addplot(bull, type="scatter",
+                                    marker="^", color="green", markersize=90))
+
     if (s < 0).any():
         bear = pd.Series(np.nan, index=df.index)
         bear[s < 0] = df["High"][s < 0] * 1.02
-        addplots.append(
-            mpf.make_addplot(
-                bear,
-                type="scatter",
-                marker="v",
-                color="red",
-                markersize=90
-            )
-        )
-
-    return addplots
-
-# ---------------------------------------------------------
-# 3️⃣ BUILD CANDLESTICK CHART (NO INTERNET)
-# ---------------------------------------------------------
+        aps.append(mpf.make_addplot(bear, type="scatter",
+                                    marker="v", color="red", markersize=90))
+
+    return aps
+
+# ---------------- Build Chart ----------------
 def build_chart(df, symbol, pattern):
     if df is None:
         return None, "❌ Load data first"
 
-    addplots = build_pattern_addplots(df, pattern)
-    has_volume = "Volume" in df.columns
-
+    addplots = build_pattern(df, pattern)
     os.makedirs("/tmp", exist_ok=True)
-    path = f"/tmp/{symbol}_candlestick_{pattern}.png"
+    path = f"/tmp/{symbol}_{pattern}.png"
 
     fig, _ = mpf.plot(
         df,
         type="candle",
-        volume=has_volume,
+        volume="Volume" in df.columns,
         addplot=addplots if addplots else None,
         style="yahoo",
-        title=f"{symbol} | Candlestick | {pattern}",
+        title=f"{symbol} | {pattern}",
         figscale=1.8,
         returnfig=True
     )
 
     fig.savefig(path, dpi=150, bbox_inches="tight")
-    return path, "✅ Candlestick chart built successfully"
+    return path, "✅ Chart rebuilt"
 
-# ---------------------------------------------------------
-# =================== GRADIO UI ===========================
-# ---------------------------------------------------------
+# ================= GRADIO APP =================
 with gr.Blocks(fill_height=True) as app:
-    gr.Markdown("## 📊 Candlestick Pattern Analyzer (Clean 3-Step App)")
+    gr.Markdown("## 📊 Candlestick Pattern Analyzer")
 
     state_df = gr.State(None)
 
-    # ---------------- LOAD DATA ----------------
+    # -------- Load Section --------
     with gr.Row():
-        with gr.Column():
-            gr.Markdown("### 1️⃣ Load Data")
-            symbol = gr.Textbox(label="Symbol", value="MSFT")
-            start = gr.Textbox(label="Start Date", value="2024-01-01")
-            end = gr.Textbox(
-                label="End Date",
-                value=date.today().strftime("%Y-%m-%d")
-            )
-            load_btn = gr.Button("Load Data", variant="primary")
-            load_status = gr.Textbox(label="Load Status")
-
-    # ---------------- BUILD SECTION ----------------
+        symbol = gr.Textbox(label="Symbol", value="MSFT")
+        start = gr.Textbox(label="Start Date", value="2024-01-01")
+        end = gr.Textbox(label="End Date", value=date.today().strftime("%Y-%m-%d"))
+        load_btn = gr.Button("Load Data", variant="primary")
+        load_status = gr.Textbox(label="Load Status")
+
+    # -------- Pattern + Chart --------
     with gr.Row():
         with gr.Column(scale=1):
-            gr.Markdown("### 2️⃣ Pattern")
-            pattern = gr.Dropdown(
-                PATTERN_CHOICES,
-                value="None"
-            )
-
-            build_btn = gr.Button("Build Chart", variant="primary")
+            pattern = gr.Dropdown(PATTERNS, value="None", label="Pattern")
+            build_btn = gr.Button("Build Chart")
 
         with gr.Column(scale=3):
-            chart = gr.Image(label="Candlestick Chart", height=600)
-            build_status = gr.Textbox(label="Build Status")
+            chart = gr.Image(height=600)
+            build_status = gr.Textbox(label="Status")
 
-    # ---------------- EVENTS ----------------
+    # -------- Events --------
     load_btn.click(
         load_data,
         inputs=[symbol, start, end],
@@ -212,5 +138,12 @@ with gr.Blocks(fill_height=True) as app:
         outputs=[chart, build_status]
     )
 
+    # 🔥 AUTO REBUILD WHEN PATTERN CHANGES
+    pattern.change(
+        build_chart,
+        inputs=[state_df, symbol, pattern],
+        outputs=[chart, build_status]
+    )
+
 if __name__ == "__main__":
     app.launch()