kernel and doc py 3.9 fixes

Author: Jaspal Singh

docs/node-scraper-external/ext_nodescraper_plugins/sample/sample_collector.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from nodescraper.base import InBandDataCollector
 from nodescraper.enums import ExecutionStatus
 from nodescraper.models import TaskResult
@@ -9,7 +11,7 @@ class SampleCollector(InBandDataCollector[SampleDataModel, None]):
 
     DATA_MODEL = SampleDataModel
 
-    def collect_data(self, args=None) -> tuple[TaskResult, SampleDataModel | None]:
+    def collect_data(self, args=None) -> tuple[TaskResult, Optional[SampleDataModel]]:
         sample_data = SampleDataModel(some_str="example123")
         self.result.message = "Collector ran successfully"
         self.result.status = ExecutionStatus.OK

nodescraper/plugins/inband/kernel/kernel_collector.py

@@ -81,9 +81,10 @@ def collect_data(
         if self.system_info.os_family == OSFamily.WINDOWS:
             res = self._run_sut_cmd(self.CMD_WINDOWS)
             if res.exit_code == 0:
-                kernel_info = [line for line in res.stdout.splitlines() if "Version=" in line][
-                    0
-                ].split("=")[1]
+                kernel_info = res.stdout
+                kernel = [line for line in res.stdout.splitlines() if "Version=" in line][0].split(
+                    "="
+                )[1]
         else:
             res = self._run_sut_cmd(self.CMD)
             if res.exit_code == 0:
@@ -107,7 +108,7 @@ def collect_data(
                 console_log=True,
             )
 
-        if kernel_info:
+        if kernel_info and kernel:
 
             kernel_data = KernelDataModel(kernel_info=kernel_info, kernel_version=kernel)
             self._log_event(

nodescraper/plugins/inband/kernel/kerneldata.py

@@ -29,4 +29,4 @@
 
 class KernelDataModel(DataModel):
     kernel_info: str
-    kernel_version: str | None = None
+    kernel_version: str

test/unit/plugin/test_kernel_collector.py

@@ -53,7 +53,9 @@ def test_run_windows(collector, conn_mock):
 
     result, data = collector.collect_data()
 
-    assert data == KernelDataModel(kernel_info="10.0.19041.1237", kernel_version=None)
+    assert data == KernelDataModel(
+        kernel_info="Version=10.0.19041.1237", kernel_version="10.0.19041.1237"
+    )
     assert result.status == ExecutionStatus.OK