feat: tool graph (1st draw)

src/ui/dashboard.py

@@ -1,98 +1,54 @@
 import time
 import json
 import gradio as gr
+import pandas as pd
 
-from src.production.flow import generate_data#, compile
-from src.production.metrics.tools import get_tools_metrics
-from src.production.metrics.machine import get_machine_metrics
+from src.production.flow import generate_data
+from src.production.metrics.tools import tools_metrics
+from src.production.metrics.machine import machine_metrics, fetch_issues
 
-def dashboard_ui(state):
-
-    def update_dashboard(state):
-        if state['running']:
-            generate_data(state)
+from src.ui.graphs.tools_graphs import ToolMetricsDisplay
 
-            raw_data = state['data']['raw_df']
-            print(raw_data)
+def dashboard_ui(state):
 
+    display1 = ToolMetricsDisplay()
 
-            tools_dfs = get_tools_metrics(raw_data)
-            tools_dfs = {tool: df for tool, df in tools_dfs.items() if not df.empty}
+    def dataflow(state):
 
-            for tool, df in tools_dfs.items():
-                print(tool)
-                print(df.columns.tolist())
-                print("\n")
+        # --- INIT ---
+        if 'tools' not in state['data']:
+            state['data']['tools'] = {}
 
-            machine_results = get_machine_metrics(raw_data)
-            machine_json = json.dumps(machine_results, indent=4)
-            print(machine_json)
+        if 'issues' not in state['data']:
+            state['data']['issues'] = {}
 
-        return state
+        # --- DATA FLOW ---
+        if state['running']:
 
+            # Generation
+            generate_data(state)
+            raw_data = state['data']['raw_df']
 
+            # Process tools metrics
+            tools_data = tools_metrics(raw_data)
+            tools_data = {tool: df for tool, df in tools_data.items() if not df.empty}
+            for tool, df in tools_data.items():
+                state['data']['tools'][tool] = df
 
+            # Process machine metrics
+            machine_data = machine_metrics(raw_data)
+            state['machine'] = machine_data
+            issues = fetch_issues(raw_data)
+            state['data']['issues'] = issues
 
+        # --- UPDATE UI ---
+        df1 = pd.DataFrame(state['data']['tools'].get('tool_1', pd.DataFrame()))
+        return display1.tool_block(df=df1, id=1)
 
-    timer = gr.Timer(0.1)
+    plots = display1.tool_block(df=pd.DataFrame(), id=1)
+    timer = gr.Timer(1)
     timer.tick(
-        fn=update_dashboard,
+        fn=dataflow,
         inputs=state,
-        outputs=state
-    )
-
-
-
-#        # ----------------   TOOLS METRICS DISPLAY   ----------------
-#        tools_count = 4
-#        visualizers = [ToolMetricsDisplay() for _ in range(tools_count)]
-#        for id, display in enumerate(visualizers, start=1):
-#            with gr.Row():
-#                df = datalist.value['data'][id - 1][0]
-#                header = f"Tool {id}"
-#                html_content = f"""
-#                                    <div style="display: flex; align-items: center; justify-content: flex-start; width: 100%;">
-#                                        <div style="flex: 0 0 2%; border-top: 1px solid white;"></div>
-#                                        <h2 style="flex: 0 0 auto; margin: 0 10px;">{header}</h2>
-#                                        <div style="flex: 1; border-top: 1px solid white;"></div>
-#                                </div>
-#                                """
-#                gr.HTML(html_content)
-#            with gr.Row():
-#                with gr.Column(scale=1):
-#                    gr.Markdown("### `Position`")
-#                    with gr.Group():
-#                        with gr.Row(height=250):
-#                            pos_normal_plot = gr.Plot(display.normal_curve(df=df, cote='pos'))
-#                        with gr.Row(height=150):
-#                            pos_cp_gauge = gr.Plot(display.gauge(df=df, type='cp', cote='pos'))
-#                            pos_cpk_gauge = gr.Plot(display.gauge(df=df, type='cpk', cote='pos'))
-#
-#                with gr.Column(scale=1):
-#                    gr.Markdown("### `Orientation`")
-#                    with gr.Group():
-#                        with gr.Row(height=250):
-#                            ori_normal_plot = gr.Plot(display.normal_curve(df=df, cote='ori'))
-#                        with gr.Row(height=150):
-#                            ori_cp_gauge = gr.Plot(display.gauge(df=df, type='cp', cote='ori'))
-#                            ori_cpk_gauge = gr.Plot(display.gauge(df=df, type='cpk', cote='ori'))
-#
-#                with gr.Column(scale=2):
-#                    gr.Markdown("### `Control card`")
-#                    with gr.Row(height=400):
-#                        control_plot = gr.Plot(display.control_graph(df=df))
-#
-#            timer = gr.Timer(1)
-#            timer.tick(
-#                lambda : [
-#                    display.normal_curve(df=df, cote='pos'),
-#                    display.gauge(df=df, type='cp', cote='pos'),
-#                    display.gauge(df=df, type='cpk', cote='pos'),
-#                    display.normal_curve(df=df, cote='ori'),
-#                    display.gauge(df=df, type='cp', cote='ori'),
-#                    display.gauge(df=df, type='cpk', cote='ori'),
-#                    display.control_graph(df=df)
-#                ],
-#                outputs=[pos_normal_plot, pos_cp_gauge, pos_cpk_gauge, ori_normal_plot, ori_cp_gauge, ori_cpk_gauge,
-#                         control_plot]
-#            )
+        outputs=plots
+    )

