fprime-gds 4.0.0a6__tar.gz → 4.0.0a8__tar.gz

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/.github/workflows/codeql-security-scan.yml

@@ -8,6 +8,10 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ devel ]
+# Cancel in-progress runs if a newer run is started on a given PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'devel') && !contains(github.ref, 'release/')}}
 
 jobs:
   analyze:

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/.github/workflows/fprime-gds-tests.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ devel ]
+# Cancel in-progress runs if a newer run is started on a given PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'devel') && !contains(github.ref, 'release/')}}
 
 jobs:
   Unit-tests:

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/.github/workflows/gds-cli-tests.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ devel ]
+# Cancel in-progress runs if a newer run is started on a given PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'devel') && !contains(github.ref, 'release/')}}
 
 env:
   DICTIONARY: ./.github/resources/RefTopologyAppDictionary.xml

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/.github/workflows/spelling.yml

@@ -11,6 +11,10 @@ on:
     tags-ignore:
       - "**"
     types: ['opened', 'reopened', 'synchronize']
+# Cancel in-progress runs if a newer run is started on a given PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'devel') && !contains(github.ref, 'release/')}}
 
 jobs:
   spelling:

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-gds
-Version: 4.0.0a6
+Version: 4.0.0a8
 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.0a6 → fprime_gds-4.0.0a8}/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.0a6 → fprime_gds-4.0.0a8}/src/fprime_gds/common/decoders/event_decoder.py

@@ -22,6 +22,8 @@ from fprime_gds.common.decoders import decoder
 from fprime_gds.common.decoders.decoder import DecodingException
 from fprime_gds.common.utils import config_manager
 
+import logging
+LOGGER = logging.getLogger("event_decoder")
 
 class EventDecoder(decoder.Decoder):
     """Decoder class for event data"""
@@ -67,7 +69,11 @@ class EventDecoder(decoder.Decoder):
         while (ptr < len(data)):
 
             # Decode event ID here...
-            self.id_obj.deserialize(data, ptr)
+            if ptr + self.id_obj.getSize() <= len(data):
+                self.id_obj.deserialize(data, ptr)
+            else:
+                LOGGER.warning("Insufficient data for event ID")
+                break
             ptr += self.id_obj.getSize()
             event_id = self.id_obj.val
 

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/src/fprime_gds/common/distributor/distributor.py

@@ -203,6 +203,8 @@ class Distributor(DataHandler):
                 try:
                     d.data_callback(msg)
                 except DecodingException as dexc:
-                    LOGGER.warning("Decoding error occurred: %s. Skipping.", dexc)
+                    LOGGER.warning("Decoding error: %s", dexc)
+                except Exception as exc:
+                    LOGGER.warning("Parsing error: %s", exc)
             else:
                 LOGGER.warning("No decoder registered for: %s", data_desc_type.DataDescType(data_desc).name)

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/src/fprime_gds/common/logger/__init__.py

@@ -13,7 +13,7 @@ import sys
 INITIALIZED = False
 
 
-def configure_py_log(directory=None, filename=sys.argv[0], mirror_to_stdout=False):
+def configure_py_log(directory=None, filename=sys.argv[0], mirror_to_stdout=False, log_level="INFO"):
     """
     Configure the python logging. If logdir is supplied, our logs will go in that directory as a log file. Otherwise,
     logs will go to the CLI.
@@ -40,6 +40,6 @@ def configure_py_log(directory=None, filename=sys.argv[0], mirror_to_stdout=Fals
     for handler in handlers:
         handler.setFormatter(formatter)
         logging.getLogger().addHandler(handler)
-    logging.getLogger().setLevel(logging.INFO)
+    logging.getLogger().setLevel(log_level)
     logging.info("Logging system initialized!")
     INITIALIZED = True

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/src/fprime_gds/executables/cli.py

@@ -829,6 +829,13 @@ class LogDeployParser(ParserBase):
                 "default": False,
                 "help": "Log to standard out along with log output files",
             },
+            ("--log-level-gds",): {
+                "action": "store",
+                "dest": "log_level_gds",
+                "choices": ["DEBUG", "INFO", "WARNING", "ERROR"],
+                "default": "INFO",
+                "help": "Set the logging level of GDS processes [default: %(default)s]",
+            },
         }
 
     def handle_arguments(self, args, **kwargs):
@@ -856,7 +863,7 @@ class LogDeployParser(ParserBase):
                 raise
         # Setup the basic python logging
         fprime_gds.common.logger.configure_py_log(
-            args.logs, mirror_to_stdout=args.log_to_stdout
+            args.logs, mirror_to_stdout=args.log_to_stdout, log_level=args.log_level_gds
         )
         return args
 

{fprime_gds-4.0.0a6 → fprime_gds-4.0.0a8}/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.0a6 → fprime_gds-4.0.0a8}/src/fprime_gds.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-gds
-Version: 4.0.0a6
+Version: 4.0.0a8
 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.0a6 → fprime_gds-4.0.0a8}/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