dsh-origin-bridge 0.4.0 → 0.4.2

package/smoke_test.py

@@ -13,12 +13,17 @@ import sys
 import threading
 import time
 
+import originlab  # only for the instance-table cleanup at the end; no COM until called
+
 HERE = os.path.dirname(os.path.abspath(__file__))
 OUT = os.path.join(HERE, "out")
 # Point this at the installed copy (…/node_modules/dsh-origin-bridge/server.py)
 # to regression-test what dsh actually runs, without littering that folder.
 SERVER = os.environ.get("ORIGIN_BRIDGE_SERVER") or os.path.join(HERE, "server.py")
 PY = sys.executable
+# ISO-8601 local timestamp of this run, used to tell our own leftover Origin
+# instances from a session that was already open.
+STARTED_AT = time.strftime("%Y-%m-%dT%H:%M:%S")
 
 
 class Rpc:
@@ -112,11 +117,16 @@ def main():
 
     tools = rpc.request("tools/list").get("result", {}).get("tools", [])
     names = sorted(t["name"] for t in tools)
-    check("tools/list returns 25", len(tools) == 25, len(tools))
+    check("tools/list returns 27", len(tools) == 27, len(tools))
+    check("实例治理工具已暴露", {"origin_instances", "origin_reclaim"} <= set(names),
+          [n for n in names if "instance" in n or "reclaim" in n])
+    # Tools that genuinely take no arguments are the only ones allowed an empty
+    # properties block; everything else must describe its inputs.
+    no_arg = {"origin_status", "origin_instances"}
     for t in tools:
-        check("schema present: %s" % t["name"], bool(t.get("inputSchema", {}).get("properties")
-                                                     or t["name"] in ("origin_status",)),
-              len(t.get("inputSchema", {}).get("properties", {})))
+        props = t.get("inputSchema", {}).get("properties") or {}
+        check("schema present: %s" % t["name"], bool(props) or t["name"] in no_arg, len(props))
+        check("无参工具确实无参: %s" % t["name"], t["name"] not in no_arg or not props, sorted(props))
     print("       %s" % ", ".join(names))
 
     # origin_read_file is pure Python, so it is checked in both modes.
@@ -241,7 +251,7 @@ def main():
           lyr.get("layer_name_from_origin"))
     check("add_layer proof", lyr.get("proof_level") == "verified", lyr.get("proof_level"))
 
