Update app.py

app.py

@@ -1,10 +1,8 @@
 # ==============================================================================
-# 🚀 app.py (V70.5 - GEM-Architect: X-Ray Mode & Full Visibility)
+# 🚀 app.py (V70.6 - GEM-Architect: R2 Source of Truth)
 # ==============================================================================
-# - Features:
-#   1. X-Ray Logging: Shows Top 10 candidates even if they fail thresholds.
-#   2. Transparency: Displays individual model scores (Pattern, Oracle, MC).
-#   3. Integration: Fully compatible with Clean R2 (V41) & SmartPortfolio (V38).
+# - Fix: All UI elements now fetch directly from R2 to prevent Split-Brain.
+# - Features: X-Ray Mode, Neural Visibility, Atomic UI Updates.
 # ==============================================================================
 
 import os
@@ -109,7 +107,7 @@ class SystemState:
 
     def set_ready(self): 
         self.ready = True
-        self.last_cycle_logs = "✅ System Ready. X-Ray Mode Online."
+        self.last_cycle_logs = "✅ System Ready. R2 Source of Truth Mode."
         logger.info("✅ System State set to READY.")
     
     def set_cycle_start(self): 
@@ -175,13 +173,10 @@ async def auto_pilot_loop():
             if adaptive_hub and int(time.time()) % 60 == 0:
                 sys_state.training_status_msg = adaptive_hub.get_status()
 
-            # Trade Manager Watchdog
+            # Trade Manager Watchdog (Reduced freq)
             if trade_manager and len(trade_manager.open_positions) > 0:
-                wd_status = await trade_manager.ensure_active_guardians()
-                if "No active" not in wd_status:
-                    # Only update logs if cycle isn't writing
-                    if not sys_state.cycle_running:
-                        sys_state.last_cycle_logs = trade_manager.latest_guardian_log
+                if not sys_state.cycle_running:
+                    sys_state.last_cycle_logs = trade_manager.latest_guardian_log
                 continue 
 
             # Trigger Auto Scan
@@ -207,7 +202,7 @@ async def auto_pilot_loop():
 async def lifespan(app: FastAPI):
     global r2, data_manager, ml_processor, adaptive_hub, trade_manager, whale_monitor, news_fetcher, senti_analyzer, sys_state
     
-    logger.info("\n🚀 [System] Startup Sequence (Titan V70.5 - X-Ray Mode)...")
+    logger.info("\n🚀 [System] Startup Sequence (Titan V70.6 - R2 Sync)...")
     try:
         # 1. Initialize R2 (Persistence)
         r2 = R2Service()
@@ -245,6 +240,7 @@ async def lifespan(app: FastAPI):
             logger.info("🔧 [Tuner] Continuous Tuner Injected.")
         
         # 9. Start Sentries
+        await trade_manager.sync_internal_state_with_r2()
         await trade_manager.initialize_sentry_exchanges()
         await trade_manager.start_sentry_loops()
         
@@ -311,16 +307,11 @@ async def _fetch_l2_data_task(candidate_data: Dict[str, Any]) -> Dict[str, Any]:
         return None
 
 # ------------------------------------------------------------------------------
-# 8. Unified Logic Cycle (The 5-Layer Pipeline - X-Ray Edition)
+# 8. Unified Logic Cycle (The 5-Layer Pipeline)
 # ------------------------------------------------------------------------------
 async def run_unified_cycle():
     """
     💎 GEM-Architect: The 5-Layer Precision Pipeline
-    - Layer 1: Breadth Filter.
-    - Layer 2: Transparent Neural Analysis (Full Visibility).
-    - Layer 3: External Data Injection.
-    - Layer 4: Sniper Execution.
-    - Layer 5: Governance Approval.
     """
     log_buffer = StringIO()
     def log_and_print(message):
@@ -333,7 +324,7 @@ async def run_unified_cycle():
     sys_state.set_cycle_start()
     
     try:
-        # Sync R2 State
+        # Sync R2 State (Crucial)
         await trade_manager.sync_internal_state_with_r2()
         
         # Log Active Trades
@@ -371,10 +362,7 @@ async def run_unified_cycle():
         l2_tasks = [process_l2(c) for c in l1_candidates]
         l2_results = await asyncio.gather(*l2_tasks)
         
-        # Filter None values
         processed_l2 = [res for res in l2_results if res is not None]
-        
-        # Sort ALL results by score (Pass AND Fail) to show user the best available
         processed_l2.sort(key=lambda x: x['l2_score'], reverse=True)
         
         # 👁️ X-RAY MODE: Show Top 10 regardless of status
