Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions bec_lib/bec_lib/lmfit_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,32 @@ def serialize_lmfit_params(params: Parameters) -> dict:
return {v.name: serialize_param_object(v) for v in params}


def deserialize_param_object(obj: dict) -> Parameter:
def deserialize_param_object(obj: dict[str, dict | Parameter]) -> Parameters:
"""
Deserialize dictionary representation of lmfit.Parameter object.

Args:
obj (dict): Dictionary representation of the parameters
obj (dict[str, dict | Parameter]): Dictionary representation of the parameters

Returns:
Parameter: Parameter object
Parameters: Parameters object
"""
param = Parameters()
for k, v in obj.items():
v.pop("name")
param.add(k, **v)
if isinstance(v, Parameter):
param.add(
k,
value=v.value,
vary=v.vary,
min=v.min,
max=v.max,
expr=v.expr,
brute_step=v.brute_step,
)
continue
if isinstance(v, dict):
v.pop("name", None)
v_copy = v.copy()
v_copy.pop("name", None)
param.add(k, **v_copy)
return param
16 changes: 16 additions & 0 deletions bec_lib/tests/test_lmfit_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,19 @@ def test_serialize_lmfit_params():

obj = deserialize_param_object(result)
assert obj == params

# `name` is optional for deserialization (key is the param name)
result_without_names = {
k: {kk: vv for kk, vv in v.items() if kk != "name"} for k, v in result.items()
}
obj = deserialize_param_object(result_without_names)
assert obj == params


def test_deserialize_param_object_accepts_parameter_objects():
params = lmfit.Parameters()
params.add("a", value=1.0, vary=True, min=-2.0, max=3.0)
params.add("b", value=2.0, vary=False)

obj = deserialize_param_object({"a": params["a"], "b": params["b"]})
assert obj == params
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def process_dap_request(self, dap_request_msg: messages.DAPRequestMessage) -> No
Args:
dap_request_msg (DAPRequestMessage): DAPRequestMessage instance
"""
logger.info(f"Processing dap request {dap_request_msg}")
try:
dap_cls = self._get_dap_cls(dap_request_msg)
if not dap_cls:
Expand Down
Loading
Loading