Update app.py

app.py

@@ -179,6 +179,7 @@ async def run_3_layer_analysis():
                 # إرسال كل عملة للنموذج الضخم على حدة
                 llm_analysis = await llm_service_global.get_trading_decision(candidate)
                 
+                # ✅ التحقق من وجود قرار صالح من النموذج
                 if llm_analysis and llm_analysis.get('action') in ['BUY', 'SELL']:
                     opportunity = {
                         'symbol': candidate['symbol'],
@@ -192,6 +193,8 @@ async def run_3_layer_analysis():
                     final_opportunities.append(opportunity)
                     
                     print(f"   ✅ {candidate['symbol']}: {llm_analysis.get('action')} - ثقة: {llm_analysis.get('confidence_level', 0):.2f}")
+                else:
+                    print(f"   ⚠️ {candidate['symbol']}: لا يوجد قرار تداول من النموذج الضخم")
                 
             except Exception as e:
                 print(f"❌ خطأ في تحليل النموذج الضخم لـ {candidate.get('symbol')}: {e}")
@@ -241,19 +244,24 @@ async def re_analyze_open_trade_async(trade_data):
             # استخدام LLM لإعادة التحليل
             re_analysis_decision = await llm_service_global.re_analyze_trade_async(trade_data, processed_data)
             
-            await r2_service_global.save_system_logs_async({
-                "trade_reanalyzed": True, 
-                "symbol": symbol, 
-                "action": re_analysis_decision.get('action'),
-                "strategy": re_analysis_decision.get('strategy', 'GENERIC')
-            })
-            
-            return {
-                "symbol": symbol, 
-                "decision": re_analysis_decision,
-                "current_price": processed_data.get('current_price')
-            }
-            
+            # ✅ التحقق من وجود قرار صالح من النموذج
+            if re_analysis_decision:
+                await r2_service_global.save_system_logs_async({
+                    "trade_reanalyzed": True, 
+                    "symbol": symbol, 
+                    "action": re_analysis_decision.get('action'),
+                    "strategy": re_analysis_decision.get('strategy', 'GENERIC')
+                })
+                
+                return {
+                    "symbol": symbol, 
+                    "decision": re_analysis_decision,
+                    "current_price": processed_data.get('current_price')
+                }
+            else:
+                print(f"⚠️ لا يوجد قرار إعادة تحليل لـ {symbol}")
+                return None
+                
     except Exception as error:
         print(f"❌ Error during trade re-analysis: {error}")
         await r2_service_global.save_system_logs_async({
@@ -282,7 +290,7 @@ async def run_bot_cycle_async():
             print(f"📋 الصفقات المفتوحة: {len(open_trades)}")
             
             should_look_for_new_trade = len(open_trades) == 0
-            
+
             # إعادة تحليل الصفقات المفتوحة
             if open_trades:
                 now = datetime.now()
@@ -364,6 +372,7 @@ async def lifespan(application: FastAPI):
         state_manager.set_service_initialized('data_manager')
 
         llm_service_global = LLMService()
+        llm_service_global.r2_service = r2_service_global  # ✅ ربط R2Service مع LLMService
         state_manager.set_service_initialized('llm_service')
 
         sentiment_analyzer_global = SentimentAnalyzer(data_manager_global)
@@ -442,6 +451,37 @@ async def analyze_market_api():
     else:
         return {"opportunity_found": False, "message": "No suitable opportunities found"}
 
+@application.get("/portfolio")
+async def get_portfolio_api():
+    """الحصول على حالة المحفظة"""
+    if not state_manager.initialization_complete:
+        raise HTTPException(status_code=503, detail="الخدمات غير مهيأة بالكامل")
+    
+    try:
+        portfolio_state = await r2_service_global.get_portfolio_state_async()
+        open_trades = await trade_manager_global.get_open_trades()
+        
+        return {
+            "portfolio": portfolio_state,
+            "open_trades": open_trades,
+            "timestamp": datetime.now().isoformat()
+        }
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"خطأ في جلب بيانات المحفظة: {str(e)}")
+
+@application.get("/system-status")
+async def get_system_status():
+    """الحصول على حالة النظام التفصيلية"""
+    monitoring_status = trade_manager_global.get_monitoring_status() if trade_manager_global else {}
+    
+    return {
+        "initialization_complete": state_manager.initialization_complete,
+        "services_initialized": state_manager.services_initialized,
+        "market_state_ok": state.MARKET_STATE_OK,
+        "monitoring_status": monitoring_status,
+        "timestamp": datetime.now().isoformat()
+    }
+
 async def cleanup_on_shutdown():
     """تنظيف الموارد عند الإغلاق"""
     global r2_service_global, data_manager_global, trade_manager_global, learning_engine_global
@@ -477,11 +517,14 @@ async def cleanup_on_shutdown():
 
 def signal_handler(signum, frame):
     """معالج إشارات الإغلاق"""
+    print(f"🛑 Received signal {signum}. Initiating shutdown...")
     asyncio.create_task(cleanup_on_shutdown())
     sys.exit(0)
 
+# تسجيل معالجات الإشارات
 signal.signal(signal.SIGINT, signal_handler)
 signal.signal(signal.SIGTERM, signal_handler)
 
 if __name__ == "__main__": 
-    uvicorn.run(application, host="0.0.0.0", port=7860)
+    print("🚀 Starting AI Trading Bot with 3-Layer Analysis System...")
+    uvicorn.run(application, host="0.0.0.0", port=7860, log_level="info")