WIP

A

Author: evvaaaa

src/fastcs/controller.py

@@ -42,6 +42,11 @@ def register_sub_controller(self, name: str, sub_controller: SubController):
     def get_sub_controllers(self) -> dict[str, BaseController]:
         return self.__sub_controller_tree
 
+    def get_attributes(self) -> dict[str, Attribute]:
+        """For getting any attributes which aren't defined on the class itself."""
+
+        return {}
+
 
 class Controller(BaseController):
     """Top-level controller for a device.

src/fastcs/mapping.py

@@ -41,7 +41,6 @@ def _get_single_mapping(controller: BaseController) -> SingleMapping:
     scan_methods: dict[str, Scan] = {}
     put_methods: dict[str, Put] = {}
     command_methods: dict[str, Command] = {}
-    attributes: dict[str, Attribute] = {}
     for attr_name in dir(controller):
         attr = getattr(controller, attr_name)
         match attr:
@@ -51,8 +50,26 @@ def _get_single_mapping(controller: BaseController) -> SingleMapping:
                 scan_methods[attr_name] = scan_method
             case WrappedMethod(fastcs_method=Command(enabled=True) as command_method):
                 command_methods[attr_name] = command_method
-            case Attribute(enabled=True):
-                attributes[attr_name] = attr
+
+    attributes: dict[str, Attribute] = {}
+    for name in dir(type(controller)):
+        if isinstance((attr := getattr(controller, name, None)), Attribute):
+            attributes[name] = attr
+
+    object_defined_attributes = controller.get_attributes()
+
+    if conflicting_keys := {
+        key
+        for key in object_defined_attributes.keys() & attributes.keys()
+        if object_defined_attributes[key] is not attributes[key]
+    }:
+        raise TypeError(
+            f"{controller} has conflicting attributes between those passed in"
+            "`get_attributes` and those obtained from the class definition: "
+            f"{conflicting_keys}"
+        )
+
+    attributes.update(object_defined_attributes)
 
     return SingleMapping(
         controller, scan_methods, put_methods, command_methods, attributes