chore: address review comments

Author: shihab-dls

src/fastcs/controller.py

@@ -17,6 +17,7 @@ class BaseController(Tracer):
 
     #: Attributes passed from the device at runtime.
     attributes: dict[str, Attribute]
+    root_attribute: Attribute | None = None
 
     description: str | None = None
 
@@ -144,9 +145,7 @@ def add_attribute(self, name, attribute: Attribute):
         self.attributes[name] = attribute
         super().__setattr__(name, attribute)
 
-    def add_sub_controller(
-        self, name: str, sub_controller: Controller | ControllerVector
-    ):
+    def add_sub_controller(self, name: str, sub_controller: BaseController):
         if name in self.__sub_controller_tree.keys():
             raise ValueError(
                 f"Cannot add sub controller {sub_controller}. "
@@ -196,18 +195,14 @@ class Controller(BaseController):
     such as generating a UI or creating parameters for a control system.
     """
 
-    root_attribute: Attribute | None = None
-
     def __init__(
         self,
         description: str | None = None,
         ios: Sequence[AttributeIO[T, AttributeIORefT]] | None = None,
     ) -> None:
         super().__init__(description=description, ios=ios)
 
-    def add_sub_controller(
-        self, name: str, sub_controller: Controller | ControllerVector
-    ):
+    def add_sub_controller(self, name: str, sub_controller: BaseController):
         if name.isdigit():
             raise ValueError(
                 f"Cannot add sub controller {name}. "
@@ -226,8 +221,6 @@ class ControllerVector(MutableMapping[int, Controller], BaseController):
     """A controller with a collection of identical sub controllers distinguished
     by a numeric value"""
 
-    root_attribute: Attribute | None = None
-
     def __init__(
         self,
         children: Mapping[int, Controller],
@@ -239,9 +232,7 @@ def __init__(
         for index, child in children.items():
             self[index] = child
 
-    def add_sub_controller(
-        self, name: str, sub_controller: Controller | ControllerVector
-    ):
+    def add_sub_controller(self, name: str, sub_controller: BaseController):
         raise NotImplementedError(
             "Cannot add named sub controller to ControllerVector. "
             "Use __setitem__ instead, for indexed sub controllers. "

src/fastcs/controller_api.py

@@ -41,7 +41,7 @@ def __repr__(self):
         return (
             f"ControllerAPI("
             f"path={self.path}, "
-            f"sub_apis=[{', '.join(sub_api for sub_api in self.sub_apis.keys())}]"
+            f"sub_apis=[{', '.join(self.sub_apis.keys())}]"
             f")"
         )
 

src/fastcs/transport/epics/pva/pvi.py

@@ -70,9 +70,9 @@ def _make_p4p_raw_value(pv_prefix: str, controller_api: ControllerAPI) -> dict:
     # Sub-controller api returned if current item is a Controller
     for pv_leaf, sub_controller_api in controller_api.sub_apis.items():
         # Add Controller entry
-        # Sub-device of a ControllerVector
         pv = f"{pv_prefix}:{snake_to_pascal(pv_leaf)}:PVI"
         if sub_controller_api.path[-1].isdigit():
+            # Sub-device of a ControllerVector
             p4p_raw_value[f"__{int(pv_leaf)}"]["d"] = pv
         else:
             p4p_raw_value[pv_leaf]["d"] = pv