Merge pull request #93 from NTIA/ntia-diagnostics-v1.1.2

Update for `ntia-diagnostics` v1.1.2
NTIA · Oct 23, 2023 · 7790000 · 7790000
2 parents d3da4a0 + a35de4f
commit 7790000
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/scos_actions/__init__.py b/scos_actions/__init__.py
@@ -1 +1 @@
-__version__ = "6.4.0"
+__version__ = "6.4.1"
diff --git 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,
         }
 

diff --git 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
@@ -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,15 +138,16 @@ 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.
     """
 
     system_platform: Optional[str] = None
     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