Update helpers.py

helpers.py

@@ -41,15 +41,50 @@ def validate_required_fields(data_dict: dict, required_fields: list) -> bool:
     return all(field in data_dict for field in required_fields)
 
 def format_technical_indicators(advanced_indicators):
+    """تنسيق جميع المؤشرات الفنية بشكل شامل للنموذج الضخم"""
     if not advanced_indicators: return "No data for advanced indicators."
+    
     summary = []
     for timeframe, indicators in advanced_indicators.items():
         if indicators:
             parts = []
+            
+            # مؤشرات الاتجاه
+            if 'ema_9' in indicators: parts.append(f"EMA9: {indicators['ema_9']:.6f}")
+            if 'ema_21' in indicators: parts.append(f"EMA21: {indicators['ema_21']:.6f}")
+            if 'ema_50' in indicators: parts.append(f"EMA50: {indicators['ema_50']:.6f}")
+            if 'ema_200' in indicators: parts.append(f"EMA200: {indicators['ema_200']:.6f}")
+            if 'adx' in indicators: parts.append(f"ADX: {indicators['adx']:.2f}")
+            if 'ichimoku_conversion' in indicators: parts.append(f"Ichimoku Conv: {indicators['ichimoku_conversion']:.6f}")
+            if 'ichimoku_base' in indicators: parts.append(f"Ichimoku Base: {indicators['ichimoku_base']:.6f}")
+            
+            # مؤشرات الزخم
             if 'rsi' in indicators: parts.append(f"RSI: {indicators['rsi']:.2f}")
-            if 'macd_hist' in indicators: parts.append(f"MACD Hist: {indicators['macd_hist']:.4f}")
-            if 'volume_ratio' in indicators: parts.append(f"Volume: {indicators['volume_ratio']:.2f}x")
-            if parts: summary.append(f"{timeframe}: {', '.join(parts)}")
+            if 'macd_hist' in indicators: parts.append(f"MACD Hist: {indicators['macd_hist']:.6f}")
+            if 'macd_line' in indicators: parts.append(f"MACD Line: {indicators['macd_line']:.6f}")
+            if 'stoch_rsi_k' in indicators: parts.append(f"Stoch RSI: {indicators['stoch_rsi_k']:.2f}")
+            if 'williams_r' in indicators: parts.append(f"Williams %R: {indicators['williams_r']:.2f}")
+            
+            # مؤشرات التقلب
+            if 'bb_upper' in indicators: parts.append(f"BB Upper: {indicators['bb_upper']:.6f}")
+            if 'bb_lower' in indicators: parts.append(f"BB Lower: {indicators['bb_lower']:.6f}")
+            if 'bb_middle' in indicators: parts.append(f"BB Middle: {indicators['bb_middle']:.6f}")
+            if 'atr' in indicators: parts.append(f"ATR: {indicators['atr']:.6f}")
+            if 'atr_percent' in indicators: parts.append(f"ATR %: {indicators['atr_percent']:.2f}%")
+            
+            # مؤشرات الحجم
+            if 'volume_ratio' in indicators: parts.append(f"Volume Ratio: {indicators['volume_ratio']:.2f}x")
+            if 'vwap' in indicators: parts.append(f"VWAP: {indicators['vwap']:.6f}")
+            if 'obv' in indicators: parts.append(f"OBV: {indicators['obv']:.0f}")
+            if 'mfi' in indicators: parts.append(f"MFI: {indicators['mfi']:.2f}")
+            
+            # مؤشرات الدورة
+            if 'hull_ma' in indicators: parts.append(f"Hull MA: {indicators['hull_ma']:.6f}")
+            if 'supertrend' in indicators: parts.append(f"Supertrend: {indicators['supertrend']:.6f}")
+            
+            if parts:
+                summary.append(f"{timeframe.upper()}: {', '.join(parts)}")
+    
     return "\n".join(summary) if summary else "Insufficient indicator data."
 
 def format_strategy_scores(strategy_scores, recommended_strategy):
