dsh-origin-bridge 0.4.2 → 0.4.3

package/originlab.py

@@ -47,7 +47,7 @@ SCALE_NAMES = {1: "linear", 2: "log10", 3: "probability", 4: "probit", 5: "recip
                6: "offset_reciprocal", 7: "logit", 8: "ln", 9: "log2"}
 # new_graph(template=NAME) accepts these OriginPro 2024 template stems (extension
 # optional) and returns None for an unknown one, which is how they get validated.
-GRAPH_TEMPLATES = ("line", "scatter", "linesymb", "column", "doubley", "dply",
+GRAPH_TEMPLATES = ("line", "scatter", "linesymb", "column", "doubley",
                    "heat_map", "cmap", "mesh", "contline", "contgray", "3d",
                    "glwireface", "pie", "box", "histdist", "polar", "ternary",
                    "vector", "errbar")
@@ -661,7 +661,9 @@ def write_columns(columns, book_name=""):
         ws = op.new_sheet(lname=book_name or "")
         for i, (name, values) in enumerate(columns.items()):
             try:
-                nums = [float(v) for v in values]
+                # None is a documented missing value, not a non-numeric cell: it has
+                # to reach Origin as an empty cell instead of killing the write.
+                nums = [None if v is None else float(v) for v in values]
             except (TypeError, ValueError) as exc:
                 raise OriginError("bad_arguments", "列 %r 里有非数值项：%s" % (name, exc),
                                   ["数值列只接受数字或 null；文本请放 Notes 页，或先把分类编码成数字"])
@@ -676,6 +678,10 @@ def write_block(headers, rows, book_name=""):
     which is why a 40-column sheet is slow; from_list2 writes the block at once."""
     if not rows or not isinstance(rows, (list, tuple)):
         raise OriginError("bad_arguments", "rows 必须是非空的二维列表")
+    if any(not isinstance(r, (list, tuple)) for r in rows):
+        raise OriginError("bad_arguments",
+                          "rows 得是二维的（每行一个列表），收到 %r" % (rows[0],),
+                          [['[["x","y"],[1,2],[3,4]] 这种形状']])
     ncol = max(len(r) for r in rows)
     if headers and len(headers) != ncol:
         raise OriginError("bad_arguments", "headers 有 %d 项，但 rows 最宽 %d 列" % (len(headers), ncol))
@@ -747,6 +753,39 @@ def column_formula(worksheet, col, formula, label="", units=""):
     return call(run)
 
 
+def _decade_span(values):
+    """How many orders of magnitude the positive values cover (0 if not measurable)."""
+    pos = [v for v in (values or []) if isinstance(v, (int, float)) and v > 0]
+    if len(pos) < 2:
+        return 0.0
+    lo, hi = min(pos), max(pos)
+    return math.log10(hi / lo) if hi > lo else 0.0
+
+
+def _axis_review(lay, xvals):
+    """Flag a plot whose X axis is linear across several orders of magnitude.
+
+    A Bode/EIS sweep spans 1e5..1e-2 Hz: on a linear axis every point piles up
+    against the y axis and the exported PNG is unreadable, yet nothing about the
+    call failed. The bridge cannot decide for the user whether they want a log
+    axis, a zoomed range or a Nyquist view, so it says so and hands the choice
+    back.
+    """
+    scale = _safe(lambda: lay.xscale)
+    decades = _decade_span(xvals)
+    if scale not in (None, 1) or decades < 3:
+        return None
+    return ("X 轴是线性刻度但数据跨了 %.1f 个数量级（%g..%g），点会全挤在最左边，"
+            "图基本没法看。这不算出错，但要让用户决定怎么处理，别自己改轴"
+            % (decades, min(v for v in xvals if v > 0), max(v for v in xvals if v > 0)))
+
+
+REVIEW_OPTIONS = ["origin_style 把 x_scale 设成 log10（对数横轴，Bode 图常用）",
+                  "只画其中一段：origin_style 用 xlim 限定范围",
+                  "换成别的 X 轴：如阻抗用 Z' 对 Z'' 画 Nyquist 图",
+                  "保持现状（用户就是想看线性轴）"]
+
+
 def plot(worksheet, x=1, y=2, plot_type="line", graph_name="", title="",
          graph="", layer=0, template=""):
     """Draw one or more series.
@@ -844,6 +883,10 @@ def plot(worksheet, x=1, y=2, plot_type="line", graph_name="", title="",
             raise OriginError("plot_incomplete",
                               "要求 %d 条曲线，层里只有 %d 条" % (len(yis), drawn),
                               ["origin_inspect 看该层，或改用 origin_view 目视确认"])
+        review = _axis_review(lay, xvals)
+        if review:
+            span["warnings"] = [review]
+            span["next_actions"] = list(REVIEW_OPTIONS)
         return sanitize({"graph": _bind("gr", gr, gr.name), "plot_type": plot_type,
                          "channel": channel, "template": tpl,
                          "source_sheet": _safe(lambda: ws.name, ""),
@@ -1140,6 +1183,8 @@ def add_layer(graph, layer_type="right"):
     right-Y layer reads back as 'RightY'. Filling it is left to origin_plot with
     layer=<index>, which is the only path measured to draw into a chosen layer.
     """
+    if isinstance(layer_type, str) and layer_type.strip().isdigit():
+        layer_type = int(layer_type.strip())   # "2" from a model is still the code 2
     if isinstance(layer_type, str) and layer_type.lower() in LAYER_TYPES:
         code = LAYER_TYPES[layer_type.lower()]
     elif isinstance(layer_type, int) and layer_type in LAYER_TYPES.values():
@@ -1393,7 +1438,10 @@ def export(graph, path="", fmt="png", width=1600):
         if page is None:
             raise OriginError("graph_not_found", "找不到图页：%s（项目里可能还没有图）" % (graph or ""))
         name = _safe(lambda: page.name, "Graph1")
-        target_path = os.path.abspath(path or os.path.join(os.getcwd(), "%s.%s" % (name, fmt)))
+        # No path is not an invitation to write into the process CWD: under dsh
+        # that is the plugin's node_modules folder. Origin's User Files wins.
+        folder = _safe(lambda: op.path("u"), "") or os.getcwd()
+        target_path = os.path.abspath(path or os.path.join(folder, "%s.%s" % (name, fmt)))
         if os.path.splitext(target_path)[1].lower().lstrip(".") != fmt:
             target_path = os.path.splitext(target_path)[0] + "." + fmt
         os.makedirs(os.path.dirname(target_path) or ".", exist_ok=True)
@@ -1557,6 +1605,9 @@ def figure(source="", columns=None, x=1, y=1, plot_type="line", title="",
     p = plot(info["worksheet"], x=x, y=y, plot_type=plot_type, title=title, template=template)
     steps.append({"step": "plot", "graph": p["graph_page"], "type": plot_type,
                   "channel": p.get("channel", ""), "plots": p.get("plots_in_layer")})
+    warns = list(p.get("warnings") or [])
+    if warns:
+        steps.append({"step": "review", "why": str(warns[0])[:90]})
     if x_title or y_title:
         st = style(p["graph"], x_title=x_title, y_title=y_title)
         steps.append({"step": "style", **st})
@@ -1568,6 +1619,11 @@ def figure(source="", columns=None, x=1, y=1, plot_type="line", title="",
         steps.append({"step": "legend", "proof_level": lg.get("proof_level")})
 
     out = {"data": info, "plot": p, "style": st, "legend": lg}
+    if warns:
+        # Top level, because a delivered-but-unreadable PNG is exactly the kind of
+        # thing the model must raise with the user rather than quietly hand over.
+        out["warnings"] = warns
+        out["next_actions"] = list(p.get("next_actions") or []) + ["origin_view 目视确认后再决定"]
     deliver = {}
     if export_path or output_dir:
         base = export_path or os.path.join(output_dir, "%s.%s" % (p["graph_page"], fmt))
@@ -1730,7 +1786,9 @@ def close_pages(kind="graph", names=None, dry_run=False):
     targets, had = call(collect)
     wanted = [_safe(lambda p=p: p.name, "?") for p in targets]
     if not targets:
-        return sanitize({"closed": [], "asked": [], "note": "没有匹配的页面"})
+        # Stable shape: a dry run always answers with would_close, empty or not.
+        return sanitize({"closed": [], "asked": [], "would_close": [],
+                         "note": "没有匹配的页面"})
     if dry_run:
         return sanitize({"would_close": wanted, "dry_run": True})
     errors = call(destroy, targets)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-origin-bridge",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Drive local Origin/OriginPro from chat: import .dat/.csv/Excel/workstation .bin data, plot, fit, and save editable .opju projects. Third-party tool, not affiliated with or endorsed by OriginLab Corporation.",
   "license": "MIT",
   "type": "module",
@@ -46,10 +46,6 @@
     "fixtures/*.csv",
     "fixtures/*.txt",
     "smoke_test.py",
-    "run_cases.py",
-    "render_realdata.py",
-    "cases/catalogue.py",
-    "cases/data.py",
     "edge_checks.py",
     "test_asciiio.py",
     "test_binio.py",

package/server.py

@@ -20,7 +20,7 @@ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 import originlab  # noqa: E402
 
 SERVER_NAME = "origin-bridge"
-SERVER_VERSION = "0.4.2"
+SERVER_VERSION = "0.4.3"
 PROTOCOL = "2024-11-05"
 
 
@@ -82,7 +82,7 @@ TOOLS = [
     },
     {
         "name": "origin_plot",
-        "description": "在工作表上画图。x/y 用 1 起始列号或列名；y 可以给列表，一次把多条曲线画进同一层。plot_type: line|scatter|line_symbol|column。给 template 用 Origin 自带图模建页（如 doubley/heat_map/line），给 graph+layer 则往已有图页的指定层里加曲线。",
+        "description": "在工作表上画图。x/y 用 1 起始列号或列名；y 可以给列表，一次把多条曲线画进同一层。plot_type: line|scatter|line_symbol|column。给 template 用 Origin 自带图模建页（如 doubley/heat_map/line），给 graph+layer 则往已有图页的指定层里加曲线。返回里有 warnings 时代表图可能不可读（线性轴跨数量级等），要把选项交给用户决定。",
         "inputSchema": {
             "type": "object",
             "properties": {
@@ -235,7 +235,7 @@ TOOLS = [
     },
     {
         "name": "origin_figure",
-        "description": "主路径：一次调用完成 导入/写数 → 画图 → 轴标题 → 导出图片 → 保存可编辑 .opju。用户只想“把这份数据画成图并给我文件”时用它，不要拆成多步。",
+        "description": "主路径：一次调用完成 导入/写数 → 画图 → 轴标题 → 导出图片 → 保存可编辑 .opju。用户只想“把这份数据画成图并给我文件”时用它，不要拆成多步。返回里若有 warnings，说明图虽然画成了但可能不可读（例如线性横轴跨了几个数量级，点全挤在最左边）：把 next_actions 里的方案讲给用户让他选，不要自己擅自改轴。",
         "inputSchema": {
             "type": "object",
             "properties": {
@@ -536,6 +536,14 @@ def _handle(msg):
         except originlab.OriginError as exc:
             return _tool_result(call_id, {"ok": False, "code": exc.code, "message": exc.message,
                                           "next_actions": exc.next_actions, **exc.extra}, True)
+        except KeyError as exc:
+            # A model can omit a required argument even though the schema names it;
+            # that is a bad_arguments answer, not a crash with a stack trace.
+            want = (tool.get("inputSchema") or {}).get("required") or []
+            return _tool_result(call_id, {"ok": False, "code": "bad_arguments",
+                                          "message": "%s 缺少参数 %s（该工具要求 %s）"
+                                                     % (name, exc, want or "见 schema"),
+                                          "next_actions": ["补上缺的参数再调用"]}, True)
         except Exception as exc:  # noqa: BLE001 - report, never kill the server
             _log("tool %s crashed: %r" % (name, exc))
             bare = isinstance(exc, (SystemError, TypeError, AttributeError))

package/smoke_test.py

@@ -7,6 +7,7 @@ Exits non-zero on the first hard failure. Writes artifacts to ./out/.
 """
 
 import json
+import math
 import os
 import subprocess
 import sys
@@ -309,15 +310,22 @@ def main():
                                          "data": os.path.join(HERE, "sample.dat")})
     check("chart_check reads columns from the file", pv.get("ok") and
           pv.get("columns_detected") == ["X", "Y"], (pv.get("columns_detected"), pv.get("issues")))
-    cr = rpc.tool("origin_chart_render", {"name": preset_name,
-                                          "source": os.path.join(HERE, "sample.dat"),
-                                          "x": 1, "y": 2, "output_dir": OUT})
+    xrd = {"two_theta": [round(20 + i * 1.5, 2) for i in range(12)],
+           "intensity": [round(120 + 900 * math.exp(-((i - 5) ** 2) / 3.0)) for i in range(12)]}
+    cr = rpc.tool("origin_chart_render", {"name": preset_name, "columns": xrd,
+                                          "output_dir": OUT})
     check("chart_render delivers image+opju", cr.get("ok") and
           bool((cr.get("delivered") or {}).get("image")) and bool((cr.get("delivered") or {}).get("project")),
           (cr.get("delivered"), cr.get("code"), cr.get("message")))
     check("chart_render applied the preset titles",
           (cr.get("preset") or {}).get("x_title") and (cr.get("preset") or {}).get("y_title"),
           cr.get("preset"))
+    bad = rpc.tool("origin_chart_render", {"name": preset_name,
+                                           "source": os.path.join(HERE, "sample.dat"),
+                                           "x": 1, "y": 2, "output_dir": OUT})
+    check("chart_render refuses data missing the preset's columns",
+          not bad.get("ok") and bad.get("code") == "preset_columns_mismatch",
+          (bad.get("code"), bad.get("message")))
 
     gp = rpc.tool("origin_fit", {"worksheet": ws, "x": 1, "y": 2, "kind": "gauss"})
     check("fit preset resolves to an installed function", gp.get("ok") and gp.get("func") == "Gauss",