all changes done over the last 2 weeks

2025-12-16 22:02:15 +01:00
parent 596718e30b
commit cbd6584db5
54 changed files with 25684 additions and 116 deletions
@@ -0,0 +1,460 @@
+# 🎯 Trading Bot - Master Plan V2.0
+
+**Datum:** 2025-12-06
+**Status:** Planning Phase
+**Current Version:** V1.9 (Jupyter Notebook + Drawdown Protection)
+
+---
+
+## 📊 **AKTUELLER STAND (V1.9)**
+
+### ✅ **Erfolgreich implementiert:**
+
+1. **Position Monitor** ✅
+   - Exit-Tracking funktioniert
+   - Automatische Profit-Berechnung
+   - Database Updates
+   - Telegram Notifications
+
+2. **Trading Dashboard** ✅
+   - Streamlit Web UI
+   - Live & Historical Trades Filter
+   - Net Profit Display
+   - Session Distribution
+   - DateTime-Parsing behoben
+
+3. **Session Filter (V1.7)** ✅
+   - NY + Asian aktiv (beste Performance)
+   - London & Overlap deaktiviert
+   - Confidence Threshold: 70
+   - Live-änderbar während Laufzeit
+
+4. **Drawdown Protection (V1.9)** ✅
+   - Multi-Level Loss Limits (Daily/Weekly/Monthly)
+   - Consecutive Loss Detection (5 in Folge)
+   - Automatische Pause + Cooldown (24h)
+   - Telegram Notifications
+   - Erfolgreich ins Notebook integriert
+
+5. **Database & Cleanup** ✅
+   - SQLite mit trades, bot_status, performance_summary Tables
+   - Invalide Exits entfernt
+   - Closed Positions korrigiert
+   - Historical vs Live Separation
+
+6. **Infrastructure** ✅
+   - TradingDatabase
+   - TelegramNotifier
+   - Scheduled Reports (Daily/Weekly)
+   - APScheduler Integration
+
+### 📁 **Aktuelle Dateien:**
+
+#### **Core System (Production):**
+- `TradingBot_V1.6_Adaptive_Complete_CORRECTED.ipynb` - Main Bot (gepatcht mit Drawdown)
+- `trading_database.py` - Database Management
+- `telegram_notifier.py` - Telegram Integration
+- `infrastructure_patch.py` - Infrastructure Setup
+- `position_monitor.py` - Exit Tracking
+- `session_filter_patch.py` - Session Filter
+- `drawdown_protection.py` - Drawdown Protection
+- `trading_bot.db` - SQLite Database
+
+#### **Dashboard & Analysis:**
+- `trading_dashboard.py` - Streamlit Web Dashboard
+- `performance_analysis_simple.py` - Performance Reports
+- `analyze_json_performance.py` - JSON Analysis
+
+#### **Utilities & Patches:**
+- `patch_drawdown_protection_v2.py` - Notebook Patcher
+- `clean_invalid_exits.py` - Database Cleanup
+- `fix_closed_positions.py` - Position Fixer
+- `diagnose_position_monitor.py` - Diagnostic Tool
+
+#### **New GUI (Framework):**
+- `trading_bot_gui.py` - Tkinter Desktop App (Framework)
+- `adaptive_rhythm_manager.py` - Rhythm Manager (extrahiert)
+- `execute_trade.py` - Trade Execution (Placeholder)
+- `README_GUI.md` - GUI Documentation
+
+#### **Documentation:**
+- `DRAWDOWN_PROTECTION_SETUP.md`
+- `POSITION_MONITOR_GUIDE.md`
+- `V1.8_AGGRESSIVE_MODE_AKTIVIERT.md`
+- `VPS_STATUS_CHECK.md`
+- `README_GUI.md`
+- `MASTER_PLAN_V2.0.md` (dieses Dokument)
+
+#### **Archive:**
+- `archive/` - Alte Versionen & Dokumentation
+
+---
+
+## 🎯 **MASTER PLAN - Drei Wege zur V2.0**
+
+### **🔀 OPTION A: Tkinter Desktop App (Windows-PC Focus)**
+
+**Ziel:** Standalone Desktop-Anwendung für lokale Kontrolle
+
+#### **Phase 1: GUI Vervollständigen**
+- [ ] Trade Execution Module extrahieren aus Notebook
+  - [ ] `extended_top_down_v2_adaptive()`
+  - [ ] `check_existing_positions()`
+  - [ ] `market_order()`
+  - [ ] `calculate_position_size()`
+  - [ ] `check_risk_limits()`
+
+- [ ] Market Analysis Module erstellen
+  - [ ] `detect_market_regime()`
+  - [ ] `get_enhanced_trend()`
+  - [ ] `check_pullback_entry()`
+  - [ ] `get_rates()`
+
+- [ ] Helper Functions Module
+  - [ ] Alle Hilfsfunktionen sammeln
+  - [ ] Imports auflösen
+  - [ ] Tests erstellen
+
+#### **Phase 2: GUI Enhancement**
+- [ ] Live Charts integrieren (matplotlib)
+- [ ] Trade History Table
+- [ ] Performance Metrics Dashboard
+- [ ] Configuration Panel (Drawdown Limits ändern)
+- [ ] Log Export Funktion
+
+#### **Phase 3: Deployment**
+- [ ] PyInstaller Setup
+  - [ ] .exe erstellen
+  - [ ] Icon hinzufügen
+  - [ ] Dependencies bundlen
+- [ ] Installer erstellen (NSIS)
+- [ ] Update-Mechanismus
+- [ ] Error Reporting
+
+**Vorteile:**
+- ✅ Benutzerfreundlich (keine Code-Kenntnisse nötig)
+- ✅ Lokale Kontrolle
+- ✅ Windows-native
+- ✅ Standalone (keine Server)
+
+**Nachteile:**
+- ❌ Nur lokal (kein 24/7 auf VPS)
+- ❌ Kein Remote-Access
+- ❌ GUI auf VPS schwierig
+
+**Zeitaufwand:** 2-3 Tage
+
+---
+
+### **🔀 OPTION B: Python Service + Web Dashboard (VPS Focus)**
+
+**Ziel:** Production-ready Service für 24/7 VPS-Betrieb
+
+#### **Phase 1: Notebook → Python Service**
+- [ ] `trading_bot_service.py` erstellen
+  - [ ] Alle Code-Cells aus Notebook extrahieren
+  - [ ] Markdown entfernen
+  - [ ] Proper Logging hinzufügen
+  - [ ] Configuration File (YAML/JSON)
+  - [ ] Command-line Arguments
+
+- [ ] Service Management
+  - [ ] systemd service file
+  - [ ] Auto-restart on crash
+  - [ ] Log rotation
+  - [ ] Health checks
+
+#### **Phase 2: Web Dashboard Enhancement**
+- [ ] Streamlit Dashboard erweitern
+  - [ ] Drawdown Protection Status
+  - [ ] Session Filter Visualisierung
+  - [ ] Real-time Alerts
+  - [ ] Configuration Editor
+  - [ ] Manual Controls (Start/Stop/Close)
+
+- [ ] REST API (optional)
+  - [ ] Flask/FastAPI Backend
+  - [ ] /status endpoint
+  - [ ] /trades endpoint
+  - [ ] /control endpoints (start/stop)
+
+#### **Phase 3: VPS Deployment**
+- [ ] Deployment Script
+  - [ ] `deploy_to_vps.sh`
+  - [ ] Environment Setup
+  - [ ] Database Migration
+  - [ ] Service Installation
+
+- [ ] Monitoring & Backup
+  - [ ] Log aggregation
+  - [ ] Database Backups (cron)
+  - [ ] Uptime Monitoring
+  - [ ] Alert System
+
+**Vorteile:**
+- ✅ 24/7 Betrieb
+- ✅ Remote-Access (Web Dashboard)
+- ✅ Auto-Restart
+- ✅ Production-ready
+- ✅ Cloud-native
+
+**Nachteile:**
+- ❌ Kein lokales GUI
+- ❌ VPS-Kosten
+- ❌ Server-Wartung nötig
+
+**Zeitaufwand:** 1-2 Tage
+
+---
+
+### **🔀 OPTION C: Hybrid Setup (BESTE LÖSUNG!)**
+
+**Ziel:** Kombination aus Desktop GUI + VPS Service
+
+#### **Setup:**
+```
+Windows PC (lokal):
+├── trading_bot_gui.py          # Desktop App
+│   ├── MT5 Connection
+│   ├── Manual Controls
+│   ├── Live Monitoring
+│   └── Quick Testing
+│
+VPS (24/7):
+├── trading_bot_service.py      # Production Service
+│   ├── APScheduler
+│   ├── Position Monitor
+│   ├── Session Filter
+│   └── Drawdown Protection
+│
+├── trading_dashboard.py        # Web Dashboard
+│   └── Remote Monitoring
+│
+└── telegram_notifier.py        # Mobile Alerts
+```
+
+#### **Phase 1: Service-Konvertierung (VPS)**
+- [ ] Notebook → `trading_bot_service.py`
+- [ ] systemd service setup
+- [ ] Configuration File
+- [ ] Deployment Script
+
+#### **Phase 2: GUI-Vervollständigung (Windows)**
+- [ ] Trade Execution Module
+- [ ] Market Analysis Module
+- [ ] PyInstaller .exe
+
+#### **Phase 3: Integration**
+- [ ] Shared Database (SQLite Sync oder PostgreSQL)
+- [ ] Unified Configuration
+- [ ] Status Synchronization
+
+**Vorteile:**
+- ✅ Beste aus beiden Welten
+- ✅ Flexibilität (lokal + remote)
+- ✅ Failover (VPS läuft immer)
+- ✅ Testing lokal, Production VPS
+
+**Nachteile:**
+- ❌ Doppelter Wartungsaufwand
+- ❌ Sync-Komplexität
+
+**Zeitaufwand:** 3-4 Tage
+
+---
+
+## 📋 **PROJEKT CLEANUP - VOR Start**
+
+### **Aufräumen & Strukturieren:**
+
+#### **1. Archive verschieben:**
+```bash
+mkdir -p archive/old_notebooks
+mkdir -p archive/old_patches
+mkdir -p archive/old_docs
+
+# Move old files:
+mv *_backup*.ipynb archive/old_notebooks/
+mv patch_drawdown_protection.py archive/old_patches/  # (v1, nicht v2)
+mv *_V1.*.md archive/old_docs/
+```
+
+#### **2. Ordnerstruktur erstellen:**
+```
+placeorder/
+├── core/                       # Core Trading Logic
+│   ├── trading_bot_service.py  # Main Service (TODO)
+│   ├── market_analysis.py      # Market Analysis (TODO)
+│   ├── trade_execution.py      # Trade Execution (TODO)
+│   └── risk_management.py      # Risk Management (TODO)
+│
+├── infrastructure/             # Infrastructure
+│   ├── trading_database.py
+│   ├── telegram_notifier.py
+│   ├── infrastructure_patch.py
+│   └── position_monitor.py
+│
+├── strategies/                 # Trading Strategies
+│   ├── session_filter_patch.py
+│   ├── drawdown_protection.py
+│   └── adaptive_rhythm_manager.py
+│
+├── gui/                        # Desktop GUI
+│   ├── trading_bot_gui.py
+│   └── execute_trade.py
+│
+├── dashboard/                  # Web Dashboard
+│   └── trading_dashboard.py
+│
+├── utils/                      # Utilities
+│   ├── clean_invalid_exits.py
+│   ├── fix_closed_positions.py
+│   ├── diagnose_position_monitor.py
+│   ├── performance_analysis_simple.py
+│   └── analyze_json_performance.py
+│
+├── scripts/                    # Deployment & Patches
+│   ├── patch_drawdown_protection_v2.py
+│   ├── deploy_to_vps.sh        # (TODO)
+│   └── setup_service.sh         # (TODO)
+│
+├── docs/                       # Documentation
+│   ├── MASTER_PLAN_V2.0.md     # (dieses Dokument)
+│   ├── README_GUI.md
+│   ├── DRAWDOWN_PROTECTION_SETUP.md
+│   ├── POSITION_MONITOR_GUIDE.md
+│   └── VPS_DEPLOYMENT.md       # (TODO)
+│
+├── archive/                    # Archive
+│   ├── old_notebooks/
+│   ├── old_patches/
+│   └── old_docs/
+│
+├── data/                       # Data & Logs
+│   ├── trading_bot.db
+│   ├── logs/
+│   └── backups/
+│
+├── config/                     # Configuration
+│   ├── trading_config.yaml     # (TODO)
+│   ├── session_filter.yaml     # (TODO)
+│   └── drawdown_limits.yaml    # (TODO)
+│
+├── tests/                      # Tests (TODO)
+│   ├── test_market_analysis.py
+│   ├── test_trade_execution.py
+│   └── test_risk_management.py
+│
+└── README.md                   # Main README
+```
+
+#### **3. Code Cleanup:**
+- [ ] Entferne doppelten Code
+- [ ] Konsolidiere Helper Functions
+- [ ] Einheitliche Imports
+- [ ] Docstrings hinzufügen
+- [ ] Type Hints hinzufügen
+
+#### **4. Documentation Cleanup:**
+- [ ] Alles in `/docs` sammeln
+- [ ] Outdated Docs archivieren
+- [ ] Main README.md erstellen
+- [ ] API Documentation (optional)
+
+---
+
+## 🎯 **EMPFEHLUNG:**
+
+### **Path Forward:**
+
+**1. HEUTE:**
+- ✅ Master Plan erstellt (dieses Dokument)
+- 🔄 Projekt aufräumen (siehe Cleanup-Plan oben)
+- 🔄 Ordnerstruktur erstellen
+
+**2. MORGEN:**
+- **Option B wählen** (Python Service + Web Dashboard)
+- Notebook → `trading_bot_service.py` konvertieren
+- systemd service setup
+- VPS Deployment
+
+**3. DIESE WOCHE:**
+- Service auf VPS deployen
+- Dashboard erweitern (Drawdown Status, Config Editor)
+- Monitoring & Backup Setup
+
+**4. NÄCHSTE WOCHE (OPTIONAL):**
+- GUI vervollständigen (wenn gewünscht)
+- .exe erstellen
+- Hybrid Setup testen
+
+---
+
+## 📊 **PERFORMANCE ZIELE V2.0:**
+
+### **Target Metrics:**
+- Win Rate: >40% (aktuell ~30%)
+- Profit Factor: >1.5
+- Max Drawdown: <10%
+- Recovery Time: <7 Tage
+
+### **Durch:**
+- ✅ Session Filter optimiert (NY + Asian)
+- ✅ Drawdown Protection aktiv
+- 🔄 Confidence Threshold optimiert (70 → 75?)
+- 🔄 Position Sizing optimiert
+- 🔄 Exit Strategy verbessert (Trailing Stop?)
+
+---
+
+## ✅ **NEXT ACTIONS:**
+
+### **Sofort (heute):**
+1. [ ] Diesen Plan speichern
+2. [ ] Backup vom aktuellen Stand
+3. [ ] Ordnerstruktur erstellen
+4. [ ] Dateien sortieren & archivieren
+5. [ ] README.md erstellen
+
+### **Diese Woche:**
+1. [ ] Entscheiden: Option A / B / C?
+2. [ ] Cleanup abschließen
+3. [ ] Mit Implementation beginnen
+
+---
+
+## 📝 **DECISION LOG:**
+
+| Datum | Entscheidung | Begründung |
+|-------|--------------|------------|
+| 2025-12-06 | Drawdown Protection implementiert | Schutz vor Overtrading |
+| 2025-12-06 | Session Filter: NY + Asian | Beste Performance laut Daten |
+| 2025-12-06 | Confidence auf 70 erhöht | Balance zwischen Signals und Qualität |
+| 2025-12-06 | GUI Framework erstellt | Für lokale Kontrolle & Testing |
+| 2025-12-06 | Master Plan V2.0 erstellt | Roadmap für Production |
+
+---
+
+## 🤔 **OFFENE FRAGEN:**
+
+1. **Deployment-Präferenz:**
+   - Nur VPS Service? (empfohlen)
+   - Nur Desktop GUI?
+   - Hybrid Setup?
+
+2. **Zeitrahmen:**
+   - Schnell Production (1-2 Tage) → Option B
+   - Vollständig mit GUI (3-4 Tage) → Option C
+
+3. **Features:**
+   - REST API für Remote-Control?
+   - Mobile App (später)?
+   - Multi-Symbol Support?
+
+---
+
+**Status:** 📋 Plan Complete - Ready for Cleanup & Implementation
+
+**Nächster Schritt:** Projekt aufräumen & Ordnerstruktur erstellen
+
+**Estimated Time to Production:** 1-2 Tage (Option B) | 3-4 Tage (Option C)