@@ -390,7 +378,6 @@ async def run_unified_cycle():
             log_and_print(f"{status:<3} | {c['symbol']:<9} | {c['l2_score']:>5.1f} | {c['pattern_score']*100:>5.1f} | {c['oracle_score']*100:>5.1f} | {c['mc_score']*100:>4.1f}")
         log_and_print("-" * 65)
 
-        # 🛑 The Real Filter: Only Valid Ones proceed
         valid_l2 = [c for c in processed_l2 if c.get('is_valid', False)]
         
         if not valid_l2:
@@ -435,10 +422,8 @@ async def run_unified_cycle():
             cand['final_total_score'] = l2_score + whale_bonus + news_bonus
             final_l3_list.append(cand)
 
-        # Re-sort
         final_l3_list.sort(key=lambda x: x['final_total_score'], reverse=True)
 
-        # Show L3 Results (Only for Survivors)
         log_and_print(f"   -> {len(final_l3_list)} passed to L3.")
         l3_header = f"{'SYMBOL':<9} | {'L2':<5} | {'WHALE':<6} | {'NEWS':<6} | {'TOTAL':<6}"
         log_and_print("-" * 60)
@@ -531,7 +516,10 @@ async def trigger_strategic_backtest():
     return "🧪 Strategic Backtest Started."
 
 async def manual_close_current_trade():
-    if not trade_manager.open_positions: return "⚠️ No trade."
+    # Sync first to be sure
+    await trade_manager.sync_internal_state_with_r2()
+    if not trade_manager.open_positions: return "⚠️ No trade found in R2."
+    
     symbol = list(trade_manager.open_positions.keys())[0]
     await trade_manager.force_exit_by_manager(symbol, reason="MANUAL_UI")
     return f"✅ Closed {symbol}."
@@ -587,6 +575,7 @@ async def run_cycle_from_gradio():
 async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
     """
     Poller function to update Gradio UI every few seconds.
+    NOW PURELY R2-BASED TO PREVENT SPLIT-BRAIN.
     """
     empty_chart = go.Figure()
     empty_chart.update_layout(template="plotly_dark", paper_bgcolor="#0b0f19", plot_bgcolor="#0b0f19", xaxis={'visible':False}, yaxis={'visible':False})
@@ -598,21 +587,31 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
         return "Initializing...", "...", empty_chart, "0.0", "0.0", "0.0", "0.0", "0.0%", wl_df_empty, diag_df_empty, type_df_empty, "Loading...", "Loading...", "Loading..."
 
     try:
-        sp = trade_manager.smart_portfolio
-        equity = sp.state.get('current_capital', 10.0) 
-        allocated = sp.state.get('allocated_capital_usd', 0.0)
+        # 🔥 DIRECT R2 FETCH (Source of Truth)
+        portfolio = await r2.get_portfolio_state_async()
+        open_trades_raw = await r2.get_open_trades_async()
+        
+        # Parse Trades
+        active_trades_dict = {}
+        if isinstance(open_trades_raw, list):
+             for t in open_trades_raw: active_trades_dict[t['symbol']] = t
+        elif isinstance(open_trades_raw, dict):
+             active_trades_dict = open_trades_raw
+
+        equity = portfolio.get('current_capital_usd', INITIAL_CAPITAL)
+        daily_pnl = portfolio.get('daily_net_pnl', 0.0)
+        allocated = portfolio.get('allocated_capital_usd', 0.0)
+        is_halted = portfolio.get('is_trading_halted', False)
         free_cap = max(0.0, equity - allocated)
-        daily_pnl = sp.state.get('daily_net_pnl', 0.0)
-        is_halted = sp.state.get('is_trading_halted', False)
         
         symbol = None; entry_p = 0.0; tp_p = 0.0; sl_p = 0.0; curr_p = 0.0; pnl_pct = 0.0; pnl_val_unrealized = 0.0
         active_trade_info = ""
         trade_dur_str = "--:--:--"
 
         # --- Active Trade Details ---
-        if trade_manager.open_positions:
-            symbol = list(trade_manager.open_positions.keys())[0]
-            trade = trade_manager.open_positions[symbol]
+        if active_trades_dict:
+            symbol = list(active_trades_dict.keys())[0]
+            trade = active_trades_dict[symbol]
             entry_p = float(trade.get('entry_price', 0.0))
             tp_p = float(trade.get('tp_price', 0.0))
             sl_p = float(trade.get('sl_price', 0.0))
