recursive-llm-ts 2.0.6 → 2.0.10

package/dist/bunpy-bridge.js

@@ -62,6 +62,7 @@ class BunpyBridge {
     }
     ensureRLMModule() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this.rlmModule)
                 return;
             // Lazy load bunpy to avoid errors in Node.js environments
@@ -76,29 +77,38 @@ class BunpyBridge {
             }
             // Import sys module to add path
             const sys = this.python.import('sys');
+            const pythonExecutable = String(sys.executable || 'python');
+            const pythonCmd = pythonExecutable.includes(' ') ? `"${pythonExecutable}"` : pythonExecutable;
             const pythonPackagePath = path.join(__dirname, '..', 'recursive-llm');
             const pythonSrcPath = path.join(pythonPackagePath, 'src');
+            const pipCmd = `${pythonCmd} -m pip install -e "${pythonPackagePath}"`;
             sys.path.insert(0, pythonSrcPath);
-            // Try to import rlm, install deps if needed
+            // Try to import rlm, install deps if import fails
             try {
-                // First check if litellm is available
-                try {
-                    this.python.import('litellm');
-                }
-                catch (_a) {
-                    // litellm not found, install dependencies
-                    console.log('[recursive-llm-ts] Installing Python dependencies (first time only)...');
-                    const { execSync } = yield Promise.resolve().then(() => __importStar(require('child_process')));
-                    const pipCmd = `pip install -e "${pythonPackagePath}" || pip3 install -e "${pythonPackagePath}"`;
-                    execSync(pipCmd, { stdio: 'inherit' });
-                    console.log('[recursive-llm-ts] ✓ Python dependencies installed');
-                }
                 this.rlmModule = this.python.import('rlm');
             }
             catch (error) {
-                throw new Error('Failed to import rlm module. Python dependencies may not be installed.\n' +
-                    `Run: pip install -e ${pythonPackagePath}\n` +
-                    `Original error: ${error.message || 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)...');
+                    try {
+                        const { execSync } = yield Promise.resolve().then(() => __importStar(require('child_process')));
+                        execSync(pipCmd, { 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` +
+                            `Error: ${installError.message || installError}`);
+                    }
+                }
+                else {
+                    throw new Error('Failed to import rlm module.\n' +
+                        `Run: ${pipCmd}\n` +
+                        `Original error: ${error.message || error}`);
+                }
             }
         });
     }

package/dist/rlm-bridge.js

@@ -62,6 +62,7 @@ class PythoniaBridge {
     }
     ensureRLMModule() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this.rlmModule)
                 return;
             // Lazy load pythonia to avoid errors in Bun environments
@@ -78,28 +79,37 @@ class PythoniaBridge {
             const pythonPackagePath = path.join(__dirname, '..', 'recursive-llm');
             // Import sys module to add path
             const sys = yield this.python('sys');
+            const pythonExecutable = String((yield sys.executable) || 'python');
+            const pythonCmd = pythonExecutable.includes(' ') ? `"${pythonExecutable}"` : pythonExecutable;
+            const pipCmd = `${pythonCmd} -m pip install -e "${pythonPackagePath}"`;
             const pathList = yield sys.path;
             yield pathList.insert(0, path.join(pythonPackagePath, 'src'));
-            // Try to import rlm, install deps if needed
+            // Try to import rlm, install deps if import fails
             try {
-                // First check if litellm is available
-                try {
-                    yield this.python('litellm');
-                }
-                catch (_a) {
-                    // litellm not found, install dependencies
-                    console.log('[recursive-llm-ts] Installing Python dependencies (first time only)...');
-                    const { execSync } = yield Promise.resolve().then(() => __importStar(require('child_process')));
-                    const pipCmd = `pip install -e "${pythonPackagePath}" || pip3 install -e "${pythonPackagePath}"`;
-                    execSync(pipCmd, { stdio: 'inherit' });
-                    console.log('[recursive-llm-ts] ✓ Python dependencies installed');
-                }
                 this.rlmModule = yield this.python('rlm');
             }
             catch (error) {
-                throw new Error('Failed to import rlm module. Python dependencies may not be installed.\n' +
-                    `Run: pip install -e ${pythonPackagePath}\n` +
-                    `Original error: ${error.message || 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)...');
+                    try {
+                        const { execSync } = yield Promise.resolve().then(() => __importStar(require('child_process')));
+                        execSync(pipCmd, { 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` +
+                            `Error: ${installError.message || installError}`);
+                    }
+                }
+                else {
+                    throw new Error('Failed to import rlm module.\n' +
+                        `Run: ${pipCmd}\n` +
+                        `Original error: ${error.message || error}`);
+                }
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "recursive-llm-ts",
-  "version": "2.0.6",
+  "version": "2.0.10",
   "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

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const { execSync } = require('child_process');
+const { execSync, execFileSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
@@ -16,28 +16,56 @@ if (!fs.existsSync(pyprojectPath)) {
 console.log('[recursive-llm-ts] Installing Python dependencies...');
 
 try {
-  // Check if pip is available
-  try {
-    execSync('pip --version', { stdio: 'pipe' });
-  } catch {
-    // Try pip3
-    execSync('pip3 --version', { stdio: 'pipe' });
+  const pythonCandidates = [];
+  if (process.env.PYTHON) {
+    pythonCandidates.push({ command: process.env.PYTHON, args: [] });
+  }
+  if (process.platform === 'win32') {
+    pythonCandidates.push({ command: 'py', args: ['-3'] });
+    pythonCandidates.push({ command: 'python', args: [] });
+    pythonCandidates.push({ command: 'python3', args: [] });
+  } else {
+    pythonCandidates.push({ command: 'python3', args: [] });
+    pythonCandidates.push({ command: 'python', args: [] });
+  }
+
+  let pythonCmd = null;
+  for (const candidate of pythonCandidates) {
+    try {
+      execFileSync(candidate.command, [...candidate.args, '--version'], { stdio: 'pipe' });
+      pythonCmd = candidate;
+      break;
+    } catch {
+      // Try next candidate
+    }
   }
 
-  // Install the Python package in editable mode
-  const pipCommand = process.platform === 'win32' 
-    ? `pip install -e "${pythonPackagePath}"`
-    : `pip install -e "${pythonPackagePath}" || pip3 install -e "${pythonPackagePath}"`;
-  
-  execSync(pipCommand, {
-    stdio: 'inherit',
-    cwd: pythonPackagePath
-  });
+  if (pythonCmd) {
+    execFileSync(
+      pythonCmd.command,
+      [...pythonCmd.args, '-m', 'pip', 'install', '-e', pythonPackagePath],
+      { stdio: 'inherit', cwd: pythonPackagePath }
+    );
+  } else {
+    // Fall back to pip/pip3 if a Python executable wasn't found
+    try {
+      execSync('pip --version', { stdio: 'pipe' });
+    } catch {
+      execSync('pip3 --version', { stdio: 'pipe' });
+    }
+    const pipCommand = process.platform === 'win32'
+      ? `pip install -e "${pythonPackagePath}"`
+      : `pip install -e "${pythonPackagePath}" || pip3 install -e "${pythonPackagePath}"`;
+    execSync(pipCommand, {
+      stdio: 'inherit',
+      cwd: pythonPackagePath
+    });
+  }
   console.log('[recursive-llm-ts] ✓ Python dependencies installed successfully');
 } 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 && pip install -e .`);
+  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);