bec-widgets 0.72.0__py3-none-any.whl → 0.72.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- CHANGELOG.md +16 -14
- PKG-INFO +1 -1
- bec_widgets/cli/client.py +21 -21
- bec_widgets/examples/jupyter_console/jupyter_console_window.py +1 -1
- bec_widgets/utils/bec_designer.py +50 -1
- bec_widgets/widgets/__init__.py +1 -5
- bec_widgets/widgets/bec_status_box/bec_status_box.py +6 -2
- bec_widgets/widgets/ring_progress_bar/__init__.py +1 -0
- bec_widgets/widgets/{spiral_progress_bar → ring_progress_bar}/ring.py +16 -6
- bec_widgets/widgets/{spiral_progress_bar/spiral_progress_bar.py → ring_progress_bar/ring_progress_bar.py} +10 -8
- {bec_widgets-0.72.0.dist-info → bec_widgets-0.72.2.dist-info}/METADATA +1 -1
- {bec_widgets-0.72.0.dist-info → bec_widgets-0.72.2.dist-info}/RECORD +23 -23
- docs/user/getting_started/quick_start.md +2 -2
- docs/user/widgets/{spiral_progress_bar.md → ring_progress_bar.md} +9 -9
- docs/user/widgets/widgets.md +1 -1
- pyproject.toml +1 -1
- tests/end-2-end/test_bec_dock_rpc_e2e.py +5 -5
- tests/unit_tests/test_bec_status_box.py +121 -152
- tests/unit_tests/test_ring_progress_bar.py +338 -0
- tests/unit_tests/test_rpc_widget_handler.py +1 -1
- bec_widgets/widgets/spiral_progress_bar/__init__.py +0 -1
- tests/unit_tests/test_spiral_progress_bar.py +0 -338
- {bec_widgets-0.72.0.dist-info → bec_widgets-0.72.2.dist-info}/WHEEL +0 -0
- {bec_widgets-0.72.0.dist-info → bec_widgets-0.72.2.dist-info}/entry_points.txt +0 -0
- {bec_widgets-0.72.0.dist-info → bec_widgets-0.72.2.dist-info}/licenses/LICENSE +0 -0
@@ -1,338 +0,0 @@
|
|
1
|
-
# pylint: disable=missing-function-docstring, missing-module-docstring, unused-import
|
2
|
-
|
3
|
-
import pytest
|
4
|
-
from bec_lib.endpoints import MessageEndpoints
|
5
|
-
from pydantic import ValidationError
|
6
|
-
|
7
|
-
from bec_widgets.utils import Colors
|
8
|
-
from bec_widgets.widgets.spiral_progress_bar import SpiralProgressBar
|
9
|
-
from bec_widgets.widgets.spiral_progress_bar.ring import RingConfig, RingConnections
|
10
|
-
from bec_widgets.widgets.spiral_progress_bar.spiral_progress_bar import SpiralProgressBarConfig
|
11
|
-
|
12
|
-
from .client_mocks import mocked_client
|
13
|
-
|
14
|
-
|
15
|
-
@pytest.fixture
|
16
|
-
def spiral_progress_bar(qtbot, mocked_client):
|
17
|
-
widget = SpiralProgressBar(client=mocked_client)
|
18
|
-
qtbot.addWidget(widget)
|
19
|
-
qtbot.waitExposed(widget)
|
20
|
-
yield widget
|
21
|
-
widget.close()
|
22
|
-
|
23
|
-
|
24
|
-
def test_bar_init(spiral_progress_bar):
|
25
|
-
assert spiral_progress_bar is not None
|
26
|
-
assert spiral_progress_bar.client is not None
|
27
|
-
assert isinstance(spiral_progress_bar, SpiralProgressBar)
|
28
|
-
assert spiral_progress_bar.config.widget_class == "SpiralProgressBar"
|
29
|
-
assert spiral_progress_bar.config.gui_id is not None
|
30
|
-
assert spiral_progress_bar.gui_id == spiral_progress_bar.config.gui_id
|
31
|
-
|
32
|
-
|
33
|
-
def test_config_validation_num_of_bars():
|
34
|
-
config = SpiralProgressBarConfig(num_bars=100, min_num_bars=1, max_num_bars=10)
|
35
|
-
|
36
|
-
assert config.num_bars == 10
|
37
|
-
|
38
|
-
|
39
|
-
def test_config_validation_num_of_ring_error():
|
40
|
-
ring_config_0 = RingConfig(index=0)
|
41
|
-
ring_config_1 = RingConfig(index=1)
|
42
|
-
|
43
|
-
with pytest.raises(ValidationError) as excinfo:
|
44
|
-
SpiralProgressBarConfig(rings=[ring_config_0, ring_config_1], num_bars=1)
|
45
|
-
errors = excinfo.value.errors()
|
46
|
-
assert len(errors) == 1
|
47
|
-
assert errors[0]["type"] == "different number of configs"
|
48
|
-
assert "Length of rings configuration (2) does not match the number of bars (1)." in str(
|
49
|
-
excinfo.value
|
50
|
-
)
|
51
|
-
|
52
|
-
|
53
|
-
def test_config_validation_ring_indices_wrong_order():
|
54
|
-
ring_config_0 = RingConfig(index=2)
|
55
|
-
ring_config_1 = RingConfig(index=5)
|
56
|
-
|
57
|
-
with pytest.raises(ValidationError) as excinfo:
|
58
|
-
SpiralProgressBarConfig(rings=[ring_config_0, ring_config_1], num_bars=2)
|
59
|
-
errors = excinfo.value.errors()
|
60
|
-
assert len(errors) == 1
|
61
|
-
assert errors[0]["type"] == "wrong indices"
|
62
|
-
assert (
|
63
|
-
"Indices of ring configurations must be unique and in order from 0 to num_bars 2."
|
64
|
-
in str(excinfo.value)
|
65
|
-
)
|
66
|
-
|
67
|
-
|
68
|
-
def test_config_validation_ring_same_indices():
|
69
|
-
ring_config_0 = RingConfig(index=0)
|
70
|
-
ring_config_1 = RingConfig(index=0)
|
71
|
-
|
72
|
-
with pytest.raises(ValidationError) as excinfo:
|
73
|
-
SpiralProgressBarConfig(rings=[ring_config_0, ring_config_1], num_bars=2)
|
74
|
-
errors = excinfo.value.errors()
|
75
|
-
assert len(errors) == 1
|
76
|
-
assert errors[0]["type"] == "wrong indices"
|
77
|
-
assert (
|
78
|
-
"Indices of ring configurations must be unique and in order from 0 to num_bars 2."
|
79
|
-
in str(excinfo.value)
|
80
|
-
)
|
81
|
-
|
82
|
-
|
83
|
-
def test_config_validation_invalid_colormap():
|
84
|
-
with pytest.raises(ValueError) as excinfo:
|
85
|
-
SpiralProgressBarConfig(color_map="crazy_colors")
|
86
|
-
errors = excinfo.value.errors()
|
87
|
-
assert len(errors) == 1
|
88
|
-
assert errors[0]["type"] == "unsupported colormap"
|
89
|
-
assert "Colormap 'crazy_colors' not found in the current installation of pyqtgraph" in str(
|
90
|
-
excinfo.value
|
91
|
-
)
|
92
|
-
|
93
|
-
|
94
|
-
def test_ring_connection_endpoint_validation():
|
95
|
-
with pytest.raises(ValueError) as excinfo:
|
96
|
-
RingConnections(slot="on_scan_progress", endpoint="non_existing")
|
97
|
-
errors = excinfo.value.errors()
|
98
|
-
assert len(errors) == 1
|
99
|
-
assert errors[0]["type"] == "unsupported endpoint"
|
100
|
-
assert (
|
101
|
-
"For slot 'on_scan_progress', endpoint must be MessageEndpoint.scan_progress or 'scans/scan_progress'."
|
102
|
-
in str(excinfo.value)
|
103
|
-
)
|
104
|
-
|
105
|
-
with pytest.raises(ValueError) as excinfo:
|
106
|
-
RingConnections(slot="on_device_readback", endpoint="non_existing")
|
107
|
-
errors = excinfo.value.errors()
|
108
|
-
assert len(errors) == 1
|
109
|
-
assert errors[0]["type"] == "unsupported endpoint"
|
110
|
-
assert (
|
111
|
-
"For slot 'on_device_readback', endpoint must be MessageEndpoint.device_readback(device) or 'internal/devices/readback/{device}'."
|
112
|
-
in str(excinfo.value)
|
113
|
-
)
|
114
|
-
|
115
|
-
|
116
|
-
def test_bar_add_number_of_bars(spiral_progress_bar):
|
117
|
-
assert spiral_progress_bar.config.num_bars == 1
|
118
|
-
|
119
|
-
spiral_progress_bar.set_number_of_bars(5)
|
120
|
-
assert spiral_progress_bar.config.num_bars == 5
|
121
|
-
|
122
|
-
spiral_progress_bar.set_number_of_bars(2)
|
123
|
-
assert spiral_progress_bar.config.num_bars == 2
|
124
|
-
|
125
|
-
|
126
|
-
def test_add_remove_bars_individually(spiral_progress_bar):
|
127
|
-
spiral_progress_bar.add_ring()
|
128
|
-
spiral_progress_bar.add_ring()
|
129
|
-
|
130
|
-
assert spiral_progress_bar.config.num_bars == 3
|
131
|
-
assert len(spiral_progress_bar.config.rings) == 3
|
132
|
-
|
133
|
-
spiral_progress_bar.remove_ring(1)
|
134
|
-
assert spiral_progress_bar.config.num_bars == 2
|
135
|
-
assert len(spiral_progress_bar.config.rings) == 2
|
136
|
-
assert spiral_progress_bar.rings[0].config.index == 0
|
137
|
-
assert spiral_progress_bar.rings[1].config.index == 1
|
138
|
-
|
139
|
-
|
140
|
-
def test_bar_set_value(spiral_progress_bar):
|
141
|
-
spiral_progress_bar.set_number_of_bars(5)
|
142
|
-
|
143
|
-
assert spiral_progress_bar.config.num_bars == 5
|
144
|
-
assert len(spiral_progress_bar.config.rings) == 5
|
145
|
-
assert len(spiral_progress_bar.rings) == 5
|
146
|
-
|
147
|
-
spiral_progress_bar.set_value([10, 20, 30, 40, 50])
|
148
|
-
ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
|
149
|
-
assert ring_values == [10, 20, 30, 40, 50]
|
150
|
-
|
151
|
-
# update just one bar
|
152
|
-
spiral_progress_bar.set_value(90, 1)
|
153
|
-
ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
|
154
|
-
assert ring_values == [10, 90, 30, 40, 50]
|
155
|
-
|
156
|
-
|
157
|
-
def test_bar_set_precision(spiral_progress_bar):
|
158
|
-
spiral_progress_bar.set_number_of_bars(3)
|
159
|
-
|
160
|
-
assert spiral_progress_bar.config.num_bars == 3
|
161
|
-
assert len(spiral_progress_bar.config.rings) == 3
|
162
|
-
assert len(spiral_progress_bar.rings) == 3
|
163
|
-
|
164
|
-
spiral_progress_bar.set_precision(2)
|
165
|
-
ring_precision = [ring.config.precision for ring in spiral_progress_bar.rings]
|
166
|
-
assert ring_precision == [2, 2, 2]
|
167
|
-
|
168
|
-
spiral_progress_bar.set_value([10.1234, 20.1234, 30.1234])
|
169
|
-
ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
|
170
|
-
assert ring_values == [10.12, 20.12, 30.12]
|
171
|
-
|
172
|
-
spiral_progress_bar.set_precision(4, 1)
|
173
|
-
ring_precision = [ring.config.precision for ring in spiral_progress_bar.rings]
|
174
|
-
assert ring_precision == [2, 4, 2]
|
175
|
-
|
176
|
-
spiral_progress_bar.set_value([10.1234, 20.1234, 30.1234])
|
177
|
-
ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
|
178
|
-
assert ring_values == [10.12, 20.1234, 30.12]
|
179
|
-
|
180
|
-
|
181
|
-
def test_set_min_max_value(spiral_progress_bar):
|
182
|
-
spiral_progress_bar.set_number_of_bars(2)
|
183
|
-
|
184
|
-
spiral_progress_bar.set_min_max_values(0, 10)
|
185
|
-
ring_min_values = [ring.config.min_value for ring in spiral_progress_bar.rings]
|
186
|
-
ring_max_values = [ring.config.max_value for ring in spiral_progress_bar.rings]
|
187
|
-
|
188
|
-
assert ring_min_values == [0, 0]
|
189
|
-
assert ring_max_values == [10, 10]
|
190
|
-
|
191
|
-
spiral_progress_bar.set_value([5, 15])
|
192
|
-
ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
|
193
|
-
assert ring_values == [5, 10]
|
194
|
-
|
195
|
-
|
196
|
-
def test_setup_colors_from_colormap(spiral_progress_bar):
|
197
|
-
spiral_progress_bar.set_number_of_bars(5)
|
198
|
-
spiral_progress_bar.set_colors_from_map("viridis", "RGB")
|
199
|
-
|
200
|
-
expected_colors = Colors.golden_angle_color("viridis", 5, "RGB")
|
201
|
-
converted_colors = [ring.color.getRgb() for ring in spiral_progress_bar.rings]
|
202
|
-
ring_config_colors = [ring.config.color for ring in spiral_progress_bar.rings]
|
203
|
-
|
204
|
-
assert expected_colors == converted_colors
|
205
|
-
assert ring_config_colors == expected_colors
|
206
|
-
|
207
|
-
|
208
|
-
def get_colors_from_rings(rings):
|
209
|
-
converted_colors = [ring.color.getRgb() for ring in rings]
|
210
|
-
ring_config_colors = [ring.config.color for ring in rings]
|
211
|
-
return converted_colors, ring_config_colors
|
212
|
-
|
213
|
-
|
214
|
-
def test_set_colors_from_colormap_and_change_num_of_bars(spiral_progress_bar):
|
215
|
-
spiral_progress_bar.set_number_of_bars(2)
|
216
|
-
spiral_progress_bar.set_colors_from_map("viridis", "RGB")
|
217
|
-
|
218
|
-
expected_colors = Colors.golden_angle_color("viridis", 2, "RGB")
|
219
|
-
converted_colors, ring_config_colors = get_colors_from_rings(spiral_progress_bar.rings)
|
220
|
-
|
221
|
-
assert expected_colors == converted_colors
|
222
|
-
assert ring_config_colors == expected_colors
|
223
|
-
|
224
|
-
# increase the number of bars to 6
|
225
|
-
spiral_progress_bar.set_number_of_bars(6)
|
226
|
-
expected_colors = Colors.golden_angle_color("viridis", 6, "RGB")
|
227
|
-
converted_colors, ring_config_colors = get_colors_from_rings(spiral_progress_bar.rings)
|
228
|
-
|
229
|
-
assert expected_colors == converted_colors
|
230
|
-
assert ring_config_colors == expected_colors
|
231
|
-
|
232
|
-
# decrease the number of bars to 3
|
233
|
-
spiral_progress_bar.set_number_of_bars(3)
|
234
|
-
expected_colors = Colors.golden_angle_color("viridis", 3, "RGB")
|
235
|
-
converted_colors, ring_config_colors = get_colors_from_rings(spiral_progress_bar.rings)
|
236
|
-
|
237
|
-
assert expected_colors == converted_colors
|
238
|
-
assert ring_config_colors == expected_colors
|
239
|
-
|
240
|
-
|
241
|
-
def test_set_colors_directly(spiral_progress_bar):
|
242
|
-
spiral_progress_bar.set_number_of_bars(3)
|
243
|
-
|
244
|
-
# setting as a list of rgb tuples
|
245
|
-
colors = [(255, 0, 0, 255), (0, 255, 0, 255), (0, 0, 255, 255)]
|
246
|
-
spiral_progress_bar.set_colors_directly(colors)
|
247
|
-
converted_colors = get_colors_from_rings(spiral_progress_bar.rings)[0]
|
248
|
-
|
249
|
-
assert colors == converted_colors
|
250
|
-
|
251
|
-
spiral_progress_bar.set_colors_directly((255, 0, 0, 255), 1)
|
252
|
-
converted_colors = get_colors_from_rings(spiral_progress_bar.rings)[0]
|
253
|
-
|
254
|
-
assert converted_colors == [(255, 0, 0, 255), (255, 0, 0, 255), (0, 0, 255, 255)]
|
255
|
-
|
256
|
-
|
257
|
-
def test_set_line_width(spiral_progress_bar):
|
258
|
-
spiral_progress_bar.set_number_of_bars(3)
|
259
|
-
|
260
|
-
spiral_progress_bar.set_line_widths(5)
|
261
|
-
line_widths = [ring.config.line_width for ring in spiral_progress_bar.rings]
|
262
|
-
|
263
|
-
assert line_widths == [5, 5, 5]
|
264
|
-
|
265
|
-
spiral_progress_bar.set_line_widths([10, 20, 30])
|
266
|
-
line_widths = [ring.config.line_width for ring in spiral_progress_bar.rings]
|
267
|
-
|
268
|
-
assert line_widths == [10, 20, 30]
|
269
|
-
|
270
|
-
spiral_progress_bar.set_line_widths(15, 1)
|
271
|
-
line_widths = [ring.config.line_width for ring in spiral_progress_bar.rings]
|
272
|
-
|
273
|
-
assert line_widths == [10, 15, 30]
|
274
|
-
|
275
|
-
|
276
|
-
def test_set_gap(spiral_progress_bar):
|
277
|
-
spiral_progress_bar.set_number_of_bars(3)
|
278
|
-
spiral_progress_bar.set_gap(20)
|
279
|
-
|
280
|
-
assert spiral_progress_bar.config.gap == 20
|
281
|
-
|
282
|
-
|
283
|
-
def test_auto_update(spiral_progress_bar):
|
284
|
-
spiral_progress_bar.enable_auto_updates(True)
|
285
|
-
|
286
|
-
scan_queue_status_scan_progress = {
|
287
|
-
"queue": {
|
288
|
-
"primary": {
|
289
|
-
"info": [{"active_request_block": {"report_instructions": [{"scan_progress": 10}]}}]
|
290
|
-
}
|
291
|
-
}
|
292
|
-
}
|
293
|
-
meta = {}
|
294
|
-
|
295
|
-
spiral_progress_bar.on_scan_queue_status(scan_queue_status_scan_progress, meta)
|
296
|
-
|
297
|
-
assert spiral_progress_bar._auto_updates is True
|
298
|
-
assert len(spiral_progress_bar._rings) == 1
|
299
|
-
assert spiral_progress_bar._rings[0].config.connections == RingConnections(
|
300
|
-
slot="on_scan_progress", endpoint=MessageEndpoints.scan_progress()
|
301
|
-
)
|
302
|
-
|
303
|
-
scan_queue_status_device_readback = {
|
304
|
-
"queue": {
|
305
|
-
"primary": {
|
306
|
-
"info": [
|
307
|
-
{
|
308
|
-
"active_request_block": {
|
309
|
-
"report_instructions": [
|
310
|
-
{
|
311
|
-
"readback": {
|
312
|
-
"devices": ["samx", "samy"],
|
313
|
-
"start": [1, 2],
|
314
|
-
"end": [10, 20],
|
315
|
-
}
|
316
|
-
}
|
317
|
-
]
|
318
|
-
}
|
319
|
-
}
|
320
|
-
]
|
321
|
-
}
|
322
|
-
}
|
323
|
-
}
|
324
|
-
spiral_progress_bar.on_scan_queue_status(scan_queue_status_device_readback, meta)
|
325
|
-
|
326
|
-
assert spiral_progress_bar._auto_updates is True
|
327
|
-
assert len(spiral_progress_bar._rings) == 2
|
328
|
-
assert spiral_progress_bar._rings[0].config.connections == RingConnections(
|
329
|
-
slot="on_device_readback", endpoint=MessageEndpoints.device_readback("samx")
|
330
|
-
)
|
331
|
-
assert spiral_progress_bar._rings[1].config.connections == RingConnections(
|
332
|
-
slot="on_device_readback", endpoint=MessageEndpoints.device_readback("samy")
|
333
|
-
)
|
334
|
-
|
335
|
-
assert spiral_progress_bar._rings[0].config.min_value == 1
|
336
|
-
assert spiral_progress_bar._rings[0].config.max_value == 10
|
337
|
-
assert spiral_progress_bar._rings[1].config.min_value == 2
|
338
|
-
assert spiral_progress_bar._rings[1].config.max_value == 20
|
File without changes
|
File without changes
|
File without changes
|