amd-node-scraper 1.1.5__tar.gz → 1.1.6__tar.gz

{amd_node_scraper-1.1.5 → amd_node_scraper-1.1.6}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: amd-node-scraper
-Version: 1.1.5
+Version: 1.1.6
 Summary: A framework for automated error detection and data collection
+Author: AMD
 Project-URL: homepage, https://github.com/amd/node-scraper
 Project-URL: documentation, https://github.com/amd/node-scraper
 Project-URL: repository, https://github.com/amd/node-scraper
@@ -25,6 +26,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Dynamic: license-file
 
 # Node Scraper
 Node Scraper is a tool which performs automated data collection and analysis for the purposes of
@@ -144,7 +146,7 @@ options:
                         Comma-separated built-in names and/or plugin config
                         JSON paths (e.g. --plugin-
                         configs=NodeStatus,/path/c.json). Built-ins:
-                        NodeStatus, AllPlugins (default: None)
+                        AllPlugins, NodeStatus (default: None)
   --system-config STRING
                         Path to system config json (default: None)
   --connection-config STRING

{amd_node_scraper-1.1.5 → amd_node_scraper-1.1.6}/README.md

@@ -116,7 +116,7 @@ options:
                         Comma-separated built-in names and/or plugin config
                         JSON paths (e.g. --plugin-
                         configs=NodeStatus,/path/c.json). Built-ins:
-                        NodeStatus, AllPlugins (default: None)
+                        AllPlugins, NodeStatus (default: None)
   --system-config STRING
                         Path to system config json (default: None)
   --connection-config STRING

{amd_node_scraper-1.1.5 → amd_node_scraper-1.1.6}/amd_node_scraper.egg-info/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: amd-node-scraper
-Version: 1.1.5
+Version: 1.1.6
 Summary: A framework for automated error detection and data collection
+Author: AMD
 Project-URL: homepage, https://github.com/amd/node-scraper
 Project-URL: documentation, https://github.com/amd/node-scraper
 Project-URL: repository, https://github.com/amd/node-scraper
@@ -25,6 +26,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Dynamic: license-file
 
 # Node Scraper
 Node Scraper is a tool which performs automated data collection and analysis for the purposes of
@@ -144,7 +146,7 @@ options:
                         Comma-separated built-in names and/or plugin config
                         JSON paths (e.g. --plugin-
                         configs=NodeStatus,/path/c.json). Built-ins:
-                        NodeStatus, AllPlugins (default: None)
+                        AllPlugins, NodeStatus (default: None)
   --system-config STRING
                         Path to system config json (default: None)
   --connection-config STRING

{amd_node_scraper-1.1.5 → amd_node_scraper-1.1.6}/amd_node_scraper.egg-info/SOURCES.txt

@@ -62,7 +62,6 @@ nodescraper/cli/helper.py
 nodescraper/cli/host_cli_embed.py
 nodescraper/cli/inputargtypes.py
 nodescraper/cli/invocation.py
-nodescraper/configs/node_status.json
 nodescraper/connection/__init__.py
 nodescraper/connection/inband/__init__.py
 nodescraper/connection/inband/inband.py
@@ -108,6 +107,11 @@ nodescraper/models/priority_override.py
 nodescraper/models/systeminfo.py
 nodescraper/models/taskresult.py
 nodescraper/models/timerangeargs.py
+nodescraper/pluginrecipe/__init__.py
+nodescraper/pluginrecipe/all_plugins.py
+nodescraper/pluginrecipe/discovery.py
+nodescraper/pluginrecipe/node_status.py
+nodescraper/pluginrecipe/pluginrecipe.py
 nodescraper/plugins/__init__.py
 nodescraper/plugins/inband/__init__.py
 nodescraper/plugins/inband/amdsmi/__init__.py
@@ -309,6 +313,7 @@ test/functional/test_redfish_endpoint_plugin.py
 test/functional/test_reference_config_workflow.py
 test/functional/test_run_plugins.py
 test/functional/test_sys_settings_plugin.py
+test/functional/fixtures/amdsmi_plugin_config.json
 test/functional/fixtures/bios_plugin_config.json
 test/functional/fixtures/cmdline_plugin_config.json
 test/functional/fixtures/dimm_plugin_config.json
