Merge branch 'master' into addcodespacesdemo

hanak · Feb 13, 2024 · c6c9bd9 · c6c9bd9
2 parents 3208e36 + b61c3a5
commit c6c9bd9
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/pvServer/pvServer.py b/pvServer/pvServer.py
@@ -302,9 +302,11 @@ def check_pv_initialized_after_disconnect():
                                 as_numpy=True, with_ctrlvars=True, use_monitor=True
                             )
                         else:
-                            clientPVlist[pvname]["pv"].get(as_string=True)
+                            clientPVlist[pvname]["pv"].get(
+                                as_string=True, as_numpy=False
+                            )
                             d = clientPVlist[pvname]["pv"].get_with_metadata(
-                                with_ctrlvars=True, use_monitor=True
+                                with_ctrlvars=True, use_monitor=True, as_numpy=False
                             )
                         if (clientPVlist[pvname]["pv"].value) is not None:
                             if d is not None:
@@ -318,7 +320,10 @@ def check_pv_initialized_after_disconnect():
                                         ].tobytes()  # convert numpy array to binary
                                 else:
                                     if clientPVlist[pvname]["pv"].count > 1:
-                                        d["value"] = list(d["value"])
+                                        if isinstance(d["value"], np.ndarray):
+                                            d["value"] = d["value"].tolist()
+                                        else:
+                                            d["value"] = list(d["value"])
                                     if clientPVlist[pvname]["pv"].count == 0:
                                         d["value"] = []
                                     if clientPVlist[pvname]["pv"].count == 1:
@@ -507,6 +512,7 @@ def on_change_value(
                     room=str(pvname),
                     namespace="/pvServer",
                 )
+
         elif float(count) == 1:
             new_char_value = str(char_value)
             if len(new_char_value) == 0:
@@ -530,6 +536,8 @@ def on_change_value(
             new_char_value = str(char_value)
             if len(new_char_value) == 0:
                 new_char_value = str(value)
+            if isinstance(value, np.ndarray):
+                value = value.tolist()
             d = {
                 "pvname": pvname,
                 "newmetadata": "False",