fprime-gds 3.4.4a2__tar.gz → 3.5.0__tar.gz

{fprime_gds-3.4.4a2 → fprime_gds-3.5.0}/.github/actions/spelling/expect.txt

@@ -571,6 +571,7 @@ RLock
 Roboto
 rollup
 rpaetz
+rsplit
 rst
 rtd
 rtf

{fprime_gds-3.4.4a2 → fprime_gds-3.5.0}/.github/workflows/publish.yml

@@ -12,10 +12,14 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - name: Upgrade Python Build Tools
         run: pip install -U build twine
       - name: Build distributions
         run: python -m build

{fprime_gds-3.4.4a2 → fprime_gds-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fprime-gds
-Version: 3.4.4a2
+Version: 3.5.0
 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-3.4.4a2 → fprime_gds-3.5.0}/src/fprime_gds/common/loaders/ch_json_loader.py

@@ -65,14 +65,14 @@ class ChJsonLoader(JsonLoader):
         try:
             ch_id = channel_dict[self.ID]
             # The below assignment also raises a ValueError if the name does not contain a '.'
-            component_name, channel_name = channel_dict[self.NAME].split(".")
-            if not component_name or not channel_name:
+            qualified_component_name, channel_name = channel_dict[self.NAME].rsplit('.', 1)
+            if not qualified_component_name or not channel_name:
                 raise ValueError()
 
             type_obj = self.parse_type(channel_dict[self.TYPE])
         except ValueError as e:
             raise GdsDictionaryParsingException(
-                f"Channel dictionary entry malformed, expected name of the form '<COMP_NAME>.<CH_NAME>' in : {str(channel_dict)}"
+                f"Channel dictionary entry malformed, expected name of the form '<QUAL_COMP_NAME>.<CH_NAME>' in : {str(channel_dict)}"
             )
         except KeyError as e:
             raise GdsDictionaryParsingException(
@@ -94,7 +94,7 @@ class ChJsonLoader(JsonLoader):
         return ChTemplate(
             ch_id,
             channel_name,
-            component_name,
+            qualified_component_name,
             type_obj,
             ch_fmt_str=format_str,
             ch_desc=channel_dict.get(self.DESC),

{fprime_gds-3.4.4a2 → fprime_gds-3.5.0}/src/fprime_gds/common/loaders/cmd_json_loader.py

@@ -54,12 +54,12 @@ class CmdJsonLoader(JsonLoader):
 
     def construct_template_from_dict(self, cmd_dict: dict) -> CmdTemplate:
         try:
-            cmd_comp, cmd_mnemonic = cmd_dict[self.NAME].split(".")
+            qualified_component_name, cmd_mnemonic = cmd_dict[self.NAME].rsplit('.', 1)
             cmd_opcode = cmd_dict[self.OPCODE]
             cmd_desc = cmd_dict.get(self.DESC)
         except ValueError as e:
             raise GdsDictionaryParsingException(
-                f"Command dictionary entry malformed, expected name of the form '<COMP_NAME>.<CMD_NAME>' in : {str(cmd_dict)}"
+                f"Command dictionary entry malformed, expected name of the form '<QUAL_COMP_NAME>.<CMD_NAME>' in : {str(cmd_dict)}"
             )
         except KeyError as e:
             raise GdsDictionaryParsingException(
@@ -82,4 +82,4 @@ class CmdJsonLoader(JsonLoader):
                     param_type,
                 )
             )
-        return CmdTemplate(cmd_opcode, cmd_mnemonic, cmd_comp, cmd_args, cmd_desc)
+        return CmdTemplate(cmd_opcode, cmd_mnemonic, qualified_component_name, cmd_args, cmd_desc)

{fprime_gds-3.4.4a2 → fprime_gds-3.5.0}/src/fprime_gds/common/loaders/event_json_loader.py

@@ -61,12 +61,12 @@ class EventJsonLoader(JsonLoader):
 
     def construct_template_from_dict(self, event_dict: dict):
         try:
-            event_comp, event_name = event_dict[self.NAME].split(".")
+            qualified_component_name, event_name = event_dict[self.NAME].rsplit('.', 1)
             event_id = event_dict[self.ID]
             event_severity = EventSeverity[event_dict[self.SEVERITY]]
         except ValueError as e:
             raise GdsDictionaryParsingException(
-                f"Event dictionary entry malformed, expected name of the form '<COMP_NAME>.<EVENT_NAME>' in : {str(event_dict)}"
+                f"Event dictionary entry malformed, expected name of the form '<QUAL_COMP_NAME>.<EVENT_NAME>' in : {str(event_dict)}"
             )
         except KeyError as e:
             raise GdsDictionaryParsingException(
@@ -100,7 +100,7 @@ class EventJsonLoader(JsonLoader):
         return EventTemplate(
             event_id,
             event_name,
-            event_comp,
+            qualified_component_name,
             event_args,
             event_severity,
             event_fmt_str,

{fprime_gds-3.4.4a2 → fprime_gds-3.5.0}/src/fprime_gds.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fprime-gds
-Version: 3.4.4a2
+Version: 3.5.0
 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: