s3dgraphy 1.6.0.dev35__tar.gz → 1.6.0.dev36__tar.gz

{s3dgraphy-1.6.0.dev35/src/s3dgraphy.egg-info → s3dgraphy-1.6.0.dev36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev35
+Version: 1.6.0.dev36
 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.dev35 → s3dgraphy-1.6.0.dev36}/pyproject.toml

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

{s3dgraphy-1.6.0.dev35 → s3dgraphy-1.6.0.dev36}/src/s3dgraphy/__init__.py

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

{s3dgraphy-1.6.0.dev35 → s3dgraphy-1.6.0.dev36}/src/s3dgraphy/tools/node_finder.py

@@ -102,10 +102,25 @@ def parse_avahi(text: str) -> List[Dict[str, str]]:
     for line in text.splitlines():
         parts = line.split(";")
         if len(parts) >= 9 and parts[0] == "=":
-            out.append({"name": parts[3], "host": parts[6], "address": parts[7], "port": parts[8]})
+            out.append({"name": parts[3], "host": parts[6], "address": parts[7], "port": parts[8],
+                        "txt": parts[9] if len(parts) > 9 else ""})
     return out
 
 
+def url_of(host: str, port: str, txt: str = "") -> str:
+    """The node's address from what DNS-SD gives: host, port and the TXT keys
+    ``scheme`` (default ``http``) and ``path`` (default none). The personal node
+    announces ``path=/``; the dev stack behind Caddy announces ``scheme=https
+    path=/em`` (``fcn-up.sh``), because that port answers https and the API
+    lives under ``/em`` — ``http://host:8443`` would be a node that never answers."""
+    keys = dict(m.groups() for m in re.finditer(r'"?([A-Za-z][\w-]*)=([^"\s]*)"?', txt or ""))
+    scheme = keys.get("scheme") if keys.get("scheme") in ("http", "https") else "http"
+    path = (keys.get("path") or "").rstrip("/")
+    if path and not path.startswith("/"):
+        path = "/" + path
+    return f"{scheme}://{host.rstrip('.')}:{port}{path}"
+
+
 def browse_lan(timeout: float = 3.0, *, tool: Optional[str] = None,
                runner: Optional[Callable[..., Any]] = None) -> Dict[str, Any]:
     """The nodes that announce themselves on the local network.
@@ -120,7 +135,7 @@ def browse_lan(timeout: float = 3.0, *, tool: Optional[str] = None,
         try:
             done = run(["avahi-browse", "-rpt", SERVICE], capture_output=True, text=True,
                        timeout=timeout)
-            found = [{"name": f["name"], "url": f"http://{f['host']}:{f['port']}"}
+            found = [{"name": f["name"], "url": url_of(f["host"], f["port"], f.get("txt", ""))}
                      for f in parse_avahi(done.stdout)]
             return {"how": "avahi-browse", "found": found, "note": ""}
         except Exception as exc:  # noqa: BLE001
@@ -146,7 +161,8 @@ def browse_lan(timeout: float = 3.0, *, tool: Optional[str] = None,
 
 def resolve_dns_sd(name: str, *, timeout: float = 3.0,
                    runner: Optional[Callable[..., Any]] = None) -> Optional[str]:
-    """``dns-sd -L <name>`` → ``http://<host>:<port>``, or None."""
+    """``dns-sd -L <name>`` → ``<scheme>://<host>:<port><path>`` (:func:`url_of`;
+    the TXT record is the line after «can be reached at»), or None."""
     run = runner or subprocess.run
     try:
         done = run(["dns-sd", "-L", name, SERVICE, "local."], capture_output=True, text=True,
@@ -156,8 +172,11 @@ def resolve_dns_sd(name: str, *, timeout: float = 3.0,
         text = exc.stdout.decode() if isinstance(exc.stdout, bytes) else (exc.stdout or "")
     except Exception:  # noqa: BLE001
         return None
-    m = re.search(r"can be reached at (\S+?)\.?:(\d+)", text)
-    return f"http://{m.group(1).rstrip('.')}:{m.group(2)}" if m else None
+    m = re.search(r"can be reached at (\S+?)\.?:(\d+)[^\n]*\n?([^\n]*)", text)
+    if not m:
+        return None
+    txt = m.group(3) if "=" in m.group(3) and "can be reached" not in m.group(3) else ""
+    return url_of(m.group(1), m.group(2), txt)
 
 
 def find_nodes(*, saved: Iterable[str] = (), typed: str = "", lan: bool = True,

{s3dgraphy-1.6.0.dev35 → s3dgraphy-1.6.0.dev36/src/s3dgraphy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev35
+Version: 1.6.0.dev36
 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.dev35 → s3dgraphy-1.6.0.dev36}/tests/test_node_finder.py

@@ -22,7 +22,37 @@ def test_parse_dns_sd_and_avahi():
     assert N.parse_dns_sd(DNS_SD_B) == [{"domain": "local", "name": "StratiGraph lab (fcn)"}]
     avahi = "=;eth0;IPv4;StratiGraph lab;_stratigraph._tcp;local;fcn.local;192.168.1.9;8777;\n"
     assert N.parse_avahi(avahi) == [{"name": "StratiGraph lab", "host": "fcn.local",
-                                     "address": "192.168.1.9", "port": "8777"}]
+                                     "address": "192.168.1.9", "port": "8777", "txt": ""}]
+
+
+#: measured 4 Oct 2026 on this Mac: `dns-sd -R probe-fcn-test _stratigraph._tcp
+#: local. 8443 path=/em scheme=https`, then `dns-sd -L` — the TXT is the next line
+DNS_SD_L_FCN = """Lookup probe-fcn-test._stratigraph._tcp.local.
+DATE: ---Sun 04 Oct 2026---
+13:14:54.518  ...STARTING...
+13:14:54.519  probe-fcn-test._stratigraph._tcp.local. can be reached at MacBook-Pro-di-Emanuel.local.:8443 (interface 14) Flags: 1
+ path=/em scheme=https
+13:14:54.519  probe-fcn-test._stratigraph._tcp.local. can be reached at MacBook-Pro-di-Emanuel.local.:8443 (interface 14)
+ path=/em scheme=https
+"""
+
+
+def test_the_dev_stack_announced_by_fcn_up_resolves_to_its_https_door():
+    def runner(cmd, **kw):
+        raise subprocess.TimeoutExpired(cmd, 1, output=DNS_SD_L_FCN)
+    assert N.resolve_dns_sd("probe-fcn-test", runner=runner) == \
+        "https://MacBook-Pro-di-Emanuel.local:8443/em"
+    avahi = ('=;eth0;IPv4;StratiGraph fcn;_stratigraph._tcp;local;fcn.local;192.168.1.9;8443;'
+             '"scheme=https" "path=/em"\n')
+    got = N.browse_lan(1, tool="avahi-browse",
+                       runner=lambda cmd, **kw: subprocess.CompletedProcess(cmd, 0, avahi, ""))
+    assert got["found"] == [{"name": "StratiGraph fcn", "url": "https://fcn.local:8443/em"}]
+
+
+def test_the_personal_node_path_slash_stays_a_bare_address():
+    assert N.url_of("fcn.local.", "8777", "path=/") == "http://fcn.local:8777"
+    assert N.url_of("fcn.local", "8777", "") == "http://fcn.local:8777"
+    assert N.url_of("h.local", "1", "scheme=gopher path=em") == "http://h.local:1/em"
 
 
 def test_browse_lan_with_dns_sd_resolves_the_url():

{s3dgraphy-1.6.0.dev35 → s3dgraphy-1.6.0.dev36}/tests/test_release.py

@@ -239,6 +239,27 @@ esac
 
 CHANGELOG = "# Changelog\n\n## [0.1.3] — YYYY-MM-DD <!-- the date is written when the tag is made -->\n\nNew.\n"
 
+# step 10, the development node: `docker ps` says em-dev-server runs when
+# FAKE_NODE_UP is set; /v1/health is a file:// URL whose JSON the fake
+# bump-s3dgraphy.sh rewrites FAKE_NODE_RESTART seconds after the rebuild (the
+# container restarting), or never with FAKE_NODE_STUCK
+FAKE_DOCKER = r"""#!/usr/bin/env bash
+echo "docker $*" >> "$FAKE_STATE/docker.log"
+[[ "$1" == ps ]] || exit 0
+[[ -n "$FAKE_NODE_UP" ]] && echo em-dev-server
+exit 0
+"""
+
+SERVER_BUMP = r"""#!/usr/bin/env bash
+set -e
+{ echo "$*"; git log -1 --format=%s; git rev-list --count @{u}..HEAD; } > "$FAKE_STATE/bump.log"
+[[ -n "$FAKE_NODE_STUCK" ]] && exit 0
+rm -f "$FAKE_STATE/health.json"
+( sleep "${FAKE_NODE_RESTART:-0}"
+  printf '{"version": "1.6.0.dev2", "s3dgraphy": "%s"}' "$1" > "$FAKE_STATE/health.tmp"
+  mv "$FAKE_STATE/health.tmp" "$FAKE_STATE/health.json" ) >/dev/null 2>&1 &
+"""
+
 
 # ── the world ─────────────────────────────────────────────────────────────────
 
@@ -268,6 +289,8 @@ class World:
             "EM_RELEASE_PYTHON": str(self.bin / "fakepython"), "EM_RELEASE_TMP": str(tmp / "t"),
             "EM_RELEASE_POLL": "0.02", "EM_RELEASE_WAIT_TAG": "3", "EM_RELEASE_WAIT_RUN": "3",
             "EM_RELEASE_WAIT_PYPI": "5", "EM_RELEASE_WAIT_BUILD": "5", "EM_RELEASE_PROGRESS": "0.02",
+            "EM_RELEASE_DOCKER": str(self.bin / "docker"),
+            "EM_RELEASE_NODE_HEALTH": (self.state / "health.json").as_uri(),
             "EM_RELEASE_DOWNSTREAM": json.dumps([{"repo": "EM-blender-tools", "cmd": [
                 "bash", "-c", 'echo "$FAKE_DOWNSTREAM_SAYS"; exit "${FAKE_DOWNSTREAM_RC:-0}"']}]),
         })
