fix(acl): update endpoint access levels and remove unused types

Author: wakonig

bec_lib/bec_lib/endpoints.py

@@ -234,7 +234,7 @@ def device_config_request():
         Returns:
             EndpointInfo: Endpoint for device config request.
         """
-        endpoint = f"{EndpointType.ADMIN.value}/devices/config_request"
+        endpoint = f"{EndpointType.USER.value}/devices/config_request"
         return EndpointInfo(
             endpoint=endpoint, message_type=messages.DeviceConfigMessage, message_op=MessageOp.SEND
         )
@@ -703,7 +703,7 @@ def stop_devices():
         Returns:
             EndpointInfo: Endpoint for stopping devices.
         """
-        endpoint = f"{EndpointType.INFO.value}/queue/stop_devices"
+        endpoint = f"{EndpointType.USER.value}/queue/stop_devices"
         return EndpointInfo(
             endpoint=endpoint, message_type=messages.VariableMessage, message_op=MessageOp.SEND
         )
@@ -849,17 +849,6 @@ def available_scans():
             message_op=MessageOp.SET_PUBLISH,
         )
 
-    @staticmethod
-    def bluesky_events() -> str:
-        """
-        Endpoint for bluesky events. This endpoint is used by the scan bundler to
-        publish the bluesky events using a direct msgpack dump of the bluesky event.
-
-        Returns:
-            str: Endpoint for bluesky events.
-        """
-        return f"{EndpointType.INFO.value}/scans/bluesky-events"
-
     @staticmethod
     def scan_segment():
         """
@@ -1084,7 +1073,7 @@ def log():
         Returns:
             EndpointInfo: Endpoint for log.
         """
-        endpoint = f"{EndpointType.INFO.value}/log"
+        endpoint = f"{EndpointType.USER.value}/log"
         return EndpointInfo(
             endpoint=endpoint, message_type=messages.LogMessage, message_op=MessageOp.STREAM
         )
@@ -1626,7 +1615,7 @@ def procedure_logs(queue: str):
         Returns:
             EndpointInfo: Endpoint for procedure queue updates for given queue.
         """
-        endpoint = f"{EndpointType.INFO.value}/procedures/logs/{queue}"
+        endpoint = f"{EndpointType.USER.value}/procedures/logs/{queue}"
         return EndpointInfo(
             endpoint=endpoint, message_type=messages.RawMessage, message_op=MessageOp.STREAM
         )
@@ -1682,7 +1671,7 @@ def builtin_actor_update_notif(actor_name: str):
 
     @staticmethod
     def modify_interlock_table():
-        endpoint = f"{EndpointType.INTERNAL.value}/actor/builtin/scan_interlock/table_mod"
+        endpoint = f"{EndpointType.USER.value}/actor/builtin/scan_interlock/table_mod"
         return EndpointInfo(
             endpoint=endpoint,
             message_type=messages.ScanInterlockModifyStateTableMessage,
@@ -1700,7 +1689,7 @@ def scan_interlock_states():
 
     @staticmethod
     def scan_interlock_enabled():
-        endpoint = f"{EndpointType.INFO.value}/actor/builtin/scan_interlock/config/enabled"
+        endpoint = f"{EndpointType.USER.value}/actor/builtin/scan_interlock/config/enabled"
         return EndpointInfo(
             endpoint=endpoint,
             message_type=messages.BoolConfigDefaultFalse,
@@ -1710,7 +1699,7 @@ def scan_interlock_enabled():
     @staticmethod
     def scan_interlock_trigger_setting():
         """Whether to restart the scan when the interlock is triggered."""
-        endpoint = f"{EndpointType.INFO.value}/actor/builtin/scan_interlock/config/trigger_setting"
+        endpoint = f"{EndpointType.USER.value}/actor/builtin/scan_interlock/config/trigger_setting"
         return EndpointInfo(
             endpoint=endpoint,
             message_type=messages.ScanInterlockTriggerSettingMessage,
@@ -1812,7 +1801,7 @@ def script_execution_info(script_id: str):
         Returns:
             EndpointInfo: Endpoint for script execution info.
         """
