drift-ml 0.1.1 → 0.1.4

package/bin/drift.js

@@ -1,175 +1,82 @@
 #!/usr/bin/env node
 
-const { spawnSync, spawn } = require("child_process");
-const fs = require("fs");
+const { spawnSync } = require("child_process");
 const path = require("path");
-const https = require("https");
-const http = require("http");
-
-const ENGINE_PORT = process.env.DRIFT_ENGINE_PORT || "8000";
-const ENGINE_BASE = process.env.DRIFT_ENGINE_BASE_URL || "https://github.com/lakshitsachdeva/drift/releases/latest/download";
-const HEALTH_URL = `http://127.0.0.1:${ENGINE_PORT}/health`;
-const HEALTH_TIMEOUT_MS = 2000;
-const HEALTH_POLL_MS = 500;
-const HEALTH_POLL_MAX = 60; // 30s
-
-function which(cmd) {
-  const { status, stdout } = spawnSync("which", [cmd], { encoding: "utf8" });
-  return status === 0 ? (stdout || "").trim() : null;
-}
-
-function getPlatformKey() {
-  const p = process.platform;
-  const a = process.arch;
-  const plat = p === "darwin" ? "macos" : p === "win32" ? "windows" : "linux";
-  const arch = a === "arm64" || a === "aarch64" ? "arm64" : "x64";
-  return { plat, arch };
-}
-
-function getEngineDir() {
-  const home = process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH;
-  if (!home) return null;
-  return path.join(home, ".drift", "bin");
-}
-
-function getEnginePath() {
-  const dir = getEngineDir();
-  if (!dir) return null;
-  const { plat, arch } = getPlatformKey();
-  const ext = process.platform === "win32" ? ".exe" : "";
-  return path.join(dir, `drift-engine-${plat}-${arch}${ext}`);
-}
+const fs = require("fs");
 
