fix(bec-desiger+plugins): imports fixed, PYSIDE6 check to not enable run plugins with pyqt6

bec_widgets/utils/bec_designer.py

@@ -3,20 +3,27 @@ import sys
 import sysconfig
 from pathlib import Path
 
-from PySide6.scripts.pyside_tool import (
-    _extend_path_var,
-    init_virtual_env,
-    is_pyenv_python,
-    is_virtual_env,
-    qt_tool_wrapper,
-    ui_tool_binary,
-)
+from qtpy import PYSIDE6
+
+if PYSIDE6:
+    from PySide6.scripts.pyside_tool import (
+        _extend_path_var,
+        init_virtual_env,
+        is_pyenv_python,
+        is_virtual_env,
+        qt_tool_wrapper,
+        ui_tool_binary,
+    )
 
 import bec_widgets
 
 
 def patch_designer():  # pragma: no cover
-    # init_virtual_env()
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+
+    init_virtual_env()
 
     major_version = sys.version_info[0]
     minor_version = sys.version_info[1]
@@ -66,7 +73,9 @@ def set_plugin_environment_variable(plugin_paths):
 
 # Patch the designer function
 def main():  # pragma: no cover
-
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Exiting...")
+        return
     base_dir = Path(os.path.dirname(bec_widgets.__file__)).resolve()
     plugin_paths = find_plugin_paths(base_dir)
     set_plugin_environment_variable(plugin_paths)

bec_widgets/widgets/device_inputs/device_combobox/device_combobox_plugin.py

@@ -1,10 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from device_combobox import DeviceComboBox
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+from bec_widgets.widgets.device_inputs import DeviceComboBox
+
 DOM_XML = """
 <ui language='c++'>
     <widget class='DeviceComboBox' name='device_combobox'>

bec_widgets/widgets/device_inputs/device_combobox/register_device_combobox.py

@@ -1,15 +1,17 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
 
-from device_combobox import DeviceComboBox
-from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-from bec_widgets.widgets.device_inputs.device_combobox.device_combobox_plugin import (
-    DeviceComboBoxPlugin,
-)
+    from bec_widgets.widgets.device_inputs.device_combobox.device_combobox_plugin import (
+        DeviceComboBoxPlugin,
+    )
 
-# Set PYSIDE_DESIGNER_PLUGINS to point to this directory and load the plugin
+    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceComboBoxPlugin())
 
 
 if __name__ == "__main__":  # pragma: no cover
-    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceComboBoxPlugin())
+    main()

bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py

@@ -89,14 +89,3 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):
         if device_obj is None:
             raise ValueError(f"Device {device_name} is not found.")
         return device_obj
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    w = DeviceLineEdit(default_device="samx")
-    w.show()
-    sys.exit(app.exec_())

bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit_plugin.py

@@ -1,10 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from device_line_edit import DeviceLineEdit
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+from bec_widgets.widgets.device_inputs import DeviceLineEdit
+
 DOM_XML = """
 <ui language='c++'>
     <widget class='DeviceLineEdit' name='device_line_edit'>

bec_widgets/widgets/device_inputs/device_line_edit/register_device_line_edit.py

@@ -1,12 +1,17 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
 
-from device_line_edit import DeviceLineEdit
-from device_line_edit_plugin import DeviceLineEditPlugin
-from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-# Set PYSIDE_DESIGNER_PLUGINS to point to this directory and load the plugin
+    from bec_widgets.widgets.device_inputs.device_line_edit.device_line_edit_plugin import (
+        DeviceLineEditPlugin,
+    )
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceLineEditPlugin())
 
 
 if __name__ == "__main__":  # pragma: no cover
-    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceLineEditPlugin())
+    main()