fprime-gds 4.0.0a5__tar.gz → 4.0.0a7__tar.gz

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-gds
-Version: 4.0.0a5
+Version: 4.0.0a7
 Summary: F Prime Flight Software Ground Data System layer
 Author-email: Michael Starch <Michael.D.Starch@jpl.nasa.gov>, Thomas Boyer-Chammard <Thomas.Boyer.Chammard@jpl.nasa.gov>
 License: 
@@ -241,7 +241,7 @@ Requires-Dist: openpyxl>=3.0.10
 Requires-Dist: pyserial>=3.5
 Requires-Dist: pydantic>=2.6
 Requires-Dist: PyYAML>=6.0.2
-Requires-Dist: spacepackets>=0.28.0
+Requires-Dist: spacepackets>=0.30.0
 Requires-Dist: crc>=7.0.0
 Dynamic: license-file
 

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/pyproject.toml

@@ -44,7 +44,7 @@ dependencies = [
     "pyserial>=3.5",
     "pydantic>=2.6",
     "PyYAML>=6.0.2",
-    "spacepackets>=0.28.0",
+    "spacepackets>=0.30.0",
     "crc>=7.0.0"
 ]
 

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/src/fprime_gds/common/pipeline/dictionaries.py

@@ -128,7 +128,13 @@ class Dictionaries:
             msg = f"[ERROR] Dictionary '{dictionary}' does not exist."
             raise Exception(msg)
         # Check for packet specification
-        if self._metadata["dictionary_type"] == "json":
+        if packet_spec is not None:
+            packet_loader = fprime_gds.common.loaders.pkt_xml_loader.PktXmlLoader()
+            self._packet_dict = packet_loader.get_id_dict(
+                packet_spec, self._channel_name_dict
+            )
+        # Otherwise use JSON dictionary to attempt automatic packet loading
+        elif self._metadata["dictionary_type"] == "json":
             packet_loader = fprime_gds.common.loaders.pkt_json_loader.PktJsonLoader(dictionary)
             if packet_set_name is None:
                 names = packet_loader.get_packet_set_names(None)
@@ -141,11 +147,6 @@ class Dictionaries:
             self._packet_dict = packet_loader.get_id_dict(
                 None, packet_set_name, self._channel_name_dict
             )
-        elif packet_spec is not None:
-            packet_loader = fprime_gds.common.loaders.pkt_xml_loader.PktXmlLoader(dictionary)
-            self._packet_dict = packet_loader.get_id_dict(
-                packet_spec, self._channel_name_dict
-            )
         else:
             self._packet_dict = None
 

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/src/fprime_gds/executables/apps.py

@@ -237,14 +237,18 @@ class GdsStandardApp(GdsApp):
         arguments needed for the given parsers.  When main is loaded, it will dispatch to the sub-classing plugin's
         start method. The subclassing plugin will already have had the arguments supplied via the PluginParser's
         construction of plugin objects.
