wip

Author: d-perl

bec_widgets/widgets/control/procedure_control/procedure_control.py

@@ -9,8 +9,8 @@
     ProcedureQNotifMessage,
     ProcedureRequestMessage,
 )
+from bec_lib.procedures.helper import FrontendProcedureHelper
 from bec_qthemes._icon.material_icons import material_icon
-from bec_server.scan_server.procedures.helper import FrontendProcedureHelper
 from pydantic import BaseModel, ConfigDict
 from qtpy.QtCore import QSize, Qt, Signal
 from qtpy.QtWidgets import (

bec_widgets/widgets/control/procedure_control/procedure_logs.py

@@ -1,7 +1,7 @@
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
+from bec_lib.procedures.helper import FrontendProcedureHelper
 from bec_qthemes import material_icon
-from bec_server.scan_server.procedures.helper import FrontendProcedureHelper
 from qtpy.QtGui import QFont
 from qtpy.QtWidgets import (
     QComboBox,

tests/unit_tests/test_procedure_control.py

@@ -4,10 +4,10 @@
 
 import pytest
 from bec_lib.messages import ProcedureExecutionMessage, ProcedureRequestMessage
-from bec_server.scan_server.procedures.helper import BackendProcedureHelper
-from bec_server.scan_server.procedures.manager import ProcedureManager
-from bec_server.scan_server.procedures.procedure_registry import register
-from bec_server.scan_server.procedures.worker_base import ProcedureWorker
+from bec_lib.procedures.helper import BackendProcedureHelper
+from bec_server.procedures.manager import ProcedureManager
+from bec_server.procedures.procedure_registry import register
+from bec_server.procedures.worker_base import ProcedureWorker
 
 from bec_widgets.widgets.control.procedure_control.procedure_control import (
     JobItem,
@@ -41,8 +41,7 @@ def proc_ctrl_w_helper(qtbot, mocked_client: MagicMock):
     proc_ctrl = ProcedureControl(client=mocked_client)
     qtbot.addWidget(proc_ctrl)
     with patch(
-        "bec_server.scan_server.procedures.manager.RedisConnector",
-        lambda _: proc_ctrl.client.connector,
+        "bec_server.procedures.manager.RedisConnector", lambda _: proc_ctrl.client.connector
     ):
         manager = ProcedureManager(MagicMock(), MockWorker)
     yield proc_ctrl, BackendProcedureHelper(proc_ctrl.client.connector)