fprime-gds 4.0.2a4__py3-none-any.whl → 4.0.2a5__py3-none-any.whl

fprime_gds/common/communication/ccsds/apid.py

@@ -1,19 +1,21 @@
-""" ccsds.apid: APID mapping functions for F´ data """
+"""ccsds.apid: APID mapping functions for F´ data"""
+
 from fprime_gds.common.utils.data_desc_type import DataDescType
-from fprime.common.models.serialize.numerical_types import U32Type
+from fprime.common.models.serialize.numerical_types import NumericalType
+
 
 class APID(object):
-    """ APID implementations """
-    #TODO: use the DataDescType configured by loading the dictionary
+    """APID implementations"""
+
+    # TODO: use the DataDescType configured by loading the dictionary
 
     @classmethod
     def from_type(cls, data_type: DataDescType):
-        """ Map from data description type to APID """
+        """Map from data description type to APID"""
         return data_type.value
 
     @classmethod
-    def from_data(cls, data):
-        """ Map from data bytes to APID """
-        u32_type = U32Type()
-        u32_type.deserialize(data, offset=0)
-        return cls.from_type(DataDescType(u32_type.val))
+    def from_data(cls, data, packet_descriptor_type: NumericalType):
+        """Map from data bytes to APID"""
+        packet_descriptor_type.deserialize(data, offset=0)
+        return cls.from_type(DataDescType(packet_descriptor_type.val))

fprime_gds/common/communication/ccsds/space_packet.py

@@ -10,6 +10,7 @@ from spacepackets.ccsds.spacepacket import SpacePacketHeader, PacketType, SpaceP
 from fprime_gds.common.communication.framing import FramerDeframer
 from fprime_gds.plugin.definitions import gds_plugin_implementation, gds_plugin
 from fprime_gds.common.utils.data_desc_type import DataDescType
+from fprime_gds.common.utils.config_manager import ConfigManager
 
 from .apid import APID
 import logging
@@ -29,17 +30,21 @@ class SpacePacketFramerDeframer(FramerDeframer):
     IDLE_APID = 0x7FF  # max 11 bit value per protocol specification
 
     def __init__(self):
-        # self.sequence_number = 0
         # Map APID to sequence counts
         self.apid_to_sequence_count_map = dict()
         for key in DataDescType:
             self.apid_to_sequence_count_map[key.value] = 0
+        self.packet_descriptor_type = ConfigManager.get_instance().get_type(
+            "FwPacketDescriptorType"
+        )
 
     def frame(self, data):
         """Frame the supplied data in Space Packet"""
         # The protocol defines length token to be number of bytes minus 1
         data_length_token = len(data) - 1
-        apid = APID.from_data(data)
+        # Extract the APID from the data
+        # F' has the packet descriptor (= APID currently) as first n bytes of the data
+        apid = APID.from_data(data, self.packet_descriptor_type)
         space_header = SpacePacketHeader(
             packet_type=PacketType.TC,
             apid=apid,

fprime_gds/common/communication/framing.py

@@ -47,7 +47,7 @@ class FramerDeframer(abc.ABC):
         self, data: bytes, no_copy=False
     ) -> tuple[(bytes | None), bytes, bytes]:
         """
-        Deframes the incoming data from the specified format. 
+        Deframes the incoming data from the specified format.
         Produces:
         - One packet, or None if no packet found
         - leftover bytes (not consumed yet)
@@ -80,7 +80,7 @@ class FramerDeframer(abc.ABC):
             # Deframe and return only on None
             (deframed, data, discarded) = self.deframe(data, no_copy=True)
             discarded_aggregate += discarded
-            if deframed is None: # No more packets available, return aggregate
+            if deframed is None:  # No more packets available, return aggregate
                 return packets, data, discarded_aggregate
             packets.append(deframed)
 

fprime_gds/common/encoders/encoder.py

@@ -20,6 +20,7 @@ purpose is to define the interface for an encoder.
 
 @bug No known bugs
 """
+
 import abc
 import logging
 

fprime_gds/common/pipeline/standard.py

@@ -61,7 +61,7 @@ class StandardPipeline:
         dictionaries,
         file_store,
         logging_prefix=None,
-        data_logging_enabled=True
+        data_logging_enabled=True,
     ):
         """
         Setup the standard pipeline for moving data from the middleware layer through the GDS layers using the standard

fprime_gds/common/testing_fw/pytest_integration.py

@@ -56,7 +56,8 @@ def pytest_addoption(parser):
     parser.addoption(
         "--deployment-config",
         action="store",
-        help="Path to JSON configuration file for mapping deployment components"
+        type=Path,
+        help="Path to JSON configuration file for mapping deployment components",
     )
 
 def pytest_configure(config):

fprime_gds/common/utils/data_desc_type.py

@@ -3,6 +3,7 @@ DataDescType:
 
 Defines an enumeration that represents each type of data packet that can be downlinked.
 """
+
 from enum import Enum
 
 

fprime_gds/executables/cli.py

@@ -318,7 +318,6 @@ class ConfigDrivenParser(ParserBase):
 
     DEFAULT_CONFIGURATION_PATH = Path("fprime-gds.yml")
 
-
     @classmethod
     def set_default_configuration(cls, path: Path):
         """Set path for (global) default configuration file
@@ -417,7 +416,7 @@ class ConfigDrivenParser(ParserBase):
                     relative_base = args.config.parent.absolute()
 
                     def path_constructor(loader, node):
-                        """ Processes !PATH annotations as relative to current file """
+                        """Processes !PATH annotations as relative to current file"""
                         calculated_path = relative_base / loader.construct_scalar(node)
                         return calculated_path
 
@@ -1028,7 +1027,7 @@ class DictionaryParser(DetectionParser):
         elif args.dictionary is None:
             args = super().handle_arguments(args, **kwargs)
             args.dictionary = find_dict(args.deployment)
-        
+
         # Setup dictionaries encoders and decoders
         dictionaries = Dictionaries()
 
@@ -1108,7 +1107,7 @@ class StandardPipelineParser(CompositeParser):
             "dictionaries": args_ns.dictionaries,
             "file_store": args_ns.files_storage_directory,
             "logging_prefix": args_ns.logs,
-            "data_logging_enabled": not args_ns.disable_data_logging
+            "data_logging_enabled": not args_ns.disable_data_logging,
         }
         pipeline = pipeline if pipeline else StandardPipeline()
         pipeline.transport_implementation = args_ns.connection_transport
@@ -1131,6 +1130,7 @@ class CommParser(CompositeParser):
         CommExtraParser,
         MiddleWareParser,
         LogDeployParser,
+        DictionaryParser,  # needed to get types from dictionary for framing
     ]
 
     def __init__(self):

fprime_gds/executables/comm.py

@@ -51,8 +51,6 @@ def main():
     Plugins.system(["communication", "framing"])
     args, _ = fprime_gds.executables.cli.ParserBase.parse_args(
         [
-            fprime_gds.executables.cli.LogDeployParser,
-            fprime_gds.executables.cli.MiddleWareParser,
             fprime_gds.executables.cli.CommParser,
             fprime_gds.executables.cli.PluginArgumentParser,
         ],

{fprime_gds-4.0.2a4.dist-info → fprime_gds-4.0.2a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-gds
-Version: 4.0.2a4
+Version: 4.0.2a5
 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: 

{fprime_gds-4.0.2a4.dist-info → fprime_gds-4.0.2a5.dist-info}/RECORD

@@ -7,7 +7,7 @@ fprime_gds/common/transport.py,sha256=uYXWkM8TYEYz1vfY4AEn0PF8Gu4tkYmJ5t4w1YY1yW
 fprime_gds/common/zmq_transport.py,sha256=E_iBZ5sA4JKB99MWSOM6XnPrO-mbFyRvD9eQp9te6-Y,12397
 fprime_gds/common/communication/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/communication/checksum.py,sha256=f6W0Tr68U-XGnFmysMqsFzoGYZVE8clKf-VIJja_1YM,741
-fprime_gds/common/communication/framing.py,sha256=GnEUgHiTc0dEJ3coaVmcA03NXk8ehHfPaywB7hNnoO8,12658
+fprime_gds/common/communication/framing.py,sha256=0i8idvfaWJXesdNcUjpKtB2gErks3voQW69RaJFaAW0,12658
 fprime_gds/common/communication/ground.py,sha256=9SD3AoyHA43yNE8UYkWnu5nEJt1PgyB3sU3QLDc4eDY,3619
 fprime_gds/common/communication/updown.py,sha256=UhfCIIA2eM5g2FsIhOGJJH6HzHurUPgcKIJ5fsLb2lE,9888
 fprime_gds/common/communication/adapters/__init__.py,sha256=ivGtzUTqhBYuve5mhN9VOHITwgZjNMVv7sxuac2Ll3c,470
@@ -15,10 +15,10 @@ fprime_gds/common/communication/adapters/base.py,sha256=i3mf4HC-4tuf4mNkhdXCKlng
 fprime_gds/common/communication/adapters/ip.py,sha256=vxSGbxQYNCC4M0Zp0wvA7VTwsDFQ0i6uqRuOHks1ibA,17322
 fprime_gds/common/communication/adapters/uart.py,sha256=5WkA8xpQ8E7nv2DbN168fibz1l-GddJUKnf6Hcd4hvU,7194
 fprime_gds/common/communication/ccsds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fprime_gds/common/communication/ccsds/apid.py,sha256=Y5K_xHLo1bmpxOlkt-TSLulCXbKIQrbYfa3GXhadqEE,686
+fprime_gds/common/communication/ccsds/apid.py,sha256=svYD4a1wIk6M1NRdLB2AJe1OLAbkRIQiSI0Mniz3Dbc,726
 fprime_gds/common/communication/ccsds/chain.py,sha256=Rkhls55BUwFU0cMlRMY183hlFpfqidQJ9ZUE1kdfi38,4637
 fprime_gds/common/communication/ccsds/space_data_link.py,sha256=pDi1JpmYBuKGsDgTX80Wp8PU_CDtDPtkzdnX1FXN5eM,7385
-fprime_gds/common/communication/ccsds/space_packet.py,sha256=27phwn8MfBFfdjS5Vl0Lfe38xfss6xSZnxGkJcQa92g,5190
+fprime_gds/common/communication/ccsds/space_packet.py,sha256=Fys13Ka5uoMeSrnUNYn5Mp58s1RMa-uEyjN5_ACNCaU,5501
 fprime_gds/common/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/data_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/data_types/ch_data.py,sha256=RP9zSyzNcH0nJ3MYyW_IATnmnHYZ6d0KmoJUJantdBI,6111
@@ -39,7 +39,7 @@ fprime_gds/common/distributor/distributor.py,sha256=6XevwW9c75Un-tT0JXCE_savhvBU
 fprime_gds/common/encoders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/encoders/ch_encoder.py,sha256=TBrTJ7TK4WwCh6KAspozh63WcPxrMImloB8tz7qeulw,2878
 fprime_gds/common/encoders/cmd_encoder.py,sha256=iFPi6uMlMPlApC47p9YKRjKJxMvz46p15Yy3NnGTyaE,3497
-fprime_gds/common/encoders/encoder.py,sha256=jaN-uLHRGAzAs33ZdPm2FTdh3mAvsOCtqO6Ov9hspyI,2997
+fprime_gds/common/encoders/encoder.py,sha256=IqcKlBTOQIpzdxOKbPF_iYevdbgF3vrYCXeooo5iURk,2998
 fprime_gds/common/encoders/event_encoder.py,sha256=aM_3hWWx4OrLKF3-MlhmGSBYnzt-4iktSzMVrcUbfB8,3140
 fprime_gds/common/encoders/file_encoder.py,sha256=G9uUXQP-oD2eW_GJuGNBrN7xPafKFhmgKiNi-zvZz-g,3830
 fprime_gds/common/encoders/pkt_encoder.py,sha256=6hzwrAEg1tjGw9yGycWMuNgbGCoe87Cd-7eP1rvy2d4,3126
@@ -103,7 +103,7 @@ fprime_gds/common/pipeline/files.py,sha256=J2zm0sucvImtmSnv0iUp5uTpvUO8nlmz2lUdM
 fprime_gds/common/pipeline/histories.py,sha256=7KyboNnm9OARQk4meVPSSeYpeqH0G8RWRiy0BLBL1rw,3671
 fprime_gds/common/pipeline/publishing.py,sha256=A0Hb4RpK7RCBDN9BEiJZr9WQMSrmohYXCFOuzl23mPo,3953
 fprime_gds/common/pipeline/router.py,sha256=-P1wI0KXEh_snOzDaq8CjEoWuM_zRm8vUMR1T0oY9qQ,2327
-fprime_gds/common/pipeline/standard.py,sha256=w6L9kj6phA0twSB-TfEtZIcMWWZwNBm5wzSmz1lyNEA,9239
+fprime_gds/common/pipeline/standard.py,sha256=_uyosawD7n5adwOx1qTOrPIMtIgpUhGvGcmgVQVRbRw,9240
 fprime_gds/common/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/templates/ch_template.py,sha256=1MoDZsia0dI_CvnIttwyKLhbQhum35OcJnFc50Xohuo,3893
 fprime_gds/common/templates/cmd_template.py,sha256=n91z4WhFgHwTu6_fQqy7JqpkEObAkllIeEy0AR0DvrQ,5455
@@ -114,20 +114,20 @@ fprime_gds/common/templates/prm_template.py,sha256=qd0UX4ARZuPWvnFbU_DO3HkQY4QgM
 fprime_gds/common/testing_fw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/testing_fw/api.py,sha256=HcstOYK1_TYyzxo2O3TsI3QKtQbm6FBP-kG_7ZT1bDM,68091
 fprime_gds/common/testing_fw/predicates.py,sha256=CsHsVs_EVXCLQLd2NVOvy8MxmUQVxLMr3i1ouEUqOtQ,18371
-fprime_gds/common/testing_fw/pytest_integration.py,sha256=CAvuH9_3RuKplKQVB3t_jerPr-LPzwPWoM6z3lMs16g,6203
+fprime_gds/common/testing_fw/pytest_integration.py,sha256=32lXFh4evwOsiKT-VA7w2PVg2jj1NSrsd8V66ApSSRA,6223
 fprime_gds/common/tools/README.md,sha256=WVEciyfsbEVGmb9xR5A6Ioy5pBVnCsWOIJfySLeq9YM,2325
 fprime_gds/common/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/tools/params.py,sha256=htnMLlUW9HmBo4Qc7kYhnWr1sO6bK2mckdskLt5rDUk,9323
 fprime_gds/common/tools/seqgen.py,sha256=O57igktjWku5OJhBqezhCjPYUmh4GZM-9qKCChqEW7g,6034
 fprime_gds/common/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fprime_gds/common/utils/config_manager.py,sha256=dMqN204UKLiZzIs7-d--fdYMQ8kBzTX56xexkgFq18s,5550
-fprime_gds/common/utils/data_desc_type.py,sha256=0AkEMfEa5refd_moovf1hkgKiNakADRzv4soghvf9a4,883
+fprime_gds/common/utils/data_desc_type.py,sha256=qoYTi_GC3OOHP66TNsIyO7Qo6wiRBlfB1gHW15dm_Ig,884
 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=_OLWxby1XvYmmDcecsOAKu34XGf952_ya5uRWf_8Y3I,15127
-fprime_gds/executables/cli.py,sha256=OgP0RYrqasTzFXP8r3L1UAlGq0wKGVLb5_Vr6nxFpGc,52643
-fprime_gds/executables/comm.py,sha256=08rO0o0MJgTRngB7Ygu2IL_gEAWKF7WFvFyro1CqReE,5214
+fprime_gds/executables/cli.py,sha256=E7LP8BtpY1QDugXBmgMH6Bk-WA5ktFSGyjgNM_xJ3Kk,52710
+fprime_gds/executables/comm.py,sha256=CI_PeD5fYC0_JsLeaj9OdJhzeRnlJbZRqPE0II29WOQ,5101
 fprime_gds/executables/data_product_writer.py,sha256=e1Rp2LT_Cpg08f0Ki8GhirC7Wn6LtYiAef7KLAkZHUY,37773
 fprime_gds/executables/dictionary_merge.py,sha256=3Zy8LcbEdBwmNX2GLN_Nr1DfbLyWYHg-y4jdjTVCXgY,7966
 fprime_gds/executables/fprime_cli.py,sha256=9_eNU7AzUOMhz4FLPkD_byA9C13c509wGPZN-kdw9Ok,12429
@@ -248,10 +248,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.2a4.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-fprime_gds-4.0.2a4.dist-info/licenses/NOTICE.txt,sha256=vXjA_xRcQhd83Vfk5D_vXg5kOjnnXvLuMi5vFKDEVmg,1612
-fprime_gds-4.0.2a4.dist-info/METADATA,sha256=jJXlRA8gO9KhN8WGHJ6J_vx59671yO7OHe_XNNtYLAM,24576
-fprime_gds-4.0.2a4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fprime_gds-4.0.2a4.dist-info/entry_points.txt,sha256=zESAeUBvVYSuzzinWIqNWaewa8nYDDImEX4jBzdyThs,559
-fprime_gds-4.0.2a4.dist-info/top_level.txt,sha256=6vzFLIX6ANfavKaXFHDMSLFtS94a6FaAsIWhjgYuSNE,27
-fprime_gds-4.0.2a4.dist-info/RECORD,,
+fprime_gds-4.0.2a5.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+fprime_gds-4.0.2a5.dist-info/licenses/NOTICE.txt,sha256=vXjA_xRcQhd83Vfk5D_vXg5kOjnnXvLuMi5vFKDEVmg,1612
+fprime_gds-4.0.2a5.dist-info/METADATA,sha256=-ZUxd0T4sY7RGn_nEhta2bWU-JJUoD7_cJOSqmU6904,24576
+fprime_gds-4.0.2a5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fprime_gds-4.0.2a5.dist-info/entry_points.txt,sha256=zESAeUBvVYSuzzinWIqNWaewa8nYDDImEX4jBzdyThs,559
+fprime_gds-4.0.2a5.dist-info/top_level.txt,sha256=6vzFLIX6ANfavKaXFHDMSLFtS94a6FaAsIWhjgYuSNE,27
+fprime_gds-4.0.2a5.dist-info/RECORD,,