bec-ipython-client 3.122.4__tar.gz → 3.122.6__tar.gz
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.
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/PKG-INFO +1 -1
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/ipython_live_updates.py +11 -8
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/pyproject.toml +3 -1
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/.gitignore +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/__init__.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/beamline_mixin.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/bec_magics.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/bec_startup.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/__init__.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/device_progress.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/live_table.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/move_device.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/utils.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/high_level_interfaces/__init__.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/high_level_interfaces/bec_hli.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/high_level_interfaces/spec_hli.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/main.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/SLS/__init__.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/SLS/sls_info.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/XTreme/__init__.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/XTreme/x-treme.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/__init__.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/flomni/flomni_config.yaml +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/prettytable.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/progressbar.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/signals.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/demo.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/conftest.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_beamline_mixins.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_bec_client.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_device_progress.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_ipython_live_updates.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_live_table.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_move_callback.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_pretty_table.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/conftest.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/end-2-end/_ensure_requirements_container.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/end-2-end/test_procedures_e2e.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/end-2-end/test_scans_e2e.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/end-2-end/test_scans_lib_e2e.py +0 -0
- {bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/end-2-end/test_scans_v4_lib_e2e.py +0 -0
|
@@ -308,16 +308,18 @@ class IPythonLiveUpdates:
|
|
|
308
308
|
|
|
309
309
|
"""
|
|
310
310
|
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
assert self.client.queue.queue_storage.current_scan_queue is not None
|
|
314
|
-
assert queue.queue_position is not None
|
|
315
|
-
|
|
311
|
+
if self.client.queue is None or self.client.queue.queue_storage.current_scan_queue is None:
|
|
312
|
+
return
|
|
316
313
|
target_queue = self.client.queue.queue_storage.current_scan_queue.get(
|
|
317
314
|
self.client.queue.get_default_scan_queue()
|
|
318
315
|
)
|
|
319
316
|
if target_queue is None:
|
|
320
317
|
return
|
|
318
|
+
|
|
319
|
+
queue_position = queue.queue_position
|
|
320
|
+
if queue_position is None:
|
|
321
|
+
return
|
|
322
|
+
|
|
321
323
|
status = target_queue.status
|
|
322
324
|
if status == "LOCKED":
|
|
323
325
|
lock_info = [f"{lock.identifier}: {lock.reason}\n" for lock in target_queue.locks]
|
|
@@ -332,10 +334,11 @@ class IPythonLiveUpdates:
|
|
|
332
334
|
else:
|
|
333
335
|
self._status_live.update(Panel(message, title="[yellow]Scan Status[/yellow]"))
|
|
334
336
|
return
|
|
335
|
-
|
|
337
|
+
|
|
338
|
+
if queue_position > 0:
|
|
336
339
|
message = (
|
|
337
|
-
f"Scan is enqueued and is waiting for execution. Current position in queue {
|
|
338
|
-
f" {
|
|
340
|
+
f"Scan is enqueued and is waiting for execution. Current position in queue {target_queue}:"
|
|
341
|
+
f" {queue_position + 1}. Queue status: {status}."
|
|
339
342
|
)
|
|
340
343
|
if self._status_live is None:
|
|
341
344
|
self._status_live = Live(
|
|
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "bec_ipython_client"
|
|
7
|
-
version = "3.122.
|
|
7
|
+
version = "3.122.6"
|
|
8
8
|
description = "BEC IPython client"
|
|
9
9
|
requires-python = ">=3.11"
|
|
10
10
|
classifiers = [
|
|
@@ -52,6 +52,8 @@ Homepage = "https://github.com/bec-project/bec"
|
|
|
52
52
|
|
|
53
53
|
|
|
54
54
|
|
|
55
|
+
|
|
56
|
+
|
|
55
57
|
[tool.hatch.build.targets.wheel]
|
|
56
58
|
include = ["*"]
|
|
57
59
|
|
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/beamline_mixin.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/live_table.py
RENAMED
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/callbacks/utils.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/SLS/__init__.py
RENAMED
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/SLS/sls_info.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/bec_ipython_client/plugins/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_beamline_mixins.py
RENAMED
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_bec_client.py
RENAMED
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_device_progress.py
RENAMED
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_live_table.py
RENAMED
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_move_callback.py
RENAMED
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/client_tests/test_pretty_table.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/end-2-end/test_procedures_e2e.py
RENAMED
|
File without changes
|
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/end-2-end/test_scans_lib_e2e.py
RENAMED
|
File without changes
|
{bec_ipython_client-3.122.4 → bec_ipython_client-3.122.6}/tests/end-2-end/test_scans_v4_lib_e2e.py
RENAMED
|
File without changes
|