fprime-gds 3.4.4a2__py3-none-any.whl → 3.4.4a3__py3-none-any.whl

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fprime-gds
-Version: 3.4.4a2
+Version: 3.4.4a3
 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: 
@@ -228,18 +228,18 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 License-File: NOTICE.txt
-Requires-Dist: flask >=3.0.0
-Requires-Dist: flask-compress >=1.11
-Requires-Dist: pyzmq >=24.0.1
-Requires-Dist: pexpect >=4.8.0
-Requires-Dist: pytest >=6.2.4
-Requires-Dist: flask-restful >=0.3.8
-Requires-Dist: fprime-tools >=3.4.3
-Requires-Dist: argcomplete >=1.12.3
-Requires-Dist: Jinja2 >=2.11.3
-Requires-Dist: openpyxl >=3.0.10
-Requires-Dist: pyserial >=3.5
-Requires-Dist: pydantic >=2.6
+Requires-Dist: flask>=3.0.0
+Requires-Dist: flask-compress>=1.11
+Requires-Dist: pyzmq>=24.0.1
+Requires-Dist: pexpect>=4.8.0
+Requires-Dist: pytest>=6.2.4
+Requires-Dist: flask-restful>=0.3.8
+Requires-Dist: fprime-tools>=3.4.3
+Requires-Dist: argcomplete>=1.12.3
+Requires-Dist: Jinja2>=2.11.3
+Requires-Dist: openpyxl>=3.0.10
+Requires-Dist: pyserial>=3.5
+Requires-Dist: pydantic>=2.6
 
 # F´ GDS
 

{fprime_gds-3.4.4a2.dist-info → fprime_gds-3.4.4a3.dist-info}/RECORD

@@ -57,14 +57,14 @@ fprime_gds/common/history/history.py,sha256=LbdMzlbZ2AGt5I76DqgQWU852Jg0946hVGc6
 fprime_gds/common/history/ram.py,sha256=ELNlyC6SmQJ-ZKD1NRi4H892tt1ppDNfz7R2c0UFCbQ,5797
 fprime_gds/common/history/test.py,sha256=JMOlXPYtS9OTT1xb0GKn2YLI-0ESElbhvhb8usFatz0,5048
 fprime_gds/common/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fprime_gds/common/loaders/ch_json_loader.py,sha256=fKGENkq2GQAd8GqoDRXgY1WX1o_2yBY4K4v31P6XBJU,4040
+fprime_gds/common/loaders/ch_json_loader.py,sha256=YF0nkDTlEJVZVTBWnjID8HFj8W9yq-hV2CkiyayCuhE,4079
 fprime_gds/common/loaders/ch_py_loader.py,sha256=NKJV03k9jOUB9vELVSXyCorIiUwbGx-MlatwOPsUAP8,2688
 fprime_gds/common/loaders/ch_xml_loader.py,sha256=wRXAC3GkUShvKtb89O5tY92BtKWOFYoJ7loOF7aL5v8,4093
-fprime_gds/common/loaders/cmd_json_loader.py,sha256=ohieFnXhMwvTVkjdrFhWgym2X4miK5-IJPlCoCcICx8,3018
+fprime_gds/common/loaders/cmd_json_loader.py,sha256=wcwAaalRHXntAb9m0EvX-fXNCj_ruITzItOvKKhXsGQ,3059
 fprime_gds/common/loaders/cmd_py_loader.py,sha256=6d_vMP0Vbpg2fnnV4qUtkC-WzlYkVm5kvTUABH-zp4E,2252
 fprime_gds/common/loaders/cmd_xml_loader.py,sha256=X-fCzLt1aCjqsDu-Exy2gSYDnh_TYi5rDnRpYT7tCZQ,2391
 fprime_gds/common/loaders/dict_loader.py,sha256=TasuICjsRYPWAsgmHGmsioxa8F7xmgAj9_UplzczylA,3990
-fprime_gds/common/loaders/event_json_loader.py,sha256=naRF3FUv1Di9VAeM6uOpGHGqarBXlnNMXLyqANUgWsA,3535
+fprime_gds/common/loaders/event_json_loader.py,sha256=DPVJQ1wIY3r13rxTWrE9n7i6kSAF5m4jB-XRsxaRaDA,3572
 fprime_gds/common/loaders/event_py_loader.py,sha256=m4KlDl0mXn8ZQr-IfpUg0KaGIOJUErZkcIohlW9jNPc,2598
 fprime_gds/common/loaders/event_xml_loader.py,sha256=Q3Vm7ROTVgolSp5umkNMp0Eh95sir6ZAyAegrSjkiis,2875
 fprime_gds/common/loaders/json_loader.py,sha256=afD873WyIsbzWTz4SzydLfAKD2yFirj-l79xb4g_TBk,8051
@@ -227,10 +227,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=5rHGSOrr62qRNVfX9bZIo4HDAKG62lKteNum9G40y3g,2347
 fprime_gds/plugin/system.py,sha256=uWd6DVW90Re0FoNMPNCx0cXXTJUdpgAAO0mtakzRNgk,8564
-fprime_gds-3.4.4a2.dist-info/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-fprime_gds-3.4.4a2.dist-info/METADATA,sha256=JyLE5iGNE20hTiZnDIjebJTAz_rK4fA0hcaO57YHd2c,24784
-fprime_gds-3.4.4a2.dist-info/NOTICE.txt,sha256=vXjA_xRcQhd83Vfk5D_vXg5kOjnnXvLuMi5vFKDEVmg,1612
-fprime_gds-3.4.4a2.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-fprime_gds-3.4.4a2.dist-info/entry_points.txt,sha256=oqUiO3xhJCR943jdU3zcxbqEvSXNeVgshk7dVaf_nGY,322
-fprime_gds-3.4.4a2.dist-info/top_level.txt,sha256=6vzFLIX6ANfavKaXFHDMSLFtS94a6FaAsIWhjgYuSNE,27
-fprime_gds-3.4.4a2.dist-info/RECORD,,
+fprime_gds-3.4.4a3.dist-info/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+fprime_gds-3.4.4a3.dist-info/METADATA,sha256=d-rbGI3M6Pb8JKJKRdZf-9tHKXydQj-390xk3n3mn_Y,24772
+fprime_gds-3.4.4a3.dist-info/NOTICE.txt,sha256=vXjA_xRcQhd83Vfk5D_vXg5kOjnnXvLuMi5vFKDEVmg,1612
+fprime_gds-3.4.4a3.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+fprime_gds-3.4.4a3.dist-info/entry_points.txt,sha256=oqUiO3xhJCR943jdU3zcxbqEvSXNeVgshk7dVaf_nGY,322
+fprime_gds-3.4.4a3.dist-info/top_level.txt,sha256=6vzFLIX6ANfavKaXFHDMSLFtS94a6FaAsIWhjgYuSNE,27
+fprime_gds-3.4.4a3.dist-info/RECORD,,

{fprime_gds-3.4.4a2.dist-info → fprime_gds-3.4.4a3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any