win uni toggle

2025-07-29 16:10:45 +03:00
parent ecbbabc0c1
commit d35530a9e9
4 changed files with 468 additions and 22 deletions
--- a/UNIVERSAL_MODEL_TOGGLE_SYSTEM_SUMMARY.md
+++ b/UNIVERSAL_MODEL_TOGGLE_SYSTEM_SUMMARY.md
@ -0,0 +1,168 @@
+# Universal Model Toggle System - Implementation Summary
+
+## 🎯 Problem Solved
+
+The original dashboard had hardcoded model toggle callbacks for specific models (DQN, CNN, COB_RL, Decision_Fusion). This meant:
+- ❌ Adding new models required manual code changes
+- ❌ Each model needed separate hardcoded callbacks
+- ❌ No support for dynamic model registration
+- ❌ Maintenance nightmare when adding/removing models
+
+## ✅ Solution Implemented
+
+Created a **Universal Model Toggle System** that works with any model dynamically:
+
+### Key Features
+
+1. **Dynamic Model Discovery**
+   - Automatically detects all models from orchestrator's model registry
+   - Supports models with or without interfaces
+   - Works with both registered models and toggle-only models
+
+2. **Universal Callback Generation**
+   - Single generic callback handler for all models
+   - Automatically creates inference and training toggles for each model
+   - No hardcoded model names or callbacks
+
+3. **Robust State Management**
+   - Toggle states persist across sessions
+   - Automatic initialization for new models
+   - Backward compatibility with existing models
+
+4. **Dynamic Model Registration**
+   - Add new models at runtime without code changes
+   - Remove models dynamically
+   - Automatic callback creation for new models
+
+## 🏗️ Architecture Changes
+
+### 1. Dashboard (`web/clean_dashboard.py`)
+
+**Before:**
+```python
+# Hardcoded model state variables
+self.dqn_inference_enabled = True
+self.cnn_inference_enabled = True
+# ... separate variables for each model
+
+# Hardcoded callbacks for each model
+@self.app.callback(Output('dqn-inference-toggle', 'value'), ...)
+def update_dqn_inference_toggle(value): ...
+
+@self.app.callback(Output('cnn-inference-toggle', 'value'), ...)
+def update_cnn_inference_toggle(value): ...
+# ... separate callback for each model
+```
+
+**After:**
+```python
+# Dynamic model state management
+self.model_toggle_states = {}  # Dynamic storage
+
+# Universal callback setup
+self._setup_universal_model_callbacks()
+
+def _setup_universal_model_callbacks(self):
+    available_models = self._get_available_models()
+    for model_name in available_models.keys():
+        self._create_model_toggle_callbacks(model_name)
+
+def _create_model_toggle_callbacks(self, model_name):
+    # Creates both inference and training callbacks dynamically
+    @self.app.callback(...)
+    def update_model_inference_toggle(value):
+        return self._handle_model_toggle(model_name, 'inference', value)
+```
+
+### 2. Orchestrator (`core/orchestrator.py`)
+
+**Enhanced with:**
+- `register_model_dynamically()` - Add models at runtime
+- `get_all_registered_models()` - Get all available models
+- Automatic toggle state initialization for new models
+- Notification system for toggle changes
+
+### 3. Model Registry (`models/__init__.py`)
+
+**Enhanced with:**
+- `unregister_model()` - Remove models dynamically
+- `get_memory_stats()` - Memory usage tracking
+- `cleanup_all_models()` - Cleanup functionality
+
+## 🧪 Test Results
+
+The test script `test_universal_model_toggles.py` demonstrates:
+
+✅ **Test 1: Model Discovery** - Found 9 existing models automatically
+✅ **Test 2: Dynamic Registration** - Successfully added new model at runtime
+✅ **Test 3: Toggle State Management** - Proper state retrieval for all models
+✅ **Test 4: State Updates** - Toggle changes work correctly
+✅ **Test 5: Interface-less Models** - Models without interfaces work
+✅ **Test 6: Dashboard Integration** - Dashboard sees all 14 models dynamically
+
+## 🚀 Usage Examples
+
+### Adding a New Model Dynamically
+
+```python
+# Through orchestrator
+success = orchestrator.register_model_dynamically("new_model", model_interface)
+
+# Through dashboard
+success = dashboard.add_model_dynamically("new_model", model_interface)
+```
+
+### Checking Model States
+
+```python
+# Get all available models
+models = orchestrator.get_all_registered_models()
+
+# Get specific model toggle state
+state = orchestrator.get_model_toggle_state("any_model_name")
+# Returns: {"inference_enabled": True, "training_enabled": False}
+```
+
+### Updating Toggle States
+
+```python
+# Enable/disable inference or training for any model
+orchestrator.set_model_toggle_state("any_model", inference_enabled=False)
+orchestrator.set_model_toggle_state("any_model", training_enabled=True)
+```
+
+## 🎯 Benefits Achieved
+
+1. **Scalability**: Add unlimited models without code changes
+2. **Maintainability**: Single universal handler instead of N hardcoded callbacks
+3. **Flexibility**: Works with any model type (DQN, CNN, Transformer, etc.)
+4. **Robustness**: Automatic state management and persistence
+5. **Future-Proof**: New model types automatically supported
+
+## 🔧 Technical Implementation Details
+
+### Model Discovery Process
+1. Check orchestrator's model registry for registered models
+2. Check orchestrator's toggle states for additional models
+3. Merge both sources to get complete model list
+4. Create callbacks for all discovered models
+
+### Callback Generation
+- Uses Python closures to create unique callbacks for each model
+- Each model gets both inference and training toggle callbacks
+- Callbacks use generic handler with model name parameter
+
+### State Persistence
+- Toggle states saved to `data/ui_state.json`
+- Automatic loading on startup
+- New models get default enabled state
+
+## 🎉 Result
+
+The inf and trn checkboxes now work for **ALL models** - existing and future ones. The system automatically:
+- Discovers all available models
+- Creates appropriate toggle controls
+- Manages state persistence
+- Supports dynamic model addition/removal
+
+**No more hardcoded model callbacks needed!** 🚀
--- a/data/ui_state.json
+++ b/data/ui_state.json
@ -15,11 +15,9 @@
        "decision_fusion": {
            "inference_enabled": false,
            "training_enabled": false
-        },
-        "transformer": {
-            "inference_enabled": true,
-            "training_enabled": true
        }
