added option for attributes being pascal and controllers being capitalized

Author: evvaaaa

src/fastcs/backends/epics/gui.py

@@ -27,7 +27,7 @@
 from pydantic import ValidationError
 
 from fastcs.attributes import Attribute, AttrR, AttrRW, AttrW
-from fastcs.backends.epics.util import EpicsNameOptions, _convert_attr_name_to_pv_name
+from fastcs.backends.epics.util import EpicsNameOptions, _convert_attribute_name_to_pv_name
 from fastcs.cs_methods import Command
 from fastcs.datatypes import Bool, Float, Int, String
 from fastcs.exceptions import FastCSException
@@ -64,14 +64,14 @@ def _get_pv(self, attr_path: list[str], name: str):
                 self._pv_prefix,
             ]
             + [
-                _convert_attr_name_to_pv_name(
-                    attr_name, self.epics_name_options.pv_naming_convention
+                _convert_attribute_name_to_pv_name(
+                    attr_name, self.epics_name_options.pv_naming_convention, is_attribute=False
                 )
                 for attr_name in attr_path
             ]
             + [
-                _convert_attr_name_to_pv_name(
-                    name, self.epics_name_options.pv_naming_convention
+                _convert_attribute_name_to_pv_name(
+                    name, self.epics_name_options.pv_naming_convention, is_attribute=True
                 ),
             ],
         )

src/fastcs/backends/epics/ioc.py

@@ -11,7 +11,7 @@
 from fastcs.backends.epics.util import (
     MBB_STATE_FIELDS,
     EpicsNameOptions,
-    PvNamingConvention,
+    _convert_attribute_name_to_pv_name,
     attr_is_enum,
     enum_index_to_value,
     enum_value_to_index,
@@ -30,15 +30,6 @@ class EpicsIOCOptions:
     name_options: EpicsNameOptions = EpicsNameOptions()
 
 
-def _convert_attr_name_to_pv_name(
-    attr_name: str, naming_convention: PvNamingConvention
-) -> str:
-    if naming_convention == PvNamingConvention.PASCAL:
-        return attr_name.title().replace("_", "")
-    elif naming_convention == PvNamingConvention.CAPITALIZED:
-        return attr_name.upper().replace("_", "-")
-    return attr_name
-
 
 class EpicsIOC:
     def __init__(
@@ -80,8 +71,10 @@ def _add_sub_controller_pvi_info(self, pv_prefix: str, parent: BaseController):
             child_pvi = self._name_options.pv_separator.join(
                 [pv_prefix]
                 + [
-                    _convert_attr_name_to_pv_name(
-                        path, self._name_options.pv_naming_convention
+                    _convert_attribute_name_to_pv_name(
+                        path,
+                        self._name_options.pv_naming_convention,
+                        is_attribute=False
                     )
                     for path in child.path
                 ]
@@ -96,14 +89,14 @@ def _add_sub_controller_pvi_info(self, pv_prefix: str, parent: BaseController):
     def _create_and_link_attribute_pvs(self, pv_prefix: str, mapping: Mapping) -> None:
         for single_mapping in mapping.get_controller_mappings():
             formatted_path = [
-                _convert_attr_name_to_pv_name(
-                    p, self._name_options.pv_naming_convention
+                _convert_attribute_name_to_pv_name(
+                    p, self._name_options.pv_naming_convention, is_attribute=False
                 )
                 for p in single_mapping.controller.path
             ]
             for attr_name, attribute in single_mapping.attributes.items():
-                pv_name = _convert_attr_name_to_pv_name(
-                    attr_name, self._name_options.pv_naming_convention
+                pv_name = _convert_attribute_name_to_pv_name(
+                    attr_name, self._name_options.pv_naming_convention, is_attribute=True
                 )
                 _pv_prefix = self._name_options.pv_separator.join(
                     [pv_prefix] + formatted_path
@@ -169,14 +162,14 @@ async def async_record_set(value: T):
     def _create_and_link_command_pvs(self, pv_prefix: str, mapping: Mapping) -> None:
         for single_mapping in mapping.get_controller_mappings():
             formatted_path = [
-                _convert_attr_name_to_pv_name(
-                    p, self._name_options.pv_naming_convention
+                _convert_attribute_name_to_pv_name(
+                    p, self._name_options.pv_naming_convention, is_attribute=False
                 )
                 for p in single_mapping.controller.path
             ]
             for attr_name, method in single_mapping.command_methods.items():
-                pv_name = _convert_attr_name_to_pv_name(
-                    attr_name, self._name_options.pv_naming_convention
+                pv_name = _convert_attribute_name_to_pv_name(
+                    attr_name, self._name_options.pv_naming_convention, is_attribute=True
                 )
                 _pv_prefix = self._name_options.pv_separator.join(
                     [pv_prefix] + formatted_path

src/fastcs/backends/epics/util.py

@@ -32,6 +32,7 @@ class PvNamingConvention(Enum):
     NO_CONVERSION = "NO_CONVERSION"
     PASCAL = "PASCAL"
     CAPITALIZED = "CAPITALIZED"
+    CAPITALIZED_CONTROLLER_PASCAL_ATTRIBUTE = "CAPITALIZED_CONTROLLER_PASCAL_ATTRIBUTE"
 
 
 DEFAULT_PV_SEPARATOR = ":"
@@ -43,13 +44,17 @@ class EpicsNameOptions:
     pv_separator: str = DEFAULT_PV_SEPARATOR
 
 
-def _convert_attr_name_to_pv_name(
-    attr_name: str, naming_convention: PvNamingConvention
+def _convert_attribute_name_to_pv_name(
+    attr_name: str, naming_convention: PvNamingConvention, is_attribute: bool = False
 ) -> str:
     if naming_convention == PvNamingConvention.PASCAL:
         return attr_name.title().replace("_", "")
     elif naming_convention == PvNamingConvention.CAPITALIZED:
         return attr_name.upper().replace("_", "-")
+    elif naming_convention == PvNamingConvention.CAPITALIZED_CONTROLLER_PASCAL_ATTRIBUTE:
+        if is_attribute:
+            return _convert_attribute_name_to_pv_name(attr_name, PvNamingConvention.PASCAL, is_attribute)
+        return _convert_attribute_name_to_pv_name(attr_name, PvNamingConvention.CAPITALIZED)
     return attr_name
 
 

src/fastcs/mapping.py

@@ -56,10 +56,10 @@ def _get_single_mapping(controller: BaseController) -> SingleMapping:
                     attributes[attr_name] = attr
 
     additional_attributes = controller.additional_attributes
-    if common_attributes := additional_attributes.keys() ^ attributes.keys():
+    if common_attributes := additional_attributes.keys() & attributes.keys():
         raise RuntimeError(
             f"Received additional attributes {common_attributes} "
-            "already present in the controller."
+            f"already present in the controller {controller}."
         )
 
     attributes.update(additional_attributes)