vis-agent 0.2.39.dev7593__tar.gz → 0.2.40.dev7598__tar.gz

{vis_agent-0.2.39.dev7593 → vis_agent-0.2.40.dev7598}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: vis-agent
-Version: 0.2.39.dev7593
+Version: 0.2.40.dev7598
 Summary: The Vis Python SDK — author extensions and control local or remote engines.
 Project-URL: Homepage, https://vis.blockether.com
 Project-URL: Documentation, https://vis.blockether.com

{vis_agent-0.2.39.dev7593 → vis_agent-0.2.40.dev7598}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "vis-agent"
-version = "0.2.39.dev7593"
+version = "0.2.40.dev7598"
 description = "The Vis Python SDK — author extensions and control local or remote engines."
 readme = "README.md"
 requires-python = ">=3.11"

{vis_agent-0.2.39.dev7593 → vis_agent-0.2.40.dev7598}/src/blockether/vis/_contracts.py

@@ -41,6 +41,27 @@ def definition(name: str, key: str) -> dict[str, Any]:
     return schema(name)["$defs"][key]
 
 
+# An appended live item replaces the item with its id. The host fills these keys
+# when the item leaves them out; every other required key must come with it.
+_LIVE_ITEM_DEFAULTS = {"step": {"tone": "idle"}, "link": {"target_kind": "url"}}
+_LIVE_ITEMS = {"stats": "stat", "steps": "step", "rows": "row", "links": "link"}
+
+
+def live_items(key: str, items: list[dict[str, Any]]) -> list[dict[str, Any]]:
+    """Return appended live items as the host keeps them; refuse a missing key."""
+    item = _LIVE_ITEMS[key]
+    required = definition("view", item)["required"]
+    result = []
+    for one in items:
+        one = {**_LIVE_ITEM_DEFAULTS.get(item, {}), **one}
+        if missing := [name for name in required if name not in one]:
+            raise ValueError(
+                f"{item} {one.get('id')}: {', '.join(missing)} is missing (required)"
+            )
+        result.append(one)
+    return result
+
+
 @lru_cache(maxsize=64)
 def _validator(name: str, definition: str):
     from jsonschema import Draft202012Validator, FormatChecker

{vis_agent-0.2.39.dev7593 → vis_agent-0.2.40.dev7598}/src/blockether/vis/_outside.py

@@ -1141,9 +1141,10 @@ def _live_find(nodes, node_id):
     return None
 
 
-def _live_upsert(held, incoming):
+def _live_upsert(held, incoming, *, is_merged=False):
     # An item keeps the position it was first given: a row that updates in place
-    # is what makes a table readable while it fills.
+    # is what makes a table readable while it fills. The host replaces an item;
+    # only a group declaration merges onto the one before it.
     merged = list(held or [])
     for item in incoming or []:
         item_id = item.get("id") if isinstance(item, dict) else None
@@ -1155,7 +1156,7 @@ def _live_upsert(held, incoming):
         if at is None:
             merged.append(item)
         else:
-            merged[at] = {**merged[at], **item}
+            merged[at] = {**merged[at], **item} if is_merged else item
     return merged
 
 
@@ -1248,12 +1249,18 @@ def _live_apply(view, op):
             )
             node[key] = list(node.get(key) or []) + payload
         else:
+            try:
+                payload = _contracts.live_items(key, payload)
+            except ValueError as error:
+                raise Refused(str(error)) from None
             node[key] = _live_upsert(node.get(key), payload)
         if "groups" in op:
             # A table upserts its group DECLARATIONS in the same append that
             # carries the rows hanging under them, and a second declaration
             # merges onto the first: re-toning a head keeps its label.
-            node["groups"] = _live_upsert(node.get("groups"), op["groups"])
+            node["groups"] = _live_upsert(
+                node.get("groups"), op["groups"], is_merged=True
+            )
     elif name == "clear":
         node[_live_items_key(node, "clear")] = []
         if node.get("type") == "log":

{vis_agent-0.2.39.dev7593 → vis_agent-0.2.40.dev7598}/src/blockether/vis/extension.py

@@ -4120,8 +4120,9 @@ class Progress(_Node):
 
 
 class Stat(_Node):
