recursive-llm-ts 2.0.10 → 2.0.12

package/dist/bunpy-bridge.js

@@ -55,6 +55,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BunpyBridge = void 0;
 const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
 class BunpyBridge {
     constructor() {
         this.rlmModule = null;
@@ -77,11 +78,48 @@ class BunpyBridge {
             }
             // Import sys module to add path
             const sys = this.python.import('sys');
-            const pythonExecutable = String(sys.executable || 'python');
+            const pythonExecutable = (() => {
+                try {
+                    const sysExecutable = sys.executable;
+                    if (sysExecutable && typeof sysExecutable.valueOf === 'function') {
+                        const value = sysExecutable.valueOf();
+                        if (typeof value === 'string' && value.trim()) {
+                            return value;
+                        }
+                    }
+                    if (typeof sysExecutable === 'string' && sysExecutable.trim()) {
+                        return sysExecutable;
+                    }
+                }
+                catch (_a) {
+                    // Fall back if bunpy can't coerce sys.executable
+                }
+                return 'python';
+            })();
             const pythonCmd = pythonExecutable.includes(' ') ? `"${pythonExecutable}"` : pythonExecutable;
             const pythonPackagePath = path.join(__dirname, '..', 'recursive-llm');
             const pythonSrcPath = path.join(pythonPackagePath, 'src');
+            const pythonDepsPath = path.join(pythonPackagePath, '.pydeps');
             const pipCmd = `${pythonCmd} -m pip install -e "${pythonPackagePath}"`;
+            const pyprojectPath = path.join(pythonPackagePath, 'pyproject.toml');
+            const dependencySpecifiers = (() => {
+                try {
+                    const pyproject = fs.readFileSync(pyprojectPath, 'utf8');
+                    const depsBlock = pyproject.match(/dependencies\s*=\s*\[[\s\S]*?\]/);
+                    if (!depsBlock)
+                        return [];
+                    return Array.from(depsBlock[0].matchAll(/"([^"]+)"/g), (match) => match[1]);
+                }
+                catch (_a) {
+                    return [];
+                }
+            })();
+            const depsInstallCmd = dependencySpecifiers.length > 0
+                ? `${pythonCmd} -m pip install --upgrade --target "${pythonDepsPath}" ${dependencySpecifiers.map((dep) => `"${dep}"`).join(' ')}`
+                : '';
+            const installCmd = depsInstallCmd || pipCmd;
+            fs.mkdirSync(pythonDepsPath, { recursive: true });
+            sys.path.insert(0, pythonDepsPath);
             sys.path.insert(0, pythonSrcPath);
             // Try to import rlm, install deps if import fails
             try {
@@ -90,23 +128,23 @@ class BunpyBridge {
             catch (error) {
                 // If import fails, try installing dependencies
                 if ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('No module named')) {
-                    console.log('[recursive-llm-ts] Installing Python dependencies (first time only)...');
+                    console.log('[recursive-llm-ts] Installing Python dependencies locally (first time only)...');
                     try {
                         const { execSync } = yield Promise.resolve().then(() => __importStar(require('child_process')));
-                        execSync(pipCmd, { stdio: 'inherit' });
+                        execSync(installCmd, { stdio: 'inherit' });
                         console.log('[recursive-llm-ts] ✓ Python dependencies installed');
                         // Try import again
                         this.rlmModule = this.python.import('rlm');
                     }
                     catch (installError) {
                         throw new Error('Failed to import rlm module after installing dependencies.\n' +
-                            `Manual installation: ${pipCmd}\n` +
+                            `Manual installation: ${installCmd}\n` +
                             `Error: ${installError.message || installError}`);
                     }
                 }
                 else {
                     throw new Error('Failed to import rlm module.\n' +
-                        `Run: ${pipCmd}\n` +
+                        `Run: ${installCmd}\n` +
                         `Original error: ${error.message || error}`);
                 }
             }

package/dist/rlm-bridge.js

@@ -55,6 +55,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PythoniaBridge = void 0;
 const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
 class PythoniaBridge {
     constructor() {
         this.rlmModule = null;
@@ -82,7 +83,27 @@ class PythoniaBridge {
             const pythonExecutable = String((yield sys.executable) || 'python');
             const pythonCmd = pythonExecutable.includes(' ') ? `"${pythonExecutable}"` : pythonExecutable;
             const pipCmd = `${pythonCmd} -m pip install -e "${pythonPackagePath}"`;
+            const pythonDepsPath = path.join(pythonPackagePath, '.pydeps');
+            const pyprojectPath = path.join(pythonPackagePath, 'pyproject.toml');
+            const dependencySpecifiers = (() => {
+                try {
+                    const pyproject = fs.readFileSync(pyprojectPath, 'utf8');
+                    const depsBlock = pyproject.match(/dependencies\s*=\s*\[[\s\S]*?\]/);
+                    if (!depsBlock)
+                        return [];
+                    return Array.from(depsBlock[0].matchAll(/"([^"]+)"/g), (match) => match[1]);
+                }
+                catch (_a) {
+                    return [];
+                }
+            })();
+            const depsInstallCmd = dependencySpecifiers.length > 0
+                ? `${pythonCmd} -m pip install --upgrade --target "${pythonDepsPath}" ${dependencySpecifiers.map((dep) => `"${dep}"`).join(' ')}`
+                : '';
+            const installCmd = depsInstallCmd || pipCmd;
             const pathList = yield sys.path;
+            fs.mkdirSync(pythonDepsPath, { recursive: true });
+            yield pathList.insert(0, pythonDepsPath);
             yield pathList.insert(0, path.join(pythonPackagePath, 'src'));
             // Try to import rlm, install deps if import fails
             try {
@@ -91,23 +112,23 @@ class PythoniaBridge {
             catch (error) {
                 // If import fails, try installing dependencies
                 if ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('No module named')) {
-                    console.log('[recursive-llm-ts] Installing Python dependencies (first time only)...');
+                    console.log('[recursive-llm-ts] Installing Python dependencies locally (first time only)...');
                     try {
                         const { execSync } = yield Promise.resolve().then(() => __importStar(require('child_process')));
-                        execSync(pipCmd, { stdio: 'inherit' });
+                        execSync(installCmd, { stdio: 'inherit' });
                         console.log('[recursive-llm-ts] ✓ Python dependencies installed');
                         // Try import again
                         this.rlmModule = yield this.python('rlm');
                     }
                     catch (installError) {
                         throw new Error('Failed to import rlm module after installing dependencies.\n' +
-                            `Manual installation: ${pipCmd}\n` +
+                            `Manual installation: ${installCmd}\n` +
                             `Error: ${installError.message || installError}`);
                     }
                 }
                 else {
                     throw new Error('Failed to import rlm module.\n' +
-                        `Run: ${pipCmd}\n` +
+                        `Run: ${installCmd}\n` +
                         `Original error: ${error.message || error}`);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "recursive-llm-ts",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "TypeScript bridge for recursive-llm: Recursive Language Models for unbounded context processing",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/install-python-deps.js

@@ -5,6 +5,7 @@ const fs = require('fs');
 
 const pythonPackagePath = path.join(__dirname, '..', 'recursive-llm');
 const pyprojectPath = path.join(pythonPackagePath, 'pyproject.toml');
+const pythonDepsPath = path.join(pythonPackagePath, '.pydeps');
 
 // Check if pyproject.toml exists
 if (!fs.existsSync(pyprojectPath)) {
@@ -13,9 +14,26 @@ if (!fs.existsSync(pyprojectPath)) {
   process.exit(0); // Don't fail the install
 }
 
-console.log('[recursive-llm-ts] Installing Python dependencies...');
+console.log('[recursive-llm-ts] Installing Python dependencies locally...');
+
+const dependencySpecifiers = (() => {
+  try {
+    const pyproject = fs.readFileSync(pyprojectPath, 'utf8');
+    const depsBlock = pyproject.match(/dependencies\s*=\s*\[[\s\S]*?\]/);
+    if (!depsBlock) return [];
+    return Array.from(depsBlock[0].matchAll(/"([^"]+)"/g), (match) => match[1]);
+  } catch {
+    return [];
+  }
+})();
+
+const installArgs = dependencySpecifiers.length > 0
+  ? ['-m', 'pip', 'install', '--upgrade', '--target', pythonDepsPath, ...dependencySpecifiers]
+  : ['-m', 'pip', 'install', '-e', pythonPackagePath];
+const dependencyArgs = dependencySpecifiers.map((dep) => `"${dep}"`).join(' ');
 
 try {
+
   const pythonCandidates = [];
   if (process.env.PYTHON) {
     pythonCandidates.push({ command: process.env.PYTHON, args: [] });
@@ -41,9 +59,10 @@ try {
   }
 
   if (pythonCmd) {
+    fs.mkdirSync(pythonDepsPath, { recursive: true });
     execFileSync(
       pythonCmd.command,
-      [...pythonCmd.args, '-m', 'pip', 'install', '-e', pythonPackagePath],
+      [...pythonCmd.args, ...installArgs],
       { stdio: 'inherit', cwd: pythonPackagePath }
     );
   } else {
@@ -53,9 +72,12 @@ try {
     } catch {
       execSync('pip3 --version', { stdio: 'pipe' });
     }
-    const pipCommand = process.platform === 'win32'
-      ? `pip install -e "${pythonPackagePath}"`
-      : `pip install -e "${pythonPackagePath}" || pip3 install -e "${pythonPackagePath}"`;
+    const pipCommand = dependencySpecifiers.length > 0
+      ? `pip install --upgrade --target "${pythonDepsPath}" ${dependencySpecifiers.map((dep) => `"${dep}"`).join(' ')}`
+      : process.platform === 'win32'
+        ? `pip install -e "${pythonPackagePath}"`
+        : `pip install -e "${pythonPackagePath}" || pip3 install -e "${pythonPackagePath}"`;
+    fs.mkdirSync(pythonDepsPath, { recursive: true });
     execSync(pipCommand, {
       stdio: 'inherit',
       cwd: pythonPackagePath
@@ -65,7 +87,14 @@ try {
 } catch (error) {
   console.warn('[recursive-llm-ts] Warning: Failed to auto-install Python dependencies');
   console.warn('[recursive-llm-ts] This is not critical - you can install them manually:');
-  console.warn(`[recursive-llm-ts]   cd node_modules/recursive-llm-ts/recursive-llm && python -m pip install -e .`);
+  if (dependencySpecifiers.length > 0) {
+    console.warn(
+      `[recursive-llm-ts]   cd node_modules/recursive-llm-ts/recursive-llm && ` +
+      `python -m pip install --upgrade --target .pydeps ${dependencyArgs}`
+    );
+  } else {
+    console.warn(`[recursive-llm-ts]   cd node_modules/recursive-llm-ts/recursive-llm && python -m pip install -e .`);
+  }
   console.warn('[recursive-llm-ts] Or ensure Python 3.9+ and pip are in your PATH');
   // Don't fail the npm install - exit with 0
   process.exit(0);