matrx-graph 0.2.332__tar.gz → 0.2.334__tar.gz

{matrx_graph-0.2.332 → matrx_graph-0.2.334}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: matrx-graph
-Version: 0.2.332
+Version: 0.2.334
 Summary: Channel-based, super-step workflow orchestration engine for the Matrx ecosystem
 Project-URL: Homepage, https://github.com/AI-Matrix-Engine/aidream-current
 Project-URL: Repository, https://github.com/AI-Matrix-Engine/aidream-current
@@ -19,14 +19,14 @@ Requires-Python: >=3.13
 Requires-Dist: croniter>=2.0
 Requires-Dist: httpx>=0.27
 Requires-Dist: jsonschema>=4.20
-Requires-Dist: matrx-connect>=0.1.236
+Requires-Dist: matrx-connect>=0.1.237
 Requires-Dist: matrx-utils>=2.0.83
 Requires-Dist: pydantic>=2.12
 Requires-Dist: pyyaml>=6.0
 Provides-Extra: otel
 Requires-Dist: opentelemetry-api>=1.25; extra == 'otel'
 Provides-Extra: postgres
-Requires-Dist: matrx-orm>=3.1.242; extra == 'postgres'
+Requires-Dist: matrx-orm>=3.1.243; extra == 'postgres'
 Description-Content-Type: text/markdown
 
 # matrx-graph

{matrx_graph-0.2.332 → matrx_graph-0.2.334}/matrx_graph/overview.py