+
+
    },
-    "timestamp": "2025-07-29T15:48:22.223668"
+    "timestamp": "2025-07-29T15:55:43.690404"
 }
--- a/test_universal_model_toggles.py
+++ b/test_universal_model_toggles.py
@ -0,0 +1,150 @@
+#!/usr/bin/env python3
+"""
+Test script for the Universal Model Toggle System
+
+This script demonstrates how the new universal model toggle system works
+with any model, not just hardcoded ones.
+"""
+
+import sys
+import os
+import logging
+from datetime import datetime
+
+# Add the project root to the path
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+# Setup logging
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+def test_universal_model_toggles():
+    """Test the universal model toggle system"""
+    try:
+        from core.orchestrator import TradingOrchestrator
+        from core.data_provider import DataProvider
+        from models import ModelInterface, get_model_registry
+        
+        logger.info("🧪 Testing Universal Model Toggle System")
+        
+        # Initialize components
+        data_provider = DataProvider()
+        orchestrator = TradingOrchestrator(data_provider=data_provider)
+        
+        # Test 1: Check existing models
+        logger.info("\n📋 Test 1: Checking existing models")
+        existing_models = orchestrator.get_all_registered_models()
+        logger.info(f"Found {len(existing_models)} existing models: {list(existing_models.keys())}")
+        
+        # Test 2: Add a new model dynamically
+        logger.info("\n➕ Test 2: Adding new model dynamically")
+        
+        class TestModel(ModelInterface):
+            def __init__(self):
+                super().__init__("test_model")
+            
+            def predict(self, data):
+                return {"action": "TEST", "confidence": 0.85}
+        
+        test_model = TestModel()
+        success = orchestrator.register_model_dynamically("test_model", test_model)
+        logger.info(f"Dynamic model registration: {'✅ SUCCESS' if success else '❌ FAILED'}")
+        
+        # Test 3: Check toggle states
+        logger.info("\n🔄 Test 3: Testing toggle states")
+        
+        # Test with existing model
+        dqn_state = orchestrator.get_model_toggle_state("dqn")
+        logger.info(f"DQN toggle state: {dqn_state}")
+        
+        # Test with new model
+        test_model_state = orchestrator.get_model_toggle_state("test_model")
+        logger.info(f"Test model toggle state: {test_model_state}")
+        
+        # Test 4: Update toggle states
+        logger.info("\n⚙️ Test 4: Updating toggle states")
+        
+        # Disable inference for test model
+        orchestrator.set_model_toggle_state("test_model", inference_enabled=False)
+        updated_state = orchestrator.get_model_toggle_state("test_model")
+        logger.info(f"Updated test model state: {updated_state}")
+        
+        # Test 5: Add another model without interface
+        logger.info("\n➕ Test 5: Adding model without interface")
+        orchestrator.set_model_toggle_state("custom_transformer", inference_enabled=True, training_enabled=True)
+        transformer_state = orchestrator.get_model_toggle_state("custom_transformer")
+        logger.info(f"Custom transformer state: {transformer_state}")
+        
+        # Test 6: Check all models after additions
+        logger.info("\n📋 Test 6: Final model count")
+        final_models = orchestrator.get_all_registered_models()
+        logger.info(f"Final model count: {len(final_models)}")
+        for model_name, model_info in final_models.items():
+            toggle_state = orchestrator.get_model_toggle_state(model_name)
+            logger.info(f"  - {model_name}: inf={toggle_state['inference_enabled']}, train={toggle_state['training_enabled']}")
+        
+        logger.info("\n✅ Universal Model Toggle System test completed successfully!")
+        return True
+        
+    except Exception as e:
+        logger.error(f"❌ Test failed: {e}")
+        return False
+
+def test_dashboard_integration():
+    """Test dashboard integration with universal toggles"""
+    try:
+        logger.info("\n🖥️ Testing Dashboard Integration")
+        
+        from web.clean_dashboard import CleanTradingDashboard
+        from core.orchestrator import TradingOrchestrator
+        from core.data_provider import DataProvider
+        
+        # Initialize components
+        data_provider = DataProvider()
+        orchestrator = TradingOrchestrator(data_provider=data_provider)
+        
+        # Add some test models
+        orchestrator.set_model_toggle_state("test_model_1", inference_enabled=True, training_enabled=False)
+        orchestrator.set_model_toggle_state("test_model_2", inference_enabled=False, training_enabled=True)
+        
+        # Initialize dashboard (this will test the universal callback setup)
+        dashboard = CleanTradingDashboard(
+            data_provider=data_provider,
+            orchestrator=orchestrator
+        )
+        
+        # Test adding model dynamically through dashboard
+        success = dashboard.add_model_dynamically("dynamic_test_model")
+        logger.info(f"Dashboard dynamic model addition: {'✅ SUCCESS' if success else '❌ FAILED'}")
+        
+        # Check available models
+        available_models = dashboard._get_available_models()
+        logger.info(f"Dashboard sees {len(available_models)} models: {list(available_models.keys())}")
+        
+        logger.info("✅ Dashboard integration test completed!")
+        return True
+        
+    except Exception as e:
+        logger.error(f"❌ Dashboard integration test failed: {e}")
+        return False
+
+if __name__ == "__main__":
+    logger.info("🚀 Starting Universal Model Toggle System Tests")
+    logger.info("=" * 60)
+    
+    # Run tests
+    test1_success = test_universal_model_toggles()
+    test2_success = test_dashboard_integration()
+    
+    # Summary
+    logger.info("\n" + "=" * 60)
+    logger.info("📊 TEST SUMMARY")
+    logger.info(f"Universal Toggle System: {'✅ PASS' if test1_success else '❌ FAIL'}")
+    logger.info(f"Dashboard Integration: {'✅ PASS' if test2_success else '❌ FAIL'}")
+    
+    if test1_success and test2_success:
+        logger.info("🎉 ALL TESTS PASSED! Universal model toggle system is working correctly.")
+        sys.exit(0)
+    else:
+        logger.error("❌ Some tests failed. Check the logs above for details.")
+        sys.exit(1)
--- a/web/clean_dashboard.py
+++ b/web/clean_dashboard.py
@ -388,6 +388,7 @@ class CleanTradingDashboard:
        
        logger.debug("Clean Trading Dashboard initialized with HIGH-FREQUENCY COB integration and signal generation")
        logger.info("🌙 Overnight Training Coordinator ready - call start_overnight_training() to begin")
