RHAIENG-347: fix(manifests): consistency in accelerator info display on workbenches (#2536)

Author: jiridanek

manifests/base/code-server-notebook-imagestream.yaml

@@ -19,7 +19,7 @@ spec:
         # language=json
         opendatahub.io/notebook-software: |
           [
-            {"name": "code-server", "version": "4.98"},
+            {"name": "code-server", "version": "4.104"},
             {"name": "Python", "version": "v3.12"}
           ]
         # language=json

manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml

@@ -20,6 +20,7 @@ spec:
         # language=json
         opendatahub.io/notebook-software: |
           [
+            {"name": "ROCm", "version": "v6.4"},
             {"name": "Python", "version": "v3.12"},
             {"name": "ROCm-PyTorch", "version": "2.7"}
           ]
@@ -59,6 +60,7 @@ spec:
         # language=json
         opendatahub.io/notebook-software: |
           [
+            {"name": "ROCm", "version": "v6.2"},
             {"name": "Python", "version": "v3.11"},
             {"name": "ROCm-PyTorch", "version": "2.6"}
           ]

manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml

@@ -20,14 +20,15 @@ spec:
         # language=json
         opendatahub.io/notebook-software: |
           [
+            {"name": "ROCm", "version": "v6.4"},
             {"name": "Python", "version": "v3.12"},
-            {"name": "ROCm-TensorFlow", "version": "2.18"}
+            {"name": "TensorFlow-ROCm", "version": "2.18"}
           ]
         # language=json
         opendatahub.io/notebook-python-dependencies: |
           [
             {"name": "JupyterLab","version": "4.4"},
-            {"name": "ROCm-TensorFlow", "version": "2.18"},
+            {"name": "TensorFlow-ROCm", "version": "2.18"},
             {"name": "Tensorboard", "version": "2.18"},
             {"name": "Kafka-Python-ng", "version": "2.2"},
             {"name": "Matplotlib", "version": "3.10"},
@@ -58,14 +59,15 @@ spec:
         # language=json
         opendatahub.io/notebook-software: |
           [
+            {"name": "ROCm", "version": "v6.2"},
             {"name": "Python", "version": "v3.11"},
-            {"name": "ROCm-TensorFlow", "version": "2.14"}
+            {"name": "TensorFlow-ROCm", "version": "2.14"}
           ]
         # language=json
         opendatahub.io/notebook-python-dependencies: |
           [
             {"name": "JupyterLab","version": "4.4"},
-            {"name": "ROCm-TensorFlow", "version": "2.14"},
+            {"name": "TensorFlow-ROCm", "version": "2.14"},
             {"name": "Tensorboard", "version": "2.14"},
             {"name": "Kafka-Python-ng", "version": "2.2"},
             {"name": "Matplotlib", "version": "3.10"},

tests/test_main.py

@@ -74,15 +74,23 @@ def test_image_pyprojects(subtests: pytest_subtests.plugin.SubTests):
                 manifest = load_manifests_file_for(directory)
 
                 with subtests.test(msg="checking the `notebook-software` array", pyproject=file):
-                    # TODO(jdanek)
-                    pytest.skip("checking the `notebook-software` array not yet implemented")
                     for s in manifest.sw:
                         if s.get("name") == "Python":
                             assert s.get("version") == f"v{python}", (
                                 "Python version in imagestream does not match Pipfile"
                             )
+                        elif s.get("name") in ("R", "code-server"):
+                            # TODO(jdanek): check not implemented yet
+                            continue
+                        elif s.get("name") in ("CUDA", "ROCm"):
+                            # TODO(jdanek): check not implemented yet
+                            continue
                         else:
-                            pytest.fail(f"unexpected {s=}")
+                            e = next((dep for dep in manifest.dep if dep.get("name") == s.get("name")), None)
+                            if e:
+                                assert s.get("version") == e.get("version")
+                            else:
+                                pytest.fail(f"unexpected {s=}")
 
                 with subtests.test(msg="checking the `notebook-python-dependencies` array", pyproject=file):
                     for d in manifest.dep:
@@ -130,6 +138,7 @@ def test_image_pyprojects(subtests: pytest_subtests.plugin.SubTests):
                             "Torch",
                             "Transformers",
                             "TrustyAI",
+                            "TensorFlow-ROCm",
                         }
 
                         name = d["name"]
@@ -216,7 +225,7 @@ class VersionData:
             "Numpy",
             (
                 "1.26",  # trustyai 0.6.2 depends on numpy~=1.26.4
-                # 2.0 for tensorflow rocm, but we don't have that in manifests
+                "2.0",  # for tensorflow rocm
                 "2.1",  # for tensorflow cuda
                 "2.2",  # for python 3.11 n-1 images
                 "2.3",  # this is our latest where possible
@@ -273,7 +282,7 @@ def test_image_pyprojects_version_alignment(subtests: pytest_subtests.plugin.Sub
         ("torchvision", ("==0.22.1", "~=0.22.1", "==0.22.1+cu128", "==0.22.1+rocm6.2.4")),
         (
             "matplotlib",
-            ("~=3.10.6"),
+            ("~=3.10.6",),
         ),
         (
             "numpy",
@@ -377,12 +386,8 @@ def is_suffix[T](main_sequence: Sequence[T], suffix_sequence: Sequence[T]):
 
 
 def _skip_unimplemented_manifests(directory: pathlib.Path, call_skip=True) -> bool:
-    # TODO(jdanek): missing manifests
-    dirs = (
-        "runtimes/rocm-tensorflow/ubi9-python-3.12",
-        "jupyter/rocm/tensorflow/ubi9-python-3.12",
-    )
-    for d in dirs:
+    unimplemented_dirs = ()
+    for d in unimplemented_dirs:
         if is_suffix(directory.parts, pathlib.Path(d).parts):
             if call_skip:
                 pytest.skip(f"Manifest not implemented {directory.parts}")
@@ -429,8 +434,11 @@ def load_manifests_file_for(directory: pathlib.Path) -> Manifest:
     )
     current_tag = recommended_tags[0] if recommended_tags else imagestream["spec"]["tags"][0]
 
-    sw = json.loads(current_tag["annotations"]["opendatahub.io/notebook-software"])
-    dep = json.loads(current_tag["annotations"]["opendatahub.io/notebook-python-dependencies"])
+    try:
+        sw = json.loads(current_tag["annotations"]["opendatahub.io/notebook-software"])
+        dep = json.loads(current_tag["annotations"]["opendatahub.io/notebook-python-dependencies"])
+    except Exception as e:
+        raise ValueError(f"invalid json syntax in {manifest_file}") from e
 
     return Manifest(
         filename=manifest_file,