@@ -362,12 +367,14 @@ test/unit/framework/test_cli_helper.py
 test/unit/framework/test_compare_runs.py
 test/unit/framework/test_config_builder.py
 test/unit/framework/test_config_registry.py
+test/unit/framework/test_config_registry_entry_points.py
 test/unit/framework/test_connection_manager_entrypoints.py
 test/unit/framework/test_dataanalyzer.py
 test/unit/framework/test_datacollector.py
 test/unit/framework/test_dataplugin.py
 test/unit/framework/test_file_artifact.py
 test/unit/framework/test_plugin_executor.py
+test/unit/framework/test_pluginrecipe.py
 test/unit/framework/test_regexanalyzer.py
 test/unit/framework/test_type_utils.py
 test/unit/framework/common/shared_utils.py
@@ -382,6 +389,7 @@ test/unit/framework/fixtures/log_dir/collector/biosdatamodel.json
 test/unit/framework/fixtures/log_dir/collector/result.json
 test/unit/plugin/test_amdsmi_analyzer.py
 test/unit/plugin/test_amdsmi_collector.py
+test/unit/plugin/test_amdsmi_data.py
 test/unit/plugin/test_analyzer_args_build_from_model.py
 test/unit/plugin/test_bios_analyzer.py
 test/unit/plugin/test_bios_collector.py

amd_node_scraper-1.1.6/amd_node_scraper.egg-info/entry_points.txt

@@ -0,0 +1,6 @@
+[console_scripts]
+node-scraper = nodescraper.cli:cli_entry
+
+[nodescraper.plugin_configs]
+AllPlugins = nodescraper.pluginrecipe.all_plugins:AllPlugins
+NodeStatus = nodescraper.pluginrecipe.node_status:NodeStatus

{amd_node_scraper-1.1.5 → amd_node_scraper-1.1.6}/docs/PLUGIN_DOC.md

@@ -4,7 +4,7 @@
 
 | Plugin | Collection | Analyzer Args | Collection Args | DataModel | Collector | Analyzer |
 | --- | --- | --- | --- | --- | --- | --- |
