Cleanup generation

Author: pawelrutkaq

MODULE.bazel.lock

@@ -11,7 +11,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 bazel_dep(name = "rules_python", version = "1.8.3")
-bazel_dep(name = "aspect_rules_py", version = "1.4.0")
+bazel_dep(name = "aspect_rules_py", version = "1.5.2")
 
 PYTHON_VERSION = "3.12"
 
@@ -29,7 +29,6 @@ pip.parse(
     requirements_lock = "//feature_integration_tests/test_cases:requirements.txt.lock",
 )
 use_repo(pip, "pip_score_venv_test")
-
 pip.parse(
     envsubst = ["PIP_INDEX_URL"],
     extra_pip_args = ["--index-url=${PIP_INDEX_URL:-https://pypi.org/simple/}"],

bazel_common/score_python.MODULE.bazel

@@ -0,0 +1,12 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************

scripts/tooling/cli/__init__.py

@@ -1,3 +1,15 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
 import argparse
 import sys
 
@@ -7,7 +19,10 @@ def main() -> None:
     subparsers = parser.add_subparsers(dest="group", metavar="GROUP")
     subparsers.required = True
 
-    from scripts.tooling.cli.misc import register as _register_misc
+    try:
+        from scripts.tooling.cli.misc import register as _register_misc
+    except ImportError:
+        from cli.misc import register as _register_misc  # type: ignore[no-redef]
 
     _register_misc(subparsers)
 

scripts/tooling/cli/main.py

@@ -1,3 +1,15 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
 import argparse
 
 
@@ -6,6 +18,9 @@ def register(subparsers: argparse._SubParsersAction) -> None:
     misc_sub = misc_parser.add_subparsers(dest="command", metavar="COMMAND")
     misc_sub.required = True
 
-    from scripts.tooling.cli.misc.html_report import register as _register_html_report
+    try:
+        from scripts.tooling.cli.misc.html_report import register as _register_html_report
+    except ImportError:
+        from cli.misc.html_report import register as _register_html_report  # type: ignore[no-redef]
 
     _register_html_report(misc_sub)

scripts/tooling/cli/misc/__init__.py

@@ -1,7 +1,35 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+from __future__ import annotations
+
 import argparse
+import json
+import logging
 import os
 import sys
 from pathlib import Path
+from typing import Any, Optional
+
+from jinja2 import Environment, FileSystemLoader, select_autoescape
+
+try:
+    from scripts.tooling.lib.github import fetch_compare
+    from scripts.tooling.lib.known_good import KnownGood, load_known_good
+except ImportError:
+    from lib.github import fetch_compare  # type: ignore[no-redef]
+    from lib.known_good import KnownGood, load_known_good  # type: ignore[no-redef]
+
+_LOG = logging.getLogger(__name__)
 
 TEMPLATE_DIR = Path(__file__).parent / "assets"
 
@@ -22,8 +50,69 @@ def _resolve_path_from_bazel(path: Path) -> Path:
     return path.resolve()
 
 
+def _collect_entries(known_good: KnownGood) -> list[dict[str, Any]]:
+    entries = []
+    for group_name, group_modules in known_good.modules.items():
+        for module in group_modules.values():
+            try:
+                owner_repo = module.owner_repo
+            except ValueError:
+                owner_repo = None
+            entries.append(
+                {
+                    "name": module.name,
+                    "group": group_name,
+                    "repo": module.repo,
+                    "owner_repo": owner_repo,
+                    "hash": module.hash,
+                    "version": module.version,
+                    "branch": module.branch,
+                    "current_hash": None,
+                    "behind_by": None,
+                    "compare_status": None,
+                }
+            )
+    return entries
+
+
+def _enrich_with_compare_data(entries: list[dict[str, Any]], token: str) -> None:
+    for entry in entries:
+        if not entry.get("owner_repo") or not entry.get("hash") or entry.get("version"):
+            continue
+        result = fetch_compare(entry["owner_repo"], entry["hash"], entry["branch"], token)
+        if result:
+            entry["current_hash"] = result.head_sha
+            entry["behind_by"] = result.ahead_by
+            entry["compare_status"] = result.status
+        else:
+            _LOG.warning(
+                "Could not fetch compare data for %s@%s", entry["owner_repo"], entry["branch"]
+            )
+
+
+def generate_report(known_good: KnownGood, token: Optional[str] = None) -> str:
+    entries = _collect_entries(known_good)
+    if token:
+        _enrich_with_compare_data(entries, token)
+    env = Environment(
+        loader=FileSystemLoader(TEMPLATE_DIR),
+        autoescape=select_autoescape(["html"]),
+    )
+    tmpl = env.get_template("report_template.html")
+    return tmpl.render(
+        modules_json=json.dumps(entries, indent=2),
+        timestamp=known_good.timestamp,
+    )
+
+
+def write_report(known_good: KnownGood, output_path: Path, token: Optional[str] = None) -> None:
+    Path(output_path).write_text(generate_report(known_good, token), encoding="utf-8")
+
+
 def register(subparsers: argparse._SubParsersAction) -> None:
-    parser = subparsers.add_parser("html_report", help="Generate an HTML status report from known_good.json")
+    parser = subparsers.add_parser(
+        "html_report", help="Generate an HTML status report from known_good.json"
+    )
     parser.add_argument(
         "--known_good",
         metavar="PATH",
@@ -40,9 +129,6 @@ def register(subparsers: argparse._SubParsersAction) -> None:
 
 
 def _run(args: argparse.Namespace) -> int:
-    from scripts.tooling.lib.html_report import write_report
-    from scripts.tooling.lib.known_good import load_known_good
-
     known_good_path = Path(args.known_good) / "known_good.json"
     try:
         known_good = load_known_good(known_good_path)
@@ -52,7 +138,7 @@ def _run(args: argparse.Namespace) -> int:
 
     token = os.environ.get("GITHUB_TOKEN")
     output = _resolve_path_from_bazel(Path(args.output))
-    write_report(known_good, output, TEMPLATE_DIR, token=token)
+    write_report(known_good, output, token=token)
     if token:
         print(f"Report written to {output} (current hashes fetched from GitHub)")
     else: