s3dgraphy 1.6.0.dev31__tar.gz → 1.6.0.dev33__tar.gz

{s3dgraphy-1.6.0.dev31/src/s3dgraphy.egg-info → s3dgraphy-1.6.0.dev33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev31
+Version: 1.6.0.dev33
 Summary: 3D Stratigraphic Graph Management Library for archaeological and heritage applications
 Author-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>
 Maintainer-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>

{s3dgraphy-1.6.0.dev31 → s3dgraphy-1.6.0.dev33}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "s3dgraphy"
-version = "1.6.0.dev31"
+version = "1.6.0.dev33"
 description = "3D Stratigraphic Graph Management Library for archaeological and heritage applications"
 readme = "README.md"
 requires-python = ">=3.9"

{s3dgraphy-1.6.0.dev31 → s3dgraphy-1.6.0.dev33}/src/s3dgraphy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.6.0.dev31"
+__version__ = "1.6.0.dev33"
 __datamodel_version__ = "1.5.5"  # s3Dgraphy connections datamodel version
 
 # s3Dgraphy/__init__.py

{s3dgraphy-1.6.0.dev31 → s3dgraphy-1.6.0.dev33}/src/s3dgraphy/container.py

@@ -19,8 +19,8 @@ groups — the single-graph ``layout`` object, unchanged). The file-level
 ``layout`` stays, written as a COPY of the active graph's, for whoever reads only
 that (Heriverse, the files written before today). Reading:
 ``graphs.<id>.layout`` when the member has one; otherwise the file-level
-``layout`` goes to the ACTIVE graph only (or to the only one); the other graphs
-of an old file have no arrangement and are laid out afresh, which the reader
+``layout`` goes to ONE graph — the one whose nodes it positions, else the
+active one (or the only one); the other graphs of an old file have no arrangement and are laid out afresh, which the reader
 says once. Until today the file had ONE layout for every graph, and whichever
 graph was saved first gave it away: measured on San Pietro, the layout in the
 file was an empty seed's and the real graph had lost every position.
@@ -77,7 +77,7 @@ import json
 import os
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, Iterable, List, Optional, Tuple
 
 from . import crdt
 from .graph import Graph
@@ -281,15 +281,22 @@ def resolve_layouts(graph_ids: List[str],
                     own: Dict[str, Dict[str, Any]],
                     file_layout: Dict[str, Any],
                     active_graph_id: Optional[str],
+                    node_ids: Optional[Dict[str, Iterable[str]]] = None,
                     ) -> Tuple[Dict[str, Dict[str, Any]], List[str]]:
     """Which layout each graph of a file gets, and which ones get none.
 
     THE reading rule, the same as ``container.ts::resolveLayouts``:
 
     1. a member that carries ``graphs.<id>.layout`` keeps its own;
-    2. otherwise the file-level ``layout`` goes to the ACTIVE graph — or to the
-       only one — and to no other: in a file written before per-graph layouts it
-       was the arrangement of one graph, and giving it to the rest was the bug;
+    2. otherwise the file-level ``layout`` goes to ONE graph and to no other: in a
+       file written before per-graph layouts it was the arrangement of one graph,
+       and giving it to the rest was the bug. That graph is the one whose nodes
+       the layout positions (``node_ids``, most positions wins) — NOT simply the
+       active one: an old file kept the layout of the graph laid out LAST, which
+       may be a seed that is not the active graph (San Pietro, dev.17: the seed's
+       three positions went to the real graph, which then saved them as its own
+       and was never laid out). Ties, a layout with no positions, or no
+       ``node_ids`` → the ACTIVE graph, or the only one;
     3. the remaining graphs get nothing and are laid out afresh. They are
        returned as ``fresh`` only for an OLD file — one with a layout to give and
        no member carrying its own: there, a graph's positions may have been lost
@@ -303,6 +310,13 @@ def resolve_layouts(graph_ids: List[str],
         graph_ids[0] if graph_ids else None)
     if len(graph_ids) == 1:
         heir = graph_ids[0]
+    elif file_layout and node_ids:
+        placed = set((file_layout.get("positions") or {}).keys())
+        counts = {gid: len(placed & set(node_ids.get(gid) or ()))
+                  for gid in graph_ids if gid not in own}
+        best = max(counts.values(), default=0)
+        if best > 0 and counts.get(heir, 0) < best:
+            heir = next(gid for gid in graph_ids if counts.get(gid, 0) == best)
     for gid in graph_ids:
         if gid in own:
             layouts[gid] = own[gid]
@@ -357,6 +371,7 @@ def parse_container(doc: Dict[str, Any], *,
     container = Container(header=header,
                           version=ProjectVersion.from_dict(doc.get(VERSION_KEY)))
     own_layouts: Dict[str, Dict[str, Any]] = {}
+    node_ids: Dict[str, List[str]] = {}
     members = doc[GRAPHS_KEY]
     for member_id, section in members.items():
         if not isinstance(section, dict):
@@ -388,6 +403,9 @@ def parse_container(doc: Dict[str, Any], *,
             container.corpus = graph
         else:
             container.graphs[graph.graph_id] = graph
+            node_ids[graph.graph_id] = [
+                str(n.get("id")) for n in (section.get("nodes") or [])
+                if isinstance(n, dict) and n.get("id") is not None]
             if isinstance(own, dict):
                 own_layouts[graph.graph_id] = dict(own)
 
@@ -402,7 +420,8 @@ def parse_container(doc: Dict[str, Any], *,
         container.active_graph_id = next(iter(container.graphs), None)
 
     container.layouts, fresh = resolve_layouts(
-        list(container.graphs), own_layouts, file_layout, container.active_graph_id)
+        list(container.graphs), own_layouts, file_layout, container.active_graph_id,
+        node_ids)
     if fresh:
         warnings.append(layout_fresh_warning(fresh))
 

{s3dgraphy-1.6.0.dev31 → s3dgraphy-1.6.0.dev33/src/s3dgraphy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev31
+Version: 1.6.0.dev33
 Summary: 3D Stratigraphic Graph Management Library for archaeological and heritage applications
 Author-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>
 Maintainer-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>

{s3dgraphy-1.6.0.dev31 → s3dgraphy-1.6.0.dev33}/tests/test_release.py

@@ -627,3 +627,113 @@ def test_a_long_wait_says_the_jobs_and_their_step(world):
     assert "linux        done ✓" in out
     # not a terminal: a new line per change of state, not one per look
     assert out.count(f"▸ 2 · publish.yml for v{D}") <= 3
+
+
+# ── the confirmations count down (E.D., 3 Oct 2026) ──────────────────────────
+#
+# On a FAKE TERMINAL (a pty: `isatty()` is true and keys arrive one at a time,
+# as from a person): no key → yes at zero; «n» → stop; Enter → yes at once.
+
+def _release_module():
+    import importlib.util
+    spec = importlib.util.spec_from_file_location("em_release", RELEASE)
+    mod = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
+    return mod
+
+
+@pytest.fixture
+def terminal():
+    pty = pytest.importorskip("pty")  # noqa: F841 — POSIX only, like the countdown
+    import io
+    master, slave = os.openpty()
+    stdin = os.fdopen(slave, "rb", buffering=0)
+    out = io.StringIO()
+    yield master, stdin, out
+    stdin.close()
+    os.close(master)
+
+
+def test_the_countdown_says_yes_at_zero(terminal):
+    import time
+    master, stdin, out = terminal
+    R = _release_module()
+    t0 = time.monotonic()
+    assert R.countdown_confirm("Push these 3 repositories?", 1, stdin=stdin, stdout=out) is True
+    assert time.monotonic() - t0 >= 0.9
+    said = out.getvalue()
+    assert "Push these 3 repositories? [Y/n] — yes in 1 s (n to stop)" in said
+    assert "yes (no answer in 1 s)" in said
+    assert "\r" in said                         # the same line, rewritten
+
+
+def _press(master, key, after=0.3):
+    """a key, pressed while the question is counting (not before: those are thrown away)"""
+    import threading
+    threading.Timer(after, lambda: os.write(master, key)).start()
+
+
+def test_the_countdown_stops_on_n(terminal):
+    master, stdin, out = terminal
+    R = _release_module()
+    _press(master, b"n")
+    assert R.countdown_confirm("Commit EMStudio?", 10, stdin=stdin, stdout=out) is False
+    assert out.getvalue().rstrip().endswith("— no\033[K")
+
+
+def test_the_countdown_goes_at_once_on_enter(terminal):
+    import time
+    master, stdin, out = terminal
+    R = _release_module()
+    _press(master, b"\n")
+    t0 = time.monotonic()
+    assert R.countdown_confirm("Commit EMStudio?", 10, stdin=stdin, stdout=out) is True
+    assert time.monotonic() - t0 < 1.5
+    assert "— yes\033[K" in out.getvalue()
+
+
+def test_the_countdown_gives_the_terminal_back(terminal):
+    import termios
+    master, stdin, out = terminal
+    R = _release_module()
+    before = termios.tcgetattr(stdin.fileno())
+    _press(master, b"y")
+    R.countdown_confirm("Go on?", 10, stdin=stdin, stdout=out)
+    after = termios.tcgetattr(stdin.fileno())
+    # PENDIN is the KERNEL's («input to reprint»), set by itself after a mode change
+    pendin = getattr(termios, "PENDIN", 0)
+    before[3] &= ~pendin
+    after[3] &= ~pendin
+    assert after == before
+
+
+def test_a_key_pressed_before_the_question_is_not_an_answer(terminal):
+    master, stdin, out = terminal
+    R = _release_module()
+    os.write(master, b"n")          # typed ahead, before anything was asked
+    assert R.countdown_confirm("Go on?", 1, stdin=stdin, stdout=out) is True
+    assert "yes (no answer in 1 s)" in out.getvalue()
+
+
+def test_the_seconds_come_from_the_environment(monkeypatch):
+    R = _release_module()
+    monkeypatch.delenv("EM_RELEASE_CONFIRM_SECONDS", raising=False)
+    assert R.confirm_seconds() == 10
+    monkeypatch.setenv("EM_RELEASE_CONFIRM_SECONDS", "3")
+    assert R.confirm_seconds() == 3
+    monkeypatch.setenv("EM_RELEASE_CONFIRM_SECONDS", "0")
+    assert R.confirm_seconds() == 0
+    monkeypatch.setenv("EM_RELEASE_CONFIRM_SECONDS", "dieci")
+    assert R.confirm_seconds() == 10
+
+
+def test_without_a_terminal_and_without_yes_nobody_says_yes(monkeypatch, capsys):
+    import io
+    R = _release_module()
+    c = R.Ctx(V, None, False, False, False)
+    monkeypatch.setattr(sys, "stdin", io.StringIO(""))      # not a tty, nothing on it
+    assert c.ask("Push these 3 repositories?") is False
+    assert "stdin is not a terminal" in capsys.readouterr().out
+    monkeypatch.setattr(sys, "stdin", io.StringIO("y\n"))   # a pipe that answers: as before
+    assert c.ask("Push these 3 repositories?") is True
+    assert R.Ctx(V, None, False, False, True).ask("anything?") is True   # --yes