addressed reviews

Author: alexandraBara

nodescraper/models/analyzerargs.py

@@ -23,12 +23,10 @@
 # SOFTWARE.
 #
 ###############################################################################
-from abc import ABC
-
 from pydantic import BaseModel
 
 
-class AnalyzerArgs(BaseModel, ABC):
+class AnalyzerArgs(BaseModel):
     model_config = {"extra": "forbid", "exclude_none": True}
 
     @classmethod

nodescraper/plugins/inband/dmesg/analyzer_args.py

@@ -26,24 +26,8 @@
 from typing import Optional
 
 from nodescraper.models import TimeRangeAnalysisArgs
-from nodescraper.plugins.inband.dmesg.dmesgdata import DmesgData
 
 
 class DmesgAnalyzerArgs(TimeRangeAnalysisArgs):
     check_unknown_dmesg_errors: Optional[bool] = True
     exclude_category: Optional[set[str]] = None
-
-    @classmethod
-    def build_from_model(cls, datamodel: DmesgData) -> "TimeRangeAnalysisArgs":
-        """build analyzer args from data model
-
-        Args:
-            datamodel (DmesgDataModel): data model for plugin
-
-        Raises:
-            NotImplementedError: does not implement abstract function
-
-        Returns:
-            TimeRangeAnalysisArgs: instance of analyzer args class
-        """
-        raise NotImplementedError("Dmesg does not support reference config creation")

test/unit/framework/common/shared_utils.py

@@ -26,11 +26,9 @@
 from typing import Optional
 from unittest.mock import MagicMock
 
-from pydantic import BaseModel
-
 from nodescraper.enums import ExecutionStatus
 from nodescraper.interfaces import ConnectionManager, PluginInterface
-from nodescraper.models import PluginResult, TaskResult
+from nodescraper.models import AnalyzerArgs, PluginResult, TaskResult
 from nodescraper.models.datamodel import DataModel
 
 
@@ -69,12 +67,12 @@ def disconnect(self):
         pass
 
 
-class TestModelArg(BaseModel):
+class TestModelArg(AnalyzerArgs):
     model_attr: int = 123
 
     @classmethod
     def build_from_model(cls, model):
-        return cls()
+        return cls(model_attr=int(model.some_version))
 
 
 class DummyDataModel(DataModel):

test/unit/framework/test_analyzerargs.py

@@ -13,8 +13,8 @@ def build_from_model(cls, datamodel):
 
 def test_build_from_model(dummy_data_model):
     dummy = dummy_data_model(foo=1)
-    args = MyArgs(args_foo=1)
-    args = args.build_from_model(dummy)
+    # args = args.build_from_model(dummy)
+    args = MyArgs.build_from_model(dummy)
     assert isinstance(args, MyArgs)
     assert args.args_foo == dummy.foo
     dump = args.model_dump(mode="json", exclude_none=True)

test/unit/framework/test_cli.py

@@ -228,10 +228,10 @@ def test_generate_reference_config(plugin_registry):
             source="TestPluginA",
             message="Plugin tasks completed successfully",
             result_data=DataPluginResult(
-                system_data=DummyDataModel(some_version="M17"),
+                system_data=DummyDataModel(some_version="17"),
                 collection_result=TaskResult(
                     status=ExecutionStatus.OK,
-                    message="BIOS: M17",
+                    message="BIOS: 17",
                     task="BiosCollector",
                     parent="TestPluginA",
                     artifacts=[],
@@ -242,4 +242,4 @@ def test_generate_reference_config(plugin_registry):
 
     ref_config = cli.generate_reference_config(results, plugin_registry, logging.getLogger())
     dump = ref_config.dict()
-    assert dump["plugins"] == {"TestPluginA": {"analysis_args": {"model_attr": 123}}}
+    assert dump["plugins"] == {"TestPluginA": {"analysis_args": {"model_attr": 17}}}