fprime-gds 4.0.0a5__py3-none-any.whl → 4.0.0a7__py3-none-any.whl

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/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/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/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.dist-info → fprime_gds-4.0.0a7.dist-info}/METADATA

@@ -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.dist-info → fprime_gds-4.0.0a7.dist-info}/RECORD

@@ -89,7 +89,7 @@ fprime_gds/common/models/common/event.py,sha256=gSFrCJT9ZddGJfkf3fGCCqk0aMIQV-SN
 fprime_gds/common/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/parsers/seq_file_parser.py,sha256=6DZrA0jmt8IqsutfK7pdLtYn4oVHO593rWgAOH63yRg,9587
 fprime_gds/common/pipeline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fprime_gds/common/pipeline/dictionaries.py,sha256=oZwRhGsrSRt9ptlMkUKsbFbxgoumE7MXwf0xkq1dKCg,7943
+fprime_gds/common/pipeline/dictionaries.py,sha256=x3QCZAg6YB9bEumZ330PGo0ilJqODGyo_K70RgbQ53M,8009
 fprime_gds/common/pipeline/encoding.py,sha256=PttJ8NmXm75mLXyhlmxOJqE8RFt46q1dThaV19PyAr4,7216
 fprime_gds/common/pipeline/files.py,sha256=J2zm0sucvImtmSnv0iUp5uTpvUO8nlmz2lUdMuMC5aM,2244
 fprime_gds/common/pipeline/histories.py,sha256=7KyboNnm9OARQk4meVPSSeYpeqH0G8RWRiy0BLBL1rw,3671
@@ -116,12 +116,12 @@ fprime_gds/common/utils/data_desc_type.py,sha256=0AkEMfEa5refd_moovf1hkgKiNakADR
 fprime_gds/common/utils/event_severity.py,sha256=7qPXHrDaM_REJ7sKBUEJTZIE0D4qVnVajsPDUuHg7sI,300
 fprime_gds/common/utils/string_util.py,sha256=u_2iahRG3ROu3lAAt_KVcK226gEByElXqrA8mH8eDpI,3584
 fprime_gds/executables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fprime_gds/executables/apps.py,sha256=iyHloLaHJOkcZF6O3oXZX6YpoS2SBBZVPilf25l0Q98,13138
+fprime_gds/executables/apps.py,sha256=u79T_PlgMmNmA4YwWjs7LvPMCJnrjnURr05NMthOYP0,13350
 fprime_gds/executables/cli.py,sha256=aNO8saIKuTDQMwWNFlrpIL5HuwIWWei94Wxf3G0lY3k,50382
 fprime_gds/executables/comm.py,sha256=08rO0o0MJgTRngB7Ygu2IL_gEAWKF7WFvFyro1CqReE,5214
-fprime_gds/executables/data_product_writer.py,sha256=cM_OsISsy0bwONrvUu9pYZRhaHeY_GNxsyM18k85wZM,35801
+fprime_gds/executables/data_product_writer.py,sha256=PGNju52vjfg7-AUURFojmMV8S83Tzy58Hyti5tmpffc,35821
 fprime_gds/executables/fprime_cli.py,sha256=CMoT7zWNwM8h2mSZW03AR96wl_XnZXoLNiOZN_sDi38,12431
-fprime_gds/executables/run_deployment.py,sha256=x6auxjsDyCj4216JbO0bSskv2H9r7n3vuu5Z3O5cGwY,7209
+fprime_gds/executables/run_deployment.py,sha256=Zl0Y9-6i6c8tZhcS7XkAeVQtzn0d9fV-3UJQZ0bnBrc,7237
 fprime_gds/executables/tcpserver.py,sha256=KspVpu5YIuiWKOk5E6UDMKvqXYrRB1j9aX8CkMxysfw,17555
 fprime_gds/executables/utils.py,sha256=SbzXRe1p41qMPdifvPap5_4v0T42gZZ_Rs_OYfITd80,7626
 fprime_gds/flask/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -238,10 +238,10 @@ fprime_gds/flask/static/third-party/webfonts/fa-solid-900.woff2,sha256=mDS4KtJuK
 fprime_gds/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/plugin/definitions.py,sha256=QlxW1gNvoiqGMslSJjh3dTFZuv0igFHawN__3XJ0Wns,5355
 fprime_gds/plugin/system.py,sha256=M9xb-8jBhCUUx3X1z2uAP8Wx_v6NkL8JeaFgGcMnQqY,13432
-fprime_gds-4.0.0a5.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-fprime_gds-4.0.0a5.dist-info/licenses/NOTICE.txt,sha256=vXjA_xRcQhd83Vfk5D_vXg5kOjnnXvLuMi5vFKDEVmg,1612
-fprime_gds-4.0.0a5.dist-info/METADATA,sha256=ebUCiZ36aIbdbTe19OLcUwZC7zbuG9uO5VqDQOI2B4U,24549
-fprime_gds-4.0.0a5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fprime_gds-4.0.0a5.dist-info/entry_points.txt,sha256=qFBHIR7CZ5CEeSEdZ-ZVQN9ZfUOZfm0PvvDZAAheuLk,445
-fprime_gds-4.0.0a5.dist-info/top_level.txt,sha256=6vzFLIX6ANfavKaXFHDMSLFtS94a6FaAsIWhjgYuSNE,27
-fprime_gds-4.0.0a5.dist-info/RECORD,,
+fprime_gds-4.0.0a7.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+fprime_gds-4.0.0a7.dist-info/licenses/NOTICE.txt,sha256=vXjA_xRcQhd83Vfk5D_vXg5kOjnnXvLuMi5vFKDEVmg,1612
+fprime_gds-4.0.0a7.dist-info/METADATA,sha256=rghvf1aW0D7_wd9TWo82U-XanfYlZK_eZXV7fglCMbs,24549
+fprime_gds-4.0.0a7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fprime_gds-4.0.0a7.dist-info/entry_points.txt,sha256=qFBHIR7CZ5CEeSEdZ-ZVQN9ZfUOZfm0PvvDZAAheuLk,445
+fprime_gds-4.0.0a7.dist-info/top_level.txt,sha256=6vzFLIX6ANfavKaXFHDMSLFtS94a6FaAsIWhjgYuSNE,27
+fprime_gds-4.0.0a7.dist-info/RECORD,,