@melaya/runner 1.0.33 → 1.0.35

package/dist/pythonEnv.js

@@ -175,12 +175,30 @@ export async function ensurePythonEnv(systemPython, expectedVersion, onProgress
     }
     // Scrapling browser binaries — best-effort. The fast-path AsyncFetcher
     // (curl_cffi TLS impersonation) works without this; only StealthyFetcher
-    // (Cloudflare-bypass rescue path) needs Chromium. If `scrapling install`
-    // fails (offline, network blip, browser-download mirror down) we don't
-    // fail the venv — the search just stays on the fast path. Logs are
-    // surfaced so the operator sees what happened.
+    // (Cloudflare-bypass rescue path) needs Chromium. Scrapling has no
+    // __main__.py — invoke its CLI entry point via `from scrapling.cli
+    // import main; main(['install'])` so the call works the same on every
+    // platform without reaching into the venv's Scripts/bin folder.
+    // Non-fatal: if it fails (offline, mirror down, scrapling.cli rename in
+    // a future version) the search just stays on the fast path.
     onProgress("installing scrapling browsers (best-effort, for stealth rescue path)");
-    const scrCode = await runProc(venvPython(), ["-m", "scrapling", "install"], onProgress);
+    const scrCode = await runProc(venvPython(), ["-c",
+        "import sys\n" +
+            "# Try every known CLI shape across scrapling versions, return 0 on first success.\n" +
+            "tried = []\n" +
+            "for mod, attr in (('scrapling.cli','main'), ('scrapling.__main__','main'), ('scrapling.cli','cli')):\n" +
+            "    try:\n" +
+            "        m = __import__(mod, fromlist=[attr])\n" +
+            "        fn = getattr(m, attr)\n" +
+            "        try: fn(['install'])\n" +
+            "        except TypeError: fn()  # zero-arg variants\n" +
+            "        sys.exit(0)\n" +
+            "    except Exception as e:\n" +
+            "        tried.append(f'{mod}.{attr}: {type(e).__name__}: {e}')\n" +
+            "        continue\n" +
+            "print('scrapling install: no working CLI entry — tried:'); [print(' -', t) for t in tried]\n" +
+            "sys.exit(2)\n",
+    ], onProgress);
     if (scrCode !== 0) {
         onProgress(`(scrapling install exited ${scrCode} — fast-path fetcher still works; stealth-rescue disabled)`);
     }

package/package.json

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