bec-ipython-client 3.153.0__tar.gz → 3.154.0__tar.gz

{bec_ipython_client-3.153.0 → bec_ipython_client-3.154.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec_ipython_client
-Version: 3.153.0
+Version: 3.154.0
 Summary: BEC IPython client
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec

{bec_ipython_client-3.153.0 → bec_ipython_client-3.154.0}/bec_ipython_client/callbacks/ipython_live_updates.py

@@ -69,9 +69,6 @@ class IPythonLiveUpdates:
         if not self._active_request:
             return
         scan_type = self._active_request.scan_type
-        if scan_type in ["open_scan_def", "close_scan_def"]:
-            self._process_instruction({"scan_progress": {"points": 0, "show_table": True}})
-            return
         if scan_type == "close_scan_group":
             return
 
@@ -325,10 +322,9 @@ class IPythonLiveUpdates:
         if not available_blocks:
             return False
         req_block = available_blocks[self._request_block_index[req_id]]
-        if req_block.msg.scan_type in [
-            "open_scan_def",
-            "mv",
-        ]:  # TODO: make this more general for all scan types that don't have report instructions
+        if (
+            req_block.msg.scan_type == "mv"
+        ):  # TODO: make this more general for scans without report instructions
             return True
 
         report_instructions = req_block.report_instructions or []
@@ -410,11 +406,7 @@ class IPythonLiveUpdates:
         self._current_queue = None
         self._user_callback = None
         self._processed_instructions = 0
-        scan_closed = (
-            forced
-            or self._active_request is None
-            or (self._active_request.scan_type == "close_scan_def")
-        )
+        scan_closed = forced or self._active_request is None
         self._active_request = None
 
         if self.client.scans._scan_def_id and not scan_closed:

{bec_ipython_client-3.153.0 → bec_ipython_client-3.154.0}/bec_ipython_client/callbacks/live_table.py

@@ -375,11 +375,6 @@ class LiveUpdatesTable(LiveUpdatesBase):
 
     def process_request(self):
         """process the request and start the core loop for live updates"""
-        if self.request.content["scan_type"] == "close_scan_def":
-            self.wait_for_scan_item_to_finish()
-            self.close_table()
-            return
-
         self.wait_for_request_acceptance()
         self.update_scan_item(timeout=15)
         self.wait_for_scan_to_start()
@@ -394,9 +389,6 @@ class LiveUpdatesTable(LiveUpdatesBase):
 
     def run(self):
         """run the live updates"""
-        if self.request.content["scan_type"] == "open_scan_def":
-            self.wait_for_request_acceptance()
-            return
         self.process_request()
         self.wait_for_scan_item_to_finish()
         if self._print_table_data:

{bec_ipython_client-3.153.0 → bec_ipython_client-3.154.0}/demo.py

@@ -153,13 +153,6 @@ scans.umv(dev.samx, 5, dev.samy, 20, relative=False)
 # scans.close_interactive_scan(md={"scan_def_id": scan_def_id})
 
 
-# @scan_def
-# def new_scan():
-#     for ii in range(10):
-#         scans.umv(dev.samx, ii * 10)
-#         scans.fermat_scan(dev.samx, -5, 5, dev.samy, -5, 5, step=1, exp_time=0.02, relative=True)
-
-
 # for ii in range(10):
 #     scans.umv(dev.samx, ii * 10)
 #     # scans.grid_scan(dev.samx, -5, 5, 5, dev.samy, -5, 5, 10, exp_time=0.02, relative=True)
@@ -180,17 +173,9 @@ scans.umv(dev.samx, 5, dev.samy, 20, relative=False)
 #     # scans.line_scan(dev.samx, -8, 8, steps=200, exp_time=0.1, relative=True)
 
 
-# with scans.scan_def:
-#     scan_with_decorator()
 # with scans.dataset_id_on_hold:
 #     scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.1, relative=True)
 #     scans.line_scan(dev.samx, -8, 8, steps=10, exp_time=0.1, relative=True)
-
-# scan_def_id = str(uuid.uuid4())
-# scans.open_scan_def(md={"scan_def_id": scan_def_id})
-# scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.1, md={"scan_def_id": scan_def_id})
-# scans.line_scan(dev.samx, -8, 8, steps=10, exp_time=0.1, md={"scan_def_id": scan_def_id})
-# scans.close_scan_def(md={"scan_def_id": scan_def_id})
 # for ii in range(10):
 #     scans.grid_scan(dev.samx, -5, 5, 10, dev.samy, -5, 5, 10, exp_time=0.01)
 

{bec_ipython_client-3.153.0 → bec_ipython_client-3.154.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_ipython_client"
-version = "3.153.0"
+version = "3.154.0"
 description = "BEC IPython client"
 requires-python = ">=3.11"
 classifiers = [

{bec_ipython_client-3.153.0 → bec_ipython_client-3.154.0}/tests/end-2-end/test_scans_e2e.py

@@ -550,58 +550,10 @@ def test_file_writer(bec_ipython_client_fixture):
     dev.samy.velocity.set(100).wait()
 
 
-@pytest.mark.timeout(100)
-def test_scan_def_callback(capsys, bec_ipython_client_fixture):
-    bec = bec_ipython_client_fixture
-    bec.metadata.update({"unit_test": "test_scan_def_callback"})
-    scans = bec.scans
-    dev = bec.device_manager.devices
-    scan_number = bec.queue.next_scan_number
-    with scans.scan_def:
-        scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.1, relative=False)
-        scans.umv(dev.samy, 5, relative=False)
-        current_pos_samy = dev.samy.read(cached=True)["samy"]["value"]
-        captured = capsys.readouterr()
-        assert f"Starting scan {scan_number}" in captured.out
-        ref_out_samy = f"━━━━━━━━━━━━━━━ {current_pos_samy:10.2f} /       5.00 / 100 %"
-        assert ref_out_samy in captured.out
-        scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.1, relative=False)
-    captured = capsys.readouterr()
-    assert f"Scan {scan_number} finished." in captured.out
-
-
-@pytest.mark.timeout(100)
-def test_scan_def(bec_ipython_client_fixture):
-    bec = bec_ipython_client_fixture
-    bec.metadata.update({"unit_test": "test_scan_def"})
-    scans = bec.scans
-    dev = bec.device_manager.devices
-    scan_number = bec.queue.next_scan_number
-    with scans.scan_def:
-        scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.1, relative=False)
-        scans.umv(dev.samy, 5, relative=False)
-        scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.1, relative=False)
-        scans.mv(dev.samx, 0, relative=False)
-
-    assert scan_number == bec.queue.next_scan_number - 1
-
-    scan_number = bec.queue.next_scan_number
-
-    @scans.scan_def
-    def scan_def_with_decorator():
-        scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.1, relative=False)
-        scans.umv(dev.samy, 5, relative=False)
-        scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.1, relative=False)
-        scans.mv(dev.samx, 0, relative=False)
-
-    scan_def_with_decorator()
-    assert scan_number == bec.queue.next_scan_number - 1
-
-
 @pytest.mark.timeout(100)
 def test_group_def(bec_ipython_client_fixture):
     bec = bec_ipython_client_fixture
-    bec.metadata.update({"unit_test": "test_scan_def"})
+    bec.metadata.update({"unit_test": "test_group_def"})
     scans = bec.scans
     dev = bec.device_manager.devices
     scan_number = bec.queue.next_scan_number