-| AmdSmiPlugin | bad-pages<br>firmware --json<br>list --json<br>metric -g all<br>partition --json<br>process --json<br>ras --cper --folder={folder}<br>ras --afid --cper-file {cper_file}<br>static -g all --json<br>static -g {gpu_id} --json<br>topology<br>version --json<br>xgmi -l<br>xgmi -m | **Analyzer Args:**<br>- `check_static_data`: bool — If True, run static data checks (e.g. driver version, partition mode).<br>- `expected_gpu_processes`: Optional[int] — Expected number of GPU processes.<br>- `expected_max_power`: Optional[int] — Expected maximum power value (e.g. watts).<br>- `expected_driver_version`: Optional[str] — Expected AMD driver version string.<br>- `expected_memory_partition_mode`: Optional[str] — Expected memory partition mode (e.g. sp3, dp).<br>- `expected_compute_partition_mode`: Optional[str] — Expected compute partition mode.<br>- `expected_firmware_versions`: Optional[dict[str, str]] — Expected firmware versions keyed by amd-smi fw_id (e.g. PLDM_BUNDLE).<br>- `l0_to_recovery_count_error_threshold`: Optional[int] — L0-to-recovery count above which an error is raised.<br>- `l0_to_recovery_count_warning_threshold`: Optional[int] — L0-to-recovery count above which a warning is raised.<br>- `vendorid_ep`: Optional[str] — Expected endpoint vendor ID (e.g. for PCIe).<br>- `vendorid_ep_vf`: Optional[str] — Expected endpoint VF vendor ID.<br>- `devid_ep`: Optional[str] — Expected endpoint device ID.<br>- `devid_ep_vf`: Optional[str] — Expected endpoint VF device ID.<br>- `sku_name`: Optional[str] — Expected SKU name string for GPU.<br>- `expected_xgmi_speed`: Optional[list[float]] — Expected xGMI speed value(s) (e.g. link rate).<br>- `analysis_range_start`: Optional[datetime.datetime] — Start of time range for time-windowed analysis.<br>- `analysis_range_end`: Optional[datetime.datetime] — End of time range for time-windowed analysis. | **Collection Args:**<br>- `analysis_firmware_ids`: Optional[list[str]] — amd-smi fw_id values to record in analysis_ref.firmware_versions<br>- `cper_file_path`: Optional[str] — Path to CPER folder or file for RAS AFID collection (ras --afid --cper-file). | [AmdSmiDataModel](#AmdSmiDataModel-Model) | [AmdSmiCollector](#Collector-Class-AmdSmiCollector) | [AmdSmiAnalyzer](#Data-Analyzer-Class-AmdSmiAnalyzer) |
+| AmdSmiPlugin | bad-pages<br>firmware --json<br>list --json<br>metric -g all<br>partition --json<br>process --json<br>ras --cper --folder={folder}<br>ras --afid --cper-file {cper_file}<br>static -g all --json<br>static -g {gpu_id} --json<br>topology<br>version --json<br>xgmi -l<br>xgmi -m | **Analyzer Args:**<br>- `check_static_data`: bool — If True, run static data checks (e.g. driver version, partition mode).<br>- `expected_gpu_processes`: Optional[int] — Expected number of GPU processes.<br>- `expected_max_power`: Optional[int] — Expected maximum power value (e.g. watts).<br>- `expected_power_management`: Optional[str] — Expected amd-smi metric power_management value per GPU (e.g. DISABLED for active/full power, ENABLED for power-manage...<br>- `expected_driver_version`: Optional[str] — Expected AMD driver version string.<br>- `expected_memory_partition_mode`: Optional[str] — Expected memory partition mode (e.g. sp3, dp).<br>- `expected_compute_partition_mode`: Optional[str] — Expected compute partition mode.<br>- `expected_firmware_versions`: Optional[dict[str, str]] — Expected firmware versions keyed by amd-smi fw_id (e.g. PLDM_BUNDLE).<br>- `l0_to_recovery_count_error_threshold`: Optional[int] — L0-to-recovery count above which an error is raised.<br>- `l0_to_recovery_count_warning_threshold`: Optional[int] — L0-to-recovery count above which a warning is raised.<br>- `vendorid_ep`: Optional[str] — Expected endpoint vendor ID (e.g. for PCIe).<br>- `vendorid_ep_vf`: Optional[str] — Expected endpoint VF vendor ID.<br>- `devid_ep`: Optional[str] — Expected endpoint device ID.<br>- `devid_ep_vf`: Optional[str] — Expected endpoint VF device ID.<br>- `sku_name`: Optional[str] — Expected SKU name string for GPU.<br>- `expected_xgmi_speed`: Optional[list[float]] — Expected xGMI speed value(s) (e.g. link rate).<br>- `analysis_range_start`: Optional[datetime.datetime] — Start of time range for time-windowed analysis.<br>- `analysis_range_end`: Optional[datetime.datetime] — End of time range for time-windowed analysis. | **Collection Args:**<br>- `analysis_firmware_ids`: Optional[list[str]] — amd-smi fw_id values to record in analysis_ref.firmware_versions<br>- `cper_file_path`: Optional[str] — Path to CPER folder or file for RAS AFID collection (ras --afid --cper-file). | [AmdSmiDataModel](#AmdSmiDataModel-Model) | [AmdSmiCollector](#Collector-Class-AmdSmiCollector) | [AmdSmiAnalyzer](#Data-Analyzer-Class-AmdSmiAnalyzer) |
 | BiosPlugin | sh -c 'cat /sys/devices/virtual/dmi/id/bios_version'<br>wmic bios get SMBIOSBIOSVersion /Value | **Analyzer Args:**<br>- `exp_bios_version`: list[str] — Expected BIOS version(s) to match against collected value (str or list).<br>- `regex_match`: bool — If True, match exp_bios_version as regex; otherwise exact match. | - | [BiosDataModel](#BiosDataModel-Model) | [BiosCollector](#Collector-Class-BiosCollector) | [BiosAnalyzer](#Data-Analyzer-Class-BiosAnalyzer) |
 | CmdlinePlugin | cat /proc/cmdline | **Analyzer Args:**<br>- `required_cmdline`: Union[str, List] — Command-line parameters that must be present (e.g. 'pci=bfsort').<br>- `banned_cmdline`: Union[str, List] — Command-line parameters that must not be present.<br>- `os_overrides`: Dict[str, nodescraper.plugins.inband.cmdline.cmdlineconfig.OverrideConfig] — Per-OS overrides for required_cmdline and banned_cmdline (keyed by OS identifier).<br>- `platform_overrides`: Dict[str, nodescraper.plugins.inband.cmdline.cmdlineconfig.OverrideConfig] — Per-platform overrides for required_cmdline and banned_cmdline (keyed by platform). | - | [CmdlineDataModel](#CmdlineDataModel-Model) | [CmdlineCollector](#Collector-Class-CmdlineCollector) | [CmdlineAnalyzer](#Data-Analyzer-Class-CmdlineAnalyzer) |
 | DeviceEnumerationPlugin | powershell -Command "(Get-WmiObject -Class Win32_Processor &#124; Measure-Object).Count"<br>lspci -d {vendorid_ep}: &#124; grep -iE 'VGA&#124;Display&#124;3D&#124;Processing accelerators&#124;Co-processor&#124;Accelerator' &#124; grep -vi 'Virtual Function' &#124; wc -l<br>powershell -Command "(wmic path win32_VideoController get name &#124; findstr AMD &#124; Measure-Object).Count"<br>lscpu<br>lshw<br>lspci -d {vendorid_ep}: &#124; grep -i 'Virtual Function' &#124; wc -l<br>powershell -Command "(Get-VMHostPartitionableGpu &#124; Measure-Object).Count" | **Analyzer Args:**<br>- `cpu_count`: Optional[list[int]] — Expected CPU count(s); pass as int or list of ints. Analysis passes if actual is in list.<br>- `gpu_count`: Optional[list[int]] — Expected GPU count(s); pass as int or list of ints. Analysis passes if actual is in list.<br>- `vf_count`: Optional[list[int]] — Expected virtual function count(s); pass as int or list of ints. Analysis passes if actual is in list. | - | [DeviceEnumerationDataModel](#DeviceEnumerationDataModel-Model) | [DeviceEnumerationCollector](#Collector-Class-DeviceEnumerationCollector) | [DeviceEnumerationAnalyzer](#Data-Analyzer-Class-DeviceEnumerationAnalyzer) |
@@ -1755,6 +1755,7 @@ Check sysctl matches expected sysctl details
 - **check_static_data**: `bool` — If True, run static data checks (e.g. driver version, partition mode).
 - **expected_gpu_processes**: `Optional[int]` — Expected number of GPU processes.
 - **expected_max_power**: `Optional[int]` — Expected maximum power value (e.g. watts).
+- **expected_power_management**: `Optional[str]` — Expected amd-smi metric power_management value per GPU (e.g. DISABLED for active/full power, ENABLED for power-managed idle).
 - **expected_driver_version**: `Optional[str]` — Expected AMD driver version string.
 - **expected_memory_partition_mode**: `Optional[str]` — Expected memory partition mode (e.g. sp3, dp).
 - **expected_compute_partition_mode**: `Optional[str]` — Expected compute partition mode.

{amd_node_scraper-1.1.5 → amd_node_scraper-1.1.6}/nodescraper/cli/cli.py

@@ -64,7 +64,7 @@ from nodescraper.connection.redfish import (
 from nodescraper.connection.redfish.redfish_params import RedfishConnectionParams
 from nodescraper.constants import DEFAULT_LOGGER
 from nodescraper.enums import ExecutionStatus, SystemInteractionLevel, SystemLocation
-from nodescraper.models import PluginConfig, SystemInfo
+from nodescraper.models import SystemInfo
 from nodescraper.pluginexecutor import PluginExecutor
 from nodescraper.pluginregistry import PluginRegistry
 
@@ -74,17 +74,16 @@ def _parse_plugin_configs_csv(value: str) -> list[str]:
     return [p.strip() for p in value.split(",") if p.strip()]
 
 
-def _config_registry_with_all_plugins(plugin_reg: PluginRegistry) -> ConfigRegistry:
-    """Synthetic ``AllPlugins`` config used for CLI help and :func:`build_global_argument_parser`."""
-    config_reg = ConfigRegistry()
-    config_reg.configs["AllPlugins"] = PluginConfig(
-        name="AllPlugins",
-        desc="Run all registered plugins with default arguments",
-        global_args={},
-        plugins={name: {} for name in plugin_reg.plugins},
-        result_collators={},
-    )
-    return config_reg
+def _default_config_registry(_plugin_reg: PluginRegistry) -> ConfigRegistry:
+    """Build the config registry from bundled JSON and plugin-config entry points.
+
+    Args:
+        _plugin_reg (PluginRegistry): Unused; retained for call-site compatibility.
+
+    Returns:
+        ConfigRegistry: Registry containing bundled and entry-point plugin configs.
+    """
+    return ConfigRegistry()
 
 
 def _add_cli_root_globals(
@@ -203,7 +202,7 @@ def _add_cli_root_globals(
 def build_global_argument_parser(*, add_help: bool = True) -> argparse.ArgumentParser:
     """Globals only (no subcommands), for host CLIs."""
     plugin_reg = PluginRegistry()
-    config_reg = _config_registry_with_all_plugins(plugin_reg)
+    config_reg = _default_config_registry(plugin_reg)
     parser = argparse.ArgumentParser(
         description="node scraper CLI (global options only)",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
@@ -406,7 +405,7 @@ def get_cli_top_level_subcommands() -> tuple[str, ...]:
         Tuple of ``subcmd`` subparser names; call ``cache_clear()`` if registries change in-process.
     """
     plugin_reg = PluginRegistry()
-    config_reg = _config_registry_with_all_plugins(plugin_reg)
+    config_reg = _default_config_registry(plugin_reg)
     parser, _plugin_subparser_map = build_parser(plugin_reg, config_reg)
     return _top_level_subcommand_names(parser)
 
@@ -474,7 +473,7 @@ def main(
         arg_input = sys.argv[1:]
 
     plugin_reg = PluginRegistry()
-    config_reg = _config_registry_with_all_plugins(plugin_reg)
+    config_reg = _default_config_registry(plugin_reg)
     parser, plugin_subparser_map = build_parser(plugin_reg, config_reg)
 
     try:

{amd_node_scraper-1.1.5 → amd_node_scraper-1.1.6}/nodescraper/cli/helper.py

@@ -211,8 +211,8 @@ def parse_describe(
     if not parsed_args.name:
         out: list[str] = []
         if parsed_args.type == "config":
-            out.append("Available built-in configs:")
-            for name in config_reg.configs:
+            out.append("Available configs:")
+            for name in sorted(config_reg.configs):
                 out.append(f"  {name}")
         elif parsed_args.type == "plugin":
             out.append("Available plugins:")

amd_node_scraper-1.1.6/nodescraper/configregistry.py

@@ -0,0 +1,183 @@
+###############################################################################
+#
+# MIT License
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+###############################################################################
+from __future__ import annotations
+
+import importlib.metadata
+import inspect
+import json
+import os
+from pathlib import Path
+from typing import Any, Optional
+
+from pydantic import ValidationError
+
+from nodescraper.models import PluginConfig
+
+PLUGIN_CONFIG_ENTRY_POINT_GROUP = "nodescraper.plugin_configs"
+
+
+class PluginConfigEntryPointError(RuntimeError):
+    """Raised when a ``nodescraper.plugin_configs`` entry point cannot be loaded."""
+
+
+class ConfigRegistry:
+    """Class to load json plugin configs into models"""
+
+    INTERNAL_SEARCH_PATH = os.path.join(os.path.dirname(__file__), "configs")
+
+    def __init__(
+        self,
+        config_path: Optional[str] = None,
+        load_entry_point_configs: bool = True,
+    ) -> None:
+        """Initialize the config registry.
+
+        Args:
+            config_path (Optional[str], optional): Path in which to search for JSON config files.
+                Defaults to None.
+            load_entry_point_configs (bool, optional): Whether to load ``nodescraper.plugin_configs``
+                entry points. Defaults to True.
+        """
+        self.configs: dict[str, PluginConfig] = {}
+        self.load_configs(config_path)
+        if load_entry_point_configs:
+            self.configs.update(self.load_plugin_configs_from_entry_points())
+
+    def load_configs(self, config_path: Optional[str] = None):
+        """Load plugin config JSON files into pydantic models.
+
+        Args:
+            config_path (Optional[str], optional): Path in which to search for config files.
+                Defaults to None.
+        """
+        if not config_path:
+            config_path = self.INTERNAL_SEARCH_PATH
+
+        config_path = Path(config_path)
+
+        for config_file in config_path.glob("*.json"):
+            with open(config_file, "r", encoding="utf-8") as in_file:
+                try:
+                    file_data = json.load(in_file)
+                    config_model = PluginConfig(**file_data)
+                    if config_model.name:
+                        self.configs[config_model.name] = config_model
+                    else:
+                        self.configs[config_file.name] = config_model
+                except (ValidationError, json.JSONDecodeError):
+                    pass
+
+    @staticmethod
+    def _entry_points_for_group(group: str):
+        """Return setuptools entry points for the given group name.
+
+        Args:
+            group (str): Entry point group to query.
+
+        Returns:
+            Iterable: Entry points registered under ``group``.
+        """
+        try:
+            return importlib.metadata.entry_points(group=group)  # type: ignore[call-arg]
+        except TypeError:
+            all_eps = importlib.metadata.entry_points()  # type: ignore[assignment]
+            return all_eps.get(group, [])  # type: ignore[assignment, attr-defined, arg-type]
+
+    @staticmethod
+    def _resolve_entry_point_config(loaded: Any) -> PluginConfig | dict[str, Any] | None:
+        """Resolve a loaded entry point object into a plugin config.
+
+        Args:
+            loaded (Any): Object returned by an entry point ``load()`` call.
+
+        Returns:
+            Optional[PluginConfig | dict[str, Any]]: Plugin config, or None if ``loaded`` is unsupported.
+        """
+        if isinstance(loaded, PluginConfig):
+            return loaded
+        if isinstance(loaded, dict):
+            return loaded
+        if inspect.isclass(loaded) and hasattr(loaded, "plugin_config"):
+            config_data = loaded.plugin_config()
+        elif callable(loaded):
+            config_data = loaded()
+        else:
+            return None
+
+        if isinstance(config_data, (PluginConfig, dict)):
+            return config_data
+        return None
+
+    @classmethod
+    def load_plugin_configs_from_entry_points(cls) -> dict[str, PluginConfig]:
+        """Load plugin configs registered under ``nodescraper.plugin_configs`` entry points.
+
+        Returns:
+            dict[str, PluginConfig]: Map of config name to loaded :class:`~nodescraper.models.PluginConfig`.
+
+        Raises:
+            PluginConfigEntryPointError: If an entry point target is missing, invalid, or unsupported.
+        """
+        configs: dict[str, PluginConfig] = {}
+
+        for entry_point in cls._entry_points_for_group(PLUGIN_CONFIG_ENTRY_POINT_GROUP):
+            entry_point_name = getattr(entry_point, "name", None)
+            entry_point_label = entry_point_name or "<unknown>"
+            try:
+                loaded = entry_point.load()  # type: ignore[attr-defined]
+                config_data = cls._resolve_entry_point_config(loaded)
+                if config_data is None:
+                    raise PluginConfigEntryPointError(
+                        f"Failed to load plugin config entry point {entry_point_label!r}: "
+                        f"unsupported target {loaded!r}"
+                    )
+
+                config_model = (
+                    config_data
+                    if isinstance(config_data, PluginConfig)
+                    else PluginConfig(**config_data)
+                )
+                config_key = entry_point_name or config_model.name
+                if config_key:
+                    configs[config_key] = config_model
+            except ModuleNotFoundError as exc:
+                raise PluginConfigEntryPointError(
+                    f"Failed to load plugin config entry point {entry_point_label!r}: "
+                    f"module not found ({exc}). Check the entry point target in pyproject.toml."
+                ) from exc
+            except ValidationError as exc:
+                raise PluginConfigEntryPointError(
+                    f"Failed to load plugin config entry point {entry_point_label!r}: "
+                    "invalid plugin config"
+                ) from exc
+            except PluginConfigEntryPointError:
+                raise
+            except Exception as exc:
+                raise PluginConfigEntryPointError(
+                    f"Failed to load plugin config entry point {entry_point_label!r}: {exc}"
+                ) from exc
+
+        return configs

{amd_node_scraper-1.1.5 → amd_node_scraper-1.1.6}/nodescraper/models/pluginconfig.py

@@ -23,7 +23,9 @@
 # SOFTWARE.
 #
 ###############################################################################
-from typing import Optional
+from __future__ import annotations
+
+from typing import Any, Optional
 
 from pydantic import BaseModel, Field
 
@@ -36,3 +38,31 @@ class PluginConfig(BaseModel):
     result_collators: dict[str, dict] = Field(default_factory=dict)
     name: Optional[str] = None
     desc: Optional[str] = None
+
+    @classmethod
+    def coerce(cls, config: PluginConfig | dict[str, Any]) -> PluginConfig:
+        """Return a ``PluginConfig`` instance from a model or mapping."""
+        if isinstance(config, cls):
+            return config
+        return cls.model_validate(config)
+
+    @classmethod
+    def merge(cls, *configs: PluginConfig | dict[str, Any]) -> PluginConfig:
+        """Merge recipe plugin configs.
+
+        Plugin entries from later configs overwrite earlier ones with the same name.
+        ``name``, ``desc``, ``global_args``, and ``result_collators`` come from the first
+        config.
+        """
+        normalized = [cls.coerce(config) for config in configs]
+        merged_plugins: dict[str, dict[str, Any]] = {}
+        for config in normalized:
+            merged_plugins.update(config.plugins)
+        first = normalized[0] if normalized else cls()
+        return cls(
+            name=first.name,
+            desc=first.desc,
+            global_args=first.global_args,
+            plugins=merged_plugins,
+            result_collators=first.result_collators,
+        )

amd_node_scraper-1.1.6/nodescraper/pluginrecipe/__init__.py

@@ -0,0 +1,51 @@
+###############################################################################
+#
+# MIT License
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+###############################################################################
+from nodescraper.models import PluginConfig
+
+from .all_plugins import AllPlugins
+from .discovery import (
+    load_plugin_class,
+    plugin_has_analyzer,
+    plugin_has_collector,
+    plugin_names_matching,
+    plugins_with_analyzer,
+    plugins_with_collector,
+    registered_plugin_names,
+)
+from .node_status import NodeStatus
+from .pluginrecipe import (
+    ANALYZE_ONLY,
+    COLLECT_AND_ANALYZE,
+    COLLECT_ONLY,
+    AnalyzerOnlyPluginRecipe,
+    CollectorOnlyPluginRecipe,
+    PluginRecipe,
+    PluginRunFlags,
+    merge_plugin_configs,
+)
+
+__all__ = [
+    "ANALYZE_ONLY",
+    "COLLECT_AND_ANALYZE",
+    "COLLECT_ONLY",
+    "AllPlugins",
+    "AnalyzerOnlyPluginRecipe",
+    "CollectorOnlyPluginRecipe",
+    "NodeStatus",
+    "PluginConfig",
+    "PluginRecipe",
+    "PluginRunFlags",
+    "load_plugin_class",
+    "merge_plugin_configs",
+    "plugin_has_analyzer",
+    "plugin_has_collector",
+    "plugin_names_matching",
+    "plugins_with_analyzer",
+    "plugins_with_collector",
+    "registered_plugin_names",
+]

amd_node_scraper-1.1.6/nodescraper/pluginrecipe/all_plugins.py

@@ -0,0 +1,24 @@
+###############################################################################
+#
+# MIT License
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+###############################################################################
+from __future__ import annotations
+
+from .discovery import registered_plugin_names
+from .pluginrecipe import PluginRecipe
+
+
+class AllPlugins(PluginRecipe):
+    """Run all registered plugins with default arguments."""
+
+    @classmethod
+    def plugin_names(cls) -> tuple[str, ...]:
+        """Return every plugin registered at runtime.
+
+        Returns:
+            tuple[str, ...]: Sorted names of all plugins in the plugin registry.
+        """
+        return registered_plugin_names()

amd_node_scraper-1.1.6/nodescraper/pluginrecipe/discovery.py

@@ -0,0 +1,98 @@
+###############################################################################
+#
+# MIT License
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+###############################################################################
+from __future__ import annotations
+
+from typing import Iterable
+
+
+def registered_plugin_names() -> tuple[str, ...]:
+    """Return all plugin names known to :class:`~nodescraper.pluginregistry.PluginRegistry`.
+
+    Returns:
+        tuple[str, ...]: Sorted registered plugin names.
+    """
+    from nodescraper.pluginregistry import PluginRegistry
+
+    return tuple(sorted(PluginRegistry().plugins))
+
+
+def plugin_names_matching(names: Iterable[str]) -> tuple[str, ...]:
+    """Return plugin names from ``names`` that are registered at runtime.
+
+    Args:
+        names (Iterable[str]): Candidate plugin names to filter.
+
+    Returns:
+        tuple[str, ...]: Sorted subset of ``names`` present in the plugin registry.
+    """
+    available = set(registered_plugin_names())
+    return tuple(sorted(name for name in names if name in available))
+
+
+def load_plugin_class(plugin_name: str) -> type | None:
+    """Return a registered plugin class by name.
+
+    Args:
+        plugin_name (str): Registered plugin name.
+
+    Returns:
+        type | None: Plugin class, or ``None`` if the name is not registered.
+    """
+    from nodescraper.pluginregistry import PluginRegistry
+
+    return PluginRegistry().plugins.get(plugin_name)
+
+
+def plugin_has_collector(plugin_name: str) -> bool:
+    """Return whether the plugin exposes a collector task.
+
+    Args:
+        plugin_name (str): Registered plugin name.
+
+    Returns:
+        bool: ``True`` when the plugin class defines ``COLLECTOR``.
+    """
+    plugin_class = load_plugin_class(plugin_name)
+    return plugin_class is not None and getattr(plugin_class, "COLLECTOR", None) is not None
+
+
+def plugin_has_analyzer(plugin_name: str) -> bool:
+    """Return whether the plugin exposes an analyzer task.
+
+    Args:
+        plugin_name (str): Registered plugin name.
+
+    Returns:
+        bool: ``True`` when the plugin class defines ``ANALYZER``.
+    """
+    plugin_class = load_plugin_class(plugin_name)
+    return plugin_class is not None and getattr(plugin_class, "ANALYZER", None) is not None
+
+
+def plugins_with_collector(plugin_names: Iterable[str]) -> tuple[str, ...]:
+    """Filter plugin names to those that define a collector.
+
+    Args:
+        plugin_names (Iterable[str]): Candidate plugin names.
+
+    Returns:
+        tuple[str, ...]: Sorted plugin names with a ``COLLECTOR`` implementation.
+    """
+    return tuple(sorted(name for name in plugin_names if plugin_has_collector(name)))
+
+
+def plugins_with_analyzer(plugin_names: Iterable[str]) -> tuple[str, ...]:
+    """Filter plugin names to those that define an analyzer.
+
+    Args:
+        plugin_names (Iterable[str]): Candidate plugin names.
+
+    Returns:
+        tuple[str, ...]: Sorted plugin names with an ``ANALYZER`` implementation.
+    """
+    return tuple(sorted(name for name in plugin_names if plugin_has_analyzer(name)))

amd_node_scraper-1.1.6/nodescraper/pluginrecipe/node_status.py

@@ -0,0 +1,38 @@
+###############################################################################
+#
+# MIT License
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+###############################################################################
+from __future__ import annotations
+
+from .discovery import plugin_names_matching
+from .pluginrecipe import PluginRecipe
+
+_NODE_STATUS_PLUGINS = (
+    "BiosPlugin",
+    "CmdlinePlugin",
+    "DimmPlugin",
+    "DkmsPlugin",
+    "DmesgPlugin",
+    "KernelPlugin",
+    "MemoryPlugin",
+    "OsPlugin",
+    "RocmPlugin",
+    "StoragePlugin",
+    "UptimePlugin",
+)
+
+
+class NodeStatus(PluginRecipe):
+    """Check configuration and status of the node."""
+
+    @classmethod
+    def plugin_names(cls) -> tuple[str, ...]:
+        """Return the NodeStatus plugin set resolved at runtime.
+
+        Returns:
+            tuple[str, ...]: Sorted node-status plugin names registered in the plugin registry.
+        """
+        return plugin_names_matching(_NODE_STATUS_PLUGINS)