-function fetchOk(url) {
-  return new Promise((resolve, reject) => {
-    const client = url.startsWith("https") ? https : http;
-    const req = client.get(url, { timeout: HEALTH_TIMEOUT_MS }, (res) => {
-      const redirect = res.statusCode >= 301 && res.statusCode <= 302 && res.headers.location;
-      if (redirect) {
-        fetchOk(redirect).then(resolve).catch(reject);
-        return;
-      }
-      resolve(res.statusCode === 200);
-    });
-    req.on("error", () => resolve(false));
-    req.on("timeout", () => { req.destroy(); resolve(false); });
-  });
+// Known pipx install locations
+function getPipxBinPaths() {
+  const home = process.env.HOME || process.env.USERPROFILE || "";
+  return [
+    path.join(home, ".local", "bin", "drift"),
+    "/usr/local/bin/drift",
+  ];
 }
 
-function downloadFile(url, destPath) {
-  return new Promise((resolve, reject) => {
-    const client = url.startsWith("https") ? https : http;
-    const req = client.get(url, (res) => {
-      const redirect = res.statusCode >= 301 && res.statusCode <= 302 && res.headers.location;
-      if (redirect) {
-        downloadFile(redirect, destPath).then(resolve).catch(reject);
-        return;
-      }
-      if (res.statusCode !== 200) {
-        reject(new Error(`Download failed: ${res.statusCode}`));
-        return;
+// Find Python-based drift (not this Node script)
+function findPythonDrift() {
+  // First check pipx standard locations
+  for (const p of getPipxBinPaths()) {
+    if (fs.existsSync(p)) {
+      // Verify it's not a Node script (i.e., not us)
+      try {
+        const content = fs.readFileSync(p, "utf8").slice(0, 100);
+        if (!content.includes("#!/usr/bin/env node")) {
+          return p;
+        }
+      } catch (_) {}
+    }
+  }
+  
+  // Fallback: search PATH but skip Node scripts
+  const pathEnv = process.env.PATH || "";
+  const dirs = pathEnv.split(path.delimiter);
+  
+  for (const dir of dirs) {
+    const candidate = path.join(dir, "drift");
+    if (fs.existsSync(candidate)) {
+      try {
+        const content = fs.readFileSync(candidate, "utf8").slice(0, 100);
+        // Skip if it's a Node script (that's us or another Node launcher)
+        if (content.includes("#!/usr/bin/env node")) {
+          continue;
+        }
+        return candidate;
+      } catch (_) {
+        // Binary file or unreadable - might be the real one
+        return candidate;
       }
-      const dir = path.dirname(destPath);
-      if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-      const file = fs.createWriteStream(destPath);
-      res.pipe(file);
-      file.on("finish", () => { file.close(); resolve(); });
-      file.on("error", reject);
-    });
-    req.on("error", reject);
-  });
+    }
+  }
+  
+  return null;
 }
 
-function engineRunning() {
-  return fetchOk(HEALTH_URL);
-}
+function main() {
+  const driftPath = findPythonDrift();
+  
+  if (!driftPath) {
+    console.error(`
+drift is not installed.
 
-function waitForEngine() {
-  return new Promise((resolve) => {
-    let n = 0;
-    const t = setInterval(() => {
-      n++;
-      fetchOk(HEALTH_URL).then((ok) => {
-        if (ok) { clearInterval(t); resolve(true); }
-        else if (n >= HEALTH_POLL_MAX) { clearInterval(t); resolve(false); }
-      });
-    }, HEALTH_POLL_MS);
-  });
-}
+Install it with:
 
-async function ensureEngine() {
-  const binPath = getEnginePath();
-  const binDir = getEngineDir();
-  if (!binPath || !binDir) {
-    console.error("drift: Could not resolve engine directory (~/.drift/bin). Set HOME or USERPROFILE.");
-    return false;
-  }
-  if (!fs.existsSync(binPath)) {
-    const { plat, arch } = getPlatformKey();
-    const ext = process.platform === "win32" ? ".exe" : "";
-    const asset = `drift-engine-${plat}-${arch}${ext}`;
-    const url = `${ENGINE_BASE}/${asset}`;
-    process.stderr.write(`drift: Downloading engine (${asset})...\n`);
-    try {
-      await downloadFile(url, binPath);
-    } catch (e) {
-      console.error("drift: Download failed.", e.message);
-      console.error("drift: Run the engine manually or set DRIFT_ENGINE_BASE_URL.");
-      return false;
-    }
-    if (process.platform !== "win32") {
-      try { fs.chmodSync(binPath, 0o755); } catch (_) {}
-    }
-  }
-  const child = spawn(binPath, [], {
-    detached: true,
-    stdio: "ignore",
-    cwd: binDir,
-    env: { ...process.env, DRIFT_ENGINE_PORT: ENGINE_PORT },
-  });
-  child.unref();
-  return waitForEngine();
-}
+  pipx install drift-ml
 
-async function main() {
-  const userBackend = process.env.DRIFT_BACKEND_URL;
-  if (userBackend) {
-    // User runs engine elsewhere; skip download/start and connect to their URL.
-  } else if (await engineRunning()) {
-    // Engine already running locally.
-  } else {
-    const engineStarted = await ensureEngine().catch(() => false);
-    if (!engineStarted) {
-      console.error("drift: Engine did not start. Run the engine manually or set DRIFT_BACKEND_URL to a running engine URL.");
-      process.exit(1);
-    }
-  }
+Then run:
 
-  const python = which("python3") || which("python");
-  if (!python) {
-    console.error("drift: Python is required for the chat CLI. Install Python 3 and ensure `python` or `python3` is on your PATH.");
+  drift
+`);
     process.exit(1);
   }
 
-  const pip = spawnSync(python, ["-m", "pip", "install", "--quiet", "--upgrade", "drift"], {
-    encoding: "utf8",
-    stdio: ["inherit", "pipe", "inherit"],
-  });
-  if (pip.status !== 0) {
-    console.error("drift: Failed to install or upgrade the drift Python package.");
-    process.exit(pip.status === null ? 1 : pip.status);
-  }
-
-  const backendUrl = userBackend || `http://127.0.0.1:${ENGINE_PORT}`;
-  const run = spawnSync(python, ["-m", "drift"], {
-    encoding: "utf8",
+  // Run the Python drift and forward stdin/stdout
+  const result = spawnSync(driftPath, process.argv.slice(2), {
     stdio: "inherit",
-    env: { ...process.env, DRIFT_BACKEND_URL: backendUrl },
+    env: process.env,
   });
-  process.exit(run.status === null ? (run.signal ? 128 + 9 : 1) : run.status);
+
+  process.exit(result.status === null ? (result.signal ? 128 + 9 : 1) : result.status);
 }
 
-main().catch((e) => {
-  console.error("drift:", e.message);
-  process.exit(1);
-});
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drift-ml",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "Drift — terminal-first, chat-based AutoML. Same engine as the web app. On first run: downloads and starts the engine locally (never exposes engine source).",
   "bin": {
     "drift": "./bin/drift.js"