fix: Correct EnhancedSignal attribute names in cells
Fixed AttributeError caused by wrong attribute access: - Changed component_scores['trend'] → trend_score - Changed component_scores['volume'] → volume_score - Changed component_scores['momentum'] → momentum_score - Changed component_scores['support_resistance'] → support_resistance_score - Changed component_scores['fibonacci'] → fibonacci_score - Changed reasoning → reason Files fixed: - activate_enhanced_scoring.py - Notebook cells 84, 87 regenerated Error resolved: AttributeError: 'EnhancedSignal' object has no attribute 'component_scores'
This commit is contained in:
@@ -3242,6 +3242,270 @@
|
||||
" print(\"📭 No open positions\")"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
"id": "eaabe633",
|
||||
"metadata": {},
|
||||
"source": [
|
||||
"# 🎯 ENHANCED SIGNAL SCORING ACTIVATION (V1.10)\n",
|
||||
"\n",
|
||||
"**Aktiviert Multi-Faktor-Analyse für Trading Signals**\n",
|
||||
"\n",
|
||||
"Erweitert das Trend-System um:\n",
|
||||
"- 📊 **Volume Analysis** (20%) - Hohes Volume = stärkerer Move\n",
|
||||
"- 📈 **Momentum Indicators** (20%) - RSI + MACD Confirmation\n",
|
||||
"- 🎯 **Support/Resistance** (15%) - Nähe zu Key Levels\n",
|
||||
"- 📐 **Fibonacci Levels** (15%) - Bounce-Zones\n",
|
||||
"- 📉 **Trend Alignment** (30%) - Bestehendes System\n",
|
||||
"\n",
|
||||
"**Status:** ✅ READY TO ACTIVATE\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "ec5e4268",
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"# ==========================================\n",
|
||||
"# ENHANCED TRADING CHECK WITH SIGNAL SCORING\n",
|
||||
"# ==========================================\n",
|
||||
"\n",
|
||||
"def enhanced_trading_check_wrapper(symbol=\"XAUUSD\", debug=False):\n",
|
||||
" \"\"\"\n",
|
||||
" Enhanced wrapper around execute_trade_v2_adaptive\n",
|
||||
" Adds multi-factor signal scoring before execution\n",
|
||||
" \"\"\"\n",
|
||||
"\n",
|
||||
" try:\n",
|
||||
" # SCHRITT 1: Position Check (wie vorher)\n",
|
||||
" max_positions = TRADING_CONFIG['risk']['max_positions']\n",
|
||||
" position_info = check_existing_position(symbol)\n",
|
||||
"\n",
|
||||
" if position_info['count'] >= max_positions:\n",
|
||||
" if debug:\n",
|
||||
" print(f\"🛑 TRADE BLOCKIERT: {position_info['count']}/{max_positions} Positionen aktiv\")\n",
|
||||
" for pos in position_info['details']:\n",
|
||||
" profit_emoji = \"🟢\" if pos['profit'] >= 0 else \"🔴\"\n",
|
||||
" print(f\" {pos['type']} @ {pos['price_open']} | {profit_emoji} {pos['profit']:.2f}\")\n",
|
||||
" return None\n",
|
||||
"\n",
|
||||
" print(f\"✅ Position-Check OK: {position_info['count']}/{max_positions}\")\n",
|
||||
"\n",
|
||||
" # SCHRITT 2: Signal Analysis (wie vorher)\n",
|
||||
" signal_info = extended_top_down_v2_adaptive(symbol)\n",
|
||||
" if signal_info is None:\n",
|
||||
" print(\"❌ Signal-Analyse fehlgeschlagen\")\n",
|
||||
" return None\n",
|
||||
"\n",
|
||||
" entry_signal = signal_info[\"entry_signal\"]\n",
|
||||
" base_confidence = signal_info[\"confidence\"]\n",
|
||||
" adaptive_threshold = signal_info[\"adaptive_threshold\"]\n",
|
||||
"\n",
|
||||
" print(f\"\\n📊 Base Signal Analysis:\")\n",
|
||||
" print(f\" Direction: {entry_signal}\")\n",
|
||||
" print(f\" Base Confidence: {base_confidence:.1f}%\")\n",
|
||||
" print(f\" Adaptive Threshold: {adaptive_threshold:.1f}%\")\n",
|
||||
"\n",
|
||||
" # ⭐ SCHRITT 3: ENHANCED SIGNAL SCORING (NEU!)\n",
|
||||
" print(f\"\\n🎯 Calculating Enhanced Signal Score...\")\n",
|
||||
"\n",
|
||||
" try:\n",
|
||||
" enhanced = signal_scorer.calculate_enhanced_score(\n",
|
||||
" symbol=symbol,\n",
|
||||
" base_confidence=base_confidence,\n",
|
||||
" trend_direction=entry_signal,\n",
|
||||
" current_price=signal_info['trend_info']['M5']['price']\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" # Verwende enhanced score statt base confidence\n",
|
||||
" final_confidence = enhanced.total_score\n",
|
||||
"\n",
|
||||
" print(f\"\\n✅ Enhanced Signal Scoring:\")\n",
|
||||
" print(f\" Trend Score: {enhanced.trend_score:.1f}/100\")\n",
|
||||
" print(f\" Volume Score: {enhanced.volume_score:.1f}/100\")\n",
|
||||
" print(f\" Momentum Score: {enhanced.momentum_score:.1f}/100\")\n",
|
||||
" print(f\" S/R Score: {enhanced.support_resistance_score:.1f}/100\")\n",
|
||||
" print(f\" Fibonacci Score: {enhanced.fibonacci_score:.1f}/100\")\n",
|
||||
" print(f\" ─────────────────────────────────────\")\n",
|
||||
" print(f\" 📊 Base Confidence: {base_confidence:.1f}%\")\n",
|
||||
" print(f\" 🎯 Enhanced Score: {final_confidence:.1f}%\")\n",
|
||||
" print(f\" 📈 Signal Quality: {enhanced.signal_quality}\")\n",
|
||||
"\n",
|
||||
" # Show reasoning\n",
|
||||
" if enhanced.reason:\n",
|
||||
" print(f\"\\n💡 Analysis: {enhanced.reason}\")\n",
|
||||
"\n",
|
||||
" except Exception as e:\n",
|
||||
" print(f\"⚠️ Enhanced scoring failed: {e}\")\n",
|
||||
" print(\" Falling back to base confidence\")\n",
|
||||
" final_confidence = base_confidence\n",
|
||||
"\n",
|
||||
" # SCHRITT 4: Threshold Check\n",
|
||||
" if entry_signal in [\"LONG\", \"SHORT\"]:\n",
|
||||
" if final_confidence >= adaptive_threshold:\n",
|
||||
" print(f\"\\n🎯 Signal qualified! {final_confidence:.1f}% >= {adaptive_threshold:.1f}%\")\n",
|
||||
"\n",
|
||||
" # Execute trade with ENHANCED confidence\n",
|
||||
" result = execute_trade_v2_adaptive(\n",
|
||||
" symbol=symbol,\n",
|
||||
" entry_signal=entry_signal,\n",
|
||||
" confidence=final_confidence, # ← Use enhanced score!\n",
|
||||
" signal_info=signal_info\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" return result\n",
|
||||
" else:\n",
|
||||
" print(f\"\\n❌ Signal below threshold: {final_confidence:.1f}% < {adaptive_threshold:.1f}%\")\n",
|
||||
" print(f\" Base would have been: {base_confidence:.1f}%\")\n",
|
||||
"\n",
|
||||
" if final_confidence < base_confidence:\n",
|
||||
" print(f\" ⚠️ Enhanced scoring filtered out weak setup!\")\n",
|
||||
"\n",
|
||||
" return None\n",
|
||||
" else:\n",
|
||||
" print(f\"\\n⏸️ No clear signal: {entry_signal}\")\n",
|
||||
" return None\n",
|
||||
"\n",
|
||||
" except Exception as e:\n",
|
||||
" print(f\"❌ Enhanced trading check error: {e}\")\n",
|
||||
" import traceback\n",
|
||||
" traceback.print_exc()\n",
|
||||
" return None\n",
|
||||
"\n",
|
||||
"print(\"✅ Enhanced trading check wrapper created!\")\n",
|
||||
"print(\" This will use multi-factor analysis for all trades\")\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "9b32db82",
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"# ==========================================\n",
|
||||
"# UPDATE SCHEDULER WITH ENHANCED VERSION\n",
|
||||
"# ==========================================\n",
|
||||
"\n",
|
||||
"print(\"🔄 Updating scheduler with enhanced trading check...\")\n",
|
||||
"\n",
|
||||
"# Remove old job\n",
|
||||
"try:\n",
|
||||
" scheduler.remove_job('adaptive_trading_check')\n",
|
||||
" print(\" Removed old adaptive_trading_check job\")\n",
|
||||
"except:\n",
|
||||
" pass\n",
|
||||
"\n",
|
||||
"# Add enhanced version\n",
|
||||
"scheduler.add_job(\n",
|
||||
" func=lambda: enhanced_trading_check_wrapper(\"XAUUSD\", debug=True),\n",
|
||||
" trigger='interval',\n",
|
||||
" minutes=1,\n",
|
||||
" id='adaptive_trading_check',\n",
|
||||
" name='Enhanced Adaptive Trading Check',\n",
|
||||
" replace_existing=True,\n",
|
||||
" max_instances=1\n",
|
||||
")\n",
|
||||
"\n",
|
||||
"print(\"\\n✅ Enhanced Trading Check activated!\")\n",
|
||||
"print(\" Scheduler updated with multi-factor signal scoring\")\n",
|
||||
"\n",
|
||||
"# Show active jobs\n",
|
||||
"print(\"\\n📋 Active Scheduler Jobs:\")\n",
|
||||
"for job in scheduler.get_jobs():\n",
|
||||
" print(f\" • {job.id}: {job.trigger}\")\n",
|
||||
"\n",
|
||||
"print(\"\\n\" + \"=\" * 70)\n",
|
||||
"print(\"🎯 ENHANCED SIGNAL SCORING NOW ACTIVE!\")\n",
|
||||
"print(\"=\" * 70)\n",
|
||||
"print(\"\\nBot will now use 5-factor analysis for all trading signals:\")\n",
|
||||
"print(\" ✅ Trend Alignment (30%)\")\n",
|
||||
"print(\" ✅ Volume Analysis (20%)\")\n",
|
||||
"print(\" ✅ Momentum (RSI/MACD) (20%)\")\n",
|
||||
"print(\" ✅ Support/Resistance (15%)\")\n",
|
||||
"print(\" ✅ Fibonacci Levels (15%)\")\n",
|
||||
"print(\"\\n💡 Expected improvement: +5-10% Win Rate\")\n",
|
||||
"print(\"=\" * 70)\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
"id": "409ff58c",
|
||||
"metadata": {},
|
||||
"source": [
|
||||
"## 🧪 Test Enhanced Signal Scoring\n",
|
||||
"\n",
|
||||
"Run the cell below to test enhanced scoring on current market conditions.\n",
|
||||
"This will show you the difference between base confidence and enhanced score.\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"id": "62054af5",
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"# ==========================================\n",
|
||||
"# TEST ENHANCED SIGNAL SCORING\n",
|
||||
"# ==========================================\n",
|
||||
"\n",
|
||||
"print(\"🧪 Testing Enhanced Signal Scoring...\")\n",
|
||||
"print(\"=\" * 70)\n",
|
||||
"\n",
|
||||
"# Get current signal\n",
|
||||
"signal_info = extended_top_down_v2_adaptive(\"XAUUSD\")\n",
|
||||
"\n",
|
||||
"if signal_info:\n",
|
||||
" base_confidence = signal_info[\"confidence\"]\n",
|
||||
" entry_signal = signal_info[\"entry_signal\"]\n",
|
||||
"\n",
|
||||
" print(f\"\\n📊 Base Signal:\")\n",
|
||||
" print(f\" Direction: {entry_signal}\")\n",
|
||||
" print(f\" Confidence: {base_confidence:.1f}%\")\n",
|
||||
"\n",
|
||||
" # Calculate enhanced score\n",
|
||||
" enhanced = signal_scorer.calculate_enhanced_score(\n",
|
||||
" symbol=\"XAUUSD\",\n",
|
||||
" base_confidence=base_confidence,\n",
|
||||
" trend_direction=entry_signal,\n",
|
||||
" current_price=signal_info['trend_info']['M5']['price']\n",
|
||||
" )\n",
|
||||
"\n",
|
||||
" print(f\"\\n🎯 Enhanced Analysis:\")\n",
|
||||
" print(f\" Trend: {enhanced.trend_score:.1f}/100 (30%)\")\n",
|
||||
" print(f\" Volume: {enhanced.volume_score:.1f}/100 (20%)\")\n",
|
||||
" print(f\" Momentum: {enhanced.momentum_score:.1f}/100 (20%)\")\n",
|
||||
" print(f\" S/R: {enhanced.support_resistance_score:.1f}/100 (15%)\")\n",
|
||||
" print(f\" Fibonacci: {enhanced.fibonacci_score:.1f}/100 (15%)\")\n",
|
||||
" print(f\" ─────────────────────────────────────\")\n",
|
||||
" print(f\" Total Score: {enhanced.total_score:.1f}%\")\n",
|
||||
" print(f\" Quality: {enhanced.signal_quality}\")\n",
|
||||
"\n",
|
||||
" # Compare\n",
|
||||
" diff = enhanced.total_score - base_confidence\n",
|
||||
" if diff > 0:\n",
|
||||
" print(f\"\\n✅ Enhanced score HIGHER by {diff:.1f}%\")\n",
|
||||
" print(f\" Setup has strong confirmation factors\")\n",
|
||||
" elif diff < 0:\n",
|
||||
" print(f\"\\n⚠️ Enhanced score LOWER by {abs(diff):.1f}%\")\n",
|
||||
" print(f\" Setup has weak confirmation factors\")\n",
|
||||
" else:\n",
|
||||
" print(f\"\\n⚪ Enhanced score same as base\")\n",
|
||||
"\n",
|
||||
" # Show reasoning\n",
|
||||
" if enhanced.reason:\n",
|
||||
" print(f\"\\n💡 {enhanced.reason}\")\n",
|
||||
"\n",
|
||||
"else:\n",
|
||||
" print(\"❌ No signal data available\")\n",
|
||||
"\n",
|
||||
"print(\"\\n\" + \"=\" * 70)\n",
|
||||
"print(\"✅ Test complete!\")\n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "markdown",
|
||||
"id": "1e86e5b8",
|
||||
@@ -3698,15 +3962,7 @@
|
||||
"execution_count": null,
|
||||
"id": "cf605503",
|
||||
"metadata": {},
|
||||
"outputs": [
|
||||
{
|
||||
"name": "stderr",
|
||||
"output_type": "stream",
|
||||
"text": [
|
||||
"2026-01-21 12:58:11,733 - INFO - HTTP Request: POST https://api.telegram.org/bot7783303065:AAHVVvwWGqmhJ2BVq8LqkLRSsicKy1CUsD8/getUpdates \"HTTP/1.1 200 OK\"\n"
|
||||
]
|
||||
}
|
||||
],
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"# ==========================================\n",
|
||||
"# 💰 P&L PERFORMANCE DASHBOARD\n",
|
||||
|
||||
Reference in New Issue
Block a user