trajectories-sh 1.18.4 → 1.18.5

package/dist/cli.js

@@ -98,7 +98,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
     );
   }
   if (isZip) {
-    const { uploadZip } = await import("./upload-XTPRJGN4.js");
+    const { uploadZip } = await import("./upload-NBHAW2LV.js");
     const slug2 = opts.slug ?? pathArg.replace(/\.zip$/i, "").replace(/\/+$/, "").split("/").pop();
     console.log(chalk.bold(`
   Uploading ZIP ${pathArg} \u2192 ${chalk.cyan(slug2)}
@@ -127,7 +127,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
   Uploading trajectory ${pathArg} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-XTPRJGN4.js");
+    const { uploadJob } = await import("./upload-NBHAW2LV.js");
     const result = await uploadJob(pathArg, {
       slug,
       name: opts.name

package/dist/{upload-XTPRJGN4.js → upload-NBHAW2LV.js}

@@ -51,59 +51,88 @@ async function apiPost(path, body, timeout = 3e5) {
   });
 }
 async function uploadZip(zipPath, opts) {
-  const { execSync } = await import("child_process");
-  const { mkdtempSync, existsSync, readdirSync: readdirSync2, statSync: _statSync } = await import("fs");
-  const { join: _join } = await import("path");
-  const { tmpdir: _tmpdir } = await import("os");
+  const { readFileSync: readFileSync2, statSync: _statSync } = await import("fs");
   const fileStat = _statSync(zipPath);
-  const sizeMB = (fileStat.size / (1024 * 1024)).toFixed(1);
-  console.log(`  ZIP size: ${sizeMB} MB`);
-  console.log("  Extracting ZIP...");
-  const tmpDir = mkdtempSync(_join(_tmpdir(), "traj-zip-"));
-  execSync(`unzip -q -o ${JSON.stringify(zipPath)} -d ${JSON.stringify(tmpDir)}`, {
-    stdio: "pipe",
-    timeout: 3e5
+  const sizeBytes = fileStat.size;
+  const sizeMB = (sizeBytes / (1024 * 1024)).toFixed(1);
+  const sizeGB = (sizeBytes / 1024 ** 3).toFixed(2);
+  console.log(`  ZIP size: ${sizeBytes > 1024 ** 3 ? sizeGB + " GB" : sizeMB + " MB"}`);
+  const auth = await getAuthHeader();
+  if (!auth) throw new Error("Not authenticated. Run: trajectories auth login");
+  const apiUrl = getApiUrl();
+  console.log("  Requesting upload URL...");
+  const urlResp = await fetch(`${apiUrl}/api/cli/push/zip/upload-url`, {
+    method: "POST",
+    headers: { Authorization: auth, "Content-Type": "application/json" },
+    body: "{}",
+    signal: AbortSignal.timeout(3e4)
   });
-  const topEntries = readdirSync2(tmpDir, { withFileTypes: true });
-  const jobDirs = [];
-  if (existsSync(_join(tmpDir, "config.json")) && existsSync(_join(tmpDir, "result.json"))) {
-    jobDirs.push({ path: tmpDir, name: opts.name || opts.slug || "job" });
-  } else {
-    for (const entry of topEntries) {
-      if (!entry.isDirectory() || entry.name.startsWith(".") || entry.name === "__MACOSX") continue;
-      const jobPath = _join(tmpDir, entry.name);
-      if (existsSync(_join(jobPath, "config.json")) && existsSync(_join(jobPath, "result.json"))) {
-        jobDirs.push({ path: jobPath, name: opts.name || entry.name });
-      }
-    }
+  if (!urlResp.ok) {
+    throw new Error(`Failed to get upload URL: ${await urlResp.text()}`);
   }
-  if (jobDirs.length === 0) {
-    throw new Error("No Harbor job directories found in the ZIP. Each job must contain config.json and result.json.");
+  const { task_id, signed_url } = await urlResp.json();
+  console.log(`  Uploading ZIP to storage...`);
+  const zipData = readFileSync2(zipPath);
+  const putResp = await fetch(signed_url, {
+    method: "PUT",
+    headers: { "Content-Type": "application/zip" },
+    body: zipData,
+    signal: AbortSignal.timeout(36e5)
+  });
+  if (!putResp.ok) {
+    const body = await putResp.text().catch(() => "");
+    throw new Error(`ZIP upload to storage failed (${putResp.status}): ${body.slice(0, 200)}`);
   }
-  console.log(`  Found ${jobDirs.length} job(s) in ZIP`);
-  const results = [];
-  for (let i = 0; i < jobDirs.length; i++) {
-    const jobDir = jobDirs[i];
-    const jobSlug = opts.slug ? jobDirs.length > 1 ? `${opts.slug}-${i + 1}` : opts.slug : jobDir.path.split("/").pop();
-    console.log(`
-  Job ${i + 1}/${jobDirs.length}: ${jobDir.name} \u2192 ${jobSlug}`);
-    const result = await uploadJob(jobDir.path, {
-      slug: jobSlug,
-      name: jobDir.name
-    });
-    results.push({
-      jobId: result.jobId,
-      slug: result.slug,
-      nTrials: result.nTrials,
-      meanReward: result.meanReward,
-      viewerUrl: result.viewerUrl
-    });
+  console.log("  ZIP uploaded to storage.");
+  console.log("  Enqueuing for server-side extraction...");
+  const enqueueResp = await fetch(`${apiUrl}/api/cli/push/zip/enqueue`, {
+    method: "POST",
+    headers: { Authorization: auth, "Content-Type": "application/json" },
+    body: JSON.stringify({
+      task_id,
+      slug: opts.slug || "",
+      name: opts.name || "",
+      visibility: "unlisted"
+    }),
+    signal: AbortSignal.timeout(3e4)
+  });
+  if (!enqueueResp.ok) {
+    const detail = await enqueueResp.text().catch(() => "");
+    throw new Error(`Enqueue failed (${enqueueResp.status}): ${detail.slice(0, 300)}`);
   }
-  try {
-    execSync(`rm -rf ${JSON.stringify(tmpDir)}`, { stdio: "pipe" });
-  } catch {
+  console.log("  Waiting for background extraction...");
+  let lastStatus = "";
+  while (true) {
+    await new Promise((r) => setTimeout(r, 5e3));
+    const statusResp = await fetch(`${apiUrl}/api/cli/push/zip/${task_id}/status`, {
+      headers: { Authorization: auth },
+      signal: AbortSignal.timeout(3e4)
+    });
+    if (!statusResp.ok) {
+      console.log(`  \u26A0 Status check failed (${statusResp.status}), retrying...`);
+      continue;
+    }
+    const status = await statusResp.json();
+    if (status.status !== lastStatus) {
+      const progress = status.total_jobs > 0 ? ` [${status.completed_jobs}/${status.total_jobs}]` : "";
+      const jobLabel = status.current_job ? ` (${status.current_job})` : "";
+      console.log(`  ${status.status}${jobLabel}${progress}`);
+      lastStatus = status.status;
+    }
+    if (status.status === "done") {
+      const siteUrl = apiUrl.includes("localhost") ? "http://localhost:3000" : apiUrl.replace("api.", "").replace(/\/$/, "");
+      return status.jobs.map((j) => ({
+        jobId: j.job_id,
+        slug: j.slug,
+        nTrials: j.n_trials,
+        meanReward: j.mean_reward ?? void 0,
+        viewerUrl: `${siteUrl}/t/${j.job_id}`
+      }));
+    }
+    if (status.status === "error") {
+      throw new Error(`Server-side extraction failed: ${status.error}`);
+    }
   }
-  return results;
 }
 async function convertToWebP(dir) {
   const { files } = collectFiles(dir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trajectories-sh",
-  "version": "1.18.4",
+  "version": "1.18.5",
   "description": "CLI for uploading trajectory jobs to trajectories.sh",
   "type": "module",
   "bin": {