better-rtplot 0.4.10__tar.gz → 0.4.11__tar.gz

{better_rtplot-0.4.10 → better_rtplot-0.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-rtplot
-Version: 0.4.10
+Version: 0.4.11
 Summary: 
 License: GPL V3.0
 Author: jmontp

{better_rtplot-0.4.10 → better_rtplot-0.4.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "better-rtplot"
-version = "0.4.10"
+version = "0.4.11"
 description = ""
 authors = ["jmontp <jmontp@umich.edu>"]
 license = "GPL V3.0"

{better_rtplot-0.4.10 → better_rtplot-0.4.11}/rtplot/client.py

@@ -22,7 +22,7 @@ socket = context.socket(zmq.PUB)
 control_socket = context.socket(zmq.PULL)
 control_socket.setsockopt(zmq.RCVHWM, 1000)
 #Non-blocking local state for controls, drained on each poll_controls() call
-_control_slider_values = {}
+_control_values = {}
 _control_button_events = []
 
 # Cached payload of the most recent initialize_plots() call. The server
@@ -247,10 +247,27 @@ class Text:
         })
 
 
+@dataclass
+class TextInput:
+    id: str
+    label: str
+    value: str = ""
+    placeholder: Optional[str] = None
+    max_length: Optional[int] = None
+    height: Optional[float] = None
+
+    def to_dict(self):
+        return _drop_none({
+            "type": "text_input", "id": self.id, "label": self.label,
+            "value": self.value, "placeholder": self.placeholder,
+            "max_length": self.max_length, "height": self.height,
+        })
+
+
 @dataclass
 class ControlsRow:
     """A row of control widgets, rendered in place of a plot."""
-    controls: List[Union[Button, Slider, Dial, Display, Text, dict]] = field(default_factory=list)
+    controls: List[Union[Button, Slider, Dial, Display, Text, TextInput, dict]] = field(default_factory=list)
 
     def to_dict(self):
         return {"controls": [
@@ -536,7 +553,9 @@ def _send_initialize_with_handshake(cfg, timeout):
             elif evtype == "button":
                 _control_button_events.append(event.get("id"))
             elif evtype == "slider":
-                _control_slider_values[event.get("id")] = float(event.get("value", 0.0))
+                _control_values[event.get("id")] = float(event.get("value", 0.0))
+            elif evtype == "text":
+                _control_values[event.get("id")] = str(event.get("value", ""))
             # Unknown / resend_config: ignore during handshake.
         # Resend if the window elapsed without an ack; PUB/SUB will
         # drop the first send during slow-join but retries land.
@@ -575,8 +594,8 @@ def poll_controls():
     """Drain the return channel non-blocking and return current control state.
 
     Returns a ControlState(values, buttons) where:
-      - values: dict of {slider_id: float} with the latest value of every
-        slider the server has told us about since process start.
+      - values: dict of latest control values keyed by id. Sliders/dials
+        remain floats; text_input controls remain strings.
       - buttons: list of button ids that fired since the previous poll
         (cleared after this call).
 
@@ -587,7 +606,7 @@ def poll_controls():
     Reconnect button on a tab), it asks us to re-publish the cached
     initialize_plots() payload so the plot rewires without the user
     restarting their script. The request is consumed silently — the
-    returned ControlState only ever contains slider/button events.
+    returned ControlState only ever contains control/button events.
     """
     global _control_button_events
     while True:
@@ -601,7 +620,9 @@ def poll_controls():
         if evtype == "button":
             _control_button_events.append(event.get("id"))
         elif evtype == "slider":
-            _control_slider_values[event.get("id")] = float(event.get("value", 0.0))
+            _control_values[event.get("id")] = float(event.get("value", 0.0))
+        elif evtype == "text":
+            _control_values[event.get("id")] = str(event.get("value", ""))
         elif evtype == "resend_config":
             if plot_desc_dict is not None:
                 socket.send_string(SENDING_PLOT_UPDATE)
@@ -615,7 +636,7 @@ def poll_controls():
 
     buttons = _control_button_events
     _control_button_events = []
-    return ControlState(values=dict(_control_slider_values), buttons=buttons)
+    return ControlState(values=dict(_control_values), buttons=buttons)
 
 
 def save_snapshot(path, server_url=None, animate=False, timeout=5.0):
@@ -664,4 +685,4 @@ def save_snapshot(path, server_url=None, animate=False, timeout=5.0):
     abs_path = _os.path.abspath(path)
     with open(abs_path, "wb") as fh:
         fh.write(body)
-    return abs_path
+    return abs_path

{better_rtplot-0.4.10 → better_rtplot-0.4.11}/rtplot/server_browser.py

@@ -375,6 +375,7 @@ class Tab:
     layout: list = field(default_factory=list)
     control_rows: list = field(default_factory=list)
     slider_values: dict = field(default_factory=dict)
+    text_values: dict = field(default_factory=dict)
     display_values: dict = field(default_factory=dict)
     display_dirty: set = field(default_factory=set)
     fps: float = 0.0
@@ -499,6 +500,7 @@ def parse_config(tab: Tab, json_config):
     trace_info = []
     control_rows = []
     slider_values = {}
+    text_values = {}
     layout = []
     num_datapoints_in_plot = DEFAULT_NUM_DATAPOINTS_IN_PLOT
 
@@ -514,6 +516,8 @@ def parse_config(tab: Tab, json_config):
             for element in row:
                 if element.get("type") in ("slider", "dial") and "value" in element:
                     slider_values[element["id"]] = float(element["value"])
+                elif element.get("type") == "text_input":
+                    text_values[element["id"]] = str(element.get("value", ""))
             layout.append({"kind": "controls", "index": len(control_rows)})
             control_rows.append(row)
             continue
@@ -546,6 +550,17 @@ def parse_config(tab: Tab, json_config):
     }
     tab.display_dirty = {d for d in tab.display_dirty if d in active_display_ids}
     tab.slider_values = slider_values
+    active_text_ids = {
+        el["id"]
+        for row in control_rows
+        for el in row
+        if el.get("type") == "text_input"
+    }
+    tab.text_values = {
+        text_id: tab.text_values.get(text_id, default_value)
+        for text_id, default_value in text_values.items()
+        if text_id in active_text_ids
+    }
     tab.layout = layout
 
     num_traces = sum(traces_per_plot)
@@ -585,11 +600,20 @@ def build_config_message(tab: Tab, config_dict) -> dict:
         "controls": tab.control_rows,
         "layout": tab.layout,
         "slider_values": dict(tab.slider_values),
+        "text_values": dict(tab.text_values),
         "display_values": dict(tab.display_values),
         "row_layout": bool(NEW_SUBPLOT_IN_ROW),
     }
 
 