+        logger.info("✅ Universal model toggle system initialized - supports dynamic model registration")
    
    def _on_cob_data_update(self, symbol: str, cob_data: dict):
        """Handle COB data updates from data provider"""
@ -528,6 +529,57 @@ class CleanTradingDashboard:
            logger.error(f"Error stopping overnight training: {e}")
            return False
    
+    def add_model_dynamically(self, model_name: str, model_interface=None):
+        """Add a new model dynamically to the system"""
+        try:
+            # Register with orchestrator if available
+            if self.orchestrator:
+                if model_interface:
+                    success = self.orchestrator.register_model_dynamically(model_name, model_interface)
+                else:
+                    # Just add toggle state without model interface
+                    self.orchestrator.set_model_toggle_state(model_name, inference_enabled=True, training_enabled=True)
+                    success = True
+                
+                if success:
+                    # Create callbacks for the new model
+                    self._create_model_toggle_callbacks(model_name)
+                    logger.info(f"✅ Successfully added model dynamically: {model_name}")
+                    return True
+                else:
+                    logger.error(f"Failed to register model with orchestrator: {model_name}")
+                    return False
+            else:
+                logger.error("No orchestrator available for dynamic model registration")
+                return False
+                
+        except Exception as e:
+            logger.error(f"Error adding model {model_name} dynamically: {e}")
+            return False
+    
+    def remove_model_dynamically(self, model_name: str):
+        """Remove a model dynamically from the system"""
+        try:
+            if self.orchestrator:
+                # Remove from orchestrator toggle states
+                if model_name in self.orchestrator.model_toggle_states:
+                    del self.orchestrator.model_toggle_states[model_name]
+                    self.orchestrator._save_ui_state()
+                
+                # Remove from model registry if present
+                if hasattr(self.orchestrator, 'model_registry'):
+                    self.orchestrator.model_registry.unregister_model(model_name)
+                
+                logger.info(f"✅ Successfully removed model dynamically: {model_name}")
+                return True
+            else:
+                logger.error("No orchestrator available for dynamic model removal")
+                return False
+                
+        except Exception as e:
+            logger.error(f"Error removing model {model_name} dynamically: {e}")
+            return False
+    
    def get_training_performance_summary(self) -> Dict[str, Any]:
        """Get training performance summary"""
        try:
