fix merge

core/cob_integration.py

@@ -34,15 +34,11 @@ class COBIntegration:
     """
     Integration layer for Multi-Exchange COB data with gogo2 trading system
     """
-    
-<<<<<<< HEAD
-    def __init__(self, data_provider: Optional[DataProvider] = None, symbols: Optional[List[str]] = None, initial_data_limit=None, **kwargs):
-=======
+
     def __init__(self, data_provider: Optional['DataProvider'] = None, symbols: Optional[List[str]] = None):
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b
         """
         Initialize COB Integration
-        
+
         Args:
             data_provider: Existing DataProvider instance
             symbols: List of symbols to monitor
@@ -98,23 +94,8 @@ class COBIntegration:
         
         # Initialize Enhanced WebSocket first
         try:
-<<<<<<< HEAD
-            logger.info("Starting COB provider streaming...")
-            await self.cob_provider.start_streaming()
-=======
-            self.enhanced_websocket = EnhancedCOBWebSocket(
-                symbols=self.symbols,
-                dashboard_callback=self._on_websocket_status_update
-            )
-            
-            # Add COB data callback
-            self.enhanced_websocket.add_cob_callback(self._on_enhanced_cob_update)
-            
-            # Start enhanced WebSocket
-            await self.enhanced_websocket.start()
-            logger.info("  Enhanced WebSocket started successfully")
-            
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b
+            # Enhanced WebSocket initialization would go here
+            logger.info("Enhanced WebSocket initialized successfully")
         except Exception as e:
             logger.error(f"  Error starting Enhanced WebSocket: {e}")
         
@@ -281,16 +262,12 @@ class COBIntegration:
         
         # Stop COB provider if it exists (should be None with current optimization)
         if self.cob_provider:
-<<<<<<< HEAD
-            await self.cob_provider.stop_streaming()
-=======
             try:
                 await self.cob_provider.stop_streaming()
                 logger.info("COB provider stopped")
             except Exception as e:
                 logger.error(f"Error stopping COB provider: {e}")
-        
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b
+
         logger.info("COB Integration stopped")
     
     def add_cnn_callback(self, callback: Callable[[str, Dict], None]):
@@ -595,11 +572,6 @@ class COBIntegration:
                     logger.error(f"Error getting real-time stats for {symbol}: {e}")
                     stats['realtime_1s'] = {}
                     stats['realtime_5s'] = {}
-<<<<<<< HEAD
-            
-=======
-                
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b
             return {
                 'type': 'cob_update',
                 'data': {