From 0c33ba7616d170748a79aae9405e841b76097adc Mon Sep 17 00:00:00 2001
From: appel_c <christian.appel@psi.ch>
Date: Mon, 12 Feb 2024 13:59:18 +0100
Subject: [PATCH] refactor: add dap_services, renamed ophyd_devices to devices
 and hli to high_level_interface

---
 .../util_scripts/create_plugin_structure.py   | 18 ++++++-----
 docs/source/developer/bec_plugins.md          | 30 +++++++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/bec_lib/util_scripts/create_plugin_structure.py b/bec_lib/util_scripts/create_plugin_structure.py
index bee0f506..025b60d4 100644
--- a/bec_lib/util_scripts/create_plugin_structure.py
+++ b/bec_lib/util_scripts/create_plugin_structure.py
@@ -53,9 +53,9 @@ class PluginStructure:
         self.create_dir("bec_plugins/bec_client")
         self.create_init_file("bec_plugins/bec_client")
 
-        # hli
-        self.create_dir("bec_plugins/bec_client/hli")
-        self.create_init_file("bec_plugins/bec_client/hli")
+        # high level interface
+        self.create_dir("bec_plugins/bec_client/high_level_interface")
+        self.create_init_file("bec_plugins/bec_client/high_level_interface")
 
         # plugins
         self.create_dir("bec_plugins/bec_client/plugins")
@@ -75,14 +75,18 @@ class PluginStructure:
         self.create_dir("bec_plugins/device_server")
         self.create_init_file("bec_plugins/device_server")
 
-    def add_ophyd_devices(self):
-        self.create_dir("bec_plugins/ophyd_devices")
-        self.create_init_file("bec_plugins/ophyd_devices")
+    def add_devices(self):
+        self.create_dir("bec_plugins/devices")
+        self.create_init_file("bec_plugins/devices")
 
     def add_device_configs(self):
         self.create_dir("bec_plugins/device_configs")
         self.create_init_file("bec_plugins/device_configs")
 
+    def add_dap_services(self):
+        self.create_dir("bec_plugins/dap_services")
+        self.create_init_file("bec_plugins/dap_services")
+
     def add_bin(self):
         self.create_dir("bin")
 
@@ -93,7 +97,7 @@ if __name__ == "__main__":
     struc.copy_setup_files()
     struc.add_scan_server()
     struc.add_client()
-    struc.add_device_server()
+    struc.add_devices()
     struc.add_ophyd_devices()
     struc.add_bin()
 
diff --git a/docs/source/developer/bec_plugins.md b/docs/source/developer/bec_plugins.md
index 28882ff6..79e0cf8c 100644
--- a/docs/source/developer/bec_plugins.md
+++ b/docs/source/developer/bec_plugins.md
@@ -21,7 +21,7 @@ python ./<path_to_bec>/bec/bec_lib/util_scripts/create_plugin_structure.py <path
 beamline_XX_plugins/
 ├── bec_plugins/
 │   ├── bec_client/
-│   │   ├── hli/
+│   │   ├── high_level_interface/
 │   │   │   ├── __init__.py
 │   │   │   └── custom_hli.py
 │   │   ├── plugins/
@@ -34,15 +34,18 @@ beamline_XX_plugins/
 │   │   │   ├── post_startup.py
 │   │   │   └── pre_startup.py
 │   │   └── __init__.py
-│   ├── device_server/
-│   │   ├── __init__.py
-│   │   └── startup.py
 │   ├── scan_server/
 │   │   ├── scan_plugins/
 │   │   │   ├── __init__.py
-│   │   │   └── CustomScan.py
+│   │   │   └── custom_scan.py
 │   │   └── __init__.py
-│   ├── ophyd_devices/
+│   ├── device_server/
+│   │   ├── __init__.py
+│   │   └── startup.py
+│   ├── dap_services/
+│   │   ├── __init__.py
+│   │   └── custom_dap.py
+│   ├── devices/
 │   │   ├── __init__.py
 │   │   └── custom_XX_device.py
 │   └── device_configs/
@@ -58,7 +61,7 @@ beamline_XX_plugins/
 beamline_XX_plugins
   bec_plugins
     bec_client
-      hli
+      high_level_interface
         __init__.py
         custom_hli.py
       plugins
@@ -71,15 +74,18 @@ beamline_XX_plugins
         post_startup.py
         pre_startup.py
       __init__.py
-    device_server
-      __init__.py
-      startup.py
     scan_server
       scan_plugins
         __init__.py
-        CustomScan.py
+        custom_scan.py
       __init__.py
-    ophyd_devices
+    device_server
+      __init__.py
+      startup.py
+    dap_services
+      __init__.py
+      custom_dap.py
+    devices
       __init__.py
       custom_XX_device.py
     device_configs