addressed reviews

Author: alexandraBara

nodescraper/connection/inband/inband.py

@@ -46,35 +46,36 @@ class FileArtifact(BaseModel):
     filename: str
     contents: str | bytes = Field(exclude=True)
 
-    @staticmethod
-    def coerce_contents(value: io.BytesIO | str | bytes) -> bytes:
+    @field_validator("contents", mode="before")
+    @classmethod
+    def validate_contents(cls, value: io.BytesIO | str | bytes):
         if isinstance(value, io.BytesIO):
             return value.getvalue()
         if isinstance(value, str):
             return value.encode("utf-8")
         return value
 
-    @field_validator("contents", mode="before")
-    @classmethod
-    def contents_conformer(cls, value):
-        return cls.coerce_contents(value)
-
     def log_model(self, log_path: str, encoding: Optional[str] = None) -> None:
         """Log the file contents to disk.
 
         Args:
             log_path (str): path to write the file
-            encoding (str | None): if None, writes as binary
+            encoding (str | None): if None, auto-detect binary or not
         """
         log_name = os.path.join(log_path, self.filename)
-        contents = self.coerce_contents(self.contents)
+        contents = self.contents
 
-        if encoding is None:
-            with open(log_name, "wb") as f:
-                f.write(contents)
-        else:
+        if encoding:
             with open(log_name, "w", encoding=encoding) as f:
                 f.write(contents.decode(encoding))
+        else:
+            try:
+                decoded = contents.decode("utf-8")
+                with open(log_name, "w", encoding="utf-8") as f:
+                    f.write(decoded)
+            except UnicodeDecodeError:
+                with open(log_name, "wb") as f:
+                    f.write(contents)
 
     def contents_str(self) -> str:
         """Safe string representation of contents (for logs)."""

nodescraper/plugins/inband/nvme/nvme_collector.py

@@ -71,7 +71,7 @@ def collect_data(
             return self.result, None
 
         all_device_data = {}
-        f_name = "telemetry_log"
+        f_name = "telemetry_log.bin"
 
         for dev in nvme_devices:
             device_data = {}
@@ -89,7 +89,7 @@ def collect_data(
             for key, cmd in commands.items():
                 res = self._run_sut_cmd(cmd, sudo=True)
                 if "--output-file" in cmd:
-                    _ = self._read_sut_file(filename=f_name, encoding=None)
+                    _ = self._read_sut_file(filename=f"{dev}_{f_name}", encoding=None)
                 if res.exit_code == 0:
                     device_data[key] = res.stdout
                 else:

nodescraper/taskresulthooks/filesystemloghook.py

@@ -62,15 +62,8 @@ def process_result(self, task_result: TaskResult, data: Optional[DataModel] = No
         for artifact in task_result.artifacts:
             if isinstance(artifact, FileArtifact):
                 log_name = get_unique_filename(log_path, artifact.filename)
-                file_path = os.path.join(log_path, log_name)
+                artifact.log_model(log_path)
 
-                contents = artifact.contents
-                if isinstance(contents, bytes):
-                    with open(file_path, "wb") as log_file:
-                        log_file.write(contents)
-                else:
-                    with open(file_path, "w", encoding="utf-8") as log_file:
-                        log_file.write(contents)
             else:
                 name = f"{pascal_to_snake(artifact.__class__.__name__)}s"
                 if name in artifact_map: