Skip to content

armgit / laya

Public Imported from GitHub
0

Non-autoregressive System 1 decision engine. Typed choice, score and yes/no decisions over any text in a single forward pass, in 100+ languages, with a router that picks the right checkpoint per request.

test(lazy-import): pin laya.mcp's documented no-extra import surface

Aashishe3cd18ffa678
diff --git a/tests/test_lazy_import.py b/tests/test_lazy_import.py
index 870268c6..d788b694 100644
--- a/tests/test_lazy_import.py
+++ b/tests/test_lazy_import.py
@@ -129,6 +129,75 @@ for preset in ("1", "0"):
check("USE_TF/a caller's %r is preserved" % preset, resp.stdout.strip(), preset)
+# ------------------------------------------------------------------ the mcp extra's import surface
+# `laya/mcp/__init__.py` documents that "the submodules ``device``, ``remote`` and ``tools`` are
+# importable without the ``mcp`` dependency; only ``server`` requires the extra." Nothing checks it.
+# Both CI lanes that run this suite install `-e ".[mcp,serve,langchain]"` (ci.yml:94 and :225), so
+# `import mcp` always succeeds there, and `tests/test_mcp.py` skips wholesale when the extra is
+# absent -- so a module-level `from mcp.types import ...` added to `tools.py` would break the
+# documented path for every install without the extra and leave CI green. Blocked as an
+# ImportError here rather than left missing, so reaching for it fails loudly at the exact import.
+NO_MCP = r'''
+import sys
+sys.path.insert(0, %r)
+class Blocker:
+ def find_spec(self, name, path=None, target=None):
+ if name == "mcp" or name.startswith("mcp."):
+ raise ImportError("mcp blocked")
+ return None
+sys.meta_path.insert(0, Blocker())
+
+import laya
+import laya.mcp
+import laya.mcp.device # noqa: F401
+import laya.mcp.remote # noqa: F401
+import laya.mcp.tools # noqa: F401
+assert "mcp" not in sys.modules, "the laya.mcp import surface pulled in the mcp dependency"
+print("ok")
+try:
+ import laya.mcp.server # noqa: F401
+ print("imported without the extra")
+ print("")
+except ImportError as exc:
+ print(type(exc).__name__)
+ print(str(exc))
+''' % ROOT
+
+nomcp = subprocess.run([sys.executable, "-c", NO_MCP], capture_output=True, text=True)
+lines = nomcp.stdout.splitlines()
+check("no-mcp/import laya.mcp succeeds", nomcp.returncode, 0)
+check("no-mcp/device, remote and tools import without the extra", lines[0] if lines else None, "ok")
+check("no-mcp/server fails as an ImportError", lines[1] if len(lines) > 1 else None, "ImportError")
+# The hint is the documented install path (`pip install "laya[mcp]"`), so name both halves of it
+# rather than the whole sentence: a reworded message is fine, a bare "No module named 'mcp'" is not.
+check("no-mcp/server names the extra and how to install it",
+ [part for part in ("laya[mcp]", "pip install") if part not in (lines[2] if len(lines) > 2 else "")],
+ [])
+
+# ...and the same surface stays pure-Python without torch, which is this file's own premise: `remote`
+# reaches for `laya.serve` and `laya.router`, `tools` for `laya.confidence`/`hooks`/`presets`.
+NO_MCP_NO_TORCH = r'''
+import sys
+sys.path.insert(0, %r)
+class Blocker:
+ def find_spec(self, name, path=None, target=None):
+ for dep in ("mcp", "torch"):
+ if name == dep or name.startswith(dep + "."):
+ raise ImportError(dep + " blocked")
+ return None
+sys.meta_path.insert(0, Blocker())
+
+import laya.mcp.device # noqa: F401
+import laya.mcp.remote # noqa: F401
+import laya.mcp.tools # noqa: F401
+print(sorted(dep for dep in ("mcp", "torch") if dep in sys.modules))
+''' % ROOT
+
+lean = subprocess.run([sys.executable, "-c", NO_MCP_NO_TORCH], capture_output=True, text=True)
+check("no-mcp-no-torch/the mcp surface imports", lean.returncode, 0)
+check("no-mcp-no-torch/neither heavy dependency is imported", lean.stdout.strip(), "[]")
+
+
print("\n%d passed, %d failed" % (len(PASS), len(FAIL)))
for f in FAIL:
print(" FAIL", f)