fix merge

web/layout_manager.py

@@ -16,48 +16,6 @@ class DashboardLayoutManager:
         self.dashboard = dashboard
     
     def create_main_layout(self):
-<<<<<<< HEAD
-        """Create the main dashboard layout with dark theme"""
-        return html.Div([
-            self._create_header(),
-            self._create_chained_inference_status(),
-            self._create_interval_component(),
-            self._create_main_content(),
-            self._create_prediction_tracking_section()  # NEW: Prediction tracking
-        ], className="container-fluid", style={
-            "backgroundColor": "#111827",
-            "minHeight": "100vh",
-            "color": "#f8f9fa"
-        })
-=======
-        """Create the main dashboard layout"""
-        try:
-            print("Creating main layout...")
-            header = self._create_header()
-            print("Header created")
-            interval_component = self._create_interval_component()
-            print("Interval component created")
-            main_content = self._create_main_content()
-            print("Main content created")
-            
-            layout = html.Div([
-                header,
-                interval_component,
-                main_content
-            ], className="container-fluid")
-            
-            print("Main layout created successfully")
-            return layout
-        except Exception as e:
-            print(f"Error creating main layout: {e}")
-            import traceback
-            traceback.print_exc()
-            # Return a simple error layout
-            return html.Div([
-                html.H1("Dashboard Error", className="text-danger"),
-                html.P(f"Error creating layout: {str(e)}", className="text-danger")
-            ])
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b
     
     def _create_prediction_tracking_section(self):
         """Create prediction tracking and model performance section"""
@@ -292,45 +250,6 @@ class DashboardLayoutManager:
         ], className="bg-dark p-2 mb-2")
     
     def _create_interval_component(self):
-<<<<<<< HEAD
-        """Create the auto-refresh interval component"""
-        return html.Div([
-            dcc.Interval(
-                id='interval-component',
-                interval=1000,  # Update every 1 second for maximum responsiveness
-                n_intervals=0
-            ),
-            dcc.Interval(
-                id='minute-interval-component',
-                interval=60000,  # Update every 60 seconds for chained inference
-                n_intervals=0
-            )
-=======
-        """Create the auto-refresh interval components with different frequencies"""
-        return html.Div([
-            # Fast interval for critical updates (2 seconds - reduced from 1s)
-            dcc.Interval(
-                id='interval-component',
-                interval=2000,  # Update every 2000 ms (0.5 Hz) - OPTIMIZED
-                n_intervals=0
-            ),
-            # Slow interval for non-critical updates (10 seconds - increased from 5s)
-            dcc.Interval(
-                id='slow-interval-component',
-                interval=10000,  # Update every 10 seconds (0.1 Hz) - OPTIMIZED
-                n_intervals=0,
-                disabled=False
-            ),
-            # Fast interval for testing (5 seconds)
-            dcc.Interval(
-                id='fast-interval-component',
-                interval=5000,  # Update every 5 seconds for testing
-                n_intervals=0,
-                disabled=False
-            ),
-            # WebSocket-based updates for high-frequency data (no interval needed)
-            html.Div(id='websocket-updates-container', style={'display': 'none'})
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b
         ])
     
     def _create_main_content(self):
@@ -838,9 +757,3 @@ class DashboardLayoutManager:
                 ], className="card-body p-2")
             ], className="card", style={"width": "30%", "marginLeft": "2%"})
         ], className="d-flex")
-<<<<<<< HEAD
-
-    
- 
-=======
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b