bec-ipython-client 3.80.0__py3-none-any.whl → 3.81.0__py3-none-any.whl

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec_ipython_client
-Version: 3.80.0
+Version: 3.81.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/main.py

@@ -13,6 +13,7 @@ import redis
 import redis.exceptions
 from IPython.terminal.ipapp import TerminalIPythonApp
 from IPython.terminal.prompts import Prompts, Token
+from pydantic import ValidationError
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
@@ -30,6 +31,7 @@ from bec_lib.client import BECClient
 from bec_lib.logger import bec_logger
 from bec_lib.redis_connector import RedisConnector
 from bec_lib.service_config import ServiceConfig
+from bec_lib.utils.pydantic_pretty_print import pretty_print_pydantic_validation_error
 
 logger = bec_logger.logger
 
@@ -213,16 +215,16 @@ class BECIPythonClient:
         header.append("Alarm Raised\n", style="bold red")
         header.append(f"Severity: {alarm.severity.name}\n", style="bold")
         header.append(f"Type: {alarm.alarm_type}\n", style="bold")
-        if alarm.alarm.source.get("device"):
-            header.append(f"Device: {alarm.alarm.source['device']}\n", style="bold")
+        if alarm.alarm.info.device:
+            header.append(f"Device: {alarm.alarm.info.device}\n", style="bold")
 
         console.print(Panel(header, title="Alarm Info", border_style="red", expand=False))
 
         # --- SHOW SUMMARY
