added validator for str values in AnalyzerArgs base model

Author: alexandraBara

nodescraper/models/analyzerargs.py

@@ -23,12 +23,68 @@
 # SOFTWARE.
 #
 ###############################################################################
-from pydantic import BaseModel
+from typing import Any
+
+from pydantic import BaseModel, model_validator
 
 
 class AnalyzerArgs(BaseModel):
+    """Base class for all analyzer arguments.
+
+    This class provides automatic string stripping for all string values
+    in analyzer args. All analyzer args classes should inherit from this
+    instead of BaseModel directly.
+
+    The strip_string_values validator runs in mode="before", which means
+    it executes before any field validators in child classes. This ensures
+    all string inputs are cleaned of leading/trailing whitespace before
+    any further processing.
+    """
+
     model_config = {"extra": "forbid", "exclude_none": True}
 
+    @model_validator(mode="before")
+    @classmethod
+    def strip_string_values(cls, data: Any) -> Any:
+        """Strip whitespace from all string values in analyzer args.
+
+        This validator recursively processes:
+        - String values: strips whitespace
+        - Lists: strips strings in lists
+        - Dicts: strips string values in dicts
+        - Other types: left unchanged
+
+        Runs in mode="before" to ensure stripping happens before any
+        field validators execute in child classes.
+
+        Args:
+            data: The input data to validate
+
+        Returns:
+            The data with all string values stripped
+        """
+        if isinstance(data, dict):
+            return {k: cls._strip_value(v) for k, v in data.items()}
+        return data
+
+    @classmethod
+    def _strip_value(cls, value: Any) -> Any:
+        """Recursively strip string values.
+
+        Args:
+            value: The value to process
+
+        Returns:
+            The processed value
+        """
+        if isinstance(value, str):
+            return value.strip()
+        elif isinstance(value, list):
+            return [cls._strip_value(item) for item in value]
+        elif isinstance(value, dict):
+            return {k: cls._strip_value(v) for k, v in value.items()}
+        return value
+
     @classmethod
     def build_from_model(cls, datamodel):
         """Build analyzer args instance from data model object

nodescraper/plugins/inband/bios/bios_analyzer.py

@@ -75,7 +75,7 @@ def analyze_data(
                     self.result.message = "Bios data matches expected"
                     self.result.status = ExecutionStatus.OK
                     return self.result
-            elif data.bios_version == str(bios_version).strip():
+            elif data.bios_version == bios_version:
                 self.result.message = "Bios data matches expected"
                 self.result.status = ExecutionStatus.OK
                 return self.result

nodescraper/plugins/inband/dkms/dkms_analyzer.py

@@ -83,7 +83,7 @@ def analyze_data(
                         )
                     if regex_data.match(actual_value):
                         break
-                elif actual_value == str(accepted_value).strip():
+                elif actual_value == accepted_value:
                     break
             else:
                 expected_values.append(accepted_values)

nodescraper/plugins/inband/kernel/kernel_analyzer.py

@@ -72,7 +72,7 @@ def analyze_data(
                     self.result.message = "Kernel matches expected"
                     self.result.status = ExecutionStatus.OK
                     return self.result
-            elif data.kernel_version == str(kernel).strip():
+            elif data.kernel_version == kernel:
                 self.result.message = "Kernel matches expected"
                 self.result.status = ExecutionStatus.OK
                 return self.result

nodescraper/plugins/inband/memory/analyzer_args.py

@@ -23,9 +23,9 @@
 # SOFTWARE.
 #
 ###############################################################################
-from pydantic import BaseModel
+from nodescraper.models.analyzerargs import AnalyzerArgs
 
 
-class MemoryAnalyzerArgs(BaseModel):
+class MemoryAnalyzerArgs(AnalyzerArgs):
     ratio: float = 0.66
     memory_threshold: str = "30Gi"

nodescraper/plugins/inband/os/os_analyzer.py

@@ -54,8 +54,8 @@ def analyze_data(self, data: OsDataModel, args: Optional[OsAnalyzerArgs] = None)
             return self.result
 
         for os_name in args.exp_os:
-            if (str(os_name).strip() == data.os_name and args.exact_match) or (
-                str(os_name).strip() in data.os_name and not args.exact_match
+            if (os_name == data.os_name and args.exact_match) or (
+                os_name in data.os_name and not args.exact_match
             ):
                 self.result.message = "OS name matches expected"
                 self.result.status = ExecutionStatus.OK

nodescraper/plugins/inband/package/package_analyzer.py

@@ -157,7 +157,7 @@ def package_exact_match(
             elif exp_value is None:
                 # allow any version when expected version is None
                 continue
-            elif version != str(exp_value).strip():
+            elif version != exp_value:
                 not_found_match.append((exp_key, version))
                 self._log_event(
                     EventCategory.APPLICATION,

nodescraper/plugins/inband/rocm/analyzer_args.py

@@ -25,12 +25,13 @@
 ###############################################################################
 from typing import Union
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import Field, field_validator
 
+from nodescraper.models.analyzerargs import AnalyzerArgs
 from nodescraper.plugins.inband.rocm.rocmdata import RocmDataModel
 
 
-class RocmAnalyzerArgs(BaseModel):
+class RocmAnalyzerArgs(AnalyzerArgs):
     exp_rocm: Union[str, list] = Field(default_factory=list)
 
     @field_validator("exp_rocm", mode="before")

nodescraper/plugins/inband/rocm/rocm_analyzer.py

@@ -58,7 +58,7 @@ def analyze_data(
             return self.result
 
         for rocm_version in args.exp_rocm:
-            if data.rocm_version == str(rocm_version).strip():
+            if data.rocm_version == rocm_version:
                 self.result.message = "ROCm version matches expected"
                 self.result.status = ExecutionStatus.OK
                 return self.result

nodescraper/plugins/inband/storage/analyzer_args.py

@@ -25,10 +25,12 @@
 ###############################################################################
 from typing import Optional
 
-from pydantic import BaseModel, Field
+from pydantic import Field
 
+from nodescraper.models.analyzerargs import AnalyzerArgs
 
-class StorageAnalyzerArgs(BaseModel):
+
+class StorageAnalyzerArgs(AnalyzerArgs):
     min_required_free_space_abs: Optional[str] = None
     min_required_free_space_prct: Optional[int] = None
     ignore_devices: Optional[list[str]] = Field(default_factory=list)