src/ui/graphs/tools_graphs.py

@@ -143,52 +143,37 @@ class ToolMetricsDisplay:
         )
         return fig
 
-    #def tool_block(self, df, id=1):
-    #            header = f"Tool {id}"
-    #            html_content = f"""
-    #            <div style="display: flex; align-items: center; justify-content: flex-start; width: 100%;">
-    #                <div style="flex: 0 0 2%; border-top: 1px solid white;"></div>
-    #                <h2 style="flex: 0 0 auto; margin: 0 10px;">{header}</h2>
-    #                <div style="flex: 1; border-top: 1px solid white;"></div>
-    #            </div>
-    #            """
-    #            gr.HTML(html_content)
-#
-    #            with gr.Row():
-    #                with gr.Column(scale=1):
-    #                    gr.Markdown("### `Position`")
-    #                    with gr.Group():
-    #                        with gr.Row(height=250):
-    #                            pos_normal_plot = gr.Plot(self.normal_curve(df=df, cote='pos'))
-    #                        with gr.Row(height=150):
-    #                            pos_cp_gauge = gr.Plot(self.gauge(df=df, type='cp', cote='pos'))
-    #                            pos_cpk_gauge = gr.Plot(self.gauge(df=df, type='cpk', cote='pos'))
-#
-    #                with gr.Column(scale=1):
-    #                    gr.Markdown("### `Orientation`")
-    #                    with gr.Group():
-    #                        with gr.Row(height=250):
-    #                            ori_normal_plot = gr.Plot(self.normal_curve(df=df, cote='ori'))
-    #                        with gr.Row(height=150):
-    #                            ori_cp_gauge = gr.Plot(self.gauge(df=df, type='cp', cote='ori'))
-    #                            ori_cpk_gauge = gr.Plot(self.gauge(df=df, type='cpk', cote='ori'))
-#
-    #                with gr.Column(scale=2):
-    #                    gr.Markdown("### `Control card`")
-    #                    with gr.Row(height=400):
-    #                        control_plot = gr.Plot(self.control_graph(df=df))
+    def tool_block(self, df, id=1):
+        header = f"Tool {id}"
+        html_content = f"""
+        <div style="display: flex; align-items: center; justify-content: flex-start; width: 100%;">
+            <div style="flex: 0 0 2%; border-top: 1px solid white;"></div>
+            <h2 style="flex: 0 0 auto; margin: 0 10px;">{header}</h2>
+            <div style="flex: 1; border-top: 1px solid white;"></div>
+        </div>
+        """
+        gr.HTML(html_content)
+        with gr.Row():
+            with gr.Column(scale=1):
+                gr.Markdown("### `Position`")
+                with gr.Group():
+                    with gr.Row(height=250):
+                        pos_normal_plot = gr.Plot(self.normal_curve(df=df, cote='pos'))
+                    with gr.Row(height=150):
+                        pos_cp_gauge = gr.Plot(self.gauge(df=df, type='cp', cote='pos'))
+                        pos_cpk_gauge = gr.Plot(self.gauge(df=df, type='cpk', cote='pos'))
+            with gr.Column(scale=1):
+                gr.Markdown("### `Orientation`")
+                with gr.Group():
+                    with gr.Row(height=250):
+                        ori_normal_plot = gr.Plot(self.normal_curve(df=df, cote='ori'))
+                    with gr.Row(height=150):
+                        ori_cp_gauge = gr.Plot(self.gauge(df=df, type='cp', cote='ori'))
+                        ori_cpk_gauge = gr.Plot(self.gauge(df=df, type='cpk', cote='ori'))
+            with gr.Column(scale=2):
+                gr.Markdown("### `Control card`")
+                with gr.Row(height=400):
+                    control_plot = gr.Plot(self.control_graph(df=df))
 
-            #timer = gr.Timer(1)
-#
-            #timer.tick(
-            #    lambda: [
-            #        self.update_normal_curve(cote='pos'),
-            #        self.update_gauge(type='cp', cote='pos'),
-            #        self.update_gauge(type='cpk', cote='pos'),
-            #        self.update_normal_curve(cote='ori'),
-            #        self.update_gauge(type='cp', cote='ori'),
-            #        self.update_gauge(type='cpk', cote='ori'),
-            #        self.update_control_graph()
-            #    ],
-            #    outputs=[pos_normal_plot, pos_cp_gauge, pos_cpk_gauge, ori_normal_plot, ori_cp_gauge, ori_cpk_gauge, control_plot]
-            #)
+            return [pos_normal_plot, pos_cp_gauge, pos_cpk_gauge, ori_normal_plot, ori_cp_gauge, ori_cpk_gauge,
+                    control_plot]