From cfdb046d5e57aaf5cd4be84b1936cf38c8eaf9f2 Mon Sep 17 00:00:00 2001
From: Anthony Romaniello <aromaniello@ntia.gov>
Date: Fri, 20 Oct 2023 16:21:09 -0400
Subject: [PATCH 1/3] Update metadata structs for ntia-diagnostics v1.1.2

---
 scos_actions/metadata/sigmf_builder.py           |  2 +-
 .../metadata/structs/ntia_diagnostics.py         | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/scos_actions/metadata/sigmf_builder.py b/scos_actions/metadata/sigmf_builder.py
index 6840e49f..2914096f 100644
--- a/scos_actions/metadata/sigmf_builder.py
+++ b/scos_actions/metadata/sigmf_builder.py
@@ -27,7 +27,7 @@
         },
         {
             "name": "ntia-diagnostics",
-            "version": "v1.1.1",
+            "version": "v1.1.2",
             "optional": True,
         },
         {
diff --git a/scos_actions/metadata/structs/ntia_diagnostics.py b/scos_actions/metadata/structs/ntia_diagnostics.py
index e391e744..7f39f47c 100644
--- a/scos_actions/metadata/structs/ntia_diagnostics.py
+++ b/scos_actions/metadata/structs/ntia_diagnostics.py
@@ -119,6 +119,17 @@ class Computer(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
     ssd_smart_data: Optional[SsdSmartData] = None
 
 
+class ScosPlugin(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
+    """
+    Interface for generating `ntia-diagnostics` `ScosPlugin` objects.
+    
+    :param name: The Python package name as it is imported, e.g., `"scos_tekrsa"` 
+    :param version: Version of the SCOS plugin.
+    """
+    name: Optional[str] = None
+    version: Optional[str] = None
+
+
 class Software(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
     """
     Interface for generating `ntia-diagnostics` `Software` objects.
@@ -127,7 +138,8 @@ class Software(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
     :param python_version: The Python version, as returned by `sys.version()`.
     :param scos_sensor_version: The SCOS Sensor version, as returned by `git describe --tags`.
     :param scos_actions_version: Version of `scos_actions` plugin.
-    :param scos_tekrs_version: Version of `scos_tekrsa` plugin.
+    :param scos_sigan_plugin: `ScosPlugin` object describing the plugin which defines the
+        signal analyzer interface.
     :param preselector_api_version: Version of the NTIA `preselector` package.
     """
 
@@ -135,7 +147,7 @@ class Software(msgspec.Struct, **SIGMF_OBJECT_KWARGS):
     python_version: Optional[str] = None
     scos_sensor_version: Optional[str] = None
     scos_actions_version: Optional[str] = None
-    scos_tekrsa_version: Optional[str] = None
+    scos_sigan_plugin: Optional[ScosPlugin] = None
     preselector_api_version: Optional[str] = None
 
 

From ee1e7e51d9c9639a1518f1b1a623875de64a7603 Mon Sep 17 00:00:00 2001
From: Anthony Romaniello <aromaniello@ntia.gov>
Date: Fri, 20 Oct 2023 16:22:18 -0400
Subject: [PATCH 2/3] Modify SEA action to use updated metadata struct

---
 scos_actions/actions/acquire_sea_data_product.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scos_actions/actions/acquire_sea_data_product.py b/scos_actions/actions/acquire_sea_data_product.py
index 507cf501..5fc636c5 100644
--- a/scos_actions/actions/acquire_sea_data_product.py
+++ b/scos_actions/actions/acquire_sea_data_product.py
@@ -796,7 +796,9 @@ def capture_diagnostics(self, action_start_tic: float, cpu_speeds: list) -> None
             "python_version": sys.version.split()[0],
             "scos_sensor_version": SCOS_SENSOR_GIT_TAG,
             "scos_actions_version": SCOS_ACTIONS_VERSION,
-            "scos_tekrsa_version": self.sigan.plugin_version,
+            "scos_sigan_plugin": ntia_diagnostics.ScosPlugin(
+                name="scos_tekrsa", version=self.sigan.plugin_version
+            ),
             "preselector_api_version": PRESELECTOR_API_VERSION,
         }
 

From a35de4ff5fee770a786f88b3d27bfb868fce0d4b Mon Sep 17 00:00:00 2001
From: Anthony Romaniello <aromaniello@ntia.gov>
Date: Fri, 20 Oct 2023 16:22:51 -0400
Subject: [PATCH 3/3] Bump patch version to 6.4.1

---
 scos_actions/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scos_actions/__init__.py b/scos_actions/__init__.py
index f0a00b37..6b5a92b6 100644
--- a/scos_actions/__init__.py
+++ b/scos_actions/__init__.py
@@ -1 +1 @@
-__version__ = "6.4.0"
+__version__ = "6.4.1"