Update app.py

app.py

@@ -3,6 +3,7 @@ import json
 import logging
 import time
 import bisect
+import random
 from aiohttp import web
 import websockets
 
@@ -24,113 +25,77 @@ market_state = {
     "ready": False
 }
 
-# --- AI Logic Helper ---
-def generate_ai_commentary(diff_y):
+# --- AI Logic Helper (Prediction & S/R) ---
+def analyze_structure(diff_x, diff_y, current_mid):
     """
-    Analyzes the shape of the Liquidity Curve (Bids - Asks).
-    Splits data into 'Near' (Close to price) and 'Deep' (Far from price).
+    Analyzes the Net Liquidity Curve to find Support, Resistance, and Projected Trend.
     """
-    if not diff_y or len(diff_y) < 10:
-        return {"text": "Gathering depth data...", "sentiment": "neutral"}
-
-    # 1. Split the data
-    # First 20% of steps = Near-term (Active trading zone)
-    # Last 20% of steps = Deep-term (Macro walls)
-    split_idx = int(len(diff_y) * 0.2)
-    
-    near_data = diff_y[:split_idx]
-    deep_data = diff_y[-split_idx:]
+    if not diff_y or len(diff_y) < 5:
+        return None
+
+    # 1. Momentum Projection (Weighted average of the whole book)
+    # If the book is net positive, price wants to go up.
+    net_total = diff_y[-1] # Cumulative sum at max depth
+    # Scaling factor: heavily damped to prevent unrealistic predictions
+    momentum_shift = net_total * 0.5 
+    projected_price = current_mid + momentum_shift
+
+    # 2. Find Structural Reversals (Zero Crossings)
+    support_level = None
+    resistance_level = None
     
-    near_avg = sum(near_data) / len(near_data)
-    deep_avg = sum(deep_data) / len(deep_data)
+    # We look at the 'Near' book (first 50% of depth) for immediate reversal levels
+    scan_limit = len(diff_y) // 2
     
