Merge pull request #755 from NVIDIA/am/bokeh-ver

amaslenn · web-flow · commit 67fe5f82f59b · 2025-12-16T21:52:43.000+01:00
Fix bokeh charts generation
diff --git a/src/cloudai/report_generator/comparison_report.py b/src/cloudai/report_generator/comparison_report.py
@@ -179,7 +179,14 @@ def create_chart(
         hover = lazy.bokeh_models.HoverTool(tooltips=[("X", "@x"), ("Y", "@y"), ("Segment Type", "@segment_type")])
         p.add_tools(hover)
 
+        if all(df.empty for df in dfs):
+            logging.debug(f"No data available to create chart for group {group.name}, skipping.")
+            return p
+
         for df, name in zip(dfs, [item.name for item in group.items], strict=True):
+            if df.empty:
+                continue
+
             for col in data_columns:
                 source = lazy.bokeh_models.ColumnDataSource(
                     data={
@@ -196,12 +203,13 @@ def create_chart(
         p.legend.location = "top_left"
         p.legend.click_policy = "hide"
 
-        y_max = max(df[col].max() for df in dfs for col in data_columns)
-        y_min = min(df[col].min() for df in dfs for col in data_columns)
+        y_max = max(df[col].max() for df in dfs for col in data_columns if not df.empty)
+        y_min = min(df[col].min() for df in dfs for col in data_columns if not df.empty)
         p.y_range = lazy.bokeh_models.Range1d(start=y_min * -1 * y_max * 0.01, end=y_max * 1.1)
 
-        x_min = dfs[0][info_columns[0]].min()
-        x_max = dfs[0][info_columns[0]].max()
+        df_with_max_rows = max(dfs, key=len)
+        x_min = df_with_max_rows[info_columns[0]].min()
+        x_max = df_with_max_rows[info_columns[0]].max()
         p.xaxis.ticker = calculate_power_of_two_ticks(x_min, x_max)
         p.xaxis.formatter = lazy.bokeh_models.CustomJSTickFormatter(code=bokeh_size_unit_js_tick_formatter)
         p.xaxis.major_label_orientation = lazy.np.pi / 4
diff --git a/src/cloudai/util/nixl_report_template.jinja2 b/src/cloudai/util/nixl_report_template.jinja2
@@ -4,9 +4,9 @@
 <head>
     <title>{{ title }}</title>
     <meta charset="UTF-8">
-    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-3.4.0.min.js"></script>
-    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.4.0.min.js"></script>
-    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.4.0.min.js"></script>
+    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-3.8.0.min.js"></script>
+    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.8.0.min.js"></script>
+    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.8.0.min.js"></script>
     <style>
         body {
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
diff --git a/tests/report_generation_strategy/test_comparison_report.py b/tests/report_generation_strategy/test_comparison_report.py
@@ -14,9 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from pathlib import Path
+
 import bokeh.plotting as bk
 import pandas as pd
 import pytest
+import toml
+from packaging.requirements import Requirement
+from packaging.version import Version
 from rich.table import Table
 
 from cloudai.core import TestRun, TestScenario
@@ -135,3 +140,30 @@ def test_create_charts(cmp_report: MyComparisonReport, nccl_tr: TestRun) -> None
         ["value"],
         "y_axis_label",
     )
+
+
+def test_bokeh_cdn_version_matches_pyproject():
+    bokeh_dep = None
+    for dep in toml.load(Path("pyproject.toml"))["project"]["dependencies"]:
+        if dep.startswith("bokeh"):
+            bokeh_dep = dep
+            break
+
+    assert bokeh_dep is not None, "bokeh dependency not found in pyproject.toml"
+
+    req = Requirement(bokeh_dep)
+    assert req.specifier, f"No version specifier found in: {bokeh_dep}"
+
+    template_path = Path("src/cloudai/util/nixl_report_template.jinja2")
+    template_content = template_path.read_text()
+
+    pyproject_version = Version(f"{req.specifier}".lstrip("~=<>!"))
+    ver_str = f"-{pyproject_version.major}.{pyproject_version.minor}.0"
+
+    for line in template_content.splitlines():
+        if "cdn.bokeh.org/bokeh/release" not in line:
+            continue
+
+        assert ver_str in line, (
+            f"Bokeh CDN version ({line}) in template does not match pyproject.toml version ({pyproject_version})."
+        )
