trajectories-sh 1.18.3 → 1.18.4

package/dist/cli.js

@@ -98,7 +98,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
     );
   }
   if (isZip) {
-    const { uploadZip } = await import("./upload-YDTMBIW2.js");
+    const { uploadZip } = await import("./upload-XTPRJGN4.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-YDTMBIW2.js");
+    const { uploadJob } = await import("./upload-XTPRJGN4.js");
     const result = await uploadJob(pathArg, {
       slug,
       name: opts.name

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

@@ -51,72 +51,59 @@ async function apiPost(path, body, timeout = 3e5) {
   });
 }
 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 { 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 fileStat = _statSync(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)
+  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
   });
-  if (!resp.ok) {
-    let detail;
-    try {
-      const body = await resp.json();
-      detail = body.detail || JSON.stringify(body);
-    } catch {
-      detail = await resp.text();
+  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 });
+      }
     }
-    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 (jobDirs.length === 0) {
+    throw new Error("No Harbor job directories found in the ZIP. Each job must contain config.json and result.json.");
+  }
+  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
     });
-    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}`
-  }));
+  try {
+    execSync(`rm -rf ${JSON.stringify(tmpDir)}`, { stdio: "pipe" });
+  } catch {
+  }
+  return results;
 }
 async function convertToWebP(dir) {
   const { files } = collectFiles(dir);

package/package.json

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