@@ -275,6 +298,8 @@ class World:
         _x(self.bin / "gh", FAKE_GH)
         _x(self.bin / "pip", FAKE_PIP)
         _x(self.bin / "fakepython", FAKE_PYTHON)
+        _x(self.bin / "docker", FAKE_DOCKER)
+        (self.state / "health.json").write_text('{"version": "1.6.0.dev1", "s3dgraphy": "1.6.0.dev27"}')
 
         self.repo("s3Dgraphy", {
             "pyproject.toml": f'[project]\nname = "s3dgraphy"\nversion = "1.6.0.dev27"\ndependencies = [\n'
@@ -302,7 +327,8 @@ class World:
                 (et / "wheels" / cp / w).write_text("")
         _x(et / ".venv" / "bin" / "python", EMTOOLS_VENV_PY)
         (et / ".venv" / "versions").write_text("1.6.0.dev26\n0.1.2\n")
-        self.repo("stratigraph-server", {"pyproject.toml": 'dependencies = [\n    "s3dgraphy[geo,rdf]==1.6.0.dev27",\n]\n'})
+        self.repo("stratigraph-server", {"pyproject.toml": 'dependencies = [\n    "s3dgraphy[geo,rdf]==1.6.0.dev27",\n]\n',
+                                         "bump-s3dgraphy.sh": SERVER_BUMP})
         self.repo("stratigraph-templates", {"registry/s3dgraphy-snapshot.json": '{\n  "s3dgraphy_version": "1.6.0.dev27"\n}\n'})
         self.repo("stratigraph-chatbot", {"pyproject.toml": 'dependencies = [\n    "s3dgraphy>=1.6.0.dev22",\n]\n',
                                           "schede/a.json": "{}\n"})
@@ -359,7 +385,7 @@ def test_the_whole_row_in_dry_run_writes_nothing(world):
     before = world.snapshot()
     r = world.release(*FULL, "--dry-run")
     assert r.returncode == 0, _all(r)
-    for n in range(1, 12):
+    for n in range(1, 13):
         assert f" {n:>2} " in r.stdout, f"step {n} missing:\n{r.stdout}"
     assert "  ✓  1 done" in r.stdout
     assert "  →  2 to do" in r.stdout
@@ -386,7 +412,7 @@ def test_the_round_goes_through_and_status_says_done(world):
     assert subjects == {
         "stratigraph-templates": f"Snapshot s3Dgraphy {V} from PyPI",
         "stratigraph-chatbot": f"Vendor the schede against s3Dgraphy {V} and require it",
-        "stratigraph-server": f"Pin s3dgraphy {V} in one place and its two copies",
+        "stratigraph-server": f"Pin s3dgraphy {V} in one place and its two copies, and count one more iteration of the server",
         "EM-blender-tools": f"Bundle s3dgraphy {V} and dtcstamp {D}"}
     assert f'"s3dgraphy>={V}"' in world.git(world.ws / "stratigraph-chatbot", "show", "HEAD:pyproject.toml")
     req = world.git(world.ws / "EM-blender-tools", "show", "HEAD:scripts/requirements_wheels.txt")
@@ -405,7 +431,7 @@ def test_the_round_goes_through_and_status_says_done(world):
     # and status agrees, with its proofs
     st = world.release("status", *FULL)
     assert st.returncode == 0, _all(st)
-    assert st.stdout.count(" done ") == 12, st.stdout       # 0 … 11
+    assert st.stdout.count(" done ") == 12, st.stdout       # 0 … 12, but 10: the em-dev stack is down here
     assert f"s3dgraphy {V} is on PyPI" in st.stdout and f"dtcstamp {D} is on PyPI" in st.stdout
     assert "every step is done" in st.stdout
     # a second run does nothing and says so
@@ -474,7 +500,7 @@ def test_resume_after_step_9(world):
     assert r.returncode == 1, _all(r)
     assert "not committed: EMStudio" in _all(r)
     assert world.git(world.ws / "EMStudio", "status", "--porcelain")      # its pin still waits
-    assert "git push" not in r.stdout                                     # step 10 was not reached
+    assert "git push" not in r.stdout                                     # step 11 was not reached
     r = world.release(*FULL, "--yes")
     assert r.returncode == 0, _all(r)
     for n in ("stratigraph-templates", "stratigraph-chatbot", "stratigraph-server", "EM-blender-tools"):
@@ -703,7 +729,7 @@ def test_a_long_wait_says_the_jobs_and_their_step(world):
     out = r.stdout
     assert f"▸ 2 · publish.yml for v{D} · " in out
     assert f"▸ 4 · publish.yml for v{V} · " in out
-    assert "▸ 11 · build desktop v1.6.0-dev.1 · " in out
+    assert "▸ 12 · build desktop v1.6.0-dev.1 · " in out
     assert "macos-arm64  in progress · step «tauri build»" in out
     assert "linux        done ✓" in out
     # not a terminal: a new line per change of state, not one per look
@@ -818,3 +844,67 @@ def test_without_a_terminal_and_without_yes_nobody_says_yes(monkeypatch, capsys)
     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
+
+
+# ── W3: the release updates the development node (measured on 4 Oct 2026) ────
+#
+# After `./em.sh release 1.6.0.dev34 --desktop` the server's pin was dev34 in
+# its files and the node on this computer still answered dev33 on /v1/health:
+# step 6 only printed «Per applicarlo: ./bump-s3dgraphy.sh … --build».
+
+def test_the_development_node_is_a_step_of_the_dry_run(world):
+    up = world.release(*FULL, "--dry-run", FAKE_NODE_UP=1)
+    assert up.returncode == 0, _all(up)
+    assert "10 blocked   the development node: ./bump-s3dgraphy.sh V --build if em-dev is up" in up.stdout
+    assert f"would run in stratigraph-server: [Y/n, yes in 10 s] ./bump-s3dgraphy.sh {V} --build" in up.stdout
+    assert f'"s3dgraphy": "{V}" (cap 180 s)' in up.stdout
+    assert " 11 done      the push" in up.stdout and " 12 blocked   the desktop" in up.stdout   # nothing ahead yet
+    assert not (world.state / "bump.log").exists()                  # a dry-run rebuilds nothing
+    down = world.release(*FULL, "--dry-run")
+    assert down.returncode == 0, _all(down)
+    assert "  - 10 not up" in down.stdout
+    assert "em-dev-server is not running — the em-dev stack is down, nothing to rebuild" in down.stdout
+
+
+def test_with_the_stack_up_it_rebuilds_the_node_and_waits_for_its_health(world):
+    r = world.release(*FULL, "--yes", FAKE_NODE_UP=1, FAKE_NODE_RESTART=0.3)
+    assert r.returncode == 0, _all(r)
+    said, last, ahead = (world.state / "bump.log").read_text().splitlines()
+    assert said == f"{V} --build"
+    # after the pin commit, before the push
+    assert last == f"Pin s3dgraphy {V} in one place and its two copies, and count one more iteration of the server"
+    assert int(ahead) >= 1
+    assert "the container is restarting" in r.stdout                  # the retries while it restarts
+    assert f'the development node answers "s3dgraphy": "{V}" (server 1.6.0.dev2)' in r.stdout
+    assert r.stdout.index("▸ 10 · the development node") < r.stdout.index("▸ 11 · the push")
+    assert world.git(world.ws / "stratigraph-server", "rev-list", "--count", "@{u}..HEAD") == "0"
+    st = world.release("status", *FULL, FAKE_NODE_UP=1)
+    assert f'  ✓ 10 done' in st.stdout and f'says "s3dgraphy": "{V}" (server 1.6.0.dev2)' in st.stdout
+    assert "every step is done" in st.stdout
+
+
+def test_with_the_stack_down_it_says_so_and_goes_on(world):
+    r = world.release(*FULL, "--yes")
+    assert r.returncode == 0, _all(r)
+    assert ("em-dev-server is not running — the em-dev stack is down, nothing to rebuild — skipped"
+            in r.stdout)
+    assert not (world.state / "bump.log").exists()
+    assert "▸ 11 · the push" in r.stdout
+    assert world.git(world.ws / "stratigraph-server", "rev-list", "--count", "@{u}..HEAD") == "0"
+
+
+def test_a_node_that_never_says_v_stops_before_the_push(world):
+    r = world.release(*FULL, "--yes", FAKE_NODE_UP=1, FAKE_NODE_STUCK=1, EM_RELEASE_WAIT_NODE=0.3)
+    assert r.returncode == 75, _all(r)
+    assert "still says '1.6.0.dev27', not '1.6.0.dev28'" in r.stderr
+    assert "docker logs em-dev-server" in r.stderr
+    assert world.git(world.ws / "stratigraph-server", "rev-list", "--count", "@{u}..HEAD") != "0"   # not pushed
+
+
+def test_declining_the_node_does_not_stop_the_row(world):
+    # the first confirmation, the five pin commits, then the node: n, then the push: y
+    r = world.release(*FULL, input="y\n" * 6 + "n\ny\n", FAKE_NODE_UP=1, EM_RELEASE_CONFIRM_SECONDS=0)
+    assert r.returncode == 0, _all(r)
+    assert f"not rebuilt. When ready:  (stratigraph-server) ./bump-s3dgraphy.sh {V} --build" in r.stdout
+    assert not (world.state / "bump.log").exists()
+    assert world.git(world.ws / "stratigraph-server", "rev-list", "--count", "@{u}..HEAD") == "0"