From f04862933f049030554086adef3ec9e1aebd3eda Mon Sep 17 00:00:00 2001
From: wyzula-jan <jan.wyzula@psi.ch>
Date: Sun, 7 Jul 2024 11:39:03 +0200
Subject: [PATCH] refactor(device_input): DeviceComboBox and DeviceLineEdit
 moved to top layer of widgets

---
 .../device_combobox => base_classes}/__init__.py |   0
 .../device_input_base.py                         |   2 ++
 .../__init__.py                                  |   0
 .../assets/device_combobox_icon.png              | Bin 0 -> 2592 bytes
 .../device_combobox/device_combobox.py           |   4 ++--
 .../device_combobox/device_combobox.pyproject    |   3 +++
 .../device_combobox/device_combobox_plugin.py    |   9 ++++++---
 .../device_combobox/register_device_combobox.py  |   4 +---
 bec_widgets/widgets/device_inputs/__init__.py    |   2 --
 .../device_combobox/device_combobox.pyproject    |   4 ----
 .../device_combobox/launch_device_combobox.py    |  11 -----------
 .../device_line_edit/device_line_edit.pyproject  |   4 ----
 .../device_line_edit/launch_device_line_edit.py  |  11 -----------
 bec_widgets/widgets/device_line_edit/__init__.py |   0
 .../device_line_edit/assets/line_edit_icon.png   | Bin 0 -> 3391 bytes
 .../device_line_edit/device_line_edit.py         |   4 ++--
 .../device_line_edit/device_line_edit.pyproject  |   3 +++
 .../device_line_edit/device_line_edit_plugin.py  |   9 ++++++---
 .../register_device_line_edit.py                 |   4 +---
 .../motor_map_dialog/motor_map_toolbar.py        |   2 +-
 .../widgets/scan_control/scan_group_box.py       |   2 +-
 tests/unit_tests/test_device_input_base.py       |   2 +-
 tests/unit_tests/test_device_input_widgets.py    |   4 ++--
 tests/unit_tests/test_stop_button.py             |   1 +
 24 files changed, 32 insertions(+), 53 deletions(-)
 rename bec_widgets/widgets/{device_inputs/device_combobox => base_classes}/__init__.py (100%)
 rename bec_widgets/widgets/{device_inputs => base_classes}/device_input_base.py (97%)
 rename bec_widgets/widgets/{device_inputs/device_line_edit => device_combobox}/__init__.py (100%)
 create mode 100644 bec_widgets/widgets/device_combobox/assets/device_combobox_icon.png
 rename bec_widgets/widgets/{device_inputs => }/device_combobox/device_combobox.py (93%)
 create mode 100644 bec_widgets/widgets/device_combobox/device_combobox.pyproject
 rename bec_widgets/widgets/{device_inputs => }/device_combobox/device_combobox_plugin.py (79%)
 rename bec_widgets/widgets/{device_inputs => }/device_combobox/register_device_combobox.py (75%)
 delete mode 100644 bec_widgets/widgets/device_inputs/__init__.py
 delete mode 100644 bec_widgets/widgets/device_inputs/device_combobox/device_combobox.pyproject
 delete mode 100644 bec_widgets/widgets/device_inputs/device_combobox/launch_device_combobox.py
 delete mode 100644 bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.pyproject
 delete mode 100644 bec_widgets/widgets/device_inputs/device_line_edit/launch_device_line_edit.py
 create mode 100644 bec_widgets/widgets/device_line_edit/__init__.py
 create mode 100644 bec_widgets/widgets/device_line_edit/assets/line_edit_icon.png
 rename bec_widgets/widgets/{device_inputs => }/device_line_edit/device_line_edit.py (94%)
 create mode 100644 bec_widgets/widgets/device_line_edit/device_line_edit.pyproject
 rename bec_widgets/widgets/{device_inputs => }/device_line_edit/device_line_edit_plugin.py (79%)
 rename bec_widgets/widgets/{device_inputs => }/device_line_edit/register_device_line_edit.py (75%)

