bec-ipython-client 3.64.5__tar.gz → 3.66.0__tar.gz

{bec_ipython_client-3.64.5 → bec_ipython_client-3.66.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec_ipython_client
-Version: 3.64.5
+Version: 3.66.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.64.5 → bec_ipython_client-3.66.0}/bec_ipython_client/callbacks/ipython_live_updates.py

@@ -49,7 +49,7 @@ class IPythonLiveUpdates:
         """
         scan_type = self._active_request.content["scan_type"]
         if scan_type in ["open_scan_def", "close_scan_def"]:
-            self._process_instruction({"scan_progress": 0})
+            self._process_instruction({"scan_progress": {"points": 0, "show_table": True}})
             return
         if scan_type == "close_scan_group":
             return

{bec_ipython_client-3.64.5 → bec_ipython_client-3.66.0}/bec_ipython_client/callbacks/live_table.py

@@ -182,7 +182,9 @@ class LiveUpdatesTable(LiveUpdatesBase):
                 break
             self.check_alarms()
 
-        self._run_update(self.report_instruction[self.REPORT_TYPE])
+        show_table = self.report_instruction[self.REPORT_TYPE].get("show_table", True)
+        self._print_table_data = show_table
+        self._run_update(self.report_instruction[self.REPORT_TYPE]["points"])
 
     def _run_update(self, target_num_points: int):
         """run the update loop with the progress bar

{bec_ipython_client-3.64.5 → bec_ipython_client-3.66.0}/bec_ipython_client/main.py

@@ -220,9 +220,14 @@ class BECClientPrompt(Prompts):
             next_scan_number = str(self.client.queue.next_scan_number)
         except Exception:
             next_scan_number = "?"
+
+        if self.client.active_account:
+            username = f"{self.client.active_account} | {self.username}"
+        else:
+            username = self.username
         return [
             (status_led, "\u2022"),
-            (Token.Prompt, " " + self.username),
+            (Token.Prompt, " " + username),  # BEC ACL username and pgroup
             (Token.Prompt, "@" + self.session_name),
             (Token.Prompt, " ["),
             (Token.PromptNum, str(self.shell.execution_count)),

{bec_ipython_client-3.64.5 → bec_ipython_client-3.66.0}/pyproject.toml

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

{bec_ipython_client-3.64.5 → bec_ipython_client-3.66.0}/tests/client_tests/test_bec_client.py

@@ -204,7 +204,7 @@ def test_bec_ipython_client_property_access(ipython_client):
                 client.start()
 
                 with mock.patch.object(client._client, "connector") as mock_connector:
-                    mock_connector.get.return_value = messages.VariableMessage(value="account")
+                    mock_connector.get_last.return_value = messages.VariableMessage(value="account")
                     assert client._client.active_account == "account"
 
                     with pytest.raises(AttributeError):

{bec_ipython_client-3.64.5 → bec_ipython_client-3.66.0}/tests/client_tests/test_live_table.py

@@ -111,7 +111,9 @@ class TestLiveTable:
         data = messages.ScanMessage(
             point_id=0, scan_id="", data={}, metadata={"scan_report_devices": scan_report_devices}
         )
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         devices = live_update.get_devices_from_scan_data(data)
         assert devices[0 : len(scan_report_devices)] == scan_report_devices
 
@@ -123,7 +125,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         with mock.patch.object(client.queue.queue_storage, "find_queue_item_by_requestID"):
             live_update.wait_for_request_acceptance()
 
@@ -138,7 +142,9 @@ class TestLiveTable:
         client = bec_client_mock
         client.start()
         data = messages.ScanMessage(point_id=0, scan_id="", data={}, metadata={})
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.scan_item = scan_item
         scan_item.num_points = 2
         scan_item.live_data = {0: data}
@@ -163,7 +169,9 @@ class TestLiveTable:
         client = bec_client_mock
         client.start()
         data = messages.ScanMessage(point_id=0, scan_id="", data={}, metadata={})
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.scan_item = scan_item
         scan_item.num_points = 2
         scan_item.live_data = {0: data}
@@ -193,7 +201,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.point_data = messages.ScanMessage(
             point_id=0,
             scan_id="",
@@ -212,7 +222,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.point_data = messages.ScanMessage(
             point_id=0,
             scan_id="",
@@ -231,7 +243,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
         client.device_manager.devices["samx"].precision = 3
         live_update.point_data = messages.ScanMessage(
@@ -263,7 +277,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
         client.device_manager.devices["samx"].precision = prec
         live_update.point_data = messages.ScanMessage(
@@ -312,7 +328,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.point_data = messages.ScanMessage(
             point_id=0,
             scan_id="",
@@ -355,7 +373,9 @@ class TestLiveTable:
             "find_queue_item_by_requestID",
             return_value=mock_queue_item,
         ):
-            live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+            live_update = LiveUpdatesTable(
+                client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+            )
             live_update.wait_for_request_acceptance()
             result = StringIO()
             with redirect_stdout(result):
@@ -376,7 +396,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
         client.device_manager.devices["samx"].precision = prec
         live_update.point_data = messages.ScanMessage(