Change to dataclass_from_dict

Signed-off-by: Zinkelburger <[email protected]>

Author: Zinkelburger

common.py

@@ -101,9 +101,9 @@ def __post_init__(self) -> None:
         self.test_case_id = enum_convert(TestCaseType, self.test_case_id)
         self.test_type = enum_convert(TestType, self.test_type)
         if isinstance(self.server, dict):
-            self.server = from_dict(PodInfo, self.server)
+            self.server = dataclass_from_dict(PodInfo, self.server)
         if isinstance(self.client, dict):
-            self.client = from_dict(PodInfo, self.client)
+            self.client = dataclass_from_dict(PodInfo, self.client)
 
 
 @dataclass
@@ -118,7 +118,7 @@ class IperfOutput(BaseOutput):
 
     def __post_init__(self) -> None:
         if isinstance(self.tft_metadata, dict):
-            self.tft_metadata = from_dict(TestMetadata, self.tft_metadata)
+            self.tft_metadata = dataclass_from_dict(TestMetadata, self.tft_metadata)
         elif not isinstance(self.tft_metadata, TestMetadata):
             raise ValueError("tft_metadata must be a TestMetadata instance or a dict")
 
@@ -154,12 +154,16 @@ class TftAggregateOutput:
 
     def __post_init__(self) -> None:
         if isinstance(self.flow_test, dict):
-            self.flow_test = from_dict(IperfOutput, self.flow_test)
+            self.flow_test = dataclass_from_dict(IperfOutput, self.flow_test)
         elif self.flow_test is not None and not isinstance(self.flow_test, IperfOutput):
             raise ValueError("flow_test must be an IperfOutput instance or a dict")
 
         self.plugins = [
-            from_dict(PluginOutput, plugin) if isinstance(plugin, dict) else plugin
+            (
+                dataclass_from_dict(PluginOutput, plugin)
+                if isinstance(plugin, dict)
+                else plugin
+            )
             for plugin in self.plugins
         ]
 
@@ -189,14 +193,16 @@ def serialize_enum(
 T = TypeVar("T")
 
 
-def from_dict(cls: Type[T], data: Dict[str, Any]) -> T:
-    assert is_dataclass(cls), "from_dict() should only be used with dataclasses."
+def dataclass_from_dict(cls: Type[T], data: Dict[str, Any]) -> T:
+    assert is_dataclass(
+        cls
+    ), "dataclass_from_dict() should only be used with dataclasses."
     field_values = {}
     for field in fields(cls):
         field_name = field.name
         field_type = field.type
         if is_dataclass(field_type) and field_name in data:
-            field_values[field_name] = from_dict(field_type, data[field_name])
+            field_values[field_name] = dataclass_from_dict(field_type, data[field_name])
         elif field_name in data:
             field_values[field_name] = data[field_name]
     return cast(T, cls(**field_values))

evaluator.py

@@ -12,7 +12,7 @@
 from logger import logger
 from pathlib import Path
 from typing import List
-from common import serialize_enum, from_dict
+from common import serialize_enum, dataclass_from_dict
 
 
 @dataclass
@@ -92,7 +92,7 @@ def eval_log(self, log_path: Path) -> None:
 
         for run in runs:
             if "flow_test" in run and run["flow_test"] is not None:
-                run["flow_test"] = from_dict(IperfOutput, run["flow_test"])
+                run["flow_test"] = dataclass_from_dict(IperfOutput, run["flow_test"])
 
             self._eval_flow_test(run["flow_test"])
             for plugin in run["plugins"]: