@melaya/runner 1.0.27 → 1.0.28

package/dist/pythonEnv.js

@@ -18,12 +18,45 @@ const CACHE_DIR = join(homedir(), ".melaya-runner");
 const VENV_DIR = join(CACHE_DIR, "venv");
 const VENV_MARK = join(CACHE_DIR, "venv-version.txt");
 const AGENTSCOPE = join(CACHE_DIR, "agentscope");
-// Extra deps the cached `shared/tools/*.py` import that aren't in
-// agentscope's pyproject. Keep this list narrow — full tool-specific
-// SDKs (linkedin_api, twilio, stripe, etc.) install lazily on first
-// use via tool-specific scripts. The minimum to GET A PIPELINE RUNNING
-// is agentscope + aiohttp + requests + redis (used by some tools).
-const EXTRA_DEPS = ["aiohttp", "requests", "python-dotenv"];
+// Explicit dependency list. The shared-bundle endpoint ships only
+// `*.py` files — no pyproject.toml — so `pip install -e
+// ~/.melaya-runner/agentscope` does NOT work (pip can't find a project
+// definition). PYTHONPATH=~/.melaya-runner/ already makes `import
+// agentscope` resolve to the cached source; we only need pip to bring
+// in agentscope's transitive deps + the tool-runtime extras.
+//
+// Mirrors melayaAgents/agentscope/pyproject.toml `dependencies = [...]`
+// PLUS the runner-tool extras (aiohttp, requests, python-dotenv).
+// If you bump the agentscope pyproject deps, bump this list too —
+// or extract from pyproject at server-side and ship via the bundle.
+const PIP_DEPS = [
+    // ── agentscope core (mirrors pyproject.toml `dependencies`) ──
+    "aioitertools",
+    "anthropic",
+    "dashscope",
+    "docstring_parser",
+    "filetype",
+    "json5",
+    "json_repair",
+    "mcp>=1.13",
+    "numpy",
+    "openai",
+    "python-datauri",
+    "opentelemetry-api>=1.39.0",
+    "opentelemetry-sdk>=1.39.0",
+    "opentelemetry-exporter-otlp>=1.39.0",
+    "opentelemetry-semantic-conventions>=0.60b0",
+    "python-socketio",
+    "shortuuid",
+    "tiktoken",
+    "sqlalchemy",
+    "python-frontmatter",
+    "aiofiles",
+    // ── runner tools (shared/tools/*.py) ──
+    "aiohttp",
+    "requests",
+    "python-dotenv",
+];
 export function venvPython() {
     return platform() === "win32"
         ? join(VENV_DIR, "Scripts", "python.exe")
@@ -42,9 +75,12 @@ function venvIsValid(expectedVersion) {
         return false;
     }
 }
-function runProc(cmd, args, onLine) {
+function runProc(cmd, args, onLine, envExtra = {}) {
     return new Promise((resolve) => {
-        const child = spawn(cmd, args, { stdio: ["ignore", "pipe", "pipe"] });
+        const child = spawn(cmd, args, {
+            stdio: ["ignore", "pipe", "pipe"],
+            env: { ...process.env, ...envExtra },
+        });
         const chew = (b) => {
             for (const ln of b.toString().split("\n")) {
                 const t = ln.trimEnd();
@@ -85,21 +121,26 @@ export async function ensurePythonEnv(systemPython, expectedVersion, onProgress
     // Step 2: upgrade pip + wheel so wheel-based deps install cleanly.
     onProgress("upgrading pip / wheel inside the venv");
     await runProc(venvPython(), ["-m", "pip", "install", "--quiet", "--upgrade", "pip", "wheel"], onProgress);
-    // Step 3: install agentscope from the local cache (its pyproject pulls
-    // anthropic, openai, shortuuid, opentelemetry-*, etc.).
-    onProgress("installing agentscope + 23 transitive deps (anthropic, openai, opentelemetry, …) — first run can take 1-2 min");
-    const acode = await runProc(venvPython(), ["-m", "pip", "install", "--quiet", "-e", AGENTSCOPE, ...EXTRA_DEPS], onProgress);
+    // Step 3: install agentscope's transitive deps + tool extras directly.
+    // We do NOT pip-install agentscope itself — the shared bundle ships
+    // only *.py files (no pyproject.toml), so PYTHONPATH-based import is
+    // the only path. The cached agentscope source under
+    // ~/.melaya-runner/agentscope/ resolves via PYTHONPATH at spawn time.
+    onProgress(`installing ${PIP_DEPS.length} python deps (anthropic, openai, opentelemetry, …) — first run can take 1-2 min`);
+    const acode = await runProc(venvPython(), ["-m", "pip", "install", "--quiet", "--disable-pip-version-check", ...PIP_DEPS], onProgress);
     if (acode !== 0) {
         return {
             ok: false,
             pythonPath: systemPython,
-            reason: `pip install agentscope failed (exit ${acode}). Check the lines above for the actual pip error.`,
+            reason: `pip install failed (exit ${acode}). Check the lines above for the actual pip error.`,
         };
     }
     writeFileSync(VENV_MARK, expectedVersion, "utf-8");
-    // sanity: confirm shortuuid resolves now (it's the historic canary
-    // import that fails on a stale env).
-    const probe = await runProc(venvPython(), ["-c", "import shortuuid, agentscope, anthropic, openai"], onProgress);
+    // sanity: confirm shortuuid + agentscope (via PYTHONPATH) resolve now.
+    // Probe must mirror the spawn env so PYTHONPATH=CACHE_DIR points at
+    // the cached agentscope source — without this the probe ImportError's
+    // even though the real spawn would work.
+    const probe = await runProc(venvPython(), ["-c", "import shortuuid, agentscope, anthropic, openai"], onProgress, { PYTHONPATH: CACHE_DIR });
     if (probe !== 0) {
         return {
             ok: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@melaya/runner",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "Run Melaya AI pipelines locally with your own LM Studio or Ollama models",
   "license": "UNLICENSED",
   "private": false,