Spaces:

Alvin3y1
/

test

Sleeping

App Files Files Community

Alvin3y1 commited on 13 days ago

Commit

66a96ba

verified ·

1 Parent(s): 74c1714

Update app.py

Browse files

Files changed (1) hide show

app.py +79 -73

app.py CHANGED Viewed

@@ -28,16 +28,11 @@ market_state = {
 # --- AI Logic Helper ---
 def generate_ai_commentary(diff_y, mid, prev_mid):
-    """
-    Analyzes the Net Liquidity (diff_y) and Price Action to generate commentary.
-    diff_y is a list of (BidVol - AskVol) at increasing distances.
-    """
     if not diff_y:
-        return {"text": "Initializing analysis...", "sentiment": "neutral"}
     # 1. Calculate Aggregates
     net_total = diff_y[-1] # Total Net Liquidity at max depth
-    avg_liquidity = sum(diff_y) / len(diff_y)
     # 2. Price Trend
     price_delta = mid - prev_mid
@@ -46,37 +41,35 @@ def generate_ai_commentary(diff_y, mid, prev_mid):
     msg = ""
     sentiment = "neutral"
-    # -- SCENARIO 1: STRONG DIRECTIONAL --
     if net_total > 50:
         sentiment = "bullish"
-        msg = f"🚀 <b>STRONG BUY SUPPORT:</b> Net surplus of {int(net_total)} BTC. Orderbook is heavily tilted towards Bids."
     elif net_total < -50:
         sentiment = "bearish"
-        msg = f"📉 <b>HEAVY SELL PRESSURE:</b> Net deficit of {int(net_total)} BTC. Sellers are dominating the book."
-    # -- SCENARIO 2: ABSORPTION / DIVERGENCE --
-    # Price dropping, but Orderbook is Bullish (Bids absorbing sells)
-    elif price_delta < 0 and net_total > 20:
         sentiment = "warning"
-        msg = f"🛡️ <b>ABSORPTION DETECTED:</b> Price is falling, but Bid depth is increasing (+{int(net_total)} BTC). Passive buyers are catching the dump."
-    # Price rising, but Orderbook is Bearish (Asks absorbing buys)
-    elif price_delta > 0 and net_total < -20:
         sentiment = "warning"
-        msg = f"🧱 <b>HIDDEN WALL:</b> Price is rising into heavy Sell liquidity ({int(net_total)} BTC diff). Breakout might fail."
-    # -- SCENARIO 3: EQUILIBRIUM --
     elif abs(net_total) < 10:
         sentiment = "neutral"
-        msg = f"⚖️ <b>EQUILIBRIUM:</b> Bids and Asks are perfectly balanced. Expect low volatility or a sudden breakout."
     # -- SCENARIO 4: MOMENTUM --
     else:
         if net_total > 0:
-            msg = f"📈 <b>Bullish Bias:</b> Moderate buy support (+{int(net_total)} BTC). Path of least resistance is UP."
             sentiment = "bullish"
         else:
-            msg = f"📉 <b>Bearish Bias:</b> Moderate sell overhang ({int(net_total)} BTC). Path of least resistance is DOWN."
     return {"text": msg, "sentiment": sentiment, "net": net_total}
@@ -85,7 +78,7 @@ HTML_PAGE = f"""
 <!DOCTYPE html>
 <html>
 <head>
-    <title>BTC-USD AI Analyst</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; }}
@@ -93,28 +86,26 @@ HTML_PAGE = f"""
         /* Layout Grid */
         #container {{ display: flex; flex-direction: column; height: 100vh; width: 100vw; }}
-        /* Row 1: Charts (60% Height) */
-        #row-charts {{ flex: 6; display: flex; width: 100%; border-bottom: 2px solid #333; }}
-        .col-chart {{ width: 50%; height: 100%; border-right: 1px solid #333; }}
-        /* Row 2: AI Terminal (40% Height) */
-        #row-terminal {{ flex: 4; display: flex; flex-direction: column; background-color: #050505; padding: 10px; overflow-y: auto; }}
         /* Terminal Styling */
         .terminal-header {{ color: #00bcd4; font-weight: bold; border-bottom: 1px dashed #333; padding-bottom: 5px; margin-bottom: 10px; }}
-        .log-entry {{ margin-bottom: 6px; font-size: 14px; line-height: 1.4; border-left: 3px solid transparent; padding-left: 8px; }}
-        .log-time {{ color: #666; font-size: 12px; margin-right: 10px; }}
-        /* Sentiment Colors */
         .bullish {{ border-left-color: #00e676; color: #e8f5e9; }}
         .bearish {{ border-left-color: #ff1744; color: #ffebee; }}
         .neutral {{ border-left-color: #999; color: #ccc; }}
         .warning {{ border-left-color: #ff9800; color: #fff3e0; }}
-        /* Highlight classes for inner HTML */
-        b {{ font-weight: bold; }}
-        /* Charts fill their containers */
         .chart {{ width: 100%; height: 100%; }}
         #status {{ position: absolute; top: 10px; left: 60px; z-index: 100; font-size: 14px; background: rgba(0,0,0,0.8); padding: 5px 10px; border-radius: 4px; border: 1px solid #333; }}
@@ -123,33 +114,41 @@ HTML_PAGE = f"""
     </style>
 </head>
 <body>
-    <div id="status">Connecting to Neural Net...</div>
     <div id="container">
-        <!-- ROW 1: CONTEXT CHARTS -->
-        <div id="row-charts">
-            <div class="col-chart">
                 <div id="price-chart" class="chart"></div>
             </div>
-            <div class="col-chart">
                 <div id="vol-chart" class="chart"></div>
             </div>
         </div>
-        <!-- ROW 2: AI COMMENTATOR -->
-        <div id="row-terminal">
-            <div class="terminal-header">> AI MARKET ANALYST (Based on Net Liquidity)</div>
-            <div id="terminal-logs"></div>
         </div>
     </div>
     <script>
         const priceDiv = document.getElementById('price-chart');
         const volDiv = document.getElementById('vol-chart');
         const termLogs = document.getElementById('terminal-logs');
         const statusDiv = document.getElementById('status');
-        let initPrice = false, initVol = false;
         let lastLogText = "";
         const commonConfig = {{ responsive: true, displayModeBar: false }};
@@ -157,30 +156,23 @@ HTML_PAGE = f"""
             paper_bgcolor: '#0e0e0e',
             plot_bgcolor: '#0e0e0e',
             font: {{ color: '#aaa', family: 'Courier New' }},
-            margin: {{ t: 30, b: 25, l: 40, r: 20 }},
             showlegend: false,
             xaxis: {{ gridcolor: '#222' }},
             yaxis: {{ gridcolor: '#222' }}
         }};
         function addLog(data) {{
-            // Prevent spamming the exact same message
             if (data.comment.text === lastLogText) return;
             lastLogText = data.comment.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}}`;
-            // Insert at top
             termLogs.prepend(div);
-            // Keep max 20 logs
-            if (termLogs.children.length > 20) {{
-                termLogs.removeChild(termLogs.lastChild);
-            }}
         }}
         async function updateCharts() {{
@@ -193,29 +185,40 @@ HTML_PAGE = f"""
                     return;
                 }}
-                // Update Status
-                statusDiv.innerHTML = `Mid: <span class="${{data.mid >= data.prev_mid ? 'green' : 'red'}}">$${{data.mid.toLocaleString(undefined, {{minimumFractionDigits: 2}})}}</span> | Net Liq: ${{data.comment.net.toFixed(2)}} BTC`;
-                // 1. PRICE CHART
-                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', width: 2}} }};
                 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); }}
-                // 2. VOLUME CHART
                 const tracesVol = [
-                    {{ 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: 'Asks', line: {{color: '#ff1744'}} }}
                 ];
-                if (!initVol) {{ Plotly.newPlot(volDiv, tracesVol, {{ ...commonLayout, title: '<b>Cumulative Volume by Distance</b>', xaxis: {{title:'Distance ($)'}} }}, commonConfig); initVol = true; }}
-                else {{ Plotly.react(volDiv, tracesVol, {{ ...commonLayout, title: '<b>Cumulative Volume by Distance</b>', xaxis: {{title:'Distance ($)'}} }}, commonConfig); }}
-                // 3. AI COMMENTARY LOG
                 addLog(data);
             }} catch (e) {{ console.error("Fetch error:", e); }}
         }}
-        setInterval(updateCharts, 750); // Slower update for readability
     </script>
 </body>
 </html>
@@ -294,13 +297,13 @@ async def handle_data(request):
             cum += q
             d_a_x.append(d); d_a_y.append(cum)
-    # --- Calculate Net Liquidity Array for AI ---
-    diff_values = []
     if d_b_x and d_a_x:
         max_dist = min(d_b_x[-1], d_a_x[-1])
-        step_size = max_dist / 50 # 50 Sampling points for AI
-        steps = [i * step_size for i in range(1, 51)]
         for s in steps:
             idx_b = bisect.bisect_right(d_b_x, s)
@@ -309,15 +312,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
-            diff_values.append(vol_b - vol_a)
     # --- Generate AI Commentary ---
-    ai_output = generate_ai_commentary(diff_values, mid, market_state['prev_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 },
         "comment": ai_output,
         "history": market_state['history']
     })
@@ -342,7 +348,7 @@ async def main():
     site = web.TCPSite(runner, '0.0.0.0', PORT)
     await site.start()
-    print(f"🚀 BTC-USD AI Dashboard: http://localhost:{PORT}")
     await asyncio.Event().wait()
 if __name__ == "__main__":

 # --- AI Logic Helper ---
 def generate_ai_commentary(diff_y, mid, prev_mid):
     if not diff_y:
+        return {"text": "Initializing analysis...", "sentiment": "neutral", "net": 0}
     # 1. Calculate Aggregates
     net_total = diff_y[-1] # Total Net Liquidity at max depth
     # 2. Price Trend
     price_delta = mid - prev_mid
     msg = ""
     sentiment = "neutral"
+    # -- SCENARIO 1: EXTREME IMBALANCE --
     if net_total > 50:
         sentiment = "bullish"
+        msg = f"🚀 <b>STRONG BUY WALL:</b> Net surplus of {int(net_total)} BTC. Orderbook tilted heavily to Bids."
     elif net_total < -50:
         sentiment = "bearish"
+        msg = f"📉 <b>HEAVY SELL WALL:</b> Net deficit of {int(net_total)} BTC. Sellers dominating."
+    # -- SCENARIO 2: ABSORPTION (Price moving vs Liquidity) --
+    elif price_delta < -5 and net_total > 20:
         sentiment = "warning"
+        msg = f"🛡️ <b>ABSORPTION:</b> Price dropping, but Buyers are stepping in (+{int(net_total)} BTC surplus)."
+    elif price_delta > 5 and net_total < -20:
         sentiment = "warning"
+        msg = f"🧱 <b>RESISTANCE:</b> Price rising into Sell liquidity ({int(net_total)} BTC deficit)."
+    # -- SCENARIO 3: CHOP / EQUILIBRIUM --
     elif abs(net_total) < 10:
         sentiment = "neutral"
+        msg = f"⚖️ <b>EQUILIBRIUM:</b> Liquidity is balanced. Waiting for a breakout trigger."
     # -- SCENARIO 4: MOMENTUM --
     else:
         if net_total > 0:
+            msg = f"📈 <b>Bullish Bias:</b> Moderate buy support (+{int(net_total)} BTC)."
             sentiment = "bullish"
         else:
+            msg = f"📉 <b>Bearish Bias:</b> Moderate sell pressure ({int(net_total)} BTC)."
+            sentiment = "bearish"
     return {"text": msg, "sentiment": sentiment, "net": net_total}
 <!DOCTYPE html>
 <html>
 <head>
+    <title>BTC-USD AI Hybrid 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; }}
         /* Layout Grid */
         #container {{ display: flex; flex-direction: column; height: 100vh; width: 100vw; }}
+        /* Row 1: Price & Vol */
+        #row-top {{ flex: 1; display: flex; width: 100%; border-bottom: 1px solid #333; }}
+        /* Row 2: Diff & 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: #050505; display: flex; flex-direction: column; padding: 10px; overflow-y: auto; }}
         /* Terminal Styling */
         .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; color: #e8f5e9; }}
         .bearish {{ border-left-color: #ff1744; color: #ffebee; }}
         .neutral {{ border-left-color: #999; color: #ccc; }}
         .warning {{ border-left-color: #ff9800; color: #fff3e0; }}
         .chart {{ width: 100%; height: 100%; }}
         #status {{ position: absolute; top: 10px; left: 60px; z-index: 100; font-size: 14px; background: rgba(0,0,0,0.8); padding: 5px 10px; border-radius: 4px; border: 1px solid #333; }}
     </style>
 </head>
 <body>
+    <div id="status">Connecting...</div>
     <div id="container">
+        <!-- ROW 1 -->
+        <div id="row-top">
+            <div class="col">
                 <div id="price-chart" class="chart"></div>
             </div>
+            <div class="col">
                 <div id="vol-chart" class="chart"></div>
             </div>
         </div>
+        <!-- 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">> AI MARKET COMMENTARY</div>
+                <div id="terminal-logs"></div>
+            </div>
         </div>
     </div>
     <script>
         const priceDiv = document.getElementById('price-chart');
         const volDiv = document.getElementById('vol-chart');
+        const diffDiv = document.getElementById('diff-chart');
         const termLogs = document.getElementById('terminal-logs');
         const statusDiv = document.getElementById('status');
+        let initPrice = false, initVol = false, initDiff = false;
         let lastLogText = "";
         const commonConfig = {{ responsive: true, displayModeBar: false }};
             paper_bgcolor: '#0e0e0e',
             plot_bgcolor: '#0e0e0e',
             font: {{ color: '#aaa', family: 'Courier New' }},
+            margin: {{ t: 30, b: 25, l: 45, r: 20 }},
             showlegend: false,
             xaxis: {{ gridcolor: '#222' }},
             yaxis: {{ gridcolor: '#222' }}
         }};
         function addLog(data) {{
             if (data.comment.text === lastLogText) return;
             lastLogText = data.comment.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}}`;
             termLogs.prepend(div);
+            if (termLogs.children.length > 25) termLogs.removeChild(termLogs.lastChild);
         }}
         async function updateCharts() {{
                     return;
                 }}
+                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); }}
+                // 2. Volume
                 const tracesVol = [
+                    {{ x: data.vol.dist_bids, y: data.vol.vol_bids, type: 'scatter', name: 'Bid', 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 (Restored)
+                const traceDiff = {{
+                    x: data.diff.x,
+                    y: data.diff.y,
+                    type: 'scatter',
+                    mode: 'lines',
+                    fill: 'tozeroy',
+                    line: {{color: '#e040fb', width: 2}}
+                }};
+                if (!initDiff) {{ Plotly.newPlot(diffDiv, [traceDiff], {{ ...commonLayout, title: '<b>Net Liquidity (Bids - Asks)</b>', xaxis: {{title:'Distance ($)'}} }}, commonConfig); initDiff = true; }}
+                else {{ Plotly.react(diffDiv, [traceDiff], {{ ...commonLayout, title: '<b>Net Liquidity (Bids - Asks)</b>', xaxis: {{title:'Distance ($)'}} }}, commonConfig); }}
+                // 4. AI Log
                 addLog(data);
             }} catch (e) {{ console.error("Fetch error:", e); }}
         }}
+        setInterval(updateCharts, 750);
     </script>
 </body>
 </html>
             cum += q
             d_a_x.append(d); d_a_y.append(cum)
+    # --- Calculate Net Liquidity Array (Diff) ---
+    diff_x, diff_y = [], []
     if d_b_x and d_a_x:
         max_dist = min(d_b_x[-1], d_a_x[-1])
+        step_size = max_dist / 100
+        steps = [i * step_size for i in range(1, 101)]
         for s in steps:
             idx_b = bisect.bisect_right(d_b_x, s)
             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)
     # --- Generate AI Commentary ---
+    ai_output = generate_ai_commentary(diff_y, mid, market_state['prev_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,
         "history": market_state['history']
     })
     site = web.TCPSite(runner, '0.0.0.0', PORT)
     await site.start()
+    print(f"🚀 BTC-USD AI+Graph Dashboard: http://localhost:{PORT}")
     await asyncio.Event().wait()
 if __name__ == "__main__":