From 0105e8e2e088d8c55eb6cc4ce52b8f9ebcefc949 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Fri, 26 Feb 2021 22:47:25 +0100 Subject: [PATCH] use NumpyJSONEncoder to validate params --- slic/core/acquisition/broker_client.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/slic/core/acquisition/broker_client.py b/slic/core/acquisition/broker_client.py index 2cf2b9a0..73ffc844 100644 --- a/slic/core/acquisition/broker_client.py +++ b/slic/core/acquisition/broker_client.py @@ -1,8 +1,11 @@ import requests +import json from time import sleep from tqdm import tqdm import numpy as np +from slic.utils.json import NumpyJSONEncoder + from .broker_tools import get_current_pulseid @@ -83,15 +86,7 @@ def post_request(requrl, params, timeout=10): def validate_params(params): - res = {} - for k, v in params.items(): - if isinstance(v, dict): - v = validate_params(v) - elif isinstance(v, np.ndarray): - v = v.tolist() - print(f"converted {k} = {v} from numpy array to list") - res[k] = v - return res + return json.loads(json.dumps(params, cls=NumpyJSONEncoder)) def validate_response(resp):