From ea91edbbe30e383b8a081fea5cc973031f457e55 Mon Sep 17 00:00:00 2001 From: "takeshi.iwanari" Date: Mon, 26 Feb 2024 21:14:33 +0900 Subject: [PATCH 1/2] fix(track_path): table layout Signed-off-by: takeshi.iwanari --- report/track_path/make_report_track_path.py | 2 +- report/track_path/template_track_path.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/report/track_path/make_report_track_path.py b/report/track_path/make_report_track_path.py index d8f79f22..96844576 100644 --- a/report/track_path/make_report_track_path.py +++ b/report/track_path/make_report_track_path.py @@ -113,7 +113,7 @@ def get_version_str_from_yaml(report_dir: str): elif autoware_version == '' and pilot_auto_version: version = version + ', ' + pilot_auto_version if job_description: - version = version + ', ' + job_description + version = version + ', ' + job_description[:20] if env: version = version + ', ' + env if route: diff --git a/report/track_path/template_track_path.html b/report/track_path/template_track_path.html index 91a6aa08..5e42898c 100644 --- a/report/track_path/template_track_path.html +++ b/report/track_path/template_track_path.html @@ -18,14 +18,13 @@ {% set data_num = reportpath_version_dict.keys()|length %} {% set table_heght = [(1 + data_num) * 3, 5* 3] | min %} {% for target_path_name, stats in stats_path_dict.items() %} -

{{ target_path_name }}

- + {% for value_name in stats.keys() | reverse %} @@ -57,6 +56,7 @@

{{ target_path_name }}

VersionVersion Link to report{{ value_name}} [ms]
+
{% endfor %} From 688e6ce8195bc0d681353a47f89024be3321f7ec Mon Sep 17 00:00:00 2001 From: "takeshi.iwanari" Date: Tue, 27 Feb 2024 15:57:49 +0900 Subject: [PATCH 2/2] chore: fix errors Signed-off-by: takeshi.iwanari --- report/common/utils.py | 2 ++ report/report_analysis/template_html_analysis.html | 1 - report/track_path/make_report_track_path.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/report/common/utils.py b/report/common/utils.py index 53772b1d..ba42c218 100644 --- a/report/common/utils.py +++ b/report/common/utils.py @@ -309,6 +309,8 @@ def read_note_text(trace_data_dir, dest_dir, note_text_top_path, note_text_botto if os.path.exists(caret_record_info_path): with open(caret_record_info_path, encoding='UTF-8') as f_yaml: caret_record_info = yaml.safe_load(f_yaml) + if not caret_record_info: + caret_record_info = {} note_text_top = '
    \n' note_text_top += f'
  • trace_start_datetime: {trace_datetime}
  • \n' new_caret_record_info = {} diff --git a/report/report_analysis/template_html_analysis.html b/report/report_analysis/template_html_analysis.html index 601153c4..ff9c8234 100644 --- a/report/report_analysis/template_html_analysis.html +++ b/report/report_analysis/template_html_analysis.html @@ -49,7 +49,6 @@

    Node Analysis Report

    {% endfor %}
-

Track of Response Time

diff --git a/report/track_path/make_report_track_path.py b/report/track_path/make_report_track_path.py index 96844576..45f55423 100644 --- a/report/track_path/make_report_track_path.py +++ b/report/track_path/make_report_track_path.py @@ -97,6 +97,8 @@ def get_version_str_from_yaml(report_dir: str): if os.path.exists(caret_record_info_path): with open(caret_record_info_path, encoding='UTF-8') as f_yaml: caret_record_info = yaml.safe_load(f_yaml) + if not caret_record_info: + caret_record_info = {} autoware_version = caret_record_info.get('autoware_version', '') pilot_auto_version = caret_record_info.get('pilot_auto_version', '') env = caret_record_info.get('env', '')