addressed reviews

Author: alexandraBara

nodescraper/cli/cli.py

@@ -148,7 +148,7 @@ def build_parser(
         "--gen-reference-config",
         dest="reference_config",
         action="store_true",
-        help="Path to store generated reference config. Defaults to ./reference_config.json.",
+        help="Generate reference config. File will be written to ./reference_config.json.",
     )
 
     subparsers = parser.add_subparsers(dest="subcmd", help="Subcommands")

nodescraper/cli/helper.py

@@ -301,7 +301,7 @@ def generate_reference_config(
     for obj in results:
         data_model = obj.result_data.system_data
 
-        plugin = plugin_reg.plugins.get(obj.result_data.collection_result.parent)
+        plugin = plugin_reg.plugins.get(obj.source)
         if not plugin.ANALYZER_ARGS:
             logger.warning(
                 "Plugin: %s does not support reference config creation. No analyzer args defined.",
@@ -315,7 +315,6 @@ def generate_reference_config(
         except NotImplementedError as nperr:
             logger.info(nperr)
             continue
-        args.build_from_model(data_model)
         plugins[obj.source] = {"analysis_args": {}}
         plugins[obj.source]["analysis_args"] = args.model_dump(exclude_none=True)
     plugin_config.plugins = plugins

nodescraper/interfaces/__init__.py

@@ -23,7 +23,6 @@
 # SOFTWARE.
 #
 ###############################################################################
-from .analyzerargs import AnalyzerArgs
 from .connectionmanager import ConnectionManager
 from .dataanalyzertask import DataAnalyzer
 from .datacollectortask import DataCollector
@@ -34,7 +33,6 @@
 from .taskresulthook import TaskResultHook
 
 __all__ = [
-    "AnalyzerArgs",
     "ConnectionManager",
     "Task",
     "DataPlugin",

nodescraper/interfaces/dataplugin.py

@@ -31,7 +31,13 @@
 from nodescraper.interfaces.dataanalyzertask import DataAnalyzer
 from nodescraper.interfaces.datacollectortask import DataCollector
 from nodescraper.interfaces.plugin import PluginInterface
-from nodescraper.models import DataPluginResult, PluginResult, SystemInfo, TaskResult
+from nodescraper.models import (
+    AnalyzerArgs,
+    DataPluginResult,
+    PluginResult,
+    SystemInfo,
+    TaskResult,
+)
 
 from .connectionmanager import TConnectArg, TConnectionManager
 from .task import SystemCompatibilityError
@@ -51,6 +57,8 @@ class DataPlugin(
 
     ANALYZER: Optional[Type[DataAnalyzer]] = None
 
+    ANALYZER_ARGS: Optional[Type[AnalyzerArgs]] = None
+
     def __init__(
         self,
         system_info: SystemInfo,

nodescraper/models/__init__.py

@@ -23,6 +23,7 @@
 # SOFTWARE.
 #
 ###############################################################################
+from .analyzerargs import AnalyzerArgs
 from .datamodel import DataModel
 from .datapluginresult import DataPluginResult
 from .event import Event
@@ -33,6 +34,7 @@
 from .timerangeargs import TimeRangeAnalysisArgs
 
 __all__ = [
+    "AnalyzerArgs",
     "DataModel",
     "TaskResult",
     "Event",

nodescraper/interfaces/analyzerargs.py nodescraper/models/analyzerargs.pynodescraper/interfaces/analyzerargs.py renamed to nodescraper/models/analyzerargs.py

@@ -23,20 +23,16 @@
 # SOFTWARE.
 #
 ###############################################################################
-from abc import ABC, abstractmethod
-from typing import Optional
+from abc import ABC
 
-from pydantic import BaseModel, Field
-
-from nodescraper.models.datamodel import DataModel
+from pydantic import BaseModel
 
 
 class AnalyzerArgs(BaseModel, ABC):
-    data_model: Optional["DataModel"] = Field(default=None)
+    # data_model: Optional["DataModel"] = Field(default=None)
     model_config = {"extra": "forbid", "exclude_none": True}
 
     @classmethod
-    @abstractmethod
     def build_from_model(cls, datamodel):
         raise NotImplementedError(
             "Setting analyzer args from datamodel is not implemented for class: %s", cls.__name__

nodescraper/plugins/inband/bios/analyzer_args.py

@@ -25,7 +25,7 @@
 ###############################################################################
 from pydantic import Field, field_validator
 
-from nodescraper.interfaces import AnalyzerArgs
+from nodescraper.models import AnalyzerArgs
 from nodescraper.plugins.inband.os.osdata import OsDataModel
 
 

nodescraper/plugins/inband/cmdline/analyzer_args.py

@@ -25,7 +25,7 @@
 ###############################################################################
 from pydantic import Field, field_validator
 
-from nodescraper.interfaces import AnalyzerArgs
+from nodescraper.models import AnalyzerArgs
 from nodescraper.plugins.inband.cmdline.cmdlinedata import CmdlineDataModel
 
 

nodescraper/plugins/inband/dimm/dimm_plugin.py

@@ -35,5 +35,3 @@ class DimmPlugin(InBandDataPlugin[DimmDataModel, None, None]):
     DATA_MODEL = DimmDataModel
 
     COLLECTOR = DimmCollector
-
-    ANALYZER_ARGS = None

nodescraper/plugins/inband/dkms/analyzer_args.py

@@ -27,7 +27,7 @@
 
 from pydantic import Field, field_validator
 
-from nodescraper.interfaces import AnalyzerArgs
+from nodescraper.models import AnalyzerArgs
 from nodescraper.plugins.inband.dkms.dkmsdata import DkmsDataModel