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,135 @@
+#!/bin/bash
+# ==========================================
+# Trading Bot - Project Cleanup Script
+# Strukturiert das Projekt für V2.0
+# ==========================================
+
+echo "========================================================================"
+echo "🧹 TRADING BOT - PROJECT CLEANUP"
+echo "========================================================================"
+echo ""
+
+# Backup erstellen
+echo "📦 Creating backup..."
+BACKUP_DIR="../placeorder_backup_$(date +%Y%m%d_%H%M%S)"
+cp -r . "$BACKUP_DIR"
+echo "✅ Backup created: $BACKUP_DIR"
+echo ""
+
+# Ordnerstruktur erstellen
+echo "📁 Creating new folder structure..."
+
+mkdir -p core
+mkdir -p infrastructure
+mkdir -p strategies
+mkdir -p gui
+mkdir -p dashboard
+mkdir -p utils
+mkdir -p scripts
+mkdir -p docs
+mkdir -p archive/old_notebooks
+mkdir -p archive/old_patches
+mkdir -p archive/old_docs
+mkdir -p data/logs
+mkdir -p data/backups
+mkdir -p config
+mkdir -p tests
+
+echo "✅ Folders created"
+echo ""
+
+# Infrastructure verschieben
+echo "🔧 Moving Infrastructure files..."
+mv trading_database.py infrastructure/ 2>/dev/null || echo "   trading_database.py already in place"
+mv telegram_notifier.py infrastructure/ 2>/dev/null || echo "   telegram_notifier.py already in place"
+mv infrastructure_patch.py infrastructure/ 2>/dev/null || echo "   infrastructure_patch.py already in place"
+mv position_monitor.py infrastructure/ 2>/dev/null || echo "   position_monitor.py already in place"
+
+# Strategies verschieben
+echo "📊 Moving Strategy files..."
+mv session_filter_patch.py strategies/ 2>/dev/null || echo "   session_filter_patch.py already in place"
+mv drawdown_protection.py strategies/ 2>/dev/null || echo "   drawdown_protection.py already in place"
+mv adaptive_rhythm_manager.py strategies/ 2>/dev/null || echo "   adaptive_rhythm_manager.py already in place"
+
+# GUI verschieben
+echo "🖥️ Moving GUI files..."
+mv trading_bot_gui.py gui/ 2>/dev/null || echo "   trading_bot_gui.py already in place"
+mv execute_trade.py gui/ 2>/dev/null || echo "   execute_trade.py already in place"
+
+# Dashboard verschieben
+echo "📈 Moving Dashboard files..."
+mv trading_dashboard.py dashboard/ 2>/dev/null || echo "   trading_dashboard.py already in place"
+
+# Utils verschieben
+echo "🔧 Moving Utility files..."
+mv clean_invalid_exits.py utils/ 2>/dev/null || echo "   clean_invalid_exits.py already in place"
+mv fix_closed_positions.py utils/ 2>/dev/null || echo "   fix_closed_positions.py already in place"
+mv diagnose_position_monitor.py utils/ 2>/dev/null || echo "   diagnose_position_monitor.py already in place"
+mv performance_analysis_simple.py utils/ 2>/dev/null || echo "   performance_analysis_simple.py already in place"
+mv analyze_json_performance.py utils/ 2>/dev/null || echo "   analyze_json_performance.py already in place"
+mv analyze_mt5_profitability.py utils/ 2>/dev/null || echo "   analyze_mt5_profitability.py already in place"
+mv analyze_performance.py utils/ 2>/dev/null || echo "   analyze_performance.py already in place"
+
+# Scripts verschieben
+echo "📜 Moving Scripts..."
+mv patch_drawdown_protection_v2.py scripts/ 2>/dev/null || echo "   patch_drawdown_protection_v2.py already in place"
+
+# Documentation verschieben
+echo "📚 Moving Documentation..."
+mv MASTER_PLAN_V2.0.md docs/ 2>/dev/null || echo "   MASTER_PLAN_V2.0.md already in place"
+mv README_GUI.md docs/ 2>/dev/null || echo "   README_GUI.md already in place"
+mv DRAWDOWN_PROTECTION_SETUP.md docs/ 2>/dev/null || echo "   DRAWDOWN_PROTECTION_SETUP.md already in place"
+mv POSITION_MONITOR_GUIDE.md docs/ 2>/dev/null || echo "   POSITION_MONITOR_GUIDE.md already in place"
+
+# Archive alte Dateien
+echo "📦 Archiving old files..."
+mv *_backup*.ipynb archive/old_notebooks/ 2>/dev/null
+mv patch_drawdown_protection.py archive/old_patches/ 2>/dev/null
+mv V1.*.md archive/old_docs/ 2>/dev/null
+mv *VERBESSERUNG*.md archive/old_docs/ 2>/dev/null
+mv SESSION_FILTER*.md archive/old_docs/ 2>/dev/null
+mv SQLITE*.md archive/old_docs/ 2>/dev/null
+mv CONFIDENCE*.md archive/old_docs/ 2>/dev/null
+mv VPS_*.md archive/old_docs/ 2>/dev/null
+mv NOTEBOOK_*.md archive/old_docs/ 2>/dev/null
+mv FIX_*.md archive/old_docs/ 2>/dev/null
+mv QUICK_START*.md archive/old_docs/ 2>/dev/null
+mv Implementierungs*.md archive/old_docs/ 2>/dev/null
+
+# Data & Logs verschieben
+echo "💾 Moving Data files..."
+mv trading_bot.db data/ 2>/dev/null || echo "   trading_bot.db already in place"
+mv *.json data/ 2>/dev/null
+
+# Config verschieben
+echo "⚙️ Moving Config files..."
+mv telegram_config.json config/ 2>/dev/null || echo "   telegram_config.json already in place"
+mv telegram_config_template.json config/ 2>/dev/null || echo "   template already in place"
+
+echo ""
+echo "========================================================================"
+echo "✅ CLEANUP COMPLETE!"
+echo "========================================================================"
+echo ""
+echo "📁 New Structure:"
+echo "   ├── core/               (empty - ready for service code)"
+echo "   ├── infrastructure/     (database, telegram, position monitor)"
+echo "   ├── strategies/         (session filter, drawdown, rhythm)"
+echo "   ├── gui/                (tkinter app)"
+echo "   ├── dashboard/          (streamlit)"
+echo "   ├── utils/              (analysis & cleanup tools)"
+echo "   ├── scripts/            (deployment & patches)"
+echo "   ├── docs/               (documentation)"
+echo "   ├── archive/            (old files)"
+echo "   ├── data/               (database & logs)"
+echo "   ├── config/             (configuration files)"
+echo "   └── tests/              (empty - ready for tests)"
+echo ""
+echo "📦 Backup: $BACKUP_DIR"
+echo ""
+echo "🎯 Next steps:"
+echo "   1. Review new structure"
+echo "   2. Update imports in files"
+echo "   3. Create main README.md"
+echo "   4. Choose implementation path (A/B/C)"
+echo ""