fix: issues from rebase

Author: d-perl

bec_lib/bec_lib/config_helper.py

@@ -29,7 +29,7 @@
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.file_utils import DeviceConfigWriter
 from bec_lib.logger import bec_logger
-from bec_lib.messages import ConfigAction
+from bec_lib.messages import ConfigAction, sanitize_one_way_encodable
 from bec_lib.utils.import_utils import lazy_import_from
 from bec_lib.utils.json_extended import ExtendedEncoder
 
@@ -617,7 +617,11 @@ def send_config_request(
         request_id = str(uuid.uuid4())
         self._connector.send(
             MessageEndpoints.device_config_request(),
-            DeviceConfigMessage(action=action, config=config, metadata={"RID": request_id}),
+            DeviceConfigMessage(
+                action=action,
+                config=sanitize_one_way_encodable(config),
+                metadata={"RID": request_id},
+            ),
         )
 
         if wait_for_response:

bec_lib/bec_lib/device.py

@@ -43,7 +43,7 @@
 
 def sanitize_one_way_encodable(data: Any) -> Any:
     """Sanitize any data which can be serialized in a json-compatible format and is not supposed to be decoded,
-    for example, a parameter dict containing devices"""
+    # for example, a parameter dict containing devices"""
     if isinstance(data, (list, tuple, set)):
         return [sanitize_one_way_encodable(x) for x in data]
     if isinstance(data, Mapping):
@@ -63,7 +63,7 @@ def _try_dump(v):
     try:
         msgpack.dumps(v)
     except TypeError as e:
-        raise ValueError("Non-JSONable/msgpackable data in " + str(v)) from e
+        raise ValueError(f"Non-JSONable/msgpackable data in {str(v)}\n {e}") from e
     return v
 
 
@@ -1279,6 +1279,12 @@ def from_dict(cls, metrics: dict[str, str | int | float | bool]):
         )
 
 
+DictPossibleNumpy = TypeAliasType(
+    "DictPossibleNumpy",
+    dict[str, list[int] | list[float] | int | bool | float | str | np.ndarray | None],
+)
+
+
 class ProcessedDataMessage(BECMessage):
     """Message for processed data
 
@@ -1288,7 +1294,7 @@ class ProcessedDataMessage(BECMessage):
     """
 
     msg_type: ClassVar[str] = "processed_data_message"
-    data: JsonableDict | list[JsonableDict]
+    data: DictPossibleNumpy | list[DictPossibleNumpy] | JsonableDict | list[JsonableDict]
 
 
 class DAPConfigMessage(BECMessage):

bec_lib/bec_lib/messages.py

@@ -202,9 +202,7 @@ def _import_scans(self):
             setattr(
                 getattr(self, scan_name),
                 "__signature__",
-                dict_to_signature(
-                    self._strip_scan_signature_annotations(scan_info.get("signature"))
-                ),
+                dict_to_signature(self._strip_scan_signature_annotations(scan_info.signature)),
             )
 
     @staticmethod
@@ -341,7 +339,7 @@ def prepare_scan_request(
                 if not isinstance(arg, Scans.get_arg_type(arg_input[ii % len(arg_input)])):
                     raise TypeError(
                         f"{scan_info.doc}\n Argument {ii} must be of type"
-                        f" {arg_input[ii%len(arg_input)]}, not {type(arg).__name__}."
+                        f" {arg_input[ii % len(arg_input)]}, not {type(arg).__name__}."
                     )
 
         metadata = {}

bec_lib/bec_lib/scans.py

@@ -14,7 +14,7 @@
 
 from bec_lib import messages as messages_module
 from bec_lib.logger import bec_logger
-from bec_lib.messages import BECMessage
+from bec_lib.messages import BECMessage, sanitize_one_way_encodable
 from bec_lib.serialization_registry import SerializationRegistry
 
 logger = bec_logger.logger
@@ -39,6 +39,7 @@ def dumps(self, obj):
         """Pack object `obj` and return packed bytes."""
         if isinstance(obj, (BECMessage, BaseModel)):
             obj = obj.model_dump(mode="python", fallback=self.encode)
+        obj = sanitize_one_way_encodable(obj)
         return msgpack_module.packb(obj, default=self.encode)
 
     def loads(self, raw_bytes):
@@ -56,6 +57,9 @@ class BECJson(SerializationRegistry):
 
     def dumps(self, obj, indent: int | None = None) -> str:
         """Pack object `obj` and return packed bytes."""
+        if isinstance(obj, (BECMessage, BaseModel)):
+            obj = obj.model_dump(mode="python", fallback=self.encode)
+        obj = sanitize_one_way_encodable(obj)
         return json.dumps(obj, default=self.encode, indent=indent)
 
     def loads(self, raw_bytes):