+
+        Returns:
+            list of arguments to pass to subprocess
         """
         cls = self.__class__.__name__
         module = self.__class__.__module__
 
-        namespace = Namespace(**self.arguments)
-        args = CompositeParser(
+        composite_parser = CompositeParser(
             [self.get_cli_parser(), StandardPipelineParser]
-        ).reproduce_cli_args(namespace)
+        )
+        namespace, _, _ = ParserBase.parse_known_args([composite_parser])
+        args = composite_parser.reproduce_cli_args(namespace)
         return [sys.executable, "-c", f"import {module}\n{module}.{cls}.main()"] + args
 
     @classmethod
@@ -260,9 +264,10 @@ class GdsStandardApp(GdsApp):
             # triggered by the code above that turns it off in the not-setup case. 
             except AssertionError:
                 pass
+            plugin_name = getattr(cls, "get_name", lambda: cls.__name__)()
             parsed_arguments, _ = ParserBase.parse_args(
                 [cls.get_cli_parser(), StandardPipelineParser, PluginArgumentParser],
-                f"{cls.get_name()}: a standard app plugin",
+                f"{plugin_name}: a standard app plugin",
             )
             pipeline = StandardPipeline()
             # Turn off history and filing

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/src/fprime_gds/executables/data_product_writer.py

@@ -336,12 +336,12 @@ class DPHeader(BaseModel):
     
     @computed_field
     @property
-    def dataId(self) -> Type:
+    def dataId(self) -> AliasType:
         return self.header.get("FwDpIdType")
     
     @computed_field
     @property
-    def dataSize(self) -> Type:
+    def dataSize(self) -> AliasType:
         return self.header.get("FwSizeStoreType")
 
     @model_validator(mode='after')
@@ -731,7 +731,7 @@ class DataProductWriter:
     def get_record_data(self, headerJSON: DPHeader, dictJSON: FprimeDict) -> Dict[str, int]:
         rootDict = {}
         # Go through all the Records and find the one that matches recordId
-        rootDict['dataId'] = self.read_field(headerJSON.dataId.type)
+        rootDict['dataId'] = self.read_field(headerJSON.dataId.underlyingType)
         for record in dictJSON.records:
             if record.id == rootDict['dataId']:    
                 print(f'Processing Record ID {record.id}')

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/src/fprime_gds/executables/run_deployment.py

@@ -177,7 +177,7 @@ def launch_comm(parsed_args):
 
 def launch_plugin(plugin_class_instance):
     """Launch a plugin instance"""
-    plugin_name = getattr(plugin_class_instance, "get_name", lambda: cls.__name__)()
+    plugin_name = getattr(plugin_class_instance, "get_name", lambda: plugin_class_instance.__class__.__name__)()
     return launch_process(
         plugin_class_instance.get_process_invocation(),
         name=f"{ plugin_name } Plugin App",

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/src/fprime_gds.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-gds
-Version: 4.0.0a5
+Version: 4.0.0a7
 Summary: F Prime Flight Software Ground Data System layer
 Author-email: Michael Starch <Michael.D.Starch@jpl.nasa.gov>, Thomas Boyer-Chammard <Thomas.Boyer.Chammard@jpl.nasa.gov>
 License: 
@@ -241,7 +241,7 @@ Requires-Dist: openpyxl>=3.0.10
 Requires-Dist: pyserial>=3.5
 Requires-Dist: pydantic>=2.6
 Requires-Dist: PyYAML>=6.0.2
-Requires-Dist: spacepackets>=0.28.0
+Requires-Dist: spacepackets>=0.30.0
 Requires-Dist: crc>=7.0.0
 Dynamic: license-file
 

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/src/fprime_gds.egg-info/requires.txt

@@ -11,5 +11,5 @@ openpyxl>=3.0.10
 pyserial>=3.5
 pydantic>=2.6
 PyYAML>=6.0.2
-spacepackets>=0.28.0
+spacepackets>=0.30.0
 crc>=7.0.0

{fprime_gds-4.0.0a5 → fprime_gds-4.0.0a7}/test/fprime_gds/executables/dp_writer_data/dictionary.json

@@ -7,7 +7,247 @@
     ],
     "dictionarySpecVersion" : "1.0.0"
   },
+  "constants" : [
+  {
+    "kind" : "constant",
+    "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE",
+    "type" : {
+      "name" : "U64",
+      "kind" : "integer",
+      "size" : 64,
+      "signed" : false
+    },
+    "value" : 32,
+    "annotation" : "The container user data size"
+  }
+  ],
   "typeDefinitions" : [
+      {
+        "kind" : "alias",
+        "qualifiedName" : "FwIdType",
+        "type" : {
+          "name" : "U32",
+          "kind" : "integer",
+          "size" : 32,
+          "signed" : false
+        },
+        "underlyingType" : {
+          "name" : "U32",
+          "kind" : "integer",
+          "size" : 32,
+          "signed" : false
+        },
+        "annotation" : "The id type."
+      },
+      {
+          "kind" : "alias",
+          "qualifiedName" : "FwTlmPacketizeIdType",
+          "type" : {
+            "name" : "U16",
+            "kind" : "integer",
+            "size" : 16,
+            "signed" : false
+          },
+          "underlyingType" : {
+            "name" : "U16",
+            "kind" : "integer",
+            "size" : 16,
+            "signed" : false
+          }
+        },
+        {
+          "kind" : "enum",
+          "qualifiedName" : "Fw.DpState",
+          "representationType" : {
+            "name" : "U8",
+            "kind" : "integer",
+            "size" : 8,
+            "signed" : false
+          },
+          "enumeratedConstants" : [
+            {
+              "name" : "UNTRANSMITTED",
+              "value" : 0,
+              "annotation" : "The untransmitted state"
+            },
+            {
+              "name" : "PARTIAL",
+              "value" : 1,
+              "annotation" : "The partially transmitted state\nA data product is in this state from the start of transmission\nuntil transmission is complete."
+            },
+            {
+              "name" : "TRANSMITTED",
+              "value" : 2,
+              "annotation" : "The transmitted state"
+            }
+          ],
+          "default" : "Fw.DpState.UNTRANSMITTED"
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwEventIdType",
+          "type" : {
+            "name" : "FwIdType",
+            "kind" : "qualifiedIdentifier"
+          },
+          "underlyingType" : {
+            "name" : "U32",
+            "kind" : "integer",
+            "size" : 32,
+            "signed" : false
+          }
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwSizeStoreType",
+          "type" : {
+            "name" : "U16",
+            "kind" : "integer",
+            "size" : 16,
+            "signed" : false
+          },
+          "underlyingType" : {
+            "name" : "U16",
+            "kind" : "integer",
+            "size" : 16,
+            "signed" : false
+          }
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwTimeContextStoreType",
+          "type" : {
+            "name" : "U8",
+            "kind" : "integer",
+            "size" : 8,
+            "signed" : false
+          },
+          "underlyingType" : {
+            "name" : "U8",
+            "kind" : "integer",
+            "size" : 8,
+            "signed" : false
+          },
+          "annotation" : "The type used to serialize a time context value"
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwDpIdType",
+          "type" : {
+            "name" : "FwIdType",
+            "kind" : "qualifiedIdentifier"
+          },
+          "underlyingType" : {
+            "name" : "U32",
+            "kind" : "integer",
+            "size" : 32,
+            "signed" : false
+          }
+        },
+        {
+          "kind" : "enum",
+          "qualifiedName" : "Fw.DpCfg.ProcType",
+          "representationType" : {
+            "name" : "U8",
+            "kind" : "integer",
+            "size" : 8,
+            "signed" : false
+          },
+          "enumeratedConstants" : [
+            {
+              "name" : "PROC_TYPE_ZERO",
+              "value" : 1,
+              "annotation" : "Processing type 0"
+            },
+            {
+              "name" : "PROC_TYPE_ONE",
+              "value" : 2,
+              "annotation" : "Processing type 1"
+            },
+            {
+              "name" : "PROC_TYPE_TWO",
+              "value" : 4,
+              "annotation" : "Processing type 2"
+            }
+          ],
+          "default" : "Fw.DpCfg.ProcType.PROC_TYPE_ZERO",
+          "annotation" : "A bit mask for selecting the type of processing to perform on\na container before writing it to disk."
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwPacketDescriptorType",
+          "type" : {
+            "name" : "FwIdType",
+            "kind" : "qualifiedIdentifier"
+          },
+          "underlyingType" : {
+            "name" : "U32",
+            "kind" : "integer",
+            "size" : 32,
+            "signed" : false
+          }
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwDpPriorityType",
+          "type" : {
+            "name" : "U32",
+            "kind" : "integer",
+            "size" : 32,
+            "signed" : false
+          },
+          "underlyingType" : {
+            "name" : "U32",
+            "kind" : "integer",
+            "size" : 32,
+            "signed" : false
+          }
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwTimeBaseStoreType",
+          "type" : {
+            "name" : "U16",
+            "kind" : "integer",
+            "size" : 16,
+            "signed" : false
+          },
+          "underlyingType" : {
+            "name" : "U16",
+            "kind" : "integer",
+            "size" : 16,
+            "signed" : false
+          },
+          "annotation" : "The type used to serialize a time base value"
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwOpcodeType",
+          "type" : {
+            "name" : "FwIdType",
+            "kind" : "qualifiedIdentifier"
+          },
+          "underlyingType" : {
+            "name" : "U32",
+            "kind" : "integer",
+            "size" : 32,
+            "signed" : false
+          }
+        },
+        {
+          "kind" : "alias",
+          "qualifiedName" : "FwChanIdType",
+          "type" : {
+            "name" : "FwIdType",
+            "kind" : "qualifiedIdentifier"
+          },
+          "underlyingType" : {
+            "name" : "U32",
+            "kind" : "integer",
+            "size" : 32,
+            "signed" : false
+          }
+    },
     {
       "kind" : "struct",
       "qualifiedName" : "Ref.PacketStat",
@@ -839,34 +1079,6 @@
       ],
       "default" : "Svc.DpTool.Status.MAYBE"
     },
-    {
-      "kind" : "enum",
-      "qualifiedName" : "Fw.DpState",
-      "representationType" : {
-        "name" : "U8",
-        "kind" : "integer",
-        "size" : 8,
-        "signed" : false
-      },
-      "enumeratedConstants" : [
-        {
-          "name" : "UNTRANSMITTED",
-          "value" : 0,
-          "annotation" : "The untransmitted state"
-        },
-        {
-          "name" : "PARTIAL",
-          "value" : 1,
-          "annotation" : "The partially transmitted state\nA data product is in this state from the start of transmission\nuntil transmission is complete."
-        },
-        {
-          "name" : "TRANSMITTED",
-          "value" : 2,
-          "annotation" : "The transmitted state"
-        }
-      ],
-      "default" : "Fw.DpState.UNTRANSMITTED"
-    },
     {
       "kind" : "enum",
       "qualifiedName" : "Ref.SignalType",
@@ -1211,239 +1423,6 @@
         "tSub" : 0
       },
       "annotation" : "Data structure representing a data product."
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwTlmPacketizeIdType",
-      "type" : {
-        "name" : "U16",
-        "kind" : "integer",
-        "size" : 16,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U16",
-        "kind" : "integer",
-        "size" : 16,
-        "signed" : false
-      }
-    },
-    {
-      "kind" : "enum",
-      "qualifiedName" : "Fw.DpState",
-      "representationType" : {
-        "name" : "U8",
-        "kind" : "integer",
-        "size" : 8,
-        "signed" : false
-      },
-      "enumeratedConstants" : [
-        {
-          "name" : "UNTRANSMITTED",
-          "value" : 0,
-          "annotation" : "The untransmitted state"
-        },
-        {
-          "name" : "PARTIAL",
-          "value" : 1,
-          "annotation" : "The partially transmitted state\nA data product is in this state from the start of transmission\nuntil transmission is complete."
-        },
-        {
-          "name" : "TRANSMITTED",
-          "value" : 2,
-          "annotation" : "The transmitted state"
-        }
-      ],
-      "default" : "Fw.DpState.UNTRANSMITTED"
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwEventIdType",
-      "type" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      }
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwSizeStoreType",
-      "type" : {
-        "name" : "U16",
-        "kind" : "integer",
-        "size" : 16,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U16",
-        "kind" : "integer",
-        "size" : 16,
-        "signed" : false
-      }
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwTimeContextStoreType",
-      "type" : {
-        "name" : "U8",
-        "kind" : "integer",
-        "size" : 8,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U8",
-        "kind" : "integer",
-        "size" : 8,
-        "signed" : false
-      },
-      "annotation" : "The type used to serialize a time context value"
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwDpIdType",
-      "type" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      }
-    },
-    {
-      "kind" : "enum",
-      "qualifiedName" : "Fw.DpCfg.ProcType",
-      "representationType" : {
-        "name" : "U8",
-        "kind" : "integer",
-        "size" : 8,
-        "signed" : false
-      },
-      "enumeratedConstants" : [
-        {
-          "name" : "PROC_TYPE_ZERO",
-          "value" : 1,
-          "annotation" : "Processing type 0"
-        },
-        {
-          "name" : "PROC_TYPE_ONE",
-          "value" : 2,
-          "annotation" : "Processing type 1"
-        },
-        {
-          "name" : "PROC_TYPE_TWO",
-          "value" : 4,
-          "annotation" : "Processing type 2"
-        }
-      ],
-      "default" : "Fw.DpCfg.ProcType.PROC_TYPE_ZERO",
-      "annotation" : "A bit mask for selecting the type of processing to perform on\na container before writing it to disk."
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwPacketDescriptorType",
-      "type" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      }
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwDpPriorityType",
-      "type" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      }
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwTimeBaseStoreType",
-      "type" : {
-        "name" : "U16",
-        "kind" : "integer",
-        "size" : 16,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U16",
-        "kind" : "integer",
-        "size" : 16,
-        "signed" : false
-      },
-      "annotation" : "The type used to serialize a time base value"
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwOpcodeType",
-      "type" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      }
-    },
-    {
-      "kind" : "alias",
-      "qualifiedName" : "FwChanIdType",
-      "type" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      },
-      "underlyingType" : {
-        "name" : "U32",
-        "kind" : "integer",
-        "size" : 32,
-        "signed" : false
-      }
-    }
-  ],
-  "constants": [
-    {
-      "kind" : "constant",
-      "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE",
-      "type" : {
-        "name" : "U64",
-        "kind" : "integer",
-        "size" : 64,
-        "signed" : false
-      },
-      "value" : 32,
-      "annotation" : "The container user data size"
     }
   ],
   "commands" : [