WIP: Cleaned up pvi tree

src/fastcs/transport/epics/options.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
 
@@ -24,10 +24,3 @@ class EpicsGUIOptions:
 @dataclass
 class EpicsIOCOptions:
     pv_prefix: str = "MY-DEVICE-PREFIX"
-
-
-@dataclass
-class EpicsOptions:
-    docs: EpicsDocsOptions = field(default_factory=EpicsDocsOptions)
-    gui: EpicsGUIOptions = field(default_factory=EpicsGUIOptions)
-    ioc: EpicsIOCOptions = field(default_factory=EpicsIOCOptions)

src/fastcs/transport/epics/p4p/ioc.py

@@ -1,4 +1,5 @@
 import asyncio
+import re
 from types import MethodType
 
 from p4p.server import Server, StaticProvider
@@ -16,8 +17,16 @@
 }
 
 
-def get_pv_name(pv_prefix: str, attribute_name: str) -> str:
-    return f"{pv_prefix}:{attribute_name.title().replace('_', '')}"
+def _snake_to_camel(name: str) -> str:
+    name = re.sub(
+        r"(?:^|_)([a-z])", lambda match: match.group(1).upper(), name
+    ).replace("_", "")
+    return re.sub(r"_(\d+)$", r"\1", name)
+
+
+def get_pv_name(pv_prefix: str, *attribute_names: str) -> str:
+    pv_formatted = ":".join([_snake_to_camel(attr) for attr in attribute_names])
+    return f"{pv_prefix}:{pv_formatted}" if pv_formatted else pv_prefix
 
 
 async def parse_attributes(
@@ -28,19 +37,17 @@ async def parse_attributes(
     pvi_tree.add_block(
         prefix_root,
         controller.description,
-        type(controller),
     )
 
     for single_mapping in controller.get_controller_mappings():
         path = single_mapping.controller.path
-        pv_prefix = ":".join([prefix_root] + path)
+        pv_prefix = get_pv_name(prefix_root, *path)
         provider = StaticProvider(pv_prefix)
         providers.append(provider)
 
         pvi_tree.add_block(
             pv_prefix,
             single_mapping.controller.description,
-            type(single_mapping.controller),
         )
 
         for attr_name, attribute in single_mapping.attributes.items():
@@ -57,7 +64,7 @@ async def parse_attributes(
             provider.add(pv_name, command_pv)
             pvi_tree.add_field(pv_name, "x")
 
-    providers.append(pvi_tree.make_provider())
+    providers.append(pvi_tree.make_provider(prefix_root))
     return providers