X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fdash%2Fapp%2Fpal%2Fstats%2Flayout.py;h=2e74fb8b3c298cba76b98ebe6138d9f7545af43d;hp=7ac379ae013e5bd043386034ea9db702e917cbd9;hb=a89ee06047c891d3c43d2c4cdd67177fce740e5e;hpb=d3f16c6ceaa5b475a9c8dc13d21817735e087869
diff --git a/resources/tools/dash/app/pal/stats/layout.py b/resources/tools/dash/app/pal/stats/layout.py
index 7ac379ae01..2e74fb8b3c 100644
--- a/resources/tools/dash/app/pal/stats/layout.py
+++ b/resources/tools/dash/app/pal/stats/layout.py
@@ -28,17 +28,18 @@ from yaml import load, FullLoader, YAMLError
from datetime import datetime, timedelta
from copy import deepcopy
+from ..utils.constants import Constants as C
+from ..utils.utils import show_tooltip, gen_new_url
+from ..utils.url_processing import url_decode
from ..data.data import Data
-from .graphs import graph_statistics
+from .graphs import graph_statistics, select_data
class Layout:
"""
"""
- DEFAULT_JOB = "csit-vpp-perf-mrr-daily-master-2n-icx"
-
- def __init__(self, app: Flask, html_layout_file: str, spec_file: str,
+ def __init__(self, app: Flask, html_layout_file: str,
graph_layout_file: str, data_spec_file: str, tooltip_file: str,
time_period: int=None) -> None:
"""
@@ -47,7 +48,6 @@ class Layout:
# Inputs
self._app = app
self._html_layout_file = html_layout_file
- self._spec_file = spec_file
self._graph_layout_file = graph_layout_file
self._data_spec_file = data_spec_file
self._tooltip_file = tooltip_file
@@ -89,20 +89,7 @@ class Layout:
job_info["tbed"].append("-".join(lst_job[-2:]))
self.df_job_info = pd.DataFrame.from_dict(job_info)
- lst_job = self.DEFAULT_JOB.split("-")
- self._default = {
- "job": self.DEFAULT_JOB,
- "dut": lst_job[1],
- "ttype": lst_job[3],
- "cadence": lst_job[4],
- "tbed": "-".join(lst_job[-2:]),
- "duts": self._generate_options(self._get_duts()),
- "ttypes": self._generate_options(self._get_ttypes(lst_job[1])),
- "cadences": self._generate_options(self._get_cadences(
- lst_job[1], lst_job[3])),
- "tbeds": self._generate_options(self._get_test_beds(
- lst_job[1], lst_job[3], lst_job[4]))
- }
+ self._default = self._set_job_params(C.STATS_DEFAULT_JOB)
tst_info = {
"job": list(),
@@ -111,10 +98,10 @@ class Layout:
"dut_version": list(),
"hosts": list(),
"passed": list(),
- "failed": list()
+ "failed": list(),
+ "lst_failed": list()
}
for job in jobs:
- # TODO: Add list of failed tests for each build
df_job = df_tst_info.loc[(df_tst_info["job"] == job)]
builds = df_job["build"].unique()
for build in builds:
@@ -125,15 +112,25 @@ class Layout:
tst_info["dut_version"].append(df_build["dut_version"].iloc[-1])
tst_info["hosts"].append(df_build["hosts"].iloc[-1])
try:
- passed = df_build.value_counts(subset='passed')[True]
+ passed = df_build.value_counts(subset="passed")[True]
except KeyError:
passed = 0
try:
- failed = df_build.value_counts(subset='passed')[False]
+ failed = df_build.value_counts(subset="passed")[False]
+ failed_tests = df_build.loc[(df_build["passed"] == False)]\
+ ["test_id"].to_list()
+ l_failed = list()
+ for tst in failed_tests:
+ lst_tst = tst.split(".")
+ suite = lst_tst[-2].replace("2n1l-", "").\
+ replace("1n1l-", "").replace("2n-", "")
+ l_failed.append(f"{suite.split('-')[0]}-{lst_tst[-1]}")
except KeyError:
failed = 0
+ l_failed = list()
tst_info["passed"].append(passed)
tst_info["failed"].append(failed)
+ tst_info["lst_failed"].append(sorted(l_failed))
self._data = data_stats.merge(pd.DataFrame.from_dict(tst_info))
@@ -247,25 +244,23 @@ class Layout:
(self.df_job_info["tbed"] == testbed)
)]["job"].item()
- def _show_tooltip(self, id: str, title: str) -> list:
+ def _set_job_params(self, job: str) -> dict:
"""
"""
- return [
- f"{title} ",
- dbc.Badge(
- id=id,
- children="?",
- pill=True,
- color="white",
- text_color="info",
- class_name="border ms-1",
- ),
- dbc.Tooltip(
- children=self._tooltips.get(id, str()),
- target=id,
- placement="auto"
- )
- ]
+ lst_job = job.split("-")
+ return {
+ "job": job,
+ "dut": lst_job[1],
+ "ttype": lst_job[3],
+ "cadence": lst_job[4],
+ "tbed": "-".join(lst_job[-2:]),
+ "duts": self._generate_options(self._get_duts()),
+ "ttypes": self._generate_options(self._get_ttypes(lst_job[1])),
+ "cadences": self._generate_options(self._get_cadences(
+ lst_job[1], lst_job[3])),
+ "tbeds": self._generate_options(self._get_test_beds(
+ lst_job[1], lst_job[3], lst_job[4]))
+ }
def add_content(self):
"""
@@ -274,9 +269,8 @@ class Layout:
return html.Div(
id="div-main",
children=[
- dcc.Store(
- id="control-panel"
- ),
+ dcc.Store(id="control-panel"),
+ dcc.Location(id="url", refresh=False),
dbc.Row(
id="row-navbar",
class_name="g-0",
@@ -286,7 +280,7 @@ class Layout:
),
dcc.Loading(
dbc.Offcanvas(
- class_name="w-25",
+ class_name="w-50",
id="offcanvas-metadata",
title="Detailed Information",
placement="end",
@@ -381,20 +375,51 @@ class Layout:
])
]
),
- dbc.Row( # Download
- id="row-btn-download",
+ dbc.Row(
class_name="g-0 p-2",
+ align="center",
+ justify="start",
children=[
- dcc.Loading(children=[
- dbc.Button(
- id="btn-download-data",
- children=self._show_tooltip(
- "help-download", "Download"),
- class_name="me-1",
- color="info"
- ),
- dcc.Download(id="download-data")
- ])
+ dbc.Col( # Download
+ width=2,
+ children=[
+ dcc.Loading(children=[
+ dbc.Button(
+ id="btn-download-data",
+ children=show_tooltip(self._tooltips,
+ "help-download", "Download Data"),
+ class_name="me-1",
+ color="info"
+ ),
+ dcc.Download(id="download-data")
+ ])
+ ]
+ ),
+ dbc.Col( # Show URL
+ width=10,
+ children=[
+ dbc.InputGroup(
+ class_name="me-1",
+ children=[
+ dbc.InputGroupText(
+ style=C.URL_STYLE,
+ children=show_tooltip(
+ self._tooltips,
+ "help-url", "URL",
+ "input-url"
+ )
+ ),
+ dbc.Input(
+ id="input-url",
+ readonly=True,
+ type="url",
+ style=C.URL_STYLE,
+ value=""
+ )
+ ]
+ )
+ ]
+ )
]
)
],
@@ -416,7 +441,7 @@ class Layout:
children=[
dbc.Label(
class_name="p-0",
- children=self._show_tooltip(
+ children=show_tooltip(self._tooltips,
"help-dut", "Device under Test")
),
dbc.Row(
@@ -434,7 +459,7 @@ class Layout:
children=[
dbc.Label(
class_name="p-0",
- children=self._show_tooltip(
+ children=show_tooltip(self._tooltips,
"help-ttype", "Test Type"),
),
dbc.RadioItems(
@@ -450,7 +475,7 @@ class Layout:
children=[
dbc.Label(
class_name="p-0",
- children=self._show_tooltip(
+ children=show_tooltip(self._tooltips,
"help-cadence", "Cadence"),
),
dbc.RadioItems(
@@ -466,7 +491,7 @@ class Layout:
children=[
dbc.Label(
class_name="p-0",
- children=self._show_tooltip(
+ children=show_tooltip(self._tooltips,
"help-tbed", "Test Bed"),
),
dbc.Select(
@@ -492,7 +517,7 @@ class Layout:
children=[
dbc.Label(
class_name="gy-1",
- children=self._show_tooltip(
+ children=show_tooltip(self._tooltips,
"help-time-period", "Time Period"),
),
dcc.DatePickerRange(
@@ -556,16 +581,19 @@ class Layout:
@staticmethod
def _generate_options(opts: list) -> list:
- """
- """
return [{"label": i, "value": i} for i in opts]
+ @staticmethod
+ def _get_date(s_date: str) -> datetime:
+ return datetime(int(s_date[0:4]), int(s_date[5:7]), int(s_date[8:10]))
+
def callbacks(self, app):
@app.callback(
Output("control-panel", "data"), # Store
Output("graph-passed", "figure"),
Output("graph-duration", "figure"),
+ Output("input-url", "value"),
Output("ri-ttypes", "options"),
Output("ri-cadences", "options"),
Output("dd-tbeds", "options"),
@@ -581,18 +609,24 @@ class Layout:
Input("dd-tbeds", "value"),
Input("dpr-period", "start_date"),
Input("dpr-period", "end_date"),
- prevent_initial_call=True
+ Input("url", "href")
)
def _update_ctrl_panel(cp_data: dict, dut:str, ttype: str, cadence:str,
- tbed: str, d_start: str, d_end: str) -> tuple:
+ tbed: str, start: str, end: str, href: str) -> tuple:
"""
"""
ctrl_panel = self.ControlPanel(cp_data, self.default)
- d_start = datetime(int(d_start[0:4]), int(d_start[5:7]),
- int(d_start[8:10]))
- d_end = datetime(int(d_end[0:4]), int(d_end[5:7]), int(d_end[8:10]))
+ start = self._get_date(start)
+ end = self._get_date(end)
+
+ # Parse the url:
+ parsed_url = url_decode(href)
+ if parsed_url:
+ url_params = parsed_url["params"]
+ else:
+ url_params = None
trigger_id = callback_context.triggered[0]["prop_id"].split(".")[0]
if trigger_id == "ri-duts":
@@ -644,6 +678,25 @@ class Layout:
})
elif trigger_id == "dpr-period":
pass
+ elif trigger_id == "url":
+ # TODO: Add verification
+ if url_params:
+ new_job = url_params.get("job", list())[0]
+ new_start = url_params.get("start", list())[0]
+ new_end = url_params.get("end", list())[0]
+ if new_job and new_start and new_end:
+ start = self._get_date(new_start)
+ end = self._get_date(new_end)
+ job_params = self._set_job_params(new_job)
+ ctrl_panel = self.ControlPanel(None, job_params)
+ else:
+ ctrl_panel = self.ControlPanel(cp_data, self.default)
+ job = self._get_job(
+ ctrl_panel.get("ri-duts-value"),
+ ctrl_panel.get("ri-ttypes-value"),
+ ctrl_panel.get("ri-cadences-value"),
+ ctrl_panel.get("dd-tbeds-value")
+ )
job = self._get_job(
ctrl_panel.get("ri-duts-value"),
@@ -651,26 +704,56 @@ class Layout:
ctrl_panel.get("ri-cadences-value"),
ctrl_panel.get("dd-tbeds-value")
)
- ctrl_panel.set({"al-job-children": job})
- fig_passed, fig_duration = graph_statistics(
- self.data, job, self.layout, d_start, d_end)
- ret_val = [ctrl_panel.panel, fig_passed, fig_duration]
+ ctrl_panel.set({"al-job-children": job})
+ fig_passed, fig_duration = graph_statistics(self.data, job,
+ self.layout, start, end)
+
+ ret_val = [
+ ctrl_panel.panel,
+ fig_passed,
+ fig_duration,
+ gen_new_url(
+ parsed_url,
+ {
+ "job": job,
+ "start": start,
+ "end": end
+ }
+ )
+ ]
ret_val.extend(ctrl_panel.values())
return ret_val
@app.callback(
Output("download-data", "data"),
+ State("control-panel", "data"), # Store
+ State("dpr-period", "start_date"),
+ State("dpr-period", "end_date"),
Input("btn-download-data", "n_clicks"),
prevent_initial_call=True
)
- def _download_data(n_clicks):
+ def _download_data(cp_data: dict, start: str, end: str, n_clicks: int):
"""
"""
- if not n_clicks:
+ if not (n_clicks):
raise PreventUpdate
- return dcc.send_data_frame(self.data.to_csv, "statistics.csv")
+ ctrl_panel = self.ControlPanel(cp_data, self.default)
+
+ job = self._get_job(
+ ctrl_panel.get("ri-duts-value"),
+ ctrl_panel.get("ri-ttypes-value"),
+ ctrl_panel.get("ri-cadences-value"),
+ ctrl_panel.get("dd-tbeds-value")
+ )
+
+ start = datetime(int(start[0:4]), int(start[5:7]), int(start[8:10]))
+ end = datetime(int(end[0:4]), int(end[5:7]), int(end[8:10]))
+ data = select_data(self.data, job, start, end)
+ data = data.drop(columns=["job", ])
+
+ return dcc.send_data_frame(data.T.to_csv, f"{job}-stats.csv")
@app.callback(
Output("row-metadata", "children"),
@@ -696,6 +779,26 @@ class Layout:
elif trigger_id == "graph-duration":
graph_data = duration_data["points"][0].get("text", "")
if graph_data:
+ lst_graph_data = graph_data.split("
")
+
+ # Prepare list of failed tests:
+ job = str()
+ build = str()
+ for itm in lst_graph_data:
+ if "csit-ref:" in itm:
+ job, build = itm.split(" ")[-1].split("/")
+ break
+ if job and build:
+ fail_tests = self.data.loc[
+ (self.data["job"] == job) &
+ (self.data["build"] == build)
+ ]["lst_failed"].values[0]
+ if not fail_tests:
+ fail_tests = None
+ else:
+ fail_tests = None
+
+ # Create the content of the offcanvas:
metadata = [
dbc.Card(
class_name="gy-2 p-0",
@@ -720,7 +823,7 @@ class Layout:
),
x.split(": ")[1]
]
- ) for x in graph_data.split("
")
+ ) for x in lst_graph_data
],
flush=True),
]
@@ -728,6 +831,30 @@ class Layout:
]
)
]
+
+ if fail_tests is not None:
+ metadata.append(
+ dbc.Card(
+ class_name="gy-2 p-0",
+ children=[
+ dbc.CardHeader(
+ f"List of Failed Tests ({len(fail_tests)})"
+ ),
+ dbc.CardBody(
+ id="failed-tests",
+ class_name="p-0",
+ children=[dbc.ListGroup(
+ children=[
+ dbc.ListGroupItem(x) \
+ for x in fail_tests
+ ],
+ flush=True),
+ ]
+ )
+ ]
+ )
+ )
+
open_canvas = True
return metadata, open_canvas