diff --git a/bec_widgets/widgets/device_inputs/device_combobox/__init__.py b/bec_widgets/widgets/base_classes/__init__.py
similarity index 100%
rename from bec_widgets/widgets/device_inputs/device_combobox/__init__.py
rename to bec_widgets/widgets/base_classes/__init__.py
diff --git a/bec_widgets/widgets/device_inputs/device_input_base.py b/bec_widgets/widgets/base_classes/device_input_base.py
similarity index 97%
rename from bec_widgets/widgets/device_inputs/device_input_base.py
rename to bec_widgets/widgets/base_classes/device_input_base.py
index a250cae3..0f3a25ed 100644
--- a/bec_widgets/widgets/device_inputs/device_input_base.py
+++ b/bec_widgets/widgets/base_classes/device_input_base.py
@@ -25,6 +25,7 @@ class DeviceInputBase(BECConnector):
         super().__init__(client=client, config=config, gui_id=gui_id)
 
         self.get_bec_shortcuts()
+        self._device_filter = None
         self._devices = []
 
     @property
@@ -56,6 +57,7 @@ class DeviceInputBase(BECConnector):
         """
         self.validate_device_filter(device_filter)
         self.config.device_filter = device_filter
+        self._device_filter = device_filter
 
     def set_default_device(self, default_device: str):
         """