@ -882,18 +934,17 @@ class CleanTradingDashboard:
            return value
    
    def _update_dashboard_state_variable(self, model_name, toggle_type, enabled):
-        """Update dashboard state variables for backward compatibility"""
+        """Update dashboard state variables for dynamic model management"""
        try:
-            # Map model names to dashboard state variables
-            state_var_name = f"{model_name}_{toggle_type}_enabled"
+            # Store in dynamic model toggle states
+            if model_name not in self.model_toggle_states:
+                self.model_toggle_states[model_name] = {"inference_enabled": True, "training_enabled": True}
            
-            # Set the state variable if it exists
-            if hasattr(self, state_var_name):
-                setattr(self, state_var_name, enabled)
-                logger.debug(f"Updated dashboard state: {state_var_name} = {enabled}")
+            self.model_toggle_states[model_name][f"{toggle_type}_enabled"] = enabled
+            logger.debug(f"Updated dynamic model state: {model_name}.{toggle_type}_enabled = {enabled}")
            
        except Exception as e:
-            logger.debug(f"Error updating dashboard state variable: {e}")
+            logger.debug(f"Error updating dynamic model state: {e}")

    def _setup_callbacks(self):
        """Setup dashboard callbacks"""
@ -977,7 +1028,15 @@ class CleanTradingDashboard:
                        net_unrealized_pnl = leveraged_unrealized_pnl - trading_fees
                        total_session_pnl += net_unrealized_pnl
                
-                session_pnl_str = f"${total_session_pnl:.2f}"
+                # Calculate total session fees for display
+                total_session_fees = self._calculate_total_session_fees()
+                
+                # Format Session P&L with fees breakdown
+                if total_session_fees > 0:
+                    session_pnl_str = f"${total_session_pnl:.2f} (${total_session_fees:.2f} Fees)"
+                else:
+                    session_pnl_str = f"${total_session_pnl:.2f}"
+                
                session_pnl_class = "text-success" if total_session_pnl >= 0 else "text-danger"
                
                # Current position with unrealized P&L (adjustable leverage)
@ -1276,16 +1335,15 @@ class CleanTradingDashboard:
                # Get toggle states from orchestrator
                toggle_states = {}
                if self.orchestrator:
