bec-ipython-client 3.173.1__tar.gz → 4.0.1__tar.gz

{bec_ipython_client-3.173.1 → bec_ipython_client-4.0.1}/.gitignore

@@ -1,6 +1,8 @@
 **/*_venv
 **/.idea
 *.log
+*.log.gz
+*.rdb
 **/__pycache__
 **/.DS_Store
 **/out
@@ -71,6 +73,7 @@ coverage.xml
 *.py,cover
 .hypothesis/
 .pytest_cache/
+.ruff_cache/
 cover/
 
 # Translations
@@ -187,4 +190,4 @@ cython_debug/
 
 
 # Local agent configuration file
-AGENTS_PERSONAL.md
+AGENTS_PERSONAL.md

{bec_ipython_client-3.173.1 → bec_ipython_client-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bec_ipython_client
-Version: 3.173.1
+Version: 4.0.1
 Summary: BEC IPython client
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec
@@ -8,7 +8,7 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
-Requires-Dist: bec-lib~=3.0
+Requires-Dist: bec-lib>=3.0
 Requires-Dist: ipython<10.0,>=8.22
 Requires-Dist: numpy<3.0,>=1.24
 Requires-Dist: pyepics~=3.5
@@ -19,7 +19,7 @@ Requires-Dist: black~=26.0; extra == 'dev'
 Requires-Dist: coverage~=7.0; extra == 'dev'
 Requires-Dist: isort>=5.13.2,~=5.13; extra == 'dev'
 Requires-Dist: pylint<5,>=3; extra == 'dev'
-Requires-Dist: pytest-bec-e2e~=3.0; extra == 'dev'
+Requires-Dist: pytest-bec-e2e>=3.0; extra == 'dev'
 Requires-Dist: pytest-random-order~=1.1; extra == 'dev'
 Requires-Dist: pytest-redis<6.0,>=3.1; extra == 'dev'
 Requires-Dist: pytest-retry~=1.1; extra == 'dev'

{bec_ipython_client-3.173.1 → bec_ipython_client-4.0.1}/demo.py

@@ -35,7 +35,6 @@ scans.umv(dev.samx, 5, dev.samy, 20, relative=False)
 # scans.line_scan(dev.samx, -5, 5, dev.samy, -5, 5, steps=10, exp_time=0.1, relative=True)
 
 # scans.round_scan_fly(dev.flyer_sim, 0, 50, 20, 3, exp_time=0.1, relative=True)
-# scans.monitor_scan(dev.samx, -100, 100, relative=False)
 
 # from bec_ipython_client.plotting import GrumpyConnector
 
@@ -171,9 +170,6 @@ scans.umv(dev.samx, 5, dev.samy, 20, relative=False)
 # scans.umv(dev.samx, 1000)
 
 
-# scans.grid_scan(dev.samx, -5, 5, 10, dev.samy, -5, 5, 10, exp_time=0.02, md={"queue_group": queue_group})
-# scans.grid_scan(dev.samx, -5, 5, 10, dev.samy, -5, 5, 10, exp_time=0.02, md={"queue_group": queue_group})
-
 # scans.grid_scan(dev.samx, -5, 5, 10, dev.samy, -5, 5, 10, exp_time=1)
 
 # event = threading.Event()

{bec_ipython_client-3.173.1 → bec_ipython_client-4.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_ipython_client"
-version = "3.173.1"
+version = "4.0.1"
 description = "BEC IPython client"
 requires-python = ">=3.11"
 classifiers = [
@@ -13,7 +13,7 @@ classifiers = [
     "Topic :: Scientific/Engineering",
 ]
 dependencies = [
-    "bec-lib~=3.0",
+    "bec-lib>=3.0",
     "ipython>=8.22,<10.0",
     "numpy>=1.24, <3.0",
     "pyepics~=3.5",
@@ -27,7 +27,7 @@ dev = [
     "coverage~=7.0",
     "isort~=5.13, >=5.13.2",
     "pylint>=3,<5",
-    "pytest-bec-e2e~=3.0",
+    "pytest-bec-e2e>=3.0",
     "pytest-random-order~=1.1",
     "pytest-redis>=3.1,<6.0",
     "pytest-retry~=1.1",
@@ -43,88 +43,6 @@ bec = "bec_ipython_client.main:main"
 Homepage = "https://github.com/bec-project/bec"
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 [tool.hatch.build.targets.wheel]
 include = ["*"]
 
@@ -146,8 +64,4 @@ line-length = 100
 skip-magic-trailing-comma = true
 
 [tool.ruff.lint.isort]
-known-first-party = [
-  "bec_lib",
-  "bec_server",
-  "bec_ipython_client",
-]
+known-first-party = ["bec_lib", "bec_server", "bec_ipython_client"]

bec_ipython_client-3.173.1/tests/end-2-end/test_scans_v4_lib_e2e.py → bec_ipython_client-4.0.1/tests/end-2-end/test_scan_workflows_lib_e2e.py

@@ -15,15 +15,15 @@ from bec_lib.utils.plugin_manager import create as plugin_create
 from bec_server.scan_server.scans import position_generators
 
 
-def _get_v4_scan_runner(bec, scan_name: str):
+def _get_scan_runner(bec, scan_name: str):
     return getattr(bec.scans, scan_name)
 
 
-def _run_v4_scan(
+def _run_scan(
     bec, scan_name: str, *args, timeout: float = 60, wait_for_num_points: bool = True, **kwargs
 ):
-    bec.metadata.update({"unit_test": f"test_v4_{scan_name}_lib"})
-    status = _get_v4_scan_runner(bec, scan_name)(*args, **kwargs)
+    bec.metadata.update({"unit_test": f"test_{scan_name}_lib"})
+    status = _get_scan_runner(bec, scan_name)(*args, **kwargs)
     status.wait(timeout=timeout, num_points=wait_for_num_points, file_written=False)
     return status
 
@@ -97,7 +97,7 @@ def _remove_scan_export(init_file: Path, scan_name: str):
     init_file.write_text(content.replace(import_line, ""), encoding="utf-8")
 
 
-def _wait_for_v4_scan_registration(bec, scan_name: str, timeout: float = 60):
+def _wait_for_scan_registration(bec, scan_name: str, timeout: float = 60):
     deadline = time.time() + timeout
     while time.time() < deadline:
         available_scans = bec.connector.get(MessageEndpoints.available_scans())
@@ -215,14 +215,14 @@ def _wait_for_v4_scan_registration(bec, scan_name: str, timeout: float = 60):
         ("time_scan", (), {"points": 3, "interval": 0.05, "exp_time": 0.01}, 3, 3),
     ],
 )
-def test_v4_fixed_point_scans_lib(
+def test_fixed_point_scans_lib(
     bec_client_lib, scan_name, scan_args, scan_kwargs, expected_num_points, expected_num_readouts
 ):
     bec = bec_client_lib
     dev = bec.device_manager.devices
     resolved_args = _resolve_scan_args(scan_args, dev)
 
-    status = _run_v4_scan(bec, scan_name, *resolved_args, **scan_kwargs)
+    status = _run_scan(bec, scan_name, *resolved_args, **scan_kwargs)
 
     assert status.scan is not None
     assert status.scan.num_points == expected_num_points
@@ -235,7 +235,7 @@ def test_mv_scan_lib(bec_client_lib):
     bec = bec_client_lib
     dev = bec.device_manager.devices
 
-    status = _run_v4_scan(bec, "mv", dev.samx, 1.5, dev.samy, -1.5, relative=False)
+    status = _run_scan(bec, "mv", dev.samx, 1.5, dev.samy, -1.5, relative=False)
     status.wait(timeout=30)
 
     _assert_device_position(dev.samx, 1.5, timeout=5)
@@ -247,7 +247,7 @@ def test_umv_scan_lib(bec_client_lib):
     bec = bec_client_lib
     dev = bec.device_manager.devices
 
-    status = _run_v4_scan(bec, "umv", dev.samx, -1.0, dev.samy, 1.0, relative=False)
+    status = _run_scan(bec, "umv", dev.samx, -1.0, dev.samy, 1.0, relative=False)
     status.wait(timeout=30)
 
     _assert_device_position(dev.samx, -1.0, timeout=5)
@@ -261,7 +261,7 @@ def test_cont_line_scan_lib(bec_client_lib):
     original_velocity = dev.samx.velocity.get()
     try:
         dev.samx.velocity.set(1).wait()
-        status = _run_v4_scan(
+        status = _run_scan(
             bec, "cont_line_scan", dev.samx, 0.0, 0.2, steps=3, exp_time=0.01, relative=False
         )
     finally:
@@ -282,7 +282,7 @@ def test_line_sweep_scan_lib(bec_client_lib):
         scans.umv(dev.samx, -5.0, relative=False).wait()
         dev.samx.velocity.set(5).wait()
         dev.samx.limits = [-50, 50]
-        status = _run_v4_scan(
+        status = _run_scan(
             bec,
             "line_sweep_scan",
             dev.samx,
@@ -301,9 +301,9 @@ def test_line_sweep_scan_lib(bec_client_lib):
 
 
 @pytest.mark.timeout(120)
-def test_v4_scan_lib_stop_resolves_cleanly(bec_client_lib):
+def test_scan_lib_stop_resolves_cleanly(bec_client_lib):
     bec = bec_client_lib
-    status = _get_v4_scan_runner(bec, "time_scan")(points=100, interval=0.2, exp_time=0.01)
+    status = _get_scan_runner(bec, "time_scan")(points=100, interval=0.2, exp_time=0.01)
 
     time.sleep(0.5)
     status.cancel()
@@ -312,7 +312,7 @@ def test_v4_scan_lib_stop_resolves_cleanly(bec_client_lib):
 
 
 @pytest.mark.timeout(180)
-def test_v4_generated_scan_e2e(bec_client_lib):
+def test_generated_scan_e2e(bec_client_lib):
     bec = bec_client_lib
     scan_name = f"e2e_generated_scan_{uuid.uuid4().hex[:8]}"
     try:
@@ -338,9 +338,9 @@ def test_v4_generated_scan_e2e(bec_client_lib):
         assert scan_file.exists()
 
         bec._request_scan_reload()
-        scan_runner = _wait_for_v4_scan_registration(bec, scan_name)
+        scan_runner = _wait_for_scan_registration(bec, scan_name)
 
-        bec.metadata.update({"unit_test": "test_v4_generated_scan_e2e"})
+        bec.metadata.update({"unit_test": "test_generated_scan_e2e"})
         status = scan_runner()
         status.wait(timeout=60, num_points=False, file_written=True)
 

{bec_ipython_client-3.173.1 → bec_ipython_client-4.0.1}/tests/end-2-end/test_scans_e2e.py

@@ -375,17 +375,6 @@ def test_queued_scan(bec_ipython_client_fixture):
     assert scan_number_end == scan_number_start + 2
 
 
-@pytest.mark.timeout(100)
-def test_fly_scan(bec_ipython_client_fixture):
-    bec = bec_ipython_client_fixture
-    bec.metadata.update({"unit_test": "test_fly_scan"})
-    scans = bec.scans
-    dev = bec.device_manager.devices
-    status = scans.round_scan_fly(dev.flyer_sim, 0, 40, 5, 3, exp_time=0.05, relative=True)
-    assert len(status.scan.live_data) == 63
-    assert status.scan.num_points == 63
-
-
 @pytest.mark.timeout(100)
 def test_scan_restart(bec_ipython_client_fixture):
     bec = bec_ipython_client_fixture
@@ -599,18 +588,6 @@ def test_time_scan(bec_ipython_client_fixture):
     assert len(status.scan.live_data) == 5
 
 
-@pytest.mark.timeout(100)
-def test_monitor_scan(bec_ipython_client_fixture):
-    bec = bec_ipython_client_fixture
-    bec.metadata.update({"unit_test": "test_monitor_scan"})
-    scans = bec.scans
-    dev = bec.device_manager.devices
-    dev.samx.limits = [-1100, 1100]
-    time.sleep(5)
-    status = scans.monitor_scan(dev.samx, -100, 100, min_update=0.01, relative=False)
-    assert len(status.scan.live_data) > 100
-
-
 @pytest.mark.timeout(100)
 def test_rpc_calls(bec_ipython_client_fixture):
     bec = bec_ipython_client_fixture
@@ -777,7 +754,7 @@ def test_device_preview(bec_ipython_client_fixture):
 
 @pytest.mark.timeout(100)
 def test_async_data(bec_ipython_client_fixture):
-    """Test "extend" and "append" for async data and their expected return values"""
+    """Test "add_slice" and "add" async signal data written to disk."""
     bec = bec_ipython_client_fixture
     bec.metadata.update({"unit_test": "test_async_data"})
     dev = bec.device_manager.devices
@@ -787,21 +764,15 @@ def test_async_data(bec_ipython_client_fixture):
     dev.waveform.sim.select_model("ConstantModel")
     dev.waveform.sim.params = {"noise": "none", "c": amplitude}
     dev.waveform.waveform_shape.set(10)
-    dev.waveform.async_update.set("append")
+    dev.waveform.async_update.set("add_slice")
     s1 = scans.line_scan(dev.samx, 0, 1, steps=10, relative=False)
     s1.wait()
-    while True:
-        waveform_data = s1.scan.data.devices.waveform.waveform_waveform.read()
-        if len(waveform_data["value"]) == 10:
-            break
+    waveform_data = s1.scan.data.devices.waveform.waveform_data.read()
     np.testing.assert_array_equal(waveform_data["value"], amplitude * np.ones((10, 10)))
-    dev.waveform.async_update.set("extend")
+    dev.waveform.async_update.set("add")
     s1 = scans.line_scan(dev.samx, 0, 1, steps=10, relative=False)
     s1.wait()
-    while True:
-        waveform_data = s1.scan.data.devices.waveform.waveform_waveform.read()
-        if len(waveform_data["value"]) == 100:
-            break
+    waveform_data = s1.scan.data.devices.waveform.waveform_data.read()
     np.testing.assert_array_equal(waveform_data["value"], amplitude * np.ones(100))