trajectories-sh 1.18.1 → 1.18.3

package/dist/cli.js

@@ -64,11 +64,18 @@ auth.command("status").description("Show current authentication status").action(
     console.log(chalk.dim("  Not logged in. Run: trajectories auth login"));
   }
 });
-async function uploadTrajectoryAction(directory, opts) {
+async function uploadTrajectoryAction(pathArg, opts) {
   const chalk = (await import("chalk")).default;
   const { existsSync, statSync } = await import("fs");
-  if (!existsSync(directory) || !statSync(directory).isDirectory()) {
-    console.error(chalk.red(`  \u2717 Directory not found: ${directory}`));
+  const exists = existsSync(pathArg);
+  const isZip = pathArg.toLowerCase().endsWith(".zip");
+  const isDir = exists && statSync(pathArg).isDirectory();
+  if (!exists) {
+    console.error(chalk.red(`  \u2717 Path not found: ${pathArg}`));
+    process.exit(1);
+  }
+  if (!isDir && !isZip) {
+    console.error(chalk.red(`  \u2717 ${pathArg} is not a directory or .zip file`));
     process.exit(1);
   }
   if (opts.apiKey) {
@@ -90,13 +97,38 @@ async function uploadTrajectoryAction(directory, opts) {
       )
     );
   }
-  const slug = opts.slug ?? directory.replace(/\/+$/, "").split("/").pop();
+  if (isZip) {
+    const { uploadZip } = await import("./upload-YDTMBIW2.js");
+    const slug2 = opts.slug ?? pathArg.replace(/\.zip$/i, "").replace(/\/+$/, "").split("/").pop();
+    console.log(chalk.bold(`
+  Uploading ZIP ${pathArg} \u2192 ${chalk.cyan(slug2)}
+`));
+    try {
+      const results = await uploadZip(pathArg, { slug: slug2, name: opts.name });
+      for (const r of results) {
+        console.log(chalk.green.bold(`  \u2713 ${r.slug}`));
+        console.log(`    Trials: ${r.nTrials}`);
+        if (r.meanReward != null) {
+          console.log(`    Pass rate: ${(r.meanReward * 100).toFixed(0)}%`);
+        }
+        console.log(`    Viewer: ${r.viewerUrl}`);
+      }
+      console.log("");
+    } catch (e) {
+      console.error(chalk.red(`
+  \u2717 ${e.message}
+`));
+      process.exit(1);
+    }
+    return;
+  }
+  const slug = opts.slug ?? pathArg.replace(/\/+$/, "").split("/").pop();
   console.log(chalk.bold(`
-  Uploading trajectory ${directory} \u2192 ${chalk.cyan(slug)}
+  Uploading trajectory ${pathArg} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-JHU236SW.js");
-    const result = await uploadJob(directory, {
+    const { uploadJob } = await import("./upload-YDTMBIW2.js");
+    const result = await uploadJob(pathArg, {
       slug,
       name: opts.name
     });
@@ -242,7 +274,7 @@ async function deleteTrajectoryAction(url, opts) {
   }
 }
 var upload = program.command("upload").description("Upload trajectories or tasks");
-upload.command("trajectory <directory>").description("Upload a trajectory job directory (always uploaded as unlisted)").option("-s, --slug <slug>", "URL slug (default: directory name)").option("-n, --name <name>", "Display name (default: slug)").option("--api-key <key>", "API key (or set TRAJECTORIES_API_KEY in your env)").option("-v, --visibility <vis>", "(deprecated, ignored \u2014 set visibility in the UI)").action(uploadTrajectoryAction);
+upload.command("trajectory <path>").description("Upload a trajectory job directory or ZIP file (always uploaded as unlisted)").option("-s, --slug <slug>", "URL slug (default: directory name)").option("-n, --name <name>", "Display name (default: slug)").option("--api-key <key>", "API key (or set TRAJECTORIES_API_KEY in your env)").option("-v, --visibility <vis>", "(deprecated, ignored \u2014 set visibility in the UI)").action(uploadTrajectoryAction);
 upload.command("task <directory>").description("Upload a benchmark task directory").option("-n, --name <name>", "Task name (default: directory name)").option("--api-key <key>", "API key (or set TRAJECTORIES_API_KEY in your env)").option("-v, --visibility <vis>", "public or private", "public").action(uploadTaskAction);
 var download = program.command("download").description("Download trajectories");
 download.command("trajectory <url>").description("Download a trajectory job from trajectories.sh").option("-o, --output <dir>", "Output directory (default: slug name)").action(downloadTrajectoryAction);

package/dist/{upload-JHU236SW.js → upload-YDTMBIW2.js}

@@ -50,6 +50,74 @@ async function apiPost(path, body, timeout = 3e5) {
     signal: AbortSignal.timeout(timeout)
   });
 }
+async function uploadZip(zipPath, opts) {
+  const { readFileSync: readFileSync2, statSync: statSync2 } = await import("fs");
+  const { getApiUrl: _getApiUrl, getAuthHeader: _getAuthHeader } = await import("./config-4XJRECIW.js");
+  const auth = await _getAuthHeader();
+  if (!auth) throw new Error("Not authenticated. Run: trajectories auth login");
+  const fileStat = statSync2(zipPath);
+  const sizeMB = (fileStat.size / (1024 * 1024)).toFixed(1);
+  console.log(`  ZIP size: ${sizeMB} MB`);
+  console.log("  Uploading to server (server-side extraction)...");
+  const fileData = readFileSync2(zipPath);
+  const formData = new FormData();
+  formData.append("file", new Blob([fileData]), zipPath.split("/").pop() ?? "upload.zip");
+  if (opts.slug) formData.append("slug", opts.slug);
+  if (opts.name) formData.append("name", opts.name);
+  formData.append("visibility", "unlisted");
+  const apiUrl = _getApiUrl();
+  const resp = await fetch(`${apiUrl}/api/cli/push/zip`, {
+    method: "POST",
+    headers: { Authorization: auth },
+    body: formData,
+    signal: AbortSignal.timeout(6e5)
+  });
+  if (!resp.ok) {
+    let detail;
+    try {
+      const body = await resp.json();
+      detail = body.detail || JSON.stringify(body);
+    } catch {
+      detail = await resp.text();
+    }
+    throw new Error(`ZIP upload failed (${resp.status}): ${detail}`);
+  }
+  const initResult = await resp.json();
+  console.log(`  Server received ZIP. Extracting ${initResult.total_jobs} job(s)...`);
+  let lastStatus = "";
+  while (true) {
+    await new Promise((r) => setTimeout(r, 3e3));
+    const statusResp = await fetch(`${apiUrl}/api/cli/push/zip/${initResult.task_id}/status`, {
+      headers: { Authorization: auth },
+      signal: AbortSignal.timeout(3e4)
+    });
+    if (!statusResp.ok) {
+      throw new Error(`Failed to check ZIP status: ${statusResp.status}`);
+    }
+    const status = await statusResp.json();
+    if (status.status !== lastStatus) {
+      console.log(`  ${status.status}${status.current_job ? ` (${status.current_job})` : ""} [${status.completed_jobs}/${status.total_jobs}]`);
+      lastStatus = status.status;
+    }
+    if (status.status === "done") {
+      const result2 = { jobs: status.jobs };
+      var finalResult = result2;
+      break;
+    }
+    if (status.status === "error") {
+      throw new Error(`Server-side extraction failed: ${status.error}`);
+    }
+  }
+  const result = finalResult;
+  const siteUrl = apiUrl.includes("localhost") ? "http://localhost:3000" : apiUrl.replace("api.", "").replace(/\/$/, "");
+  return result.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}`
+  }));
+}
 async function convertToWebP(dir) {
   const { files } = collectFiles(dir);
   const pngs = files.filter((f) => f.relPath.toLowerCase().endsWith(".png"));
@@ -522,5 +590,6 @@ function truncate(s, n) {
 }
 export {
   collectFiles,
-  uploadJob
+  uploadJob,
+  uploadZip
 };

package/package.json

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