-    # --- merged from optima-plot: multi-series, dual-Y, legend, matrix, presets ---
+    # --- merged features: multi-series, dual-Y, legend, matrix, presets ---
     ms = rpc.tool("origin_plot", {"worksheet": wb["worksheet"], "x": 1, "y": [2, 3],
                                   "plot_type": "line_symbol"})
     check("multi-series in one layer", ms.get("ok") and ms.get("plots_in_layer") == 2
@@ -318,7 +328,7 @@ def main():
 
     import tempfile as _tf
     def _previews():
-        return len([f for f in os.listdir(_tf.gettempdir()) if f.startswith("optima_plot_view_")])
+        return len([f for f in os.listdir(_tf.gettempdir()) if f.startswith("origin_bridge_view_")])
     before = _previews()
     vw = rpc.tool("origin_view", {"graph": gr_handle, "width": 700})
     check("view returns image content", "image" in vw.get("_content_types", []) and vw.get("_image_len", 0) > 2000,
@@ -410,6 +420,18 @@ def main():
     check("tools still work after abuse", still.get("connected") is True, still.get("code"))
     proto.close()
 
+    # The child server processes this suite drives can be terminated instead of
+    # exiting cleanly, which leaves their Origin instance running. Reclaim only
+    # windowless instances that started after this run: an older one may belong
+    # to a live dsh session.
+    late = [r for r in originlab._process_rows()
+            if not r["window"] and str(r.get("started") or "") >= STARTED_AT]
+    for row in late:
+        originlab._close_pid(row["pid"])
+    left = [r for r in originlab._process_rows()
+            if not r["window"] and str(r.get("started") or "") >= STARTED_AT]
+    check("run leaves no Origin instance of its own", not left, left)
+
     print("\nartifacts:")
     for f in sorted(os.listdir(OUT)):
         print("  %s (%d bytes)" % (f, os.path.getsize(os.path.join(OUT, f))))

package/templates_catalog.py

@@ -1,5 +1,5 @@
 """
-Optima-Plot Template Catalog.
+Origin Bridge Template Catalog.
 
 A curated library of 30+ scientific chart templates inspired by the
 editaplot project. Each template declares:
@@ -744,7 +744,7 @@ def render_template(name: str, data_path: str, output_dir: str,
 
 # Make available at import time
 if __name__ == '__main__':
-    print(f'Optima-Plot has {len(TEMPLATES)} templates:')
+    print(f'Origin Bridge has {len(TEMPLATES)} templates:')
     by_cat = {}
     for t in TEMPLATES:
         by_cat.setdefault(t['category'], []).append(t['name'])

package/test_lifecycle.py

@@ -0,0 +1,232 @@
+"""Checks for the Origin instance-lifecycle layer: classification and reclaim.
+
+These run without Origin: the process table and taskkill are stubbed, so the
+safety property that matters -- a windowed instance is never killed -- is
+asserted against a synthetic set of instances.
+"""
+
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+import originlab  # noqa: E402
+
+fails = []
+
+
+def check(label, cond, got=""):
+    if cond:
+        print("  ok   %s" % label)
+    else:
+        print("  FAIL %s  -> %r" % (label, got))
+        fails.append(label)
+
+
+class Fake(object):
+    """Stands in for the process table and taskkill."""
+
+    def __init__(self, rows):
+        self.rows = rows
+        self.killed = []
+        self.forced = []
+
+    def process_rows(self):
+        return [dict(r) for r in self.rows]
+
+    def terminate(self, pid, force=False):
+        (self.forced if force else self.killed).append(pid)
+        if force:
+            self.rows = [r for r in self.rows if r["pid"] != pid]
+        return None
+
+    def sleep(self, _seconds):
+        return None
+
+
+def with_fake(rows, fn):
+    fake = Fake(rows)
+    saved = (originlab._process_rows, originlab._terminate, originlab._close_pid,
+             originlab.time.sleep, set(originlab._started_pids))
+    originlab._process_rows = fake.process_rows
+    originlab._terminate = fake.terminate
+    originlab._close_pid = lambda pid: (fake.terminate(pid), fake.terminate(pid, force=True),
+                                        "force_closed")[2]
+    originlab.time.sleep = fake.sleep
+    try:
+        return fn(fake)
+    finally:
+        originlab._process_rows, originlab._terminate, originlab._close_pid = saved[0], saved[1], saved[2]
+        originlab.time.sleep = saved[3]
+        originlab._started_pids.clear()
+        originlab._started_pids.update(saved[4])
+
+
+BACK = {"pid": 1001, "started": "2026-10-10T12:00:00", "window": 0}
+BACK2 = {"pid": 1002, "started": "2026-10-10T12:05:00", "window": 0}
+FRONT = {"pid": 2001, "started": "2026-10-10T11:00:00", "window": 131072}
+
+print("instances() 分类")
+rows = [dict(BACK), dict(BACK2), dict(FRONT)]
+
+
+def _classify(_fake):
+    originlab._started_pids.add(1002)
+    info = originlab.instances()
+    check("后台两个", [r["pid"] for r in info["background"]] == [1001, 1002], info["background"])
+    check("前台一个", [r["pid"] for r in info["foreground"]] == [2001], info["foreground"])
+    check("count 对", info["count"] == 3, info["count"])
+    back_by_pid = {r["pid"]: r for r in info["background"]}
+    check("标出我们起的", back_by_pid[1002]["ours"] and not back_by_pid[1001]["ours"],
+          {p: b["ours"] for p, b in back_by_pid.items()})
+    check("前台窗口标记为 foreground", info["foreground"][0]["foreground"] is True)
+
+
+with_fake(rows, _classify)
+
+print("reclaim() 只动无窗口的")
+
+
+def _reclaim_closes_back(_fake):
+    out = originlab.reclaim()
+    check("关掉了两个后台", sorted(_fake.forced) == [1001, 1002], _fake.forced)
+    check("没碰前台 2001", 2001 not in _fake.killed and 2001 not in _fake.forced,
+          (_fake.killed, _fake.forced))
+    check("left_running 里是前台", out["left_running"] == [2001], out["left_running"])
+    check("通知文案提到窗口", "有窗口" in out["notify"], out["notify"])
+
+
+with_fake([dict(BACK), dict(BACK2), dict(FRONT)], _reclaim_closes_back)
+
+
+def _reclaim_dry_run(_fake):
+    out = originlab.reclaim(close_background=False)
+    check("预览模式没杀任何进程", not _fake.killed and not _fake.forced, (_fake.killed, _fake.forced))
+    check("预览模式列出了待关的", sorted(out["skipped"]) == [1001, 1002], out.get("skipped"))
+
+
+with_fake([dict(BACK), dict(BACK2), dict(FRONT)], _reclaim_dry_run)
+
+
+def _reclaim_all_background(_fake):
+    out = originlab.reclaim()
+    check("全是后台时通知说没有前台", "没有发现前台窗口" in out["notify"], out["notify"])
+    check("left_running 为空", out["left_running"] == [], out["left_running"])
+
+
+with_fake([dict(BACK)], _reclaim_all_background)
+
+print("_release_on_exit() 只回收自己起的")
+
+
+def _atexit_scope(_fake):
+    originlab._started_pids.add(1002)
+    killed = []
+    originlab._close_pid = lambda pid: killed.append(pid) or "closed"
+    originlab._release_on_exit()
+    check("只关了 1002", killed == [1002], killed)
+    check("1001 是别人的孤儿，没在退出时动它", 1001 not in killed, killed)
+
+
+with_fake([dict(BACK), dict(BACK2), dict(FRONT)], _atexit_scope)
+
+
+def _atexit_noop(_fake):
+    originlab._started_pids.clear()
+    killed = []
+    originlab._close_pid = lambda pid: killed.append(pid) or "closed"
+    originlab._release_on_exit()
+    check("自己没起实例时什么都不做", killed == [], killed)
+
+
+with_fake([dict(BACK), dict(FRONT)], _atexit_noop)
+
+print("探测失败时不能谎报干净")
+
+
+def _probe_unavailable(_fake):
+    originlab._process_rows = lambda: None          # powershell 不可用 / 超时
+    killed = []
+    originlab._close_pid = lambda pid: killed.append(pid) or "closed"
+
+    info = originlab.instances()
+    check("instances 报告探测失败", info.get("probe") == "unavailable", info)
+    check("instances 不假装数量为 0", info.get("count") is None, info.get("count"))
+    check("instances 给了下一步建议", bool(info.get("next_actions")), info.get("next_actions"))
+
+    out = originlab.reclaim()
+    check("reclaim 什么都没杀", not killed, killed)
+    check("reclaim 标出探测失败", out.get("probe") == "unavailable", out)
+    check("reclaim 不说『已回收全部』", "没关" in out.get("notify", "")
+          or "探测失败" in out.get("notify", ""), out.get("notify"))
+
+    originlab._started_pids.add(1002)
+    originlab._release_on_exit()
+    check("退出钩子在探测失败时不动手", killed == [], killed)
+
+
+with_fake([dict(BACK), dict(FRONT)], _probe_unavailable)
+
+print("掉线重连（call 层）")
+_real_reset = originlab._reset_connection
+
+check("SystemError 算掉线", originlab._dead_app(
+    SystemError("<built-in function ApplicationBase_Save> returned a result with an exception set")))
+check("originpro 报的连接失败算掉线", originlab._dead_app(
+    originlab.OriginError("connection_error", "连不上 Origin 自动化服务器："
+                          "<built-in function ApplicationBase_Path> returned a result"
+                          " with an exception set")))
+check("参数错误不算掉线", not originlab._dead_app(
+    originlab.OriginError("bad_column", "列号从 1 开始，收到 0")))
+check("被包成 internal_error 的 SystemError 也算掉线", originlab._dead_app(
+    originlab.OriginError("internal_error",
+                          "SystemError: <built-in function ApplicationBase_Save> returned a "
+                          "result with an exception set")))
+check("普通 ValueError 不算掉线", not originlab._dead_app(ValueError("识别不出分隔符")))
+
+tries = []
+
+
+def _dies_once(*a, **k):
+    tries.append(1)
+    if len(tries) == 1:
+        raise SystemError("<built-in function ApplicationBase_Save> returned a result "
+                          "with an exception set")
+    return "recovered"
+
+
+resets = []
+originlab._reset_connection = lambda: resets.append(1) or True
+try:
+    check("掉线后自动重连并完成任务", originlab.call(_dies_once) == "recovered", tries)
+    check("只重试一次", len(tries) == 2 and len(resets) == 1, (tries, resets))
+
+    tries[:] = []
+    resety = []
+    originlab._reset_connection = lambda: resety.append(1) or False
+    try:
+        originlab.call(_dies_once)
+        check("重连不可用时不无限重试", False, "本该抛错")
+    except SystemError as exc:
+        check("重连不可用时把原始错误交出去", "ApplicationBase_Save" in str(exc), str(exc))
+finally:
+    originlab._reset_connection = _real_reset
+
+print("server 工具注册")
+import server  # noqa: E402
+
+names = [t["name"] for t in server.TOOLS]
+check("origin_instances 已注册", "origin_instances" in names, names[-3:])
+check("origin_reclaim 已注册", "origin_reclaim" in names, names[-3:])
+check("工具总数 27", len(names) == 27, len(names))
+check("工具名唯一", len(set(names)) == len(names))
+for tool in server.TOOLS:
+    if tool["name"] in ("origin_instances", "origin_reclaim"):
+        check("%s 有描述和 schema" % tool["name"],
+              bool(tool.get("description")) and isinstance(tool.get("inputSchema"), dict))
+
+print()
+if fails:
+    print("%d 项失败: %s" % (len(fails), ", ".join(fails)))
+    raise SystemExit(1)
+print("all lifecycle checks passed")