Merge branch 'development' into alex_nvme

Author: alexandraBara

nodescraper/cli/helper.py

@@ -344,11 +344,13 @@ def generate_reference_config(
 
         plugin = plugin_reg.plugins.get(obj.source)
 
-        args = extract_analyzer_args_from_model(plugin, data_model, logger)
-        if not args:
-            continue
-        plugins[obj.source] = {"analysis_args": {}}
-        plugins[obj.source]["analysis_args"] = args.model_dump(exclude_none=True)
+        if obj.source not in plugins:
+            plugins[obj.source] = {}
+
+        a_args = extract_analyzer_args_from_model(plugin, data_model, logger)
+        if a_args:
+            plugins[obj.source]["analysis_args"] = a_args.model_dump(exclude_none=True)
+
     plugin_config.plugins = plugins
 
     return plugin_config

nodescraper/interfaces/dataplugin.py

@@ -241,6 +241,7 @@ def analyze(
         Returns:
             TaskResult: result of data analysis
         """
+
         if self.ANALYZER is None:
             self.analysis_result = TaskResult(
                 status=ExecutionStatus.NOT_RAN,

nodescraper/interfaces/task.py

@@ -80,6 +80,8 @@ def max_event_priority_level(self) -> EventPriority:
     def max_event_priority_level(self, input_value: str | EventPriority):
         if isinstance(input_value, str):
             value: EventPriority = getattr(EventPriority, input_value)
+        elif isinstance(input_value, int):
+            value = EventPriority(input_value)
         elif isinstance(input_value, EventPriority):
             value: EventPriority = input_value
         else:

nodescraper/models/__init__.py

@@ -24,6 +24,7 @@
 #
 ###############################################################################
 from .analyzerargs import AnalyzerArgs
+from .collectorargs import CollectorArgs
 from .datamodel import DataModel
 from .datapluginresult import DataPluginResult
 from .event import Event
@@ -35,6 +36,7 @@
 
 __all__ = [
     "AnalyzerArgs",
+    "CollectorArgs",
     "DataModel",
     "TaskResult",
     "Event",

nodescraper/models/collectorargs.py

@@ -0,0 +1,30 @@
+###############################################################################
+#
+# 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 pydantic import BaseModel
+
+
+class CollectorArgs(BaseModel):
+    model_config = {"extra": "forbid", "exclude_none": True}

nodescraper/pluginexecutor.py

@@ -33,7 +33,7 @@
 from pydantic import BaseModel
 
 from nodescraper.constants import DEFAULT_LOGGER
-from nodescraper.interfaces import ConnectionManager, DataPlugin
+from nodescraper.interfaces import ConnectionManager, DataPlugin, PluginInterface
 from nodescraper.models import PluginConfig, SystemInfo
 from nodescraper.models.pluginresult import PluginResult
 from nodescraper.pluginregistry import PluginRegistry
@@ -165,16 +165,25 @@ def run_queue(self) -> list[PluginResult]:
                     plugin_inst = plugin_class(**init_payload)
 
                     run_payload = copy.deepcopy(plugin_args)
-
                     run_args = TypeUtils.get_func_arg_types(plugin_class.run, plugin_class)
+
                     for arg in run_args.keys():
                         if arg == "preserve_connection" and issubclass(plugin_class, DataPlugin):
                             run_payload[arg] = True
-                        elif arg in self.plugin_config.global_args:
-                            run_payload[arg] = self.plugin_config.global_args[arg]
 
-                        # TODO
-                        # enable global substitution in collection and analysis args
+                    try:
+                        global_run_args = self.apply_global_args_to_plugin(
+                            plugin_inst, plugin_class, self.plugin_config.global_args
+                        )
+                        run_payload.update(global_run_args)
+                    except ValueError as ve:
+                        self.logger.error(
+                            "Invalid global_args for plugin %s: %s. Skipping plugin.",
+                            plugin_name,
+                            str(ve),
+                        )
+                        continue
+
                     self.logger.info("-" * 50)
                     plugin_results.append(plugin_inst.run(**run_payload))
                 except Exception as e:
@@ -210,3 +219,42 @@ def run_queue(self) -> list[PluginResult]:
                     )
 
         return plugin_results
+
+    def apply_global_args_to_plugin(
+        self,
+        plugin_inst: PluginInterface,
+        plugin_class: type,
+        global_args: dict,
+    ) -> dict:
+        """
+        Applies global arguments to the plugin instance, including standard attributes
+        and merging Pydantic model arguments (collection_args, analysis_args).
+
+        Args:
+            plugin_inst: The plugin instance to update.
+            plugin_class: The plugin class (needed for model instantiation).
+            global_args: Dict of global argument overrides.
+        """
+
+        run_args = {}
+        for key in global_args:
+            if key in ["collection_args", "analysis_args"] and isinstance(plugin_inst, DataPlugin):
+                continue
+            else:
+                run_args[key] = global_args[key]
+
+        if "collection_args" in global_args and hasattr(plugin_class, "COLLECTOR_ARGS"):
+            plugin_fields = set(plugin_class.COLLECTOR_ARGS.__fields__.keys())
+            filtered = {
+                k: v for k, v in global_args["collection_args"].items() if k in plugin_fields
+            }
+            if filtered:
+                run_args["collection_args"] = filtered
+
+        if "analysis_args" in global_args and hasattr(plugin_class, "ANALYZER_ARGS"):
+            plugin_fields = set(plugin_class.ANALYZER_ARGS.__fields__.keys())
+            filtered = {k: v for k, v in global_args["analysis_args"].items() if k in plugin_fields}
+            if filtered:
+                run_args["analysis_args"] = filtered
+
+        return run_args

nodescraper/plugins/inband/process/collector_args.py

@@ -23,10 +23,9 @@
 # SOFTWARE.
 #
 ###############################################################################
-from pydantic import BaseModel
 
+from nodescraper.models import CollectorArgs
 
-class ProcessCollectorArgs(BaseModel):
-    top_n_process: int = 10
 
-    model_config = {"extra": "forbid"}
+class ProcessCollectorArgs(CollectorArgs):
+    top_n_process: int = 10

nodescraper/plugins/inband/process/process_plugin.py

@@ -42,3 +42,5 @@ class ProcessPlugin(InBandDataPlugin[ProcessDataModel, ProcessCollectorArgs, Pro
     ANALYZER = ProcessAnalyzer
 
     ANALYZER_ARGS = ProcessAnalyzerArgs
+
+    COLLECTOR_ARGS = ProcessCollectorArgs

test/unit/conftest.py

@@ -55,6 +55,7 @@ class DummyDataModel(DataModel):
 
 class DummyArg(BaseModel):
     value: int
+    regex_match: bool = True
 
 
 class DummyResult:

test/unit/framework/common/shared_utils.py

@@ -72,11 +72,11 @@ class TestModelArg(AnalyzerArgs):
 
     @classmethod
     def build_from_model(cls, model):
-        return cls(model_attr=int(model.some_version))
+        return cls(model_attr=int(model.foo))
 
 
 class DummyDataModel(DataModel):
-    some_version: str = None
+    foo: str = None
 
 
 class TestPluginA(PluginInterface[MockConnectionManager, None]):