DescripyTor 0.3.1__tar.gz → 0.3.2__tar.gz

{descripytor-0.3.1 → descripytor-0.3.2}/M2_data_extractor/gui_server.py

@@ -241,7 +241,7 @@ def status():
     return jsonify({
         "ok": True,
         "version": "1.0",
-        "api": 2,
+        "api": GUI_API,
         "example_feather_dir": example_feather_dir(),
         "example_basic_feather": example_basic_feather(),
         "example_reference_feather": example_reference_feather(),
@@ -275,12 +275,25 @@ def _listening(port):
         return s.connect_ex(("127.0.0.1", port)) == 0
 
 
+def _bassa_running():
+    root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    if root_dir not in sys.path:
+        sys.path.insert(0, root_dir)
+    from M3_modeler.bassa_explorer import running
+    return running
+
+
 def _bassa_url():
     """The BASSA model explorer's address. It has its own server (it may run under another Python): started here if it
-    is not up. None when it does not come up."""
+    is not up. None when it does not come up, or when the port is held by a server from before an update."""
     import subprocess
     import time
+    global BASSA_DOWN
     port = int(os.environ.get("BASSA_EXPLORER_PORT", "8765"))
+    BASSA_DOWN = BASSA_NOT_STARTED
+    if _bassa_running().state(port) == "old":
+        BASSA_DOWN = _bassa_running().stop_hint(port, "the BASSA model explorer")
+        return None
     if not _listening(port):
         root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
         env = dict(os.environ, PYTHONPATH=root_dir + os.pathsep + os.environ.get("PYTHONPATH", ""))
@@ -294,7 +307,8 @@ def _bassa_url():
     return f"http://127.0.0.1:{port}/"
 
 
-BASSA_DOWN = "The BASSA model explorer did not start; run `descripytor bassa_explorer` to see why."
+BASSA_NOT_STARTED = "The BASSA model explorer did not start; run `descripytor bassa_explorer` to see why."
+BASSA_DOWN = BASSA_NOT_STARTED            # what the last failed _bassa_url() has to say
 
 
 @app.route("/bassa_explorer")
@@ -2253,7 +2267,10 @@ def _pd_from_numpy(arr, index, columns):
     return pd.DataFrame(arr, index=index, columns=columns)
 
 
-GUI_API = 2
+# Raised whenever the pages need a route an older server does not have. A server still running from before then answers
+# /status with a lower number, and a new start tells the user to stop it instead of reusing it (its pages are read from
+# disk, so they would be new while its routes are old: the links to /feature_explorer and /bassa_explorer gave Not Found).
+GUI_API = 3
 
 
 def _tcp_port_open(port):
@@ -2280,9 +2297,7 @@ def _status_from_running_gui(port):
 def _gui_payload_is_current(payload):
     if not isinstance(payload, dict) or not payload.get("ok"):
         return False
-    if payload.get("api") == GUI_API:
-        return True
-    return "example_presets" in payload and "example_reference_name" in payload
+    return payload.get("api") == GUI_API
 
 
 def _pids_listening_on_port(port):
@@ -2347,7 +2362,7 @@ def _reuse_or_refuse_existing_gui(host, port, open_browser, page="/visual"):
     if payload is not None or _tcp_port_open(port):
         pids = _pids_listening_on_port(port)
         print(f"\n  Port {port} is already in use by an older or different process.")
-        print("  Stop every listener, then run descripytor visual again.")
+        print("  It was started before the package was updated, so it lacks the newer pages. Stop it, then run the command again.")
         if pids:
             print("  PID(s): " + ", ".join(pids))
             if os.name == "nt":

descripytor-0.3.2/M3_modeler/bassa_explorer/running.py

@@ -0,0 +1,61 @@
+"""Is a BASSA explorer server already on a port, and is it this version's?
+
+A server left running from before an update keeps its old code while the page it serves is read from disk, so
+reusing it gives a new page on old routes. Everything that would reuse a running server asks here first.
+Standard library only: the command line, the visual extractor's server and server.py all import it.
+"""
+import json
+import os
+import socket
+import subprocess
+import urllib.request
+
+API = 1                      # raised whenever the page needs something an older server.py does not have
+GUI_API_NEEDED = 3           # the lowest /status "api" of the visual extractor's server that has the pages this one links to
+
+
+def listening(port):
+    with socket.socket() as s:
+        s.settimeout(0.3)
+        return s.connect_ex(("127.0.0.1", int(port))) == 0
+
+
+def _status(port):
+    try:
+        return json.loads(urllib.request.urlopen("http://127.0.0.1:%d/status" % int(port), timeout=3).read())
+    except Exception:
+        return None                              # no /status: something else, or a server from before this check
+
+
+def state(port):
+    """None: nothing listens on the port. "current": this version's BASSA explorer. "old": anything else."""
+    if not listening(port):
+        return None
+    d = _status(port)
+    return "current" if isinstance(d, dict) and d.get("app") == "bassa_explorer" and d.get("api") == API else "old"
+
+
+def gui_state(port):
+    """the same for the visual extractor's server, seen from here: None, "current" or "old\""""
+    if not listening(port):
+        return None
+    d = _status(port)
+    return "current" if isinstance(d, dict) and d.get("ok") and int(d.get("api") or 0) >= GUI_API_NEEDED else "old"
+
+
+def stop_hint(port, what):
+    """what to tell the user when the port is held by an older server"""
+    pids = []
+    try:
+        if os.name == "nt":
+            out = subprocess.run(["netstat", "-ano", "-p", "tcp"], capture_output=True, text=True, timeout=4).stdout
+            for p in (line.split() for line in out.splitlines()):
+                if len(p) >= 5 and p[0].upper() == "TCP" and "LISTEN" in p[3].upper() and p[1].endswith(":%d" % int(port)) and p[-1].isdigit() and p[-1] not in pids:
+                    pids.append(p[-1])
+        else:
+            pids = subprocess.run(["lsof", "-iTCP:%d" % int(port), "-sTCP:LISTEN", "-n", "-P", "-t"], capture_output=True, text=True, timeout=4).stdout.split()
+    except Exception:
+        pass
+    how = ("taskkill /PID %s /F" if os.name == "nt" else "kill %s") % " ".join(pids) if pids else "stop the process that listens on that port"
+    return ("Port %d is held by an older or different process, not by this version of %s (it was probably started before the "
+            "package was updated). Stop it, then try again:  %s" % (int(port), what, how))

{descripytor-0.3.1 → descripytor-0.3.2}/M3_modeler/bassa_explorer/server.py

@@ -10,6 +10,7 @@ POST /run     {csv, response, iters, name, structures}  ->  the same data the pa
 POST /checks  {csv, response}                           ->  {job}; the reference lines and the fold counts are computed in the background
 POST /handoff {csv, response, structures, name}         ->  {id}; another page (the atom picker) leaves a table here
 GET  /handoff?id=N                                      ->  that table, once: the page opened with #handoff=N runs it
+GET  /status                                             ->  {ok, app, api, sampler, cases}: lets a new start tell this server from an older one
 GET  /checks?job=N                                      ->  {done, total, chance, nested_q2, fold_top, n_folds, error}
 POST /keep    {name, case}                              ->  writes <name>.js beside the page and lists it, so the case is there next time
 POST /export  {cases}                                   ->  one HTML file holding the page, the explorer and those cases
@@ -28,6 +29,7 @@ from urllib.parse import parse_qs, urlparse
 import numpy as np, pandas as pd
 
 import build_case as BC
+import running as RUN
 
 H = Path(__file__).resolve().parent; C = BC.C; LOCK = threading.Lock(); JOBS = {}; HANDOFF = {}; N_PERM, NULL_ITERS = 100, 6000
 READER = BC.S["reader_python"]
@@ -39,13 +41,14 @@ STYLE = dict(look="descriptors", preset="glossy", palette="cylview", ink="colour
 NEEDS = "new tables need the sampler: pip install bassa-reg into this Python, or start with --bassa-python <a Python that has it>"                                                  # the environment with pyarrow and the DescriPyTor readers
 
 
-def listening(port):
-    with socket.socket() as s: s.settimeout(0.3); return s.connect_ex(("127.0.0.1", port)) == 0
+listening = RUN.listening
 
 
 def gui(page):
-    """the address of a page of the package's other server (the atom picker, the full feature explorer); that server is started if it is not up"""
+    """the address of a page of the package's other server (the atom picker, the full feature explorer); that server is
+    started if it is not up. None when the port is held by a server from before an update: its routes would be old."""
     port = int(os.environ.get("GUI_PORT", "7432"))
+    if RUN.gui_state(port) == "old": return None
     if not listening(port):
         env = dict(os.environ, PYTHONPATH=BC.S["descripytor"] + os.pathsep + os.environ.get("PYTHONPATH", ""))
         subprocess.Popen([READER, "-m", "descripytor.cli", "visual_extractor", "--no-browser", "--port", str(port)], env=env)
@@ -136,7 +139,11 @@ class Handler(SimpleHTTPRequestHandler):
             body = b'window.CASE_FILES = ["example"];\n'; self.send_response(200); self.send_header("Content-Type", "text/javascript"); self.send_header("Content-Length", str(len(body))); self.end_headers(); return self.wfile.write(body)
         if u.path in ("/visual_extractor", "/feature_explorer", "/bassa_explorer"):      # the three pages link to each other by these names
             to = "/" if u.path == "/bassa_explorer" else gui("/visual" if u.path == "/visual_extractor" else u.path)
+            if to is None:
+                body = RUN.stop_hint(int(os.environ.get("GUI_PORT", "7432")), "the visual extractor").encode("utf-8")
+                self.send_response(503); self.send_header("Content-Type", "text/plain; charset=utf-8"); self.send_header("Content-Length", str(len(body))); self.end_headers(); return self.wfile.write(body)
             self.send_response(302); self.send_header("Location", to); self.send_header("Content-Length", "0"); return self.end_headers()
+        if u.path == "/status": return self.answer(dict(ok=True, app="bassa_explorer", api=RUN.API, sampler=SAMPLER, cases=str(C)))      # who is on this port, and which version
         if u.path == "/handoff": q = HANDOFF.pop(parse_qs(u.query).get("id", [""])[0], None); return self.answer(q or dict(error="this table was already taken, or the server was restarted"), 200 if q else 404)
         if u.path != "/checks": return super().do_GET()
         job = JOBS.get(parse_qs(u.query).get("job", [""])[0]); self.answer(job or dict(error="no such job"), 200 if job else 404)

{descripytor-0.3.1/descripytor.egg-info → descripytor-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: descripytor
-Version: 0.3.1
+Version: 0.3.2
 Summary: Molecular feature extraction, alignment, and modeling tools.
 Author-email: Eden Specktor <edenspec@post.bgu.ac.il>
 License-Expression: MIT

{descripytor-0.3.1 → descripytor-0.3.2}/descripytor/__init__.py

@@ -1,5 +1,5 @@
 """DescriPyTor: chemical-intuition-based molecular descriptors and modeling."""
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 __all__ = ["__version__"]

{descripytor-0.3.1 → descripytor-0.3.2}/descripytor/cli.py

@@ -74,7 +74,7 @@ def get_local_setup_version():
         from descripytor import __version__ as version
         return version
     except Exception:
-        return "0.3.1"
+        return "0.3.2"
 
 __version__ = get_local_setup_version()
 
@@ -342,6 +342,17 @@ def run_bassa_explorer(cases=None, host=None, port=None, open_browser=True, bass
     url = f"http://{'127.0.0.1' if host in ('0.0.0.0', '') else host}:{port}/"
     print(f"\n  BASSA model explorer\n  Open:  {url}\n  Press Ctrl+C to stop\n", flush=True)
     python = bassa_python or os.environ.get("DESCRIPYTOR_BASSA_PYTHON") or sys.executable
+    _ensure_project_on_path()
+    from M3_modeler.bassa_explorer import running
+    already = running.state(port)
+    if already == "current":                                 # this version's server is up: use it
+        print("  It is already running; this process will not start a second server." + chr(10), flush=True)
+        if open_browser:
+            webbrowser.open(url)
+        return 0
+    if already == "old":                                     # a server from before an update would give a new page on old routes
+        print("  " + running.stop_hint(port, "the BASSA model explorer") + chr(10), flush=True)
+        return 1
 
     def open_when_up():                                      # the first import of the sampler can take a while
         import socket
@@ -628,6 +639,6 @@ def main():
         parser.print_help()
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())     # as the installed command does: a refused start exits with 1
 
 

{descripytor-0.3.1 → descripytor-0.3.2/descripytor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: descripytor
-Version: 0.3.1
+Version: 0.3.2
 Summary: Molecular feature extraction, alignment, and modeling tools.
 Author-email: Eden Specktor <edenspec@post.bgu.ac.il>
 License-Expression: MIT

{descripytor-0.3.1 → descripytor-0.3.2}/descripytor.egg-info/SOURCES.txt

@@ -150,6 +150,7 @@ M3_modeler/bassa_explorer/example_small.csv
 M3_modeler/bassa_explorer/index.html
 M3_modeler/bassa_explorer/influence_check.py
 M3_modeler/bassa_explorer/read_structures.py
+M3_modeler/bassa_explorer/running.py
 M3_modeler/bassa_explorer/server.py
 M3_modeler/bassa_explorer/settings.py
 M3_modeler/bassa_explorer/test_page.py

{descripytor-0.3.1 → descripytor-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "descripytor"
-version = "0.3.1"
+version = "0.3.2"
 description = "Molecular feature extraction, alignment, and modeling tools."
 readme = "README.md"
 requires-python = ">=3.9"

{descripytor-0.3.1 → descripytor-0.3.2}/tests/test_bassa_explorer.py

@@ -86,38 +86,92 @@ def test_the_three_pages_have_one_address_each(server):
     assert 'href="/feature_explorer"' in picker and 'href="/bassa_explorer"' in picker
     explorer = (ROOT / "M2_data_extractor" / "feature_explorer" / "template.html").read_text(encoding="utf-8")
     assert 'href="/visual_extractor"' in explorer and 'href="/bassa_explorer"' in explorer
-
-
-def test_a_table_left_by_another_page_is_taken_once(server):
-    """The picker's one-click hand-off: POST /handoff leaves a table, the page opened with #handoff=id takes it."""
-    url, _ = server
-    body = dict(csv=(TOOL / "example_small.csv").read_text(), response="ddG", structures="", name="extracted")
-    q = urllib.request.Request(url + "handoff", data=json.dumps(body).encode(), headers={"Content-Type": "application/json"})
-    token = json.loads(urllib.request.urlopen(q, timeout=30).read())["id"]
-    got = json.loads(_get(url + "handoff?id=" + token))
-    assert got["response"] == "ddG" and got["csv"] == body["csv"]
-    with pytest.raises(urllib.error.HTTPError) as e:
-        _get(url + "handoff?id=" + token)
-    assert e.value.code == 404
-    bad = urllib.request.Request(url + "handoff", data=json.dumps(dict(csv="name,a,y\nm1,1,2\n", response="y")).encode(), headers={"Content-Type": "application/json"})
-    with pytest.raises(urllib.error.HTTPError) as e:              # a table a run would refuse is refused at the door
-        urllib.request.urlopen(bad, timeout=30)
-    assert "at least 6 compounds" in json.loads(e.value.read())["error"]
-
-
-def test_the_extractor_s_own_column_names_are_drawn():
-    """A table straight from `descripytor extractor` / the visual extractor: its dipole, Sterimol and vibration columns map to drawings."""
-    code = (
-        "import build_case as B\n"
-        "want = {'dipole_x_1-2-19': 'dipole', 'total_dipole_1-2-19': 'dipole_total', 'loc_B1_1-4': 'sterimol', 'B1_B5_azimuth_4-1': 'sterimol',\n"
-        "        'B1_B5_acute_1-4': 'sterimol', 'Frequency_Stretch_1_2': 'mark', 'Frequency_Bending_5-6': 'mark', 'Cross_mag_Bending_5-6': 'mark',\n"
-        "        'cross_9_0': 'mark', 'cross_angle_9_0': 'mark', 'para_9_0': 'mark', 'para_angle_9_0': 'mark', 'B1_1-4': 'sterimol',\n"
-        "        '0_bond_length_1-2': 'bond_length', 'nbo_atom_3': 'charge', 'nbo_diff_3-5': 'charge_diff'}\n"
-        "for c, k in want.items():\n"
-        "    w = B.drawing(c); assert w and w['kind'] == k, (c, w)\n"
-        "    assert B.label(c, w) != c and B.describe(c, w)\n"
-        "d = B.drawing('dipole_y_20-19-27'); assert (d['origin'], d['y'], d['plane'], d['comp']) == (20, 19, 27, 'u')\n"
-        "assert B.drawing('cross_9_0')['atoms'] == [9] and B.drawing('aniso') is None and B.label('aniso', None) != 'aniso'\n"
-    )
-    r = subprocess.run([sys.executable, "-c", code], cwd=str(TOOL), capture_output=True, text=True)
-    assert r.returncode == 0, r.stderr[-600:]
+
+
+def test_a_table_left_by_another_page_is_taken_once(server):
+    """The picker's one-click hand-off: POST /handoff leaves a table, the page opened with #handoff=id takes it."""
+    url, _ = server
+    body = dict(csv=(TOOL / "example_small.csv").read_text(), response="ddG", structures="", name="extracted")
+    q = urllib.request.Request(url + "handoff", data=json.dumps(body).encode(), headers={"Content-Type": "application/json"})
+    token = json.loads(urllib.request.urlopen(q, timeout=30).read())["id"]
+    got = json.loads(_get(url + "handoff?id=" + token))
+    assert got["response"] == "ddG" and got["csv"] == body["csv"]
+    with pytest.raises(urllib.error.HTTPError) as e:
+        _get(url + "handoff?id=" + token)
+    assert e.value.code == 404
+    bad = urllib.request.Request(url + "handoff", data=json.dumps(dict(csv="name,a,y\nm1,1,2\n", response="y")).encode(), headers={"Content-Type": "application/json"})
+    with pytest.raises(urllib.error.HTTPError) as e:              # a table a run would refuse is refused at the door
+        urllib.request.urlopen(bad, timeout=30)
+    assert "at least 6 compounds" in json.loads(e.value.read())["error"]
+
+
+def test_the_extractor_s_own_column_names_are_drawn():
+    """A table straight from `descripytor extractor` / the visual extractor: its dipole, Sterimol and vibration columns map to drawings."""
+    code = (
+        "import build_case as B\n"
+        "want = {'dipole_x_1-2-19': 'dipole', 'total_dipole_1-2-19': 'dipole_total', 'loc_B1_1-4': 'sterimol', 'B1_B5_azimuth_4-1': 'sterimol',\n"
+        "        'B1_B5_acute_1-4': 'sterimol', 'Frequency_Stretch_1_2': 'mark', 'Frequency_Bending_5-6': 'mark', 'Cross_mag_Bending_5-6': 'mark',\n"
+        "        'cross_9_0': 'mark', 'cross_angle_9_0': 'mark', 'para_9_0': 'mark', 'para_angle_9_0': 'mark', 'B1_1-4': 'sterimol',\n"
+        "        '0_bond_length_1-2': 'bond_length', 'nbo_atom_3': 'charge', 'nbo_diff_3-5': 'charge_diff'}\n"
+        "for c, k in want.items():\n"
+        "    w = B.drawing(c); assert w and w['kind'] == k, (c, w)\n"
+        "    assert B.label(c, w) != c and B.describe(c, w)\n"
+        "d = B.drawing('dipole_y_20-19-27'); assert (d['origin'], d['y'], d['plane'], d['comp']) == (20, 19, 27, 'u')\n"
+        "assert B.drawing('cross_9_0')['atoms'] == [9] and B.drawing('aniso') is None and B.label('aniso', None) != 'aniso'\n"
+    )
+    r = subprocess.run([sys.executable, "-c", code], cwd=str(TOOL), capture_output=True, text=True)
+    assert r.returncode == 0, r.stderr[-600:]
+
+
+@pytest.fixture()
+def other_server():
+    """Something else on a port: no /status of ours, as a BASSA explorer from before the check, or any other program."""
+    with socket.socket() as s:
+        s.bind(("127.0.0.1", 0)); port = s.getsockname()[1]
+    p = subprocess.Popen([sys.executable, "-m", "http.server", str(port), "--bind", "127.0.0.1"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    try:
+        for _ in range(60):
+            try: urllib.request.urlopen(f"http://127.0.0.1:{port}/", timeout=2); break
+            except Exception: time.sleep(0.25)
+        yield port
+    finally:
+        p.kill()
+
+
+def _running():
+    sys.path.insert(0, str(ROOT))
+    from M3_modeler.bassa_explorer import running
+    return running
+
+
+def test_a_running_server_says_which_version_it_is(server):
+    url, _ = server
+    running = _running()
+    st = json.loads(_get(url + "status"))
+    assert st["app"] == "bassa_explorer" and st["api"] == running.API
+    port = int(url.rsplit(":", 1)[1].strip("/"))
+    assert running.state(port) == "current"
+    with socket.socket() as s:
+        s.bind(("127.0.0.1", 0)); free = s.getsockname()[1]
+    assert running.state(free) is None
+
+
+def test_an_older_server_on_the_port_is_not_reused(other_server):
+    """A server left from before an update would serve the new page on old routes; every way in refuses it and says how to stop it."""
+    running = _running()
+    assert running.state(other_server) == "old"
+    assert str(other_server) in running.stop_hint(other_server, "the BASSA model explorer")
+    # the command
+    r = subprocess.run([sys.executable, "-m", "descripytor.cli", "bassa_explorer", "--no-browser", "--port", str(other_server)],
+                       cwd=str(ROOT), capture_output=True, text=True, timeout=120)
+    assert r.returncode == 1 and "older or different process" in r.stdout
+    # the visual extractor's link and its one-click hand-off
+    env = dict(os.environ, BASSA_EXPLORER_PORT=str(other_server))
+    code = ("import sys; sys.path.insert(0, %r)\n"
+            "import M2_data_extractor.gui_server as gs\n"
+            "c = gs.app.test_client()\n"
+            "r = c.get('/bassa_explorer'); assert r.status_code == 503 and b'older or different process' in r.data, r.data\n"
+            "csv = 'name,a,b,c,d,y' + chr(10) + chr(10).join('m%%d,%%d,%%d,%%d,%%d,%%d' %% (i, i, i * i %% 7, i * 3 %% 5, i * 5 %% 11, i %% 4) for i in range(8))\n"
+            "r = c.post('/bassa_explorer/handoff', json={'csv': csv, 'y_column': 'y'}); assert r.status_code == 503 and 'older' in r.get_json()['error'], r.data\n") % str(ROOT)
+    r = subprocess.run([sys.executable, "-c", code], env=env, capture_output=True, text=True, timeout=120)
+    assert r.returncode == 0, r.stderr[-800:]

{descripytor-0.3.1 → descripytor-0.3.2}/tests/test_gui_server.py

@@ -40,7 +40,8 @@ def test_status(client):
     assert response.status_code == 200
     payload = response.get_json()
     assert payload["ok"] is True
-    assert payload.get("api") == 2
+    from M2_data_extractor.gui_server import GUI_API
+    assert payload.get("api") == GUI_API
     assert "example_feather_dir" in payload
     assert "example_outcomes" in payload
     assert "example_presets" in payload
@@ -625,15 +626,11 @@ def test_placeholder_path_ignores_double_underscore_in_real_paths():
 
 
 def test_gui_payload_is_current():
-    from M2_data_extractor.gui_server import _gui_payload_is_current
+    from M2_data_extractor.gui_server import GUI_API, _gui_payload_is_current
 
     assert not _gui_payload_is_current({"ok": True, "version": "1.0"})
-    assert _gui_payload_is_current({"ok": True, "api": 2})
-    assert _gui_payload_is_current({
-        "ok": True,
-        "example_presets": {},
-        "example_reference_name": "basic",
-    })
+    assert _gui_payload_is_current({"ok": True, "api": GUI_API})
+    assert not _gui_payload_is_current({"ok": True, "api": GUI_API - 1})      # a server from before the last update
     assert not _gui_payload_is_current(None)
 
 
@@ -740,23 +737,33 @@ def test_the_old_explorer_folder_still_imports():
 def test_visual_extractor_address_is_the_picker():
     r = _load_app().test_client().get("/visual_extractor")
     assert r.status_code == 302 and r.headers["Location"].endswith("/visual")
-
-
-def test_handoff_needs_a_table_and_a_target():
-    client = _load_app().test_client()
-    assert "Extract features first" in client.post("/bassa_explorer/handoff", json={}).get_json()["error"]
-    r = client.post("/bassa_explorer/handoff", json={"csv": "name,a\nm1,1\nm2,2\n"})
-    assert r.status_code == 400 and "target" in r.get_json()["error"]
-
-
-def test_the_extraction_engine_is_inside_the_package():
-    """Extract CSV runs descriptor_extractor; an installed package has no examples folder, so it must sit in M2_data_extractor."""
-    app = _load_app()
-    import M2_data_extractor.gui_server as gs
-    dx = gs._load_descriptor_extractor()
-    assert Path(dx.__file__).resolve().parent == ROOT / "M2_data_extractor"
-    assert (ROOT / "M2_data_extractor" / "feature_packages.py").is_file()
-    import subprocess, sys
-    old = ROOT / "Getting_started_with_examples" / "descriptor_extraction_toolkit"
-    code = "import sys; sys.path.insert(0, %r); import descriptor_extractor as d, feature_packages as f; assert d.run_from_config and f" % str(old)
-    assert subprocess.run([sys.executable, "-c", code]).returncode == 0      # the toolkit's old import path still works
+
+
+def test_handoff_needs_a_table_and_a_target():
+    client = _load_app().test_client()
+    assert "Extract features first" in client.post("/bassa_explorer/handoff", json={}).get_json()["error"]
+    r = client.post("/bassa_explorer/handoff", json={"csv": "name,a\nm1,1\nm2,2\n"})
+    assert r.status_code == 400 and "target" in r.get_json()["error"]
+
+
+def test_the_extraction_engine_is_inside_the_package():
+    """Extract CSV runs descriptor_extractor; an installed package has no examples folder, so it must sit in M2_data_extractor."""
+    app = _load_app()
+    import M2_data_extractor.gui_server as gs
+    dx = gs._load_descriptor_extractor()
+    assert Path(dx.__file__).resolve().parent == ROOT / "M2_data_extractor"
+    assert (ROOT / "M2_data_extractor" / "feature_packages.py").is_file()
+    import subprocess, sys
+    old = ROOT / "Getting_started_with_examples" / "descriptor_extraction_toolkit"
+    code = "import sys; sys.path.insert(0, %r); import descriptor_extractor as d, feature_packages as f; assert d.run_from_config and f" % str(old)
+    assert subprocess.run([sys.executable, "-c", code]).returncode == 0      # the toolkit's old import path still works
+
+
+def test_a_server_from_before_the_update_is_not_reused():
+    """Its pages are read from disk (new) while its routes are old: the header links gave Not Found."""
+    _load_app()
+    import M2_data_extractor.gui_server as gs
+    old = {"ok": True, "api": 2, "example_presets": {}, "example_reference_name": "basic"}
+    assert not gs._gui_payload_is_current(old)
+    assert gs._gui_payload_is_current({"ok": True, "api": gs.GUI_API})
+    assert _load_app().test_client().get("/status").get_json()["api"] == gs.GUI_API