Flatten decoder status and config into one group on FRX screen

Remove FrameReceiverDecoderController

Author: GDYendell

src/fastcs_odin/frame_receiver.py

@@ -1,34 +1,22 @@
 from fastcs_odin.odin_data import OdinDataAdapterController
 from fastcs_odin.odin_subcontroller import OdinSubController
-from fastcs_odin.util import (
-    OdinParameter,
-    create_attribute,
-    partition,
-    remove_metadata_fields_paths,
-)
+from fastcs_odin.util import create_attribute, remove_metadata_fields_paths
 
 
 class FrameReceiverController(OdinSubController):
     async def initialise(self):
-        def __decoder_parameter(parameter: OdinParameter):
-            return "decoder" in parameter.path[:-1]
-
         self.parameters = remove_metadata_fields_paths(self.parameters)
 
-        decoder_parameters, self.parameters = partition(
-            self.parameters, __decoder_parameter
-        )
-        decoder_controller = FrameReceiverDecoderController(
-            self.connection, decoder_parameters, f"{self._api_prefix}", self._ios
-        )
-        self.add_sub_controller("DECODER", decoder_controller)
-        await decoder_controller.initialise()
-
         for parameter in self.parameters:
             # Remove duplicate index from uri
             parameter.uri = parameter.uri[1:]
             # Remove redundant status/config from parameter path
             parameter.set_path(parameter.uri[1:])
+
+            if len(parameter.path) > 1 and "decoder" in parameter.path[0]:
+                # Combine "decoder" and "decoder_config"
+                parameter.path[0] = "decoder"
+
             self.add_attribute(
                 parameter.name,
                 create_attribute(parameter=parameter, api_prefix=self._api_prefix),
@@ -50,14 +38,3 @@ class FrameReceiverAdapterController(OdinDataAdapterController):
         "rx_address",
         "rx_ports",
     ]
-
-
-class FrameReceiverDecoderController(OdinSubController):
-    async def initialise(self):
-        for parameter in self.parameters:
-            # remove redundant status/decoder part from path
-            parameter.set_path(parameter.uri[3:])
-            self.add_attribute(
-                parameter.name,
-                create_attribute(parameter=parameter, api_prefix=self._api_prefix),
-            )

src/fastcs_odin/util.py

@@ -8,11 +8,14 @@
 from fastcs.attributes import AttrR, AttrRW
 from fastcs.controllers import BaseController
 from fastcs.datatypes import Bool, DataType, Float, Int, String
+from fastcs.logging import bind_logger
 from fastcs.transports.epics.util import snake_to_pascal
 from pydantic import BaseModel, ConfigDict, ValidationError
 
 from fastcs_odin.io.parameter_attribute_io import ParameterTreeAttributeIORef
 
+logger = bind_logger(logger_name=__name__)
+
 
 def is_metadata_object(v: Any) -> bool:
     return isinstance(v, dict) and "writeable" in v and "type" in v
@@ -276,6 +279,8 @@ def remove_metadata_fields_paths(parameters: list[OdinParameter]):
     )
     if invalid:
         invalid_names = ["/".join(param.uri) for param in invalid]
-        logging.warning(f"Removing parameters with invalid names: {invalid_names}")
+        logger.warning(
+            "Removing parameters with invalid names", parameters=invalid_names
+        )
 
     return parameters

tests/test_controllers.py

@@ -18,7 +18,6 @@
 from fastcs_odin.frame_receiver import (
     FrameReceiverAdapterController,
     FrameReceiverController,
-    FrameReceiverDecoderController,
 )
 from fastcs_odin.http_connection import HTTPConnection
 from fastcs_odin.io.config_fan_sender_attribute_io import (
@@ -429,15 +428,7 @@ async def test_frame_reciever_controllers():
     await fr_controller.initialise()
     assert isinstance(fr_controller, FrameReceiverController)
     assert valid_non_decoder_parameter in fr_controller.parameters
-    assert len(fr_controller.parameters) == 1
-    assert "DECODER" in fr_controller.sub_controllers
-
-    decoder_controller = fr_controller.sub_controllers["DECODER"]
-    assert isinstance(decoder_controller, FrameReceiverDecoderController)
-    assert valid_decoder_parameter in decoder_controller.parameters
-    assert invalid_decoder_parameter not in decoder_controller.parameters
-    # index, status, decoder parts removed from path
-    assert decoder_controller.parameters[0]._path == ["packets_dropped"]
+    assert len(fr_controller.parameters) == 2
 
 
 @pytest.mark.asyncio

tests/test_introspection.py

@@ -115,7 +115,6 @@ async def test_fr_initialise(mocker: MockerFixture):
         isinstance(frx, FrameReceiverController)
         for frx in controller.sub_controllers.values()
     )
-    assert "decoder_name" not in controller[0].DECODER.attributes  # type: ignore
 
 
 def test_node_with_empty_list_is_correctly_counted():