Update app.py

app.py

@@ -1,5 +1,5 @@
-# app.py (V24.0 - GEM-Architect: Full Architecture with L2.5 Boosting)
-# تمت استعادة طبقة "التعزيز" (L2.5) لدمج الأخبار والحيتان في التقييم.
+# app.py (V24.1 - GEM-Architect: Numeric Boosting Display)
+# تم تحديث طبقة التعزيز (L2.5) لعرض درجات الحيتان والأخبار رقمياً بدقة.
 
 import os
 import sys
@@ -154,7 +154,7 @@ async def auto_pilot_loop():
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     global r2, data_manager, ml_processor, hub_manager, trade_manager, whale_monitor, news_fetcher, senti_analyzer, sys_state
-    logger.info("\n🚀 [System] Startup Sequence Initiated (Titan V24.0)...")
+    logger.info("\n🚀 [System] Startup Sequence Initiated (Titan V24.1)...")
     try:
         logger.info("   [1/7] Initializing R2 & Data Services...")
         r2 = R2Service()
@@ -227,7 +227,7 @@ async def run_unified_cycle():
     1. Guardian (إدارة)
     2. L1 Screening (فلترة)
     3. L2 Analysis (تحليل فني)
-    4. L2.5 Boosting (تعزيز: حيتان + أخبار) -> 🔥 [تمت الاستعادة]
+    4. L2.5 Boosting (تعزيز رقمي: حيتان + أخبار)
     5. L3 Oracle (تحكيم)
     6. L4 Sniper (تنفيذ)
     """
@@ -277,14 +277,14 @@ async def run_unified_cycle():
         results = await asyncio.gather(*tasks)
         valid_l2 = [res for res in results if res is not None]
         
-        # نأخذ أفضل 10 بناءً على التحليل الفني فقط للمرحلة التالية
+        # نأخذ أفضل 10 بناءً على التحليل الفني
         top_technical = sorted(valid_l2, key=lambda x: x.get('enhanced_final_score', 0.0), reverse=True)[:10]
         
         if not top_technical:
             log_and_print("⚠️ No valid L2 candidates.")
             sys_state.set_cycle_end(logs=log_buffer.getvalue()); return
 
-        # 4. 🔥 L2.5 Enrichment & Boosting (Whales + News) 🔥
+        # 4. 🔥 L2.5 Enrichment & Boosting (Numeric) 🔥
         log_and_print(f"   [3/5] 🚀 L2.5 Boosting (Whales & News)...")
         boosted_candidates = []
         
@@ -292,46 +292,42 @@ async def run_unified_cycle():
             symbol = cand['symbol']
             current_score = cand['enhanced_final_score']
             
-            # أ. تعزيز الحيتان (+0.10 كحد أقصى)
+            # أ. تعزيز الحيتان
             whale_score = 0.0
-            whale_txt = "Normal"
             try:
                 w_data = await whale_monitor.get_symbol_whale_activity(symbol)
                 net_flow = w_data.get('accumulation_analysis_24h', {}).get('net_flow_usd', 0)
-                if net_flow > 500000: 
-                    whale_score = 0.10; whale_txt = "🔥 HIGH"
-                elif net_flow > 100000: 
-                    whale_score = 0.05; whale_txt = "✅ POS"
+                if net_flow > 500000: whale_score = 0.10
+                elif net_flow > 100000: whale_score = 0.05
             except: pass
             
-            # ب. تعزيز الأخبار (+0.05 كحد أقصى)
+            # ب. تعزيز الأخبار
             news_score = 0.0
-            news_txt = "-"
             try:
                 news_item = await news_fetcher.get_news(symbol)
                 if news_item:
                     sentiment = senti_analyzer.polarity_scores(news_item.get('summary', ''))
-                    if sentiment['compound'] > 0.2: 
-                        news_score = 0.05; news_txt = "POS"
+                    if sentiment['compound'] > 0.2: news_score = 0.05
             except: pass
             
-            # تحديث الدرجة
+            # تحديث الدرجة وتخزين القيم الخام
             new_final = current_score + whale_score + news_score
-            cand['enhanced_final_score'] = new_final # تحديث الدرجة للمراحل القادمة
-            cand['boost_info'] = f"W:{whale_txt} N:{news_txt}"
+            cand['enhanced_final_score'] = new_final
+            cand['whale_score'] = whale_score # حفظ الدرجة الرقمية
+            cand['news_score'] = news_score   # حفظ الدرجة الرقمية
+            cand['boost_info'] = f"W:{whale_score:.2f} N:{news_score:.2f}"
             boosted_candidates.append(cand)
 
-        # إعادة الترتيب بعد التعزيز
+        # إعادة الترتيب
         final_top_10 = sorted(boosted_candidates, key=lambda x: x['enhanced_final_score'], reverse=True)
 
-        # عرض الجدول المعزز
-        log_and_print(f"{'SYMBOL':<10} | {'FINAL':<6} | {'BASE':<6} | {'BOOST INFO'}")
+        # عرض الجدول المعزز بالأرقام
+        log_and_print(f"{'SYMBOL':<10} | {'FINAL':<6} | {'BASE':<6} | {'BOOST (W/N)'}")
         log_and_print("-" * 45)
         for c in final_top_10:
-            # نحسب الدرجة الأساسية بطرح التعزيز
-            base_s = c['enhanced_final_score'] - (0.10 if 'HIGH' in c['boost_info'] else 0) - (0.05 if 'POS' in c['boost_info'] else 0) 
-            # تقريبي للعرض فقط
-            log_and_print(f"{c['symbol']:<10} | {c['enhanced_final_score']:.3f}  | {base_s:.2f}   | {c['boost_info']}")
+            # حساب الدرجة الأساسية من القيم المخزنة بدقة
+            base_s = c['enhanced_final_score'] - c.get('whale_score', 0.0) - c.get('news_score', 0.0)
+            log_and_print(f"{c['symbol']:<10} | {c['enhanced_final_score']:.3f}  | {base_s:.3f}   | {c['boost_info']}")
 
         # 5. L3 Oracle
         log_and_print(f"   [4/5] 🔮 L3 Oracle Check...")
@@ -535,12 +531,12 @@ async def check_live_pnl_and_status(selected_view="Hybrid System"):
         return "Error", "Error", empty_chart, "0", "0", "0", "0", "0%", wl_df_empty, "Err", "Err", "Err"
 
 # ==============================================================================
-# 🎨 UI
+# 🎨 Gradio UI
 # ==============================================================================
 def create_gradio_ui():
     css = ".gradio-container {background:#0b0f19} .dataframe {background:#1a1a1a!important} .html-box {min-height:180px}"
-    with gr.Blocks(title="Titan V24.0", css=css, theme=gr.themes.Monochrome()) as demo:
-        gr.Markdown("# 🚀 Titan V24.0 (Full Architecture)")
+    with gr.Blocks(title="Titan V24.1", css=css, theme=gr.themes.Monochrome()) as demo:
+        gr.Markdown("# 🚀 Titan V24.1 (Full Architecture)")
         
         with gr.Row():
             with gr.Column(scale=3):
@@ -589,7 +585,7 @@ def create_gradio_ui():
 # ==============================================================================
 # 🏁 Server
 # ==============================================================================
-fast_api_server = FastAPI(lifespan=lifespan, title="Titan V24.0 Pro", description="Titan Enterprise Trading System")
+fast_api_server = FastAPI(lifespan=lifespan, title="Titan V24.1 Pro", description="Titan Enterprise Trading System")
 gradio_dashboard = create_gradio_ui()
 app = gr.mount_gradio_app(app=fast_api_server, blocks=gradio_dashboard, path="/")