@@ -19,7 +19,9 @@ The spec has no place for the real node ids (Archify's node schema is closed), s
 
 ``definition_structure_hash`` is the staleness key: sha256 over the nodes (id, type) and the edges
 (source, target, kind) only — never positions, labels, config or any other cosmetic field — so
-dragging a node does not invalidate an overview and adding a connection does.
+dragging a node does not invalidate an overview and adding a connection does. Because the collapse
+also reads labels, lanes and the title, ``definition_collapse_hash`` covers those inputs; a host
+re-collapses when EITHER hash differs.
 """
 
 from __future__ import annotations
@@ -132,6 +134,23 @@ def definition_structure_hash(definition: Definition) -> str:
     return hashlib.sha256(payload.encode("utf-8")).hexdigest()
 
 
+def definition_collapse_hash(
+    definition: Definition, *, title: str = "Workflow overview", categories: dict[str, str] | None = None
+) -> str:
+    """sha256 over everything ``collapse_definition_detailed`` READS, so a stored overview is re-collapsed
+    whenever its picture could differ. Derived from the collapse code: per node, in definition order (the
+    order breaks ties), the id, the spec type, the plain-words label (``_label_of``: label, else id, else
+    spec tail) and the lane (``node_family``: registry category, ``data.category``, spec name); per edge
+    (sorted) source, target and kind; and the workflow title. Positions, config and every field the
+    collapse never reads are ignored, so dragging a node leaves it unchanged while renaming a step changes
+    it. Complements ``definition_structure_hash`` (which means STRUCTURE only); bump ``COLLAPSE_VERSION``
+    when the collapse starts reading something new."""
+    nodes = [[n.id, n.spec_type, _label_of(n), node_family(n, categories)] for n in definition.nodes]
+    edges = sorted((e.source, e.target, e.kind.value) for e in definition.edges)
+    payload = json.dumps({"title": title, "nodes": nodes, "edges": edges}, sort_keys=True, separators=(",", ":"))
+    return hashlib.sha256(payload.encode("utf-8")).hexdigest()
+
+
 # --------------------------------------------------------------------------- labels
 
 _STOPWORDS = frozenset({"the", "and", "for", "from", "with", "your", "step", "agent", "source", "run", "make", "new"})
@@ -199,6 +218,8 @@ class CollapseResult:
     hidden: list[str]
     structure_hash: str
     collapse_version: int = COLLAPSE_VERSION
+    #: ``definition_collapse_hash`` of the inputs this picture was built from.
+    collapse_hash: str = ""
 
 
 def collapse_definition(
@@ -392,7 +413,10 @@ def collapse_definition_detailed(
     if cards:
         spec["cards"] = cards
     node_map = {ids[k]: list(items[k].members) for k in items}
-    return CollapseResult(spec=spec, node_map=node_map, hidden=hidden, structure_hash=structure_hash)
+    return CollapseResult(
+        spec=spec, node_map=node_map, hidden=hidden, structure_hash=structure_hash,
+        collapse_hash=definition_collapse_hash(definition, title=title, categories=categories),
+    )
 
 
 # --------------------------------------------------------------------------- folding

{matrx_graph-0.2.332 → matrx_graph-0.2.334}/matrx_graph/workers/job_lease.py

@@ -48,7 +48,8 @@ class JobLease:
     #: the copy finished its work and is settling the job (``complete``): a renewal that lands after the settle
     #: commits answers "not ours", and that is not a loss (K1b, M1)
     settling: bool = False
-    #: per-copy fencing token for anything this copy holds (an import slot): a newer copy's is always greater
+    #: per-copy fencing token for anything this copy holds (an import slot): a newer copy's is always greater. The
+    #: runner sets the job's attempt (bumped by every claim); a lease made by hand defaults to its creation time
     generation: float = field(default_factory=time.time)
     visibility_timeout: int = 600
     lost: bool = False

{matrx_graph-0.2.332 → matrx_graph-0.2.334}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "matrx-graph"
-version = "0.2.332"
+version = "0.2.334"
 description = "Channel-based, super-step workflow orchestration engine for the Matrx ecosystem"
 readme = "README.md"
 license = { text = "MIT" }
@@ -33,7 +33,7 @@ classifiers = [
 requires-python = ">=3.13"
 dependencies = [
     "pydantic>=2.12",
-    "matrx-connect>=0.1.236",
+    "matrx-connect>=0.1.237",
     # workers/queue.py imports compute_backoff_ms and validation.py imports
     # format_options/suggestion_line; all were first exported by 1.1.0.
     "matrx-utils>=2.0.83",
@@ -50,7 +50,7 @@ dependencies = [
 
 [project.optional-dependencies]
 postgres = [
-    "matrx-orm>=3.1.242",
+    "matrx-orm>=3.1.243",
 ]
 otel = [
     "opentelemetry-api>=1.25",

{matrx_graph-0.2.332 → matrx_graph-0.2.334}/tests/test_overview_collapse.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from matrx_graph import Definition
-from matrx_graph.overview import collapse_definition, collapse_definition_detailed, definition_structure_hash
+from matrx_graph.overview import collapse_definition, collapse_definition_detailed, definition_collapse_hash, definition_structure_hash
 
 
 def _node(nid: str, spec: str, label: str | None = None, x: float = 0.0, y: float = 0.0) -> dict:
@@ -90,3 +90,29 @@ def test_the_hash_ignores_positions_and_labels_but_not_structure() -> None:
     kind = base.model_dump(mode="json")
     kind["edges"][0]["data"]["kind"] = "control"
     assert definition_structure_hash(Definition.model_validate(kind)) != definition_structure_hash(base)
+
+
+def test_collapse_hash_covers_what_the_collapse_reads_and_ignores_positions() -> None:
+    base = _fan_out()
+    h = definition_collapse_hash(base, title="T")
+
+    moved = Definition.model_validate(
+        {**base.model_dump(mode="json"), "nodes": [{**n.model_dump(mode="json"), "position": {"x": 7.0, "y": 9.0}} for n in base.nodes]}
+    )
+    assert definition_collapse_hash(moved, title="T") == h  # moving a node: no change
+
+    renamed = Definition.model_validate(base.model_dump(mode="json"))
+    renamed.nodes[2].data["label"] = "Something else"
+    assert definition_collapse_hash(renamed, title="T") != h  # renaming: changes (structure hash does not)
+    assert definition_structure_hash(renamed) == definition_structure_hash(base)
+
+    assert definition_collapse_hash(base, title="Other") != h  # the title is in the picture
+    solo = Definition.model_validate({"nodes": [_node("a", "tool.call", "Look up")], "edges": []})
+    assert definition_collapse_hash(solo, categories={"tool.call": "llm"}) != definition_collapse_hash(solo)  # lane source
+    assert definition_collapse_hash(base, title="T", categories={"ai.agent.produce": "tool"}) == h  # same lane: no change
+
+    more = base.model_dump(mode="json")
+    more["edges"].append(_edge("in", "save"))
+    assert definition_collapse_hash(Definition.model_validate(more), title="T") != h
+
+    assert collapse_definition_detailed(base, title="T").collapse_hash == h