-                    for model_name in ["dqn", "cnn", "cob_rl", "decision_fusion"]:
+                    # Get all available models dynamically
+                    available_models = self._get_available_models()
+                    for model_name in available_models.keys():
                        toggle_states[model_name] = self.orchestrator.get_model_toggle_state(model_name)
                else:
-                    # Fallback to dashboard state - use actual dashboard state variables
-                    toggle_states = {
-                        "dqn": {"inference_enabled": self.dqn_inference_enabled, "training_enabled": self.dqn_training_enabled},
-                        "cnn": {"inference_enabled": self.cnn_inference_enabled, "training_enabled": self.cnn_training_enabled},
-                        "cob_rl": {"inference_enabled": self.cob_rl_inference_enabled, "training_enabled": self.cob_rl_training_enabled},
-                        "decision_fusion": {"inference_enabled": self.decision_fusion_inference_enabled, "training_enabled": self.decision_fusion_training_enabled}
-                    }
+                    # Fallback to dashboard dynamic state
+                    toggle_states = {}
+                    for model_name, state in self.model_toggle_states.items():
+                        toggle_states[model_name] = state
                # Now using slow-interval-component (10s) - no batching needed
                
                metrics_data = self._get_training_metrics(toggle_states)
@ -1534,6 +1592,78 @@ class CleanTradingDashboard:
            logger.debug(f"Error checking leverage_applied_by_exchange: {e}")
            return False
    
+    def _calculate_total_session_fees(self) -> float:
+        """Calculate total session fees including closed trades and current position fees"""
+        try:
+            # Get fees from closed trades
+            closed_trades_fees = getattr(self, 'total_fees', 0.0)
+            
+            # Calculate fees for current open position (if any)
+            current_position_fees = 0.0
+            if self.current_position and hasattr(self, 'current_prices'):
+                current_price = self.current_prices.get('ETH/USDT', 0)
+                if current_price > 0:
+                    side = self.current_position.get('side', 'UNKNOWN')
+                    size = self.current_position.get('size', 0)
+                    entry_price = self.current_position.get('price', 0)
+                    
+                    if entry_price and size > 0:
+                        # Calculate position size in USD
+                        position_size_usd = size * entry_price
+                        
+                        # Calculate opening fee (already paid)
+                        opening_fee = self._calculate_opening_fee(position_size_usd)
+                        
+                        # Calculate closing fee (due if position is closed now)
+                        closing_fee = self._calculate_closing_fee(current_price, size)
+                        
+                        # Total fees for current position
+                        current_position_fees = opening_fee + closing_fee
+            
+            # Total session fees
+            total_session_fees = closed_trades_fees + current_position_fees
+            return total_session_fees
+                
+        except Exception as e:
+            logger.debug(f"Error calculating total session fees: {e}")
+            return 0.0
+    
+    def _calculate_opening_fee(self, position_size_usd: float) -> float:
+        """Calculate opening fee for a position"""
+        try:
+            # Get fee rates from trading executor if available
+            taker_fee = 0.0006  # Default 0.06%
+            
+            if self.trading_executor and hasattr(self.trading_executor, 'primary_config'):
+                trading_fees = self.trading_executor.primary_config.get('trading_fees', {})
+                taker_fee = trading_fees.get('taker_fee', 0.0006)
+            
+            # Opening fee on entry price
+            opening_fee = position_size_usd * taker_fee
+            return opening_fee
+            
+        except Exception as e:
+            logger.debug(f"Error calculating opening fee: {e}")
+            return position_size_usd * 0.0006  # Fallback to 0.06%
+    
+    def _calculate_closing_fee(self, current_price: float, quantity: float) -> float:
+        """Calculate closing fee for a position at current price"""
+        try:
+            # Get fee rates from trading executor if available
+            taker_fee = 0.0006  # Default 0.06%
+            
+            if self.trading_executor and hasattr(self.trading_executor, 'primary_config'):
+                trading_fees = self.trading_executor.primary_config.get('trading_fees', {})
+                taker_fee = trading_fees.get('taker_fee', 0.0006)
+            
+            # Closing fee on current price
+            closing_fee = (current_price * quantity) * taker_fee
+            return closing_fee
+            
+        except Exception as e:
+            logger.debug(f"Error calculating closing fee: {e}")
+            return (current_price * quantity) * 0.0006  # Fallback to 0.06%
+    
    def _calculate_trading_fees(self, position_size_usd: float, current_price: float, quantity: float) -> float:
        """Calculate opening and closing fees for a position