-    msg = ""
-    sentiment = "neutral"
-
-    # --- PATTERN RECOGNITION ---
-
-    # 1. POSITIVE -> NEGATIVE (The "False Floor" or "Overhead Resistance")
-    if near_avg > 0 and deep_avg < 0:
-        sentiment = "warning"
-        msg = (
-            f"📉 <b>STRUCTURAL FLIP (Pos ➝ Neg):</b><br>"
-            f"Near-term buyers are holding the price, BUT deeper liquidity reveals heavy sell pressure.<br>"
-            f"<i>Why?</i> Traders are defending the immediate level, but whales have placed large Ask walls higher up. "
-            f"Upside is capped; price may rally briefly then fail."
-        )
-
-    # 2. NEGATIVE -> POSITIVE (The "Bear Trap" or "Safety Net")
-    elif near_avg < 0 and deep_avg > 0:
-        sentiment = "bullish"
-        msg = (
-            f"📈 <b>STRUCTURAL FLIP (Neg ➝ Pos):</b><br>"
-            f"Immediate sell pressure is visible, BUT massive buy walls exist deeper down.<br>"
-            f"<i>Why?</i> Price is being suppressed locally, but smart money is waiting lower to absorb the dip. "
-            f"Downside is limited; this often precedes a bounce."
-        )
-
-    # 3. CONSISTENTLY POSITIVE (Full Bull)
-    elif near_avg > 0 and deep_avg > 0:
-        sentiment = "bullish"
-        strength = "Mild" if deep_avg < 50 else "Extreme"
-        msg = (
-            f"🚀 <b>FULL BULLISH CONVICTION:</b><br>"
-            f"Bids exceed Asks at both local and deep levels.<br>"
-            f"<i>Why?</i> There is no overhead supply. Buyers are aggressive at the current price AND stacking orders below. "
-            f"Path of least resistance is purely UP."
-        )
-
-    # 4. CONSISTENTLY NEGATIVE (Full Bear)
-    elif near_avg < 0 and deep_avg < 0:
-        sentiment = "bearish"
-        msg = (
-            f"🔻 <b>FULL BEARISH CONVICTION:</b><br>"
-            f"Asks exceed Bids at all levels.<br>"
-            f"<i>Why?</i> There is no support below. Sellers are active at the current price AND stacking orders higher. "
-            f"Price is likely to drift lower until buyers step in."
-        )
-
-    # 5. MIXED / CHOP
-    else:
-        diff = near_avg - deep_avg
-        if abs(diff) < 5:
-            msg = "⚖️ <b>PERFECT BALANCE:</b> Liquidity is symmetrical. Market is waiting for a trigger."
-        else:
-            msg = "🔄 <b>TRANSITIONING:</b> Orderbook structure is shifting. Watch for a dominant side to emerge."
-
-    return {"text": msg, "sentiment": sentiment}
+    for i in range(1, scan_limit):
+        prev_val = diff_y[i-1]
+        curr_val = diff_y[i]
+        dist = diff_x[i]
+
+        # Case A: Positive -> Negative (The "Ceiling")
+        # Buyers were in control, but suddenly Sellers take over at this distance.
+        # This implies a Resistance Wall at (Mid + Distance).
+        if prev_val > 0 and curr_val < 0 and resistance_level is None:
+            resistance_level = current_mid + dist
+
+        # Case B: Negative -> Positive (The "Floor")
+        # Sellers were in control, but suddenly Buyers take over at this distance.
+        # This implies a Support Wall at (Mid - Distance).
+        if prev_val < 0 and curr_val > 0 and support_level is None:
+            support_level = current_mid - dist
+
+    return {
+        "projected": projected_price,
+        "support": support_level,
+        "resistance": resistance_level,
+        "net_score": net_total
+    }
 
 # --- HTML Frontend ---
 HTML_PAGE = f"""
 <!DOCTYPE html>
 <html>
 <head>
-    <title>BTC-USD Structural AI</title>
+    <title>BTC-USD Predictive Dashboard</title>
     <script src="https://cdn.plot.ly/plotly-2.24.1.min.js"></script>
     <style>
         body {{ margin: 0; padding: 0; background-color: #0e0e0e; color: #ccc; font-family: 'Courier New', monospace; overflow: hidden; }}
         
         #container {{ display: flex; flex-direction: column; height: 100vh; width: 100vw; }}
         
-        /* Row 1: Charts */
         #row-top {{ flex: 1; display: flex; width: 100%; border-bottom: 1px solid #333; }}
-        
-        /* Row 2: Charts + AI */
         #row-bot {{ flex: 1; display: flex; width: 100%; }}
         
         .col {{ width: 50%; height: 100%; border-right: 1px solid #333; position: relative; }}
-        .col-ai {{ width: 50%; height: 100%; background-color: #080808; display: flex; flex-direction: column; padding: 10px; overflow-y: auto; }}
+        .col-ai {{ width: 50%; height: 100%; background-color: #050505; display: flex; flex-direction: column; padding: 10px; overflow-y: auto; }}
 
-        /* AI Text Styling */
-        .terminal-header {{ color: #00bcd4; font-weight: bold; border-bottom: 1px dashed #333; padding-bottom: 5px; margin-bottom: 10px; font-size: 16px; }}
-        .log-entry {{ margin-bottom: 12px; font-size: 13px; border-left: 4px solid transparent; padding-left: 10px; background: #111; padding: 8px; border-radius: 4px; }}
-        .log-time {{ color: #555; font-size: 11px; display: block; margin-bottom: 4px; }}
+        .terminal-header {{ color: #00bcd4; font-weight: bold; border-bottom: 1px dashed #333; padding-bottom: 5px; margin-bottom: 10px; }}
+        .log-entry {{ margin-bottom: 8px; font-size: 13px; border-left: 3px solid transparent; padding-left: 8px; }}
+        .log-time {{ color: #555; font-size: 11px; margin-right: 8px; }}
         
-        /* Sentiments */
-        .bullish {{ border-left-color: #00e676; }}
-        .bearish {{ border-left-color: #ff1744; }}
-        .neutral {{ border-left-color: #999; }}
-        .warning {{ border-left-color: #ff9800; }}
+        .bullish {{ border-left-color: #00e676; color: #e8f5e9; }}
+        .bearish {{ border-left-color: #ff1744; color: #ffebee; }}
+        .neutral {{ border-left-color: #999; color: #ccc; }}
 
         .chart {{ width: 100%; height: 100%; }}
         
@@ -140,12 +105,13 @@ HTML_PAGE = f"""
     </style>
 </head>
 <body>