+def refresh_config_message(tab: Tab):
+    """Rebuild the browser config payload using the tab's latest control state."""
+    if tab.config_dict is None:
+        tab.config_message = None
+    else:
+        tab.config_message = build_config_message(tab, tab.config_dict)
+
+
 ###############################
 # Binary payload construction #
 ###############################
@@ -952,7 +976,7 @@ async def zmq_receiver(tab: Tab):
 
             tab.last_config_error = None  # clear: this one was good
             tab.config_dict = cfg
-            tab.config_message = build_config_message(tab, cfg)
+            refresh_config_message(tab)
             tab.initialized = True
             fps = None
             tab.fps = 0.0
@@ -976,6 +1000,10 @@ async def zmq_receiver(tab: Tab):
                 await send_control_event(
                     tab, {"type": "slider", "id": sid, "value": svalue}
                 )
+            for text_id, text_value in tab.text_values.items():
+                await send_control_event(
+                    tab, {"type": "text", "id": text_id, "value": text_value}
+                )
 
         elif category == RECEIVED_DATA:
             arr = await _recv_array_async(sock)
@@ -1342,6 +1370,7 @@ async def handle_ws(request):
                         },
                     )
                     if t.config_message is not None:
+                        refresh_config_message(t)
                         await ws_send_text(ws, t.config_message)
                         if t.display_values:
                             await ws_send_text(
@@ -1402,9 +1431,21 @@ async def handle_ws(request):
                     t = tabs.get(tid)
                     if sid and t is not None:
                         t.slider_values[sid] = value
+                        refresh_config_message(t)
                         await send_control_event(
                             t, {"type": "slider", "id": sid, "value": value}
                         )
+                elif ptype == "control_text":
+                    text_id = payload.get("id")
+                    tid = ws_tab.get(ws, BIND_ME_ID)
+                    t = tabs.get(tid)
+                    if text_id and t is not None:
+                        value = str(payload.get("value", ""))
+                        t.text_values[text_id] = value
+                        refresh_config_message(t)
+                        await send_control_event(
+                            t, {"type": "text", "id": text_id, "value": value}
+                        )
             elif msg.type == WSMsgType.ERROR:
                 break
     finally:

{better_rtplot-0.4.10 → better_rtplot-0.4.11}/rtplot/static/index.html

@@ -95,6 +95,8 @@
   .ctrl-numinput { width: 72px; font-family: monospace; font-size: calc(13px * var(--ui-scale)); padding: 4px 6px; border: 1px solid #b8b8b8; border-radius: 3px; background: #fff; color: #222; text-align: right; -moz-appearance: textfield; }
   .ctrl-numinput::-webkit-outer-spin-button,
   .ctrl-numinput::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; }
+  .ctrl-textinput { min-width: 200px; width: min(320px, 100%); font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; font-size: calc(13px * var(--ui-scale)); padding: 7px 10px; border: 1px solid #b8b8b8; border-radius: 3px; background: #fff; color: #222; text-align: left; }
+  .ctrl-textinput:focus { outline: none; border-color: #2a5db0; box-shadow: 0 0 0 2px rgba(42, 93, 176, 0.14); }
   .ctrl-nudgebtn { width: 26px; height: 26px; font-size: calc(15px * var(--ui-scale)); font-weight: 600; line-height: 1; padding: 0; border: 1px solid #b8b8b8; background: #f7f7f7; color: #333; cursor: pointer; border-radius: 3px; }
   .ctrl-nudgebtn:hover { background: #e9e9e9; }
   .ctrl-nudgebtn:active { background: #dcdcdc; }
@@ -415,7 +417,7 @@
       let socket = null;
       let pendingFrame = false;
       let lastStatus = { fps: 0, statusByte: 0, nonPlot: 0, peers: 0, dirty: true };
-      const controlElements = { displays: {}, displayFormats: {}, displayKinds: {}, sliders: {} };
+      const controlElements = { displays: {}, displayFormats: {}, displayKinds: {}, sliders: {}, textInputs: {} };
 
       function sendCtrl(msg) {
         if (socket && socket.readyState === WebSocket.OPEN) {
@@ -684,6 +686,34 @@
           item.appendChild(val);
           controlElements.displays[el.id] = val;
           controlElements.displayKinds[el.id] = 'text';
+        } else if (el.type === 'text_input') {
+          item.classList.add('ctrl-text-input', 'flex');
+          if (el.label) {
+            const lbl = document.createElement('label');
+            lbl.textContent = el.label;
+            item.appendChild(lbl);
+          }
+          const input = document.createElement('input');
+          input.type = 'text';
+          input.className = 'ctrl-textinput';
+          input.value = (el.value !== undefined && el.value !== null) ? String(el.value) : '';
+          if (el.placeholder !== undefined && el.placeholder !== null) {
+            input.placeholder = String(el.placeholder);
+          }
+          if (el.max_length !== undefined && Number.isFinite(Number(el.max_length))) {
+            input.maxLength = Number(el.max_length);
+          }
+          const commit = () => sendCtrl({ type: 'control_text', id: el.id, value: input.value });
+          input.addEventListener('change', commit);
+          input.addEventListener('blur', commit);
+          input.addEventListener('keydown', (e) => {
+            if (e.key === 'Enter') {
+              e.preventDefault();
+              commit();
+            }
+          });
+          item.appendChild(input);
+          controlElements.textInputs[el.id] = input;
         }
         return item;
       }
@@ -722,6 +752,14 @@
         }
       }
 
+      function applyTextValues(values) {
+        if (!values) return;
+        for (const [id, val] of Object.entries(values)) {
+          const input = controlElements.textInputs[id];
+          if (input) input.value = (val !== undefined && val !== null) ? String(val) : '';
+        }
+      }
+
       function applyDisplayValues(values) {
         if (!values) return;
         for (const [id, val] of Object.entries(values)) {
@@ -752,6 +790,7 @@
         controlElements.displayFormats = {};
         controlElements.displayKinds = {};
         controlElements.sliders = {};
+        controlElements.textInputs = {};
       }
 
       function showEmptyState(text) {
@@ -859,6 +898,7 @@
         });
         totalTraces = traceOffset;
         applySliderValues(cfg.slider_values);
+        applyTextValues(cfg.text_values);
         applyDisplayValues(cfg.display_values);
         // Render LaTeX in everything we just built: uPlot's title,
         // x/y axis labels, and legend (all rendered as HTML), plus the