diff --git a/bec_widgets/widgets/device_inputs/device_line_edit/__init__.py b/bec_widgets/widgets/device_combobox/__init__.py
similarity index 100%
rename from bec_widgets/widgets/device_inputs/device_line_edit/__init__.py
rename to bec_widgets/widgets/device_combobox/__init__.py
diff --git a/bec_widgets/widgets/device_combobox/assets/device_combobox_icon.png b/bec_widgets/widgets/device_combobox/assets/device_combobox_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7547b56ab072fec89d6378b21e0c48030ad71554
GIT binary patch
literal 2592
zcmc&$YgAKL7S6p~N&+$oGD0VS#tK3~1uHK><qA|tV<=#F1`MvEl}1Wtc!dIzRM1g}
z;s}Kn3WQ=t6bKdwEW;2Gp~KVxA}B~SJOs=Gfk+6!#E`k^kD1@IW-a<-pS{0*_F8AJ
z@9cB-z8W4DVrh;yN1;%b#L(bKM9YkVeh*m}?ldqF1*AuY1fqDu_HqOSpN%D+Ba>0C
zh>b=8S5i=rF$57jA}Evz2SAx18Zi1e;D2^y9Fzar#=wlj1Ud?Zxkd~=PGJH|k{)`Z
z^bclAm1`CrOe9%+a&|C46qP(U>O}Q>M#wyvA-h2&1<h|O5`3NYh7##_%K`s9lS9Aq
z4ygPnD~0e=LJ;XgsMYhtPg6B^R0hUH8Y&pgtx@G2c%L?{n#->lNf*9w`{%J`KP(8L
zaRiu!0=CZRbuup_B`o%Hd4|;$_tW=RSEKjS1LPLkh@LsDmgZi=WLZMd`@*}HiFYLR
zyt0yC;`0s5{&u@sm{$)~^K#(Mf=uO{U|cV3*?f8^bA|vm+BW2euT(@%D=ul@Dn1R^
z{0rGc(5)G%eHyQ0jJwT|I-J=g>y5RBJoV4CESmlw+~$qqqDs@XN&nB^RxvJq_Q9s_
zLAF-uA48jZH|8$Xtk@Ja^J6pKcuCtz_)~|e8&s7ixF9Zl=sxW~WYzehlL*^R;}lg&
zFR81uJi*o_eENl0_gZa{Fw=j^2P1pg#dnTQHeqAT%LG|%AIFhFalvfYM#MEUwg<@1
zYT>(d5MkX3+W_er0T;r_XlZxph=TP_g*IayuX3Q%ej^V)KZ<xp;#=m>x3=R%l)3Q>
zo&ZqneNg?k{|%xISS~$grRiyF?H6BEIyf;XigWT`h8wD#1*bMx2l{d}l47j0qOs{R
z_`DM<h!=<ewN>Y=X>tk}1cH8!$^PuiASlL7k3yFrC?j+*3$!$a+II`Nm~9xe?8c2H
z2yc!)ACyP3ejmwf_wMHy&)?%jmp97ydN>j|L4h6C=UoUK%QySUNue-&rSO8YC>)0E
zUQ#Q2Z?IUu!%T*8>R2rA{!UN!ZUAuD-dYU@0YK`X(~Jqst~7W&nMvs|tof8oEY6M%
zjoGVGb-dLuEHxMF^C%+D(4l^HuQ?(AjNww}#IBLLil{XLhji^aW4&{bd2ekrr*_@2
zLveTK+1o8k+PlNvlPddT-H#_;*?5nb&F@)GZlM%e$^3xK9k}oAu~=bD-%s`sI6MHf
zw!w)o*pL(mdg28q^&w2m&bkz{Sc3P^Cu3pQ`G`H&3Ku?sVq+}OvcfC%o*<~e6FklU
zK(&%lb^?YIO`yH|2psF3-;AQs4Rls-p(&Kn_b>tv0GXD?!>Bd;ETwOc7Dh9xZgNX&
zRq}30@jx?t<R*q`M)qbb{fw{~tBOqh2mpQ~*m)!lzcD`baERyTPjatbl)I*#YSk}>
z`179#h4%v#)wx|0>(Z%(XPZz4@vi;1>UhB-$({U4J~7)g)|C2fD7PFNlOvQ#SFL=s
z(9-}qLXMj0Wt#}Y^`D08+YpN5N@CI<n?jyju$@hb#iu1UmguN8Cs%1}nr!^Dm6f~q
zC`(6b*N?6rQu-q4e0FtHBh~bMKd)yjPibeXh5ZBWCBfjamwWLY(Q_E|`M-aE$M>%+
z)^7xjC6lXLe}E8e_UnaoQ|%TKoMZi%^p%<8F<l7zL#rtT&$)Kl(~|Gz^XuYSxn`+#
zUy{K+NbxzANzm;$oXAEo?&uK-!y$o_#jpkP)V4f;@u<{E{U>#iepx9m=2q-oYoGd%
z|F6wx0&OHIP|-}X5^*tk%60ABW=ZL`2i+37j>P?{GPpP7h2y31b0?91@UTymvlULX
zwUDjMrue#Mrt8*^pUjV<HT1p|yCmKhc^%Ns&zgv_Nw>?tl>S)vLqH9@#yHTQ-(Q?9
z`9G@#E@h4La&HdCHmYzNwCmoLQ2UeRi0kK?i8HT3b!pqK-1R+GP`legeOtxrP_V*1
zylZvh5sm+NdSE|Ytrt#imh#NlIFObgSL}+Xi02*FjEz*Y@}q|8d4UYx-qDaK(W{#2
z2EV00Ha_b?+FFsZjTY!Kc94C|*cR3e>Jm*_qE1p&T`<!>1d4mEU%W^WepPR{rDJeT
zRAJh!WDnm;LJazxs)5>O@w?ip>32&7Lc_fBkw(iAPHyiLL*<Y#Hm@o5?Ql*4NyXY}
z+sfBWE^>L2CVp;n4{5+nzv%9ert)W#aI%8oxPZ94&a5|<b<wo+(}A_+TRfcnItcx+
aPgx)>mj_o=pCK8iGvdc#!Mwnvum266Z$H%l

literal 0
HcmV?d00001

diff --git a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py b/bec_widgets/widgets/device_combobox/device_combobox.py
similarity index 93%
rename from bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py
rename to bec_widgets/widgets/device_combobox/device_combobox.py
index e4b9f93d..6e42203f 100644
--- a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py
+++ b/bec_widgets/widgets/device_combobox/device_combobox.py
@@ -2,10 +2,10 @@ from typing import TYPE_CHECKING
 
 from qtpy.QtWidgets import QComboBox
 
-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase, DeviceInputConfig
+from bec_widgets.widgets.base_classes.device_input_base import DeviceInputBase, DeviceInputConfig
 
 if TYPE_CHECKING:
-    from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputConfig
+    from bec_widgets.widgets.base_classes.device_input_base import DeviceInputConfig
 
 
 class DeviceComboBox(DeviceInputBase, QComboBox):
diff --git a/bec_widgets/widgets/device_combobox/device_combobox.pyproject b/bec_widgets/widgets/device_combobox/device_combobox.pyproject
new file mode 100644
index 00000000..6220cc1c
--- /dev/null
+++ b/bec_widgets/widgets/device_combobox/device_combobox.pyproject
@@ -0,0 +1,3 @@
+{
+    "files": ["device_combobox.py"]
+}
diff --git a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox_plugin.py b/bec_widgets/widgets/device_combobox/device_combobox_plugin.py
similarity index 79%
rename from bec_widgets/widgets/device_inputs/device_combobox/device_combobox_plugin.py
rename to bec_widgets/widgets/device_combobox/device_combobox_plugin.py
index fb05d5aa..6cae4b4c 100644
--- a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox_plugin.py
+++ b/bec_widgets/widgets/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
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
-from bec_widgets.widgets.device_inputs import DeviceComboBox
+from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,10 +28,12 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Device Inputs"
 
     def icon(self):
-        return QIcon()
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "device_combobox_icon.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "device_combobox"
diff --git a/bec_widgets/widgets/device_inputs/device_combobox/register_device_combobox.py b/bec_widgets/widgets/device_combobox/register_device_combobox.py
similarity index 75%
rename from bec_widgets/widgets/device_inputs/device_combobox/register_device_combobox.py
rename to bec_widgets/widgets/device_combobox/register_device_combobox.py
index ded5d2f4..0fa8a817 100644
--- a/bec_widgets/widgets/device_inputs/device_combobox/register_device_combobox.py
+++ b/bec_widgets/widgets/device_combobox/register_device_combobox.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.device_inputs.device_combobox.device_combobox_plugin import (
-        DeviceComboBoxPlugin,
-    )
+    from bec_widgets.widgets.device_combobox.device_combobox_plugin import DeviceComboBoxPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceComboBoxPlugin())
 
diff --git a/bec_widgets/widgets/device_inputs/__init__.py b/bec_widgets/widgets/device_inputs/__init__.py
deleted file mode 100644
index 0e5f9cb8..00000000
--- a/bec_widgets/widgets/device_inputs/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .device_combobox.device_combobox import DeviceComboBox
-from .device_line_edit.device_line_edit import DeviceLineEdit
diff --git a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.pyproject b/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.pyproject
deleted file mode 100644
index c97ce5c3..00000000
--- a/bec_widgets/widgets/device_inputs/device_combobox/device_combobox.pyproject
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "files": ["device_combobox.py", "launch_device_combobox.py",
-    ]
-}
diff --git a/bec_widgets/widgets/device_inputs/device_combobox/launch_device_combobox.py b/bec_widgets/widgets/device_inputs/device_combobox/launch_device_combobox.py
deleted file mode 100644
index 979b7b2d..00000000
--- a/bec_widgets/widgets/device_inputs/device_combobox/launch_device_combobox.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from bec_widgets.widgets.device_inputs import DeviceComboBox
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    w = DeviceComboBox()
-    w.show()
-    sys.exit(app.exec_())
diff --git a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.pyproject b/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.pyproject
deleted file mode 100644
index c8b80137..00000000
--- a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.pyproject
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "files": ["device_line_edit.py", "launch_device_line_edit.py",
-    ]
-}
diff --git a/bec_widgets/widgets/device_inputs/device_line_edit/launch_device_line_edit.py b/bec_widgets/widgets/device_inputs/device_line_edit/launch_device_line_edit.py
deleted file mode 100644
index 790e546d..00000000
--- a/bec_widgets/widgets/device_inputs/device_line_edit/launch_device_line_edit.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    w = DeviceLineEdit()
-    w.show()
-    sys.exit(app.exec_())
diff --git a/bec_widgets/widgets/device_line_edit/__init__.py b/bec_widgets/widgets/device_line_edit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bec_widgets/widgets/device_line_edit/assets/line_edit_icon.png b/bec_widgets/widgets/device_line_edit/assets/line_edit_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f07e3d2b0be9b57437a7256e075c13712e1e665
GIT binary patch
literal 3391
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
R$4i?(FBCGBRA%A{{s-+2q$~gc

literal 0
HcmV?d00001

diff --git a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py b/bec_widgets/widgets/device_line_edit/device_line_edit.py
similarity index 94%
rename from bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py
rename to bec_widgets/widgets/device_line_edit/device_line_edit.py
index 72c351d9..305933b6 100644
--- a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py
+++ b/bec_widgets/widgets/device_line_edit/device_line_edit.py
@@ -3,10 +3,10 @@ from typing import TYPE_CHECKING
 from qtpy.QtCore import QSize
 from qtpy.QtWidgets import QCompleter, QLineEdit, QSizePolicy
 
-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase, DeviceInputConfig
+from bec_widgets.widgets.base_classes.device_input_base import DeviceInputBase, DeviceInputConfig
 
 if TYPE_CHECKING:
-    from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputConfig
+    from bec_widgets.widgets.base_classes.device_input_base import DeviceInputConfig
 
 
 class DeviceLineEdit(DeviceInputBase, QLineEdit):
diff --git a/bec_widgets/widgets/device_line_edit/device_line_edit.pyproject b/bec_widgets/widgets/device_line_edit/device_line_edit.pyproject
new file mode 100644
index 00000000..8639120f
--- /dev/null
+++ b/bec_widgets/widgets/device_line_edit/device_line_edit.pyproject
@@ -0,0 +1,3 @@
+{
+    "files": ["device_line_edit.py"]
+}
diff --git a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit_plugin.py b/bec_widgets/widgets/device_line_edit/device_line_edit_plugin.py
similarity index 79%
rename from bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit_plugin.py
rename to bec_widgets/widgets/device_line_edit/device_line_edit_plugin.py
index df2ee138..9a3d86ee 100644
--- a/bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit_plugin.py
+++ b/bec_widgets/widgets/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
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,10 +28,12 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Device Inputs"
 
     def icon(self):
-        return QIcon()
+        current_path = os.path.dirname(__file__)
+        icon_path = os.path.join(current_path, "assets", "line_edit_icon.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "device_line_edit"
diff --git a/bec_widgets/widgets/device_inputs/device_line_edit/register_device_line_edit.py b/bec_widgets/widgets/device_line_edit/register_device_line_edit.py
similarity index 75%
rename from bec_widgets/widgets/device_inputs/device_line_edit/register_device_line_edit.py
rename to bec_widgets/widgets/device_line_edit/register_device_line_edit.py
index 28054310..8b587c38 100644
--- a/bec_widgets/widgets/device_inputs/device_line_edit/register_device_line_edit.py
+++ b/bec_widgets/widgets/device_line_edit/register_device_line_edit.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.device_inputs.device_line_edit.device_line_edit_plugin import (
-        DeviceLineEditPlugin,
-    )
+    from bec_widgets.widgets.device_line_edit.device_line_edit_plugin import DeviceLineEditPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceLineEditPlugin())
 
diff --git a/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py
index 4e16a5a9..53a02073 100644
--- a/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py
+++ b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_toolbar.py
@@ -4,7 +4,7 @@ from qtpy.QtCore import QSize
 from qtpy.QtGui import QAction, QIcon
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QWidget
 
-from bec_widgets.widgets.device_inputs import DeviceComboBox
+from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
 from bec_widgets.widgets.toolbar.toolbar import ToolBarAction
 
 
diff --git a/bec_widgets/widgets/scan_control/scan_group_box.py b/bec_widgets/widgets/scan_control/scan_group_box.py
index ac40338e..72323b24 100644
--- a/bec_widgets/widgets/scan_control/scan_group_box.py
+++ b/bec_widgets/widgets/scan_control/scan_group_box.py
@@ -12,7 +12,7 @@ from qtpy.QtWidgets import (
 )
 
 from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 
 class ScanArgType:
diff --git a/tests/unit_tests/test_device_input_base.py b/tests/unit_tests/test_device_input_base.py
index 87481237..01e2b1fa 100644
--- a/tests/unit_tests/test_device_input_base.py
+++ b/tests/unit_tests/test_device_input_base.py
@@ -1,6 +1,6 @@
 import pytest
 
-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase
+from bec_widgets.widgets.base_classes.device_input_base import DeviceInputBase
 
 from .client_mocks import mocked_client
 
diff --git a/tests/unit_tests/test_device_input_widgets.py b/tests/unit_tests/test_device_input_widgets.py
index 6059689e..786d4849 100644
--- a/tests/unit_tests/test_device_input_widgets.py
+++ b/tests/unit_tests/test_device_input_widgets.py
@@ -1,7 +1,7 @@
 import pytest
 
-from bec_widgets.widgets.device_inputs.device_combobox.device_combobox import DeviceComboBox
-from bec_widgets.widgets.device_inputs.device_line_edit.device_line_edit import DeviceLineEdit
+from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 from .client_mocks import mocked_client
 
diff --git a/tests/unit_tests/test_stop_button.py b/tests/unit_tests/test_stop_button.py
index cd9e57b6..27654071 100644
--- a/tests/unit_tests/test_stop_button.py
+++ b/tests/unit_tests/test_stop_button.py
@@ -3,6 +3,7 @@
 import pytest
 
 from bec_widgets.widgets.stop_button.stop_button import StopButton
+
 from .client_mocks import mocked_client