-    <div id="status">Connecting...</div>
+    <div id="status">Initializing AI Model...</div>
     
     <div id="container">
         <!-- ROW 1 -->
         <div id="row-top">
             <div class="col">
+                <!-- PRICE + PREDICTION -->
                 <div id="price-chart" class="chart"></div>
             </div>
             <div class="col">
@@ -156,12 +122,10 @@ HTML_PAGE = f"""
         <!-- ROW 2 -->
         <div id="row-bot">
             <div class="col">
-                <!-- NET DIFFERENCE CHART -->
                 <div id="diff-chart" class="chart"></div>
             </div>
             <div class="col-ai">
-                <!-- AI TERMINAL -->
-                <div class="terminal-header">> DEPTH STRUCTURE ANALYSIS</div>
+                <div class="terminal-header">> PREDICTIVE ANALYTICS ENGINE</div>
                 <div id="terminal-logs"></div>
             </div>
         </div>
@@ -188,19 +152,15 @@ HTML_PAGE = f"""
             yaxis: {{ gridcolor: '#222' }}
         }};
 
-        function addLog(data) {{
-            // De-duplicate messages
-            if (data.comment.text === lastLogText) return;
-            lastLogText = data.comment.text;
+        function addLog(text, type) {{
+            if (text === lastLogText) return;
+            lastLogText = text;
 
             const div = document.createElement('div');
-            div.className = `log-entry ${{data.comment.sentiment}}`;
-            const timeStr = new Date().toLocaleTimeString();
-            div.innerHTML = `<span class="log-time">${{timeStr}}</span> ${{data.comment.text}}`;
-            
+            div.className = `log-entry ${{type}}`;
+            div.innerHTML = `<span class="log-time">${{new Date().toLocaleTimeString()}}</span> ${{text}}`;
             termLogs.prepend(div);
-            // Keep history short
-            if (termLogs.children.length > 10) termLogs.removeChild(termLogs.lastChild);
+            if (termLogs.children.length > 15) termLogs.removeChild(termLogs.lastChild);
         }}
 
         async function updateCharts() {{
@@ -215,41 +175,105 @@ HTML_PAGE = f"""
 
                 statusDiv.innerHTML = `Mid: <span class="${{data.mid >= data.prev_mid ? 'green' : 'red'}}">$${{data.mid.toLocaleString(undefined, {{minimumFractionDigits: 2}})}}</span>`;
 
-                // 1. Price
-                const tracePrice = {{ x: data.history.map(d=>new Date(d.t*1000)), y: data.history.map(d=>d.p), type: 'scatter', mode:'lines', line: {{color: '#29b6f6'}} }};
-                if (!initPrice) {{ Plotly.newPlot(priceDiv, [tracePrice], {{ ...commonLayout, title: '<b>Midprice</b>', xaxis: {{type:'date', gridcolor:'#222'}} }}, commonConfig); initPrice = true; }}
-                else {{ Plotly.react(priceDiv, [tracePrice], {{ ...commonLayout, title: '<b>Midprice</b>', xaxis: {{type:'date', gridcolor:'#222'}} }}, commonConfig); }}
+                // --- 1. PRICE CHART WITH PREDICTION & S/R LINES ---
+                
+                // Historical Price Trace
+                const historyX = data.history.map(d => new Date(d.t*1000));
+                const historyY = data.history.map(d => d.p);
+                const tracePrice = {{ x: historyX, y: historyY, type: 'scatter', mode:'lines', line: {{color: '#29b6f6', width: 2}}, name: 'Price' }};
+
+                // Future Projection Trace
+                let traceProj = {{}};
+                const lastTime = historyX[historyX.length-1];
+                if (data.analysis && lastTime) {{
+                    const futureTime = new Date(lastTime.getTime() + 60000); // +1 min
+                    traceProj = {{
+                        x: [lastTime, futureTime],
+                        y: [historyY[historyY.length-1], data.analysis.projected],
+                        type: 'scatter', mode: 'lines', 
+                        line: {{color: '#ff9800', width: 2, dash: 'dot'}}, 
+                        name: 'Forecast'
+                    }};
+                }}
+
+                // Support & Resistance Shapes
+                const shapes = [];
+                let logMsg = "";
+                let logType = "neutral";
+
+                if (data.analysis) {{
+                    // Support Line (Green)
+                    if (data.analysis.support) {{
+                        shapes.push({{
+                            type: 'line', x0: historyX[0], x1: lastTime, 
+                            y0: data.analysis.support, y1: data.analysis.support,
+                            line: {{color: '#00e676', width: 1, dash: 'dash'}}
+                        }});
+                        // Add Annotation via Layout? keeping it simple with shapes for now
+                    }}
+                    
+                    // Resistance Line (Red)
+                    if (data.analysis.resistance) {{
+                        shapes.push({{
+                            type: 'line', x0: historyX[0], x1: lastTime, 
+                            y0: data.analysis.resistance, y1: data.analysis.resistance,
+                            line: {{color: '#ff1744', width: 1, dash: 'dash'}}
+                        }});
+                    }}
+
+                    // AI Commentary Logic based on Prediction
+                    const net = data.analysis.net_score;
+                    if (data.analysis.support && !data.analysis.resistance) {{
+                        logMsg = `🧱 <b>FLOOR DETECTED:</b> Strong Support at $${{data.analysis.support.toFixed(0)}}. Price expected to bounce.`;
+                        logType = "bullish";
+                    }} else if (!data.analysis.support && data.analysis.resistance) {{
+                        logMsg = `🧱 <b>CEILING DETECTED:</b> Resistance at $${{data.analysis.resistance.toFixed(0)}}. Upside capped.`;
+                        logType = "bearish";
+                    }} else if (net > 30) {{
+                        logMsg = `🚀 <b>MOMENTUM:</b> Liquidity is purely Bullish. Target: $${{data.analysis.projected.toFixed(0)}}`;
+                        logType = "bullish";
+                    }} else if (net < -30) {{
+                        logMsg = `📉 <b>MOMENTUM:</b> Liquidity is purely Bearish. Target: $${{data.analysis.projected.toFixed(0)}}`;
+                        logType = "bearish";
+                    }} else {{
+                        logMsg = `⚖️ <b>RANGE BOUND:</b> Price stuck between flows.`;
+                    }}
+                }}
+                
+                if (logMsg) addLog(logMsg, logType);
 
-                // 2. Volume
+                const priceLayout = {{ 
+                    ...commonLayout, 
+                    title: '<b>Price Analysis & Forecast</b>', 
+                    xaxis: {{type:'date', gridcolor:'#222'}},
+                    shapes: shapes
+                }};
+
+                if (!initPrice) {{ Plotly.newPlot(priceDiv, [tracePrice, traceProj], priceLayout, commonConfig); initPrice = true; }}
+                else {{ Plotly.react(priceDiv, [tracePrice, traceProj], priceLayout, commonConfig); }}
+
+
+                // --- 2. VOLUME CHART ---
                 const tracesVol = [
-                    {{ x: data.vol.dist_bids, y: data.vol.vol_bids, type: 'scatter', name: 'Bid', line: {{color: '#00e676'}} }},
+                    {{ x: data.vol.dist_bids, y: data.vol.vol_bids, type: 'scatter', name: 'Bids', line: {{color: '#00e676'}} }},
                     {{ x: data.vol.dist_asks, y: data.vol.vol_asks, type: 'scatter', name: 'Ask', line: {{color: '#ff1744'}} }}
                 ];
                 if (!initVol) {{ Plotly.newPlot(volDiv, tracesVol, {{ ...commonLayout, title: '<b>Cumulative Volume</b>', xaxis: {{title:'Distance ($)'}} }}, commonConfig); initVol = true; }}
                 else {{ Plotly.react(volDiv, tracesVol, {{ ...commonLayout, title: '<b>Cumulative Volume</b>', xaxis: {{title:'Distance ($)'}} }}, commonConfig); }}
 
-                // 3. Net Difference (Bids - Asks)
-                const traceDiff = {{ 
-                    x: data.diff.x, 
-                    y: data.diff.y, 
-                    type: 'scatter', 
-                    mode: 'lines', 
-                    fill: 'tozeroy', 
-                    line: {{color: '#e040fb', width: 2}} 
-                }};
-                // Draw a zero line for reference
-                const layoutDiff = {{ 
+
+                // --- 3. NET DIFFERENCE ---
+                const traceDiff = {{ x: data.diff.x, y: data.diff.y, type: 'scatter', mode: 'lines', fill: 'tozeroy', line: {{color: '#e040fb', width: 2}} }};
+                // Add Zero Line
+                const diffLayout = {{ 
                     ...commonLayout, 
                     title: '<b>Net Liquidity (Bids - Asks)</b>', 
                     xaxis: {{title:'Distance ($)'}},
-                    shapes: [{{ type: 'line', x0: 0, x1: 1, xref: 'paper', y0: 0, y1: 0, line: {{color: '#666', width: 1, dash:'dot'}} }}]
+                    shapes: [{{ type: 'line', x0: 0, x1: 1, xref: 'paper', y0: 0, y1: 0, line: {{color: '#666', width: 1}} }}]
                 }};
                 
-                if (!initDiff) {{ Plotly.newPlot(diffDiv, [traceDiff], layoutDiff, commonConfig); initDiff = true; }}
-                else {{ Plotly.react(diffDiv, [traceDiff], layoutDiff, commonConfig); }}
-
-                // 4. AI Log
-                addLog(data);
+                if (!initDiff) {{ Plotly.newPlot(diffDiv, [traceDiff], diffLayout, commonConfig); initDiff = true; }}
+                else {{ Plotly.react(diffDiv, [traceDiff], diffLayout, commonConfig); }}
 
             }} catch (e) {{ console.error("Fetch error:", e); }}
         }}
@@ -318,7 +342,7 @@ async def handle_data(request):
     raw_bids = sorted(market_state['bids'].items(), key=lambda x: -x[0])[:300]
     raw_asks = sorted(market_state['asks'].items(), key=lambda x: x[0])[:300]
 
-    # Calculate Distances & Cum Volumes
+    # Calculate Distances
     d_b_x, d_b_y, cum = [], [], 0
     for p, q in raw_bids:
         d = mid - p
@@ -348,19 +372,18 @@ async def handle_data(request):
             idx_a = bisect.bisect_right(d_a_x, s)
             vol_a = d_a_y[idx_a-1] if idx_a > 0 else 0
             
-            val = vol_b - vol_a
             diff_x.append(s)
-            diff_y.append(val)
+            diff_y.append(vol_b - vol_a)
 
-    # --- Generate AI Commentary ---
-    ai_output = generate_ai_commentary(diff_y)
+    # --- Run AI Analysis ---
+    analysis = analyze_structure(diff_x, diff_y, mid)
 
     return web.json_response({
         "mid": mid,
         "prev_mid": market_state['prev_mid'],
         "vol": { "dist_bids": d_b_x, "vol_bids": d_b_y, "dist_asks": d_a_x, "vol_asks": d_a_y },
         "diff": { "x": diff_x, "y": diff_y },
-        "comment": ai_output,
+        "analysis": analysis,
         "history": market_state['history']
     })
 
@@ -384,7 +407,7 @@ async def main():
     site = web.TCPSite(runner, '0.0.0.0', PORT)
     await site.start()
     
-    print(f"🚀 BTC-USD Deep Structure Dashboard: http://localhost:{PORT}")
+    print(f"🚀 BTC-USD Predictive Dashboard: http://localhost:{PORT}")
     await asyncio.Event().wait()
 
 if __name__ == "__main__":