@@ -623,19 +622,17 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
             gov_score = decision_data.get('governance_score', 0.0)
             oracle_score = decision_data.get('oracle_score', 0.0) 
             
-            grade_color = "#ccc"
-            if gov_grade == "ULTRA": grade_color = "#ff00ff" 
-            elif gov_grade == "STRONG": grade_color = "#00ff00" 
-            elif gov_grade == "NORMAL": grade_color = "#00e5ff" 
-            elif gov_grade == "WEAK": grade_color = "#ffff00" 
-            elif gov_grade == "REJECT": grade_color = "#ff0000" 
-
             curr_p = await data_manager.get_latest_price_async(symbol)
             if curr_p > 0 and entry_p > 0:
                 pnl_pct = ((curr_p - entry_p) / entry_p) * 100
                 size = float(trade.get('entry_capital', 0.0))
                 pnl_val_unrealized = size * (pnl_pct / 100)
             
+            grade_color = "#ccc"
+            if gov_grade == "ULTRA": grade_color = "#ff00ff" 
+            elif gov_grade == "STRONG": grade_color = "#00ff00" 
+            elif gov_grade == "NORMAL": grade_color = "#00e5ff" 
+            
             active_trade_info = f"""
              <div style='display: flex; justify-content: space-between; font-size: 12px; color: #ccc; margin-top:5px; border-top: 1px solid #333; padding-top: 5px;'>
                 <span>⏱️ Time:</span> <span style='color: #ffff00;'>{trade_dur_str}</span>
@@ -644,13 +641,13 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
                 <span>🏛️ Grade:</span> <span style='color: {grade_color}; font-weight:bold;'>{gov_grade} ({gov_score:.1f})</span>
              </div>
              <div style='display: flex; justify-content: space-between; font-size: 12px; color: #ccc; margin-top:5px;'>
-                <span>🔮 Oracle Exp:</span> <span style='color: #00ff00;'>{oracle_score*100:+.2f}%</span>
+                <span>🔮 Oracle:</span> <span style='color: #00ff00;'>{oracle_score*100:+.1f}%</span>
              </div>
             """
 
         virtual_equity = equity + pnl_val_unrealized
         active_pnl_color = "#00ff00" if pnl_val_unrealized >= 0 else "#ff0000"
-        portfolio = await r2.get_portfolio_state_async()
+        
         total_t = portfolio.get('total_trades', 0)
         wins = portfolio.get('winning_trades', 0)
         losses = portfolio.get('losing_trades', 0)
@@ -677,9 +674,6 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
             <hr style='border-color:#444; margin: 10px 0;'>
             
             <div style='display: flex; justify-content: space-between; font-size: 12px; color: #ccc;'>
-                <span>🦅 Mood:</span> <span style='color: white;'>{sp.market_trend}</span>
-            </div>
-            <div style='display: flex; justify-content: space-between; font-size: 12px; color: #ccc; margin-top:5px;'>
                 <span>🛡️ Status:</span> {halt_status}
             </div>
             {active_trade_info}
@@ -694,7 +688,9 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
             "Hydra: Stagnation (Time)": "stagnation"
         }
         target_key = key_map.get(selected_view, "hybrid")
-        stats_data = trade_manager.ai_stats.get(target_key, {"total":0, "good":0, "saved":0.0, "missed":0.0})
+        # Fetch stats from R2 (not memory)
+        stats_file = await r2.get_guardian_stats_async()
+        stats_data = stats_file.get(target_key, {"total":0, "good":0, "saved":0.0, "missed":0.0})
         
         tot_ds = stats_data['total']
         ds_acc = (stats_data['good'] / tot_ds * 100) if tot_ds > 0 else 0.0
@@ -823,9 +819,9 @@ async def check_live_pnl_and_status(selected_view="Dual-Core (Hybrid)"):
 def create_gradio_ui():
     custom_css = ".gradio-container {background:#0b0f19} .dataframe {background:#1a1a1a!important} .html-box {min-height:180px}"
     
-    with gr.Blocks(title="Titan V70.5 (X-Ray Mode)", css=custom_css) as demo:
+    with gr.Blocks(title="Titan V70.6 (R2-Sync)", css=custom_css) as demo:
         
-        gr.Markdown("# 🚀 Titan V70.5 (Neural Core + X-Ray Vision)")
+        gr.Markdown("# 🚀 Titan V70.6 (Neural Core + R2 Sync)")
         
         with gr.Row():
             # LEFT: Chart & Controls