more updates

Author: alexandraBara

nodescraper/cli/cli.py

@@ -257,6 +257,7 @@ def build_parser(
             model_type_map = parser_builder.build_plugin_parser()
         except Exception as e:
             print(f"Exception building arg parsers for {plugin_name}: {str(e)}")  # noqa: T201
+            continue
         plugin_subparser_map[plugin_name] = (plugin_subparser, model_type_map)
 
     return parser, plugin_subparser_map

nodescraper/configbuilder.py

@@ -26,7 +26,7 @@
 import enum
 import logging
 import types
-from typing import Any, Optional, Type
+from typing import Any, Optional, Type, Union
 
 from pydantic import BaseModel
 
@@ -102,7 +102,7 @@ def _update_config(cls, config_key, type_data: TypeData, config: dict):
             config[config_key] = cls._process_value(type_data.default)
 
     @classmethod
-    def _process_value(cls, value: Any) -> dict | str | int | float | list | None:
+    def _process_value(cls, value: Any) -> Optional[Union[dict, str, int, float, list]]:
         if isinstance(value, enum.Enum):
             return value.name
 

nodescraper/connection/inband/inbandmanager.py

@@ -26,6 +26,7 @@
 from __future__ import annotations
 
 from logging import Logger
+from typing import Optional, Union
 
 from nodescraper.enums import (
     EventCategory,
@@ -50,11 +51,11 @@ class InBandConnectionManager(ConnectionManager[InBandConnection, SSHConnectionP
     def __init__(
         self,
         system_info: SystemInfo,
-        logger: Logger | None = None,
-        max_event_priority_level: EventPriority | str = EventPriority.CRITICAL,
-        parent: str | None = None,
-        task_result_hooks: list[TaskResultHook] | None = None,
-        connection_args: SSHConnectionParams | None = None,
+        logger: Optional[Logger] = None,
+        max_event_priority_level: Union[EventPriority, str] = EventPriority.CRITICAL,
+        parent: Optional[str] = None,
+        task_result_hooks: Optional[list[TaskResultHook]] = None,
+        connection_args: Optional[SSHConnectionParams] = None,
         **kwargs,
     ):
         super().__init__(

nodescraper/pluginexecutor.py

@@ -28,7 +28,7 @@
 import copy
 import logging
 from collections import deque
-from typing import Optional, Type
+from typing import Optional, Type, Union
 
 from pydantic import BaseModel
 
@@ -47,7 +47,7 @@ class PluginExecutor:
     def __init__(
         self,
         plugin_configs: list[PluginConfig],
-        connections: Optional[dict[str, dict | BaseModel]] = None,
+        connections: Optional[dict[str, Union[dict, BaseModel]]] = None,
         system_info: Optional[SystemInfo] = None,
         logger: Optional[logging.Logger] = None,
         plugin_registry: Optional[PluginRegistry] = None,

nodescraper/plugins/inband/bios/analyzer_args.py

@@ -23,6 +23,8 @@
 # SOFTWARE.
 #
 ###############################################################################
+from typing import Union
+
 from pydantic import Field, field_validator
 
 from nodescraper.models import AnalyzerArgs
@@ -35,11 +37,11 @@ class BiosAnalyzerArgs(AnalyzerArgs):
 
     @field_validator("exp_bios_version", mode="before")
     @classmethod
-    def validate_exp_bios_version(cls, exp_bios_version: str | list) -> list:
+    def validate_exp_bios_version(cls, exp_bios_version: Union[str, list]) -> list:
         """support str or list input for exp_bios_version
 
         Args:
-            exp_bios_version (str | list): expected BIOS version(s) to match against
+            exp_bios_version (Union[str, list]): expected BIOS version(s) to match against
 
         Returns:
             list: a list of expected BIOS versions

nodescraper/plugins/inband/bios/bios_collector.py

@@ -23,6 +23,7 @@
 # SOFTWARE.
 #
 ###############################################################################
+from typing import Optional
 
 from nodescraper.base import InBandDataCollector
 from nodescraper.enums import EventCategory, EventPriority, ExecutionStatus, OSFamily
@@ -39,11 +40,11 @@ class BiosCollector(InBandDataCollector[BiosDataModel, None]):
     def collect_data(
         self,
         args=None,
-    ) -> tuple[TaskResult, BiosDataModel | None]:
+    ) -> tuple[TaskResult, Optional[BiosDataModel]]:
         """Collect BIOS version information from the system.
 
         Returns:
-            tuple[TaskResult, BiosDataModel | None]: tuple containing the task result and an instance of BiosDataModel
+            tuple[TaskResult, Optional[BiosDataModel]]: tuple containing the task result and an instance of BiosDataModel
             or None if the BIOS version could not be determined.
         """
         bios = None

nodescraper/plugins/inband/cmdline/analyzer_args.py

@@ -23,23 +23,25 @@
 # SOFTWARE.
 #
 ###############################################################################
+from typing import Union
+
 from pydantic import Field, field_validator
 
 from nodescraper.models import AnalyzerArgs
 from nodescraper.plugins.inband.cmdline.cmdlinedata import CmdlineDataModel
 
 
 class CmdlineAnalyzerArgs(AnalyzerArgs):
-    required_cmdline: str | list = Field(default_factory=list)
-    banned_cmdline: str | list = Field(default_factory=list)
+    required_cmdline: Union[str, list] = Field(default_factory=list)
+    banned_cmdline: Union[str, list] = Field(default_factory=list)
 
     @field_validator("required_cmdline", mode="before")
     @classmethod
-    def validate_required_cmdline(cls, required_cmdline: str | list) -> list:
+    def validate_required_cmdline(cls, required_cmdline: Union[str, list]) -> list:
         """support str or list input for required_cmdline
 
         Args:
-            required_cmdline (str | list): required command line arguments
+            required_cmdline (Union[str, list]): required command line arguments
 
         Returns:
             list: list of required command line arguments
@@ -51,11 +53,11 @@ def validate_required_cmdline(cls, required_cmdline: str | list) -> list:
 
     @field_validator("banned_cmdline", mode="before")
     @classmethod
-    def validate_banned_cmdline(cls, banned_cmdline: str | list) -> list:
+    def validate_banned_cmdline(cls, banned_cmdline: Union[str, list]) -> list:
         """support str or list input for banned_cmdline
 
         Args:
-            banned_cmdline (str | list): banned command line arguments
+            banned_cmdline (Union[str, list]): banned command line arguments
 
         Returns:
             list: a list of banned command line arguments

nodescraper/plugins/inband/cmdline/cmdline_collector.py

@@ -23,6 +23,8 @@
 # SOFTWARE.
 #
 ###############################################################################
+from typing import Optional
+
 from nodescraper.base import InBandDataCollector
 from nodescraper.enums import EventCategory, EventPriority, ExecutionStatus, OSFamily
 from nodescraper.models import TaskResult
@@ -40,12 +42,12 @@ class CmdlineCollector(InBandDataCollector[CmdlineDataModel, None]):
     def collect_data(
         self,
         args=None,
-    ) -> tuple[TaskResult, CmdlineDataModel | None]:
+    ) -> tuple[TaskResult, Optional[CmdlineDataModel]]:
         """
         Collects the cmdline data from the system.
 
         Returns:
-            tuple[TaskResult, CmdlineDataModel | None]: tuple containing the task result and the cmdline data model if successful, otherwise None.
+            tuple[TaskResult, Optional[CmdlineDataModel]]: tuple containing the task result and the cmdline data model if successful, otherwise None.
         """
         res = self._run_sut_cmd("cat /proc/cmdline")
         cmdline_data = None

nodescraper/plugins/inband/dimm/dimm_collector.py

@@ -41,7 +41,7 @@ class DimmCollector(InBandDataCollector[DimmDataModel, DimmCollectorArgs]):
     def collect_data(
         self,
         args: Optional[DimmCollectorArgs] = None,
-    ) -> tuple[TaskResult, DimmDataModel | None]:
+    ) -> tuple[TaskResult, Optional[DimmDataModel]]:
         """Collect data on installed DIMMs"""
         if args is None:
             args = DimmCollectorArgs()

nodescraper/plugins/inband/dkms/analyzer_args.py

@@ -23,7 +23,7 @@
 # SOFTWARE.
 #
 ###############################################################################
-from typing import Any
+from typing import Any, Union
 
 from pydantic import Field, field_validator
 
@@ -32,8 +32,8 @@
 
 
 class DkmsAnalyzerArgs(AnalyzerArgs):
-    dkms_status: str | list = Field(default_factory=list)
-    dkms_version: str | list = Field(default_factory=list)
+    dkms_status: Union[str, list] = Field(default_factory=list)
+    dkms_version: Union[str, list] = Field(default_factory=list)
     regex_match: bool = False
 
     def model_post_init(self, __context: Any) -> None:
@@ -42,11 +42,11 @@ def model_post_init(self, __context: Any) -> None:
 
     @field_validator("dkms_status", mode="before")
     @classmethod
-    def validate_dkms_status(cls, dkms_status: str | list) -> list:
+    def validate_dkms_status(cls, dkms_status: Union[str, list]) -> list:
         """support str or list input for dkms_status
 
         Args:
-            dkms_status (str | list): dkms status to check
+            dkms_status (Union[str, list]): dkms status to check
 
         Returns:
             list: list of dkms status
@@ -58,11 +58,11 @@ def validate_dkms_status(cls, dkms_status: str | list) -> list:
 
     @field_validator("dkms_version", mode="before")
     @classmethod
-    def validate_dkms_version(cls, dkms_version: str | list) -> list:
+    def validate_dkms_version(cls, dkms_version: Union[str, list]) -> list:
         """support str or list input for dkms_version
 
         Args:
-            dkms_version (str | list): dkms version to check
+            dkms_version (Union[str, list]): dkms version to check
 
         Returns:
             list: list of dkms version