-        endpoint = f"{EndpointType.INFO.value}/scripts/execution_info/{script_id}"
+        endpoint = f"{EndpointType.USER.value}/scripts/execution_info/{script_id}"
         return EndpointInfo(
             endpoint=endpoint,
             message_type=messages.ScriptExecutionInfoMessage,
@@ -1828,7 +1817,7 @@ def script_content(script_id: str):
         Returns:
             EndpointInfo: Endpoint for script content.
         """
-        endpoint = f"{EndpointType.INFO.value}/scripts/content/{script_id}"
+        endpoint = f"{EndpointType.USER.value}/scripts/content/{script_id}"
         return EndpointInfo(
             endpoint=endpoint, message_type=messages.VariableMessage, message_op=MessageOp.KEY_VALUE
         )
@@ -1859,7 +1848,7 @@ def beamline_state(state_name: str):
         Returns:
             EndpointInfo: Endpoint for beamline state.
         """
-        endpoint = f"{EndpointType.INFO.value}/beamline_state/{state_name}"
+        endpoint = f"{EndpointType.USER.value}/beamline_state/{state_name}"
         return EndpointInfo(
             endpoint=endpoint,
             message_type=messages.BeamlineStateMessage,
@@ -1875,7 +1864,7 @@ def available_beamline_states():
         Returns:
             EndpointInfo: Endpoint for beamline state updates.
         """
-        endpoint = f"{EndpointType.INFO.value}/available_beamline_states"
+        endpoint = f"{EndpointType.USER.value}/available_beamline_states"
         return EndpointInfo(
             endpoint=endpoint,
             message_type=messages.AvailableBeamlineStatesMessage,
@@ -2073,7 +2062,7 @@ def dynamic_metric(group_name: str):
         Returns:
             EndpointInfo: Endpoint for dynamic metric publishing.
         """
-        endpoint = f"{EndpointType.INFO.value}/dynamic_metrics/{group_name}"
+        endpoint = f"{EndpointType.USER.value}/dynamic_metrics/{group_name}"
         return EndpointInfo(
             endpoint=endpoint,
             message_type=messages.DynamicMetricMessage,

bec_lib/bec_lib/utils/user_acls_test.py

@@ -163,8 +163,6 @@ def set_default_non_admin(self):
             EndpointType.PUBLIC.value,
             EndpointType.PERSONAL.value,
             EndpointType.USER.value,
-            EndpointType.INFO.value,
-            EndpointType.INTERNAL.value,
         ]
         self.connector._managed_connection._redis_conn.acl_setuser(
             "default",

bec_lib/tests/test_acl_login.py

@@ -166,8 +166,6 @@ def test_access_demo_set_default_non_admin_allows_non_admin_namespaces(access_co
             f"&{EndpointType.PUBLIC.value}/*",
             f"&{EndpointType.PERSONAL.value}/*",
             f"&{EndpointType.USER.value}/*",
-            f"&{EndpointType.INFO.value}/*",
-            f"&{EndpointType.INTERNAL.value}/*",
         ]
     )
     assert f"&{EndpointType.ADMIN.value}/*" not in acl_info["channels"]

bec_lib/tests/test_bec_logger.py

@@ -112,7 +112,7 @@ def test_console_redis_callback_publishes_to_log_endpoint_with_console_service_n
 
     logger.connector.xadd.assert_called_once()
     kwargs = logger.connector.xadd.call_args.kwargs
-    assert kwargs["topic"].endpoint == "info/log"
+    assert kwargs["topic"].endpoint == "user/log"
     assert kwargs["msg_dict"]["data"].log_type == "console_log"
     assert kwargs["msg_dict"]["data"].log_msg["service_name"] == "test_CONSOLE"