@@ -159,7 +194,7 @@ def format_enhanced_analysis_for_llm(candidate_data, whale_analysis=None, market
     
     # المعلومات الأساسية
     formatted += f"💰 العملة: {candidate_data.get('symbol', 'N/A')}\n"
-    formatted += f"💰 السعر الحالي: ${safe_float_conversion(candidate_data.get('current_price', 0)):.4f}\n"
+    formatted += f"💰 السعر الحالي: ${safe_float_conversion(candidate_data.get('current_price', 0)):.6f}\n"
     formatted += f"🎯 النتيجة المحسنة: {safe_float_conversion(candidate_data.get('enhanced_final_score', 0)):.3f}\n"
     
     # المؤشرات الفنية
@@ -170,11 +205,16 @@ def format_enhanced_analysis_for_llm(candidate_data, whale_analysis=None, market
             if indicators:
                 tech_parts = []
                 if 'rsi' in indicators: tech_parts.append(f"RSI: {indicators['rsi']:.1f}")
-                if 'macd_hist' in indicators: tech_parts.append(f"MACD: {indicators['macd_hist']:.4f}")
+                if 'macd_hist' in indicators: tech_parts.append(f"MACD: {indicators['macd_hist']:.6f}")
                 if 'volume_ratio' in indicators: tech_parts.append(f"Volume: {indicators['volume_ratio']:.1f}x")
                 if 'ema_9' in indicators and 'ema_21' in indicators:
                     ema_signal = "↑" if indicators['ema_9'] > indicators['ema_21'] else "↓"
                     tech_parts.append(f"EMA: {ema_signal}")
+                if 'adx' in indicators: tech_parts.append(f"ADX: {indicators['adx']:.1f}")
+                if 'bb_upper' in indicators and 'bb_lower' in indicators:
+                    bb_position = (candidate_data.get('current_price', 0) - indicators['bb_lower']) / (indicators['bb_upper'] - indicators['bb_lower'])
+                    bb_signal = "HIGH" if bb_position > 0.8 else "LOW" if bb_position < 0.2 else "MID"
+                    tech_parts.append(f"BB: {bb_signal}")
                 if tech_parts:
                     formatted += f"   • {timeframe}: {', '.join(tech_parts)}\n"
     
@@ -366,4 +406,60 @@ def should_override_trade_decision(base_decision, whale_analysis):
         base_action == 'BUY' and whale_action == 'STRONG_SELL' and whale_confidence > 0.7,
         base_action == 'SELL' and whale_action == 'STRONG_BUY' and whale_confidence > 0.7
     ]
-    
+    
+    return any(mandatory_override_conditions)
+
+def format_candle_data_for_pattern_analysis(ohlcv_data, timeframe='1h'):
+    """تنسيق بيانات الشموع لتحليل الأنماط البيانية"""
+    if not ohlcv_data or timeframe not in ohlcv_data:
+        return "لا توجد بيانات شموع كافية لتحليل الأنماط"
+    
+    candles = ohlcv_data[timeframe]
+    if len(candles) < 20:
+        return f"بيانات غير كافية ({len(candles)} شمعة فقط)"
+    
+    # أخذ آخر 50 شمعة للتحليل
+    recent_candles = candles[-50:] if len(candles) > 50 else candles
+    
+    formatted = f"📊 بيانات الشموع للإطار {timeframe.upper()} (آخر {len(recent_candles)} شمعة):\n"
+    
+    # تحليل الاتجاه
+    first_close = recent_candles[0][4]
+    last_close = recent_candles[-1][4]
+    price_change = ((last_close - first_close) / first_close) * 100
+    trend = "🟢 صاعد" if price_change > 2 else "🔴 هابط" if price_change < -2 else "⚪ جانبي"
+    
+    # تحليل التقلب
+    highs = [c[2] for c in recent_candles]
+    lows = [c[3] for c in recent_candles]
+    high_max = max(highs)
+    low_min = min(lows)
+    volatility = ((high_max - low_min) / low_min) * 100
+    
+    # تحليل الحجم
+    volumes = [c[5] for c in recent_candles]
+    avg_volume = sum(volumes) / len(volumes)
+    current_volume = recent_candles[-1][5]
+    volume_ratio = current_volume / avg_volume if avg_volume > 0 else 1
+    
+    formatted += f"📈 الاتجاه: {trend} ({price_change:+.2f}%)\n"
+    formatted += f"🌊 التقلب: {volatility:.2f}% (النطاق: {low_min:.6f} - {high_max:.6f})\n"
+    formatted += f"📦 الحجم: {volume_ratio:.2f}x المتوسط\n\n"
+    
+    # عرض آخر 10 شموع بالتفصيل
+    formatted += "🕯️ آخر 10 شموع (من الأحدث إلى الأقدم):\n"
+    for i in range(min(10, len(recent_candles))):
+        idx = len(recent_candles) - 1 - i
+        candle = recent_candles[idx]
+        timestamp = datetime.fromtimestamp(candle[0] / 1000).strftime('%H:%M')
+        open_price, high, low, close, volume = candle[1], candle[2], candle[3], candle[4], candle[5]
+        
+        candle_type = "🟢" if close > open_price else "🔴" if close < open_price else "⚪"
+        body_size = abs(close - open_price) / open_price * 100
+        wick_upper = (high - max(open_price, close)) / high * 100
+        wick_lower = (min(open_price, close) - low) / low * 100
+        
+        formatted += f"   {timestamp} {candle_type} O:{open_price:.6f} H:{high:.6f} L:{low:.6f} C:{close:.6f} V:{volume:.0f}\n"
+        formatted += f"      الجسم: {body_size:.2f}% | الظلال: علوية {wick_upper:.2f}% / سفلية {wick_lower:.2f}%\n"
+    
+    return formatted