moved params validation into broker client; numpy arrays are now allowed in params
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import requests
|
||||
from time import sleep
|
||||
from tqdm import tqdm
|
||||
import numpy as np
|
||||
|
||||
from .broker_tools import get_current_pulseid
|
||||
|
||||
@@ -76,10 +77,23 @@ def retrieve(address, *args, **kwargs):
|
||||
|
||||
|
||||
def post_request(requrl, params, timeout=10):
|
||||
params = validate_params(params)
|
||||
response = requests.post(requrl, json=params, timeout=timeout).json()
|
||||
return validate_response(response)
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
def validate_response(resp):
|
||||
if resp.get("status") == "ok":
|
||||
return resp.get("message")
|
||||
|
||||
@@ -221,7 +221,7 @@ def make_2D_pairs(x, y):
|
||||
x_flat = x_grid.T.ravel()
|
||||
y_flat = y_grid.T.ravel()
|
||||
pairs = np.vstack((x_flat, y_flat)).T
|
||||
return pairs.tolist()
|
||||
return pairs
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user