Update app.py

app.py

@@ -12,13 +12,9 @@ PORT = 7860
 HISTORY_LENGTH = 300 
 BROADCAST_RATE = 0.1
 
-# --- Tuning Parameters ---
-# Short: Scalping/Spread focus
 DECAY_LAMBDA_SHORT = 100.0 
-# Long: Swing/Structure focus
 DECAY_LAMBDA_LONG = 500.0  
-# Macro: Deep Orderbook/Whale focus
-DECAY_LAMBDA_MACRO = 2000.0 
+DECAY_LAMBDA_MACRO = 15000.0 
 
 IMPACT_SENSITIVITY = 0.5 
 
@@ -54,16 +50,10 @@ def analyze_structure(diff_x, diff_y, current_mid):
         marginal_vol = cum_vol - prev_vol
         prev_vol = cum_vol
         
-        # 1. Short Term Decay
         w_short += marginal_vol * math.exp(-dist / DECAY_LAMBDA_SHORT)
-        
-        # 2. Long Term Decay
         w_long += marginal_vol * math.exp(-dist / DECAY_LAMBDA_LONG)
-        
-        # 3. Macro Term Decay
         w_macro += marginal_vol * math.exp(-dist / DECAY_LAMBDA_MACRO)
 
-    # Helper for impact calc
     def get_impact(w_imb):
         if w_imb == 0: return 0.0
         imp = math.sqrt(abs(w_imb)) * IMPACT_SENSITIVITY
@@ -73,7 +63,7 @@ def analyze_structure(diff_x, diff_y, current_mid):
         "proj_short": current_mid + get_impact(w_short),
         "proj_long": current_mid + get_impact(w_long),
         "proj_macro": current_mid + get_impact(w_macro),
-        "net_score": w_short # We drive the gauge with the short-term pressure
+        "net_score": w_short 
     }
 
 def process_market_data():
@@ -82,9 +72,8 @@ def process_market_data():
 
     mid = market_state['current_mid']
     
-    # We need a deeper snapshot for Macro analysis
-    raw_bids = sorted(market_state['bids'].items(), key=lambda x: -x[0])[:600]
-    raw_asks = sorted(market_state['asks'].items(), key=lambda x: x[0])[:600]
+    raw_bids = sorted(market_state['bids'].items(), key=lambda x: -x[0])[:1000]
+    raw_asks = sorted(market_state['asks'].items(), key=lambda x: x[0])[:1000]
 
     d_b_x, d_b_y, cum = [], [], 0
     for p, q in raw_bids:
@@ -125,17 +114,14 @@ def process_market_data():
     now = time.time()
     if analysis:
         if not market_state['pred_history_short'] or (now - market_state['pred_history_short'][-1]['t'] > 0.5):
-            # Short
             market_state['pred_history_short'].append({'t': now, 'p': analysis['proj_short']})
             if len(market_state['pred_history_short']) > HISTORY_LENGTH:
                 market_state['pred_history_short'].pop(0)
             
-            # Long
             market_state['pred_history_long'].append({'t': now, 'p': analysis['proj_long']})
             if len(market_state['pred_history_long']) > HISTORY_LENGTH:
                 market_state['pred_history_long'].pop(0)
                 
-            # Macro
             market_state['pred_history_macro'].append({'t': now, 'p': analysis['proj_macro']})
             if len(market_state['pred_history_macro']) > HISTORY_LENGTH:
                 market_state['pred_history_macro'].pop(0)
@@ -278,15 +264,13 @@ HTML_PAGE = f"""
             
             const priceSeries = priceChart.addLineSeries({{ color: '#2962FF', lineWidth: 2, title: 'Price' }});
             
-            // Short Term: Show Past + Future Dotted
             const pastShortSeries = priceChart.addLineSeries({{ color: '#555555', lineWidth: 1, title: 'Short (Past)' }});
             const futureShortSeries = priceChart.addLineSeries({{ color: '#ff9800', lineWidth: 2, lineStyle: 2, title: 'Short (Fut)' }});
 
-            // Long Term: Past Only
             const pastLongSeries = priceChart.addLineSeries({{ color: '#7b1fa2', lineWidth: 1, title: 'Long (Past)' }});
             
-            // Macro Term: Past Only
             const pastMacroSeries = priceChart.addLineSeries({{ color: '#4dd0e1', lineWidth: 1, title: 'Macro (Past)' }});
+            const futureMacroSeries = priceChart.addLineSeries({{ color: '#00bcd4', lineWidth: 2, lineStyle: 2, title: 'Macro (Fut)' }});
 
             const rawChart = LightweightCharts.createChart(document.getElementById('tv-raw'), {{
                 ...chartCommon,
@@ -377,9 +361,10 @@ HTML_PAGE = f"""
                         if (data.analysis) {{
                             const {{ proj_short, proj_long, proj_macro, net_score }} = data.analysis;
                             
-                            // Only plot short term future line
                             futureShortSeries.setData([last, {{ time: last.time + 60, value: proj_short }}]);
                             
+                            futureMacroSeries.setData([last, {{ time: last.time + 3600, value: proj_macro }}]);
+                            
                             dom.projShort.innerText = proj_short.toLocaleString(undefined, {{minimumFractionDigits: 0, maximumFractionDigits: 0}});
                             dom.projLong.innerText = proj_long.toLocaleString(undefined, {{minimumFractionDigits: 0, maximumFractionDigits: 0}});
                             dom.projMacro.innerText = proj_macro.toLocaleString(undefined, {{minimumFractionDigits: 0, maximumFractionDigits: 0}});