-        if alarm.alarm.compact_msg:
+        if alarm.alarm.info.compact_error_message:
             console.print(
                 Panel(
-                    Text(alarm.alarm.compact_msg, style="yellow"),
+                    Text(alarm.alarm.info.compact_error_message, style="yellow"),
                     title="Summary",
                     border_style="yellow",
                     expand=False,
@@ -230,7 +232,7 @@ class BECIPythonClient:
             )
 
         # --- SHOW FULL TRACEBACK
-        tb_str = alarm.alarm.msg
+        tb_str = alarm.alarm.info.error_message
         if tb_str:
             try:
                 console.print(tb_str)
@@ -248,6 +250,9 @@ def _ip_exception_handler(
         evalue.pretty_print()
         print("For more details, use 'bec.show_last_alarm()'")
         return
+    if issubclass(etype, ValidationError):
+        pretty_print_pydantic_validation_error(evalue)
+        return
     if issubclass(etype, (ScanInterruption, DeviceConfigError)):
         print(f"\x1b[31m {evalue.__class__.__name__}:\x1b[0m {evalue}")
         return

{bec_ipython_client-3.80.0.dist-info → bec_ipython_client-3.81.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec_ipython_client
-Version: 3.80.0
+Version: 3.81.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.80.0.dist-info → bec_ipython_client-3.81.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 .gitignore,sha256=XxC6jyyftTo2CLtm4K8axuNPYwA9Wgaz2R93WhX8bTQ,3364
-PKG-INFO,sha256=8ji8r04f5ZB6vEMze3j9lzll29dToj4q1WgoQY3wjvY,1052
+PKG-INFO,sha256=2d37BamNTItClLaO5QzXRQhDpWANAs_P0zM0dwl2NlM,1052
 demo.py,sha256=AquJB-0Tu2bIEFpcJ0Q3RUBt1xldqS6GgU5CjOAg_ww,7083
-pyproject.toml,sha256=ZTP5hqzcS4WxFRooQ32Vsw0KbDXirHaxAGvVSdXC9fA,1229
+pyproject.toml,sha256=Wsd2nSE2x4Mge794iyzctyIQiZkhU86ds3xup1gjGbA,1229
 bec_ipython_client/__init__.py,sha256=ihd_V8I7Qo0MWKMo7bcvPf-ZyUQqkcNf8IAWLJKiFJE,79
 bec_ipython_client/beamline_mixin.py,sha256=scMWIFbHJajyECzbwEVKyQUGjpqA9C_KiU2M6FuRH_Q,1067
 bec_ipython_client/bec_magics.py,sha256=Rz2aXkUCeAV_VxdXqLUNHh8T44kSH9ha83OiEtdptzI,2792
 bec_ipython_client/bec_startup.py,sha256=GGlHyxnSCQfYF5n-pYq2ic0pSyW5zvnT2PAlI5kY77w,1930
-bec_ipython_client/main.py,sha256=PzKLA5BNze_TTDrmMo0tYxvcwez9cFIOVB68nMbOOdU,13275
+bec_ipython_client/main.py,sha256=XxSaiRuvDPKRzM3yuPz3FW5I0wnfyL2SgEfEG3VrDJg,13543
 bec_ipython_client/prettytable.py,sha256=TnhGPGuU0XEvnIYJ1UfTEwadcowFW4rqJW8z_Sm0EDw,2534
 bec_ipython_client/progressbar.py,sha256=aDKYjzXmGSwa82ewm59V8WSuqVQz9GiZPx5G65fEwpk,11090
 bec_ipython_client/signals.py,sha256=mbThPo6h3mQ6RFRm9viETDMC_unFa7QxiymCdM_ZK7U,4194
@@ -28,7 +28,7 @@ bec_ipython_client/plugins/flomni/flomni_config.yaml,sha256=bCN1VKCzF6tw24HYeUE2
 tests/conftest.py,sha256=4yzGYqs8EVOxxY9Bu-yGbzmOpzG9dxs3cwSCzjmRziQ,233
 tests/client_tests/conftest.py,sha256=dUvYqvl6wogxN-kRCUuo_Uzna3P2uSYD7qGHyMGBlPY,413
 tests/client_tests/test_beamline_mixins.py,sha256=8Ws0bmzl2gSW0VuOVu80_JbYNb5Y-htchmrrptwjwDo,4611
-tests/client_tests/test_bec_client.py,sha256=KJePnvUc1I5218qaCEcIExEGSB_D-v17irarv6Ix994,8832
+tests/client_tests/test_bec_client.py,sha256=gks7IYoDDXpbkC_EGWQfKtH08Yig71PRZtleXFhkU8A,8903
 tests/client_tests/test_device_progress.py,sha256=GEw2g8MQZnv5mxABEZlxBmaMpxVS33wogaYohFolDEs,2353
 tests/client_tests/test_ipython_live_updates.py,sha256=HpA16Mx0WdseqlfP0FojlAd6VfvjnwAUReDkItZVYWs,6081
 tests/client_tests/test_live_table.py,sha256=0EKgWOgDqpjN8fJEeAzoKNCwFneDEsUY2NfWQkxB6xc,18155
@@ -36,9 +36,9 @@ tests/client_tests/test_move_callback.py,sha256=bUCcWoz_tc-yRAtwmEUMrKE_qKwatop_
 tests/client_tests/test_pretty_table.py,sha256=uQ-KPb3RXoCFE_t1IrpkT6kZAoqW7pFXxbFc445sX0Y,469
 tests/end-2-end/_ensure_requirements_container.py,sha256=RT2a5cUZnXtMjJRlPImGzgyX-KJPLiav5WSp_l3wzv8,725
 tests/end-2-end/test_procedures_e2e.py,sha256=xjczbB33Cf5pDLe1KWcalRRBrSxOQ3cbV3s3w3GsC_A,4922
-tests/end-2-end/test_scans_e2e.py,sha256=CxlXjQrzDJebaoZObt_oYx41wbnHLuJLSjKlno4u2B4,30981
-tests/end-2-end/test_scans_lib_e2e.py,sha256=-yYW-bm2jmXg4QYa6jSQFRlaLa81zeUvP7oTodccWg0,19213
-bec_ipython_client-3.80.0.dist-info/METADATA,sha256=8ji8r04f5ZB6vEMze3j9lzll29dToj4q1WgoQY3wjvY,1052
-bec_ipython_client-3.80.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-bec_ipython_client-3.80.0.dist-info/entry_points.txt,sha256=oQUXYY0jjD9ZvKPHwaGn2wkUIWpDZM8L4ixDA3RlBWE,53
-bec_ipython_client-3.80.0.dist-info/RECORD,,
+tests/end-2-end/test_scans_e2e.py,sha256=GMStotxqu24794TxIFc55PCtOjuG2qbkmibcUj7r-DI,31069
+tests/end-2-end/test_scans_lib_e2e.py,sha256=dqs0ojkyQWStIQbqABq9mQrjqQyE43gr37VPhxvQ8b8,19427
+bec_ipython_client-3.81.0.dist-info/METADATA,sha256=2d37BamNTItClLaO5QzXRQhDpWANAs_P0zM0dwl2NlM,1052
+bec_ipython_client-3.81.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+bec_ipython_client-3.81.0.dist-info/entry_points.txt,sha256=oQUXYY0jjD9ZvKPHwaGn2wkUIWpDZM8L4ixDA3RlBWE,53
+bec_ipython_client-3.81.0.dist-info/RECORD,,

pyproject.toml

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

tests/client_tests/test_bec_client.py

@@ -216,13 +216,13 @@ def test_bec_ipython_client_property_access(ipython_client):
 
 def test_bec_ipython_client_show_last_alarm(ipython_client, capsys):
     client = ipython_client
-    alarm_msg = messages.AlarmMessage(
-        severity=Alarms.MAJOR,
-        alarm_type="TestAlarm",
-        source={},
-        msg="This is a test alarm",
-        compact_msg="Test alarm",
+    error_info = messages.ErrorInfo(
+        error_message="This is a test alarm",
+        compact_error_message="Test alarm",
+        exception_type="TestAlarm",
+        device=None,
     )
+    alarm_msg = messages.AlarmMessage(severity=Alarms.MAJOR, info=error_info)
     client.alarm_handler = AlarmHandler(connector=mock.MagicMock())
     client.alarm_handler.add_alarm(alarm_msg)
     client._alarm_history.append(

tests/end-2-end/test_scans_e2e.py

@@ -737,12 +737,12 @@ def test_update_config(bec_ipython_client_fixture):
     bec = bec_ipython_client_fixture
     bec.metadata.update({"unit_test": "test_update_config"})
     demo_config_path = os.path.join(os.path.dirname(configs.__file__), "demo_config.yaml")
-    config = bec.config._load_config_from_file(demo_config_path)
+    config = bec.device_manager.config_helper._load_config_from_file(demo_config_path)
     config.pop("samx")
-    bec.config.send_config_request(action="set", config=config)
+    bec.device_manager.config_helper.send_config_request(action="set", config=config)
     assert "samx" not in bec.device_manager.devices
-    config = bec.config._load_config_from_file(demo_config_path)
-    bec.config.send_config_request(action="set", config=config)
+    config = bec.device_manager.config_helper._load_config_from_file(demo_config_path)
+    bec.device_manager.config_helper.send_config_request(action="set", config=config)
 
 
 @pytest.mark.timeout(100)

tests/end-2-end/test_scans_lib_e2e.py

@@ -322,7 +322,9 @@ def test_config_reload(
     num_devices = len(bec.device_manager.devices)
     if raises_error:
         with pytest.raises(DeviceConfigError):
-            bec.config.update_session_with_file(runtime_config_file_path)
+            bec.config.update_session_with_file(
+                runtime_config_file_path, force=True, validate=False
+            )
         if deletes_config:
             assert len(bec.device_manager.devices) == 0
         elif disabled_device:
@@ -330,7 +332,7 @@ def test_config_reload(
         else:
             assert len(bec.device_manager.devices) == num_devices
     else:
-        bec.config.update_session_with_file(runtime_config_file_path)
+        bec.config.update_session_with_file(runtime_config_file_path, force=True, validate=False)
         assert len(bec.device_manager.devices) == 2
     for dev in disabled_device:
         assert bec.device_manager.devices[dev].enabled is False
@@ -375,7 +377,7 @@ def test_config_reload_with_describe_failure(bec_test_config_file_path, bec_clie
         f.write(yaml.dump(config))
 
     with pytest.raises(DeviceConfigError):
-        bec.config.update_session_with_file(runtime_config_file_path)
+        bec.config.update_session_with_file(runtime_config_file_path, force=True, validate=False)
 
     assert len(bec.device_manager.devices) == 2
     assert bec.device_manager.devices["eyefoc"].enabled is True
@@ -386,7 +388,7 @@ def test_config_reload_with_describe_failure(bec_test_config_file_path, bec_clie
         f"e2e_test_hexapod_fail", messages.DeviceStatusMessage(device="hexapod", status=0)
     )
 
-    bec.config.update_session_with_file(runtime_config_file_path)
+    bec.config.update_session_with_file(runtime_config_file_path, force=True)
     assert len(bec.device_manager.devices) == 2
     assert bec.device_manager.devices["eyefoc"].enabled is True
     assert bec.device_manager.devices["hexapod"].enabled is True
@@ -412,13 +414,13 @@ def test_config_add_remove_device(bec_client_lib):
             "readOnly": False,
         }
     }
-    bec.config.send_config_request(action="add", config=config)
+    bec.device_manager.config_helper.send_config_request(action="add", config=config)
     with pytest.raises(DeviceConfigError) as config_error:
-        bec.config.send_config_request(action="add", config=config)
+        bec.device_manager.config_helper.send_config_request(action="add", config=config)
     assert config_error.match("Device new_device already exists")
     assert "new_device" in dev
 
-    bec.config.send_config_request(action="remove", config={"new_device": {}})
+    bec.device_manager.config_helper.send_config_request(action="remove", config={"new_device": {}})
     assert "new_device" not in dev
 
     device_config_msg = bec.connector.get(MessageEndpoints.device_config())
@@ -429,7 +431,7 @@ def test_config_add_remove_device(bec_client_lib):
 
     config["new_device"]["deviceClass"] = "ophyd_devices.doesnt_exist"
     with pytest.raises(DeviceConfigError) as config_error:
-        bec.config.send_config_request(action="add", config=config)
+        bec.device_manager.config_helper.send_config_request(action="add", config=config)
     assert config_error.match("module 'ophyd_devices' has no attribute 'doesnt_exist'")
     assert "new_device" not in dev
     assert "samx" in dev