-    def set(self, stat_id, value_text, label=None, tone=None):
-        # One counter of the strip, upserted by id.
+    def set(self, stat_id, value_text, label, tone=None):
+        # One counter of the strip, upserted by id. The View schema requires
+        # the label in each update.
         return self._op(
             "append",
             stats=[
@@ -4140,9 +4141,10 @@ class Stat(_Node):
 
 
 class Steps(_Node):
-    def set(self, step_id, tone=None, label=None, detail=None, value=None):
+    def set(self, step_id, label, tone=None, detail=None, value=None):
         # One step of the checklist, upserted by id: the same call marks it
-        # running and later done.
+        # running and later done. The View schema requires the label in each
+        # update.
         return self._op(
             "append",
             steps=[
@@ -4580,14 +4582,12 @@ class LiveView:
             value=value, done=done, total=total
         )
 
-    def stat(self, stat_id, value_text, label=None, tone=None):
-        return self._only("stat", "stat").set(
-            stat_id, value_text, label=label, tone=tone
-        )
+    def stat(self, stat_id, value_text, label, tone=None):
+        return self._only("stat", "stat").set(stat_id, value_text, label, tone=tone)
 
-    def step(self, step_id, tone=None, label=None, detail=None, value=None):
+    def step(self, step_id, label, tone=None, detail=None, value=None):
         return self._only("steps", "step").set(
-            step_id, tone=tone, label=label, detail=detail, value=value
+            step_id, label, tone=tone, detail=detail, value=value
         )
 
     def write(self, *lines: str | Sequence[str], tone: LogTone | None = None):
@@ -4809,7 +4809,7 @@ class _LiveRecorder:
             item = _LiveRecorder._copy(item)
             if item["id"] in positions:
                 at = positions[item["id"]]
-                result[at] = {**result[at], **item}
+                result[at] = item
             else:
                 positions[item["id"]] = len(result)
                 result.append(item)
@@ -4909,9 +4909,9 @@ class _LiveRecorder:
         elif action == "append":
             key = self._COLLECTION[node["type"]]
             incoming = self._copy(op.get(key) or [])
-            if node["type"] == "link":
-                for item in incoming:
-                    item.setdefault("target_kind", "url")
+            from blockether.vis import _contracts
+
+            incoming = _contracts.live_items(key, incoming)
             node[key] = self._upsert(node[key], incoming)
             if "groups" in op:
                 # `live/apply-append`: a group already declared KEEPS the keys the

{vis_agent-0.2.39.dev7593 → vis_agent-0.2.40.dev7598}/tests/test_live_primitives.py

@@ -358,3 +358,28 @@ def test_a_group_arranging_nothing_is_refused_where_it_was_written():
     ):
         with pytest.raises(ValueError, match="at least one node"):
             build()
+
+
+@pytest.mark.parametrize("host_kind", ["outside", "recorder"])
+def test_stat_and_step_updates_carry_the_label_the_schema_requires(
+    monkeypatch, host_kind
+):
+    # The evals watch view sent a counter update without its label, and the host
+    # refused it. The recorder now refuses the same patch, as the View schema says.
+    host = (
+        _outside.host if host_kind == "outside" else vis.testing.LiveRecorder(vis._host)
+    )
+    monkeypatch.setattr(vis, "_host", host)
+    nodes = [
+        vis.stat("counts", stats=[{"id": "ok", "label": "Passed", "value_text": "0"}]),
+        vis.steps("plan", steps=[{"id": "build", "label": "Build"}]),
+    ]
+    with vis.live("Counts", nodes, flush_ms=0) as view:
+        with pytest.raises((ValueError, _outside.Refused), match="label"):
+            view["counts"]._op("append", stats=[{"id": "ok", "value_text": "1"}])
+        view["counts"].set("ok", "2", "Passed")
+        view["plan"].set("build", "Build", tone="ok")
+        counts, plan = view.state()["nodes"]
+        stats, steps = counts["stats"], plan["steps"]
+        assert stats == [{"id": "ok", "label": "Passed", "value_text": "2"}]
+        assert steps[0]["label"] == "Build" and steps[0]["tone"] == "ok"