trajectories-sh 1.11.0 → 1.13.0

package/dist/cli.js

@@ -76,12 +76,20 @@ async function uploadTrajectoryAction(directory, opts) {
     console.error(chalk.red("  \u2717 Not authenticated. Run: trajectories auth login"));
     process.exit(1);
   }
+  if (opts.visibility === "public") {
+    console.error(
+      chalk.red(
+        "  \u2717 --visibility public is not allowed from the CLI.\n    Upload as 'unlisted' or 'private', then flip visibility to public\n    from the trajectory page on trajectories.sh."
+      )
+    );
+    process.exit(1);
+  }
   const slug = opts.slug ?? directory.replace(/\/+$/, "").split("/").pop();
   console.log(chalk.bold(`
   Uploading trajectory ${directory} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-YKSKGJET.js");
+    const { uploadJob } = await import("./upload-CDNIKYW3.js");
     const result = await uploadJob(directory, {
       slug,
       name: opts.name,
@@ -92,8 +100,11 @@ async function uploadTrajectoryAction(directory, opts) {
     if (result.meanReward != null) {
       console.log(`    Pass rate: ${(result.meanReward * 100).toFixed(0)}%`);
     }
-    console.log(`    Viewer: ${result.viewerUrl}
-`);
+    console.log(`    Viewer:        ${result.viewerUrl}`);
+    if (result.existingDuplicateUrl) {
+      console.log(`    Earlier copy:  ${result.existingDuplicateUrl}`);
+    }
+    console.log("");
   } catch (e) {
     console.error(chalk.red(`
   \u2717 ${e.message}
@@ -219,7 +230,11 @@ 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").option("-s, --slug <slug>", "URL slug (default: directory name)").option("-n, --name <name>", "Display name (default: slug)").option("-v, --visibility <vis>", "public, unlisted, or private", "private").action(uploadTrajectoryAction);
+upload.command("trajectory <directory>").description("Upload a trajectory job directory").option("-s, --slug <slug>", "URL slug (default: directory name)").option("-n, --name <name>", "Display name (default: slug)").option(
+  "-v, --visibility <vis>",
+  "unlisted or private (use the UI to flip a trajectory to public after upload)",
+  "private"
+).action(uploadTrajectoryAction);
 upload.command("task <directory>").description("Upload a benchmark task directory").option("-n, --name <name>", "Task name (default: directory name)").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-YKSKGJET.js → upload-CDNIKYW3.js}

@@ -345,14 +345,18 @@ async function uploadJob(dir, opts) {
   }
   const initResp = await apiPost("/api/cli/push/init", { slug, name, visibility, estimated_bytes: totalSize, content_hash: contentHash });
   if (!initResp.ok) {
-    if (initResp.status === 409) {
-      const err = await initResp.json().catch(() => ({ detail: "Duplicate trajectory" }));
-      throw new Error(err.detail);
-    }
     throw new Error(`Init failed: ${await initResp.text()}`);
   }
-  const { job_id: jobId } = await initResp.json();
+  const initBody = await initResp.json();
+  const jobId = initBody.job_id;
   console.log(`  Job ID: ${jobId}`);
+  const apiUrlEarly = getApiUrl();
+  const siteUrlEarly = apiUrlEarly.includes("localhost") ? "http://localhost:3000" : apiUrlEarly.replace("api.", "").replace(/\/$/, "");
+  const existingDuplicateUrl = initBody.existing_duplicate ? `${siteUrlEarly}/t/${initBody.existing_duplicate.job_id}` : void 0;
+  if (existingDuplicateUrl) {
+    console.log(`  \u24D8 This content was already uploaded as '${initBody.existing_duplicate.slug}' \u2014 uploading anyway.`);
+    console.log(`    Existing: ${existingDuplicateUrl}`);
+  }
   await uploadDirect(jobId, files);
   console.log("  Finalizing...");
   const finalResp = await apiPost(`/api/cli/push/${jobId}/finalize`, {});
@@ -381,7 +385,8 @@ async function uploadJob(dir, opts) {
     slug: result.slug,
     nTrials: result.n_trials,
     meanReward: result.mean_reward,
-    viewerUrl: `${siteUrl}/t/${jobId}`
+    viewerUrl: `${siteUrl}/t/${jobId}`,
+    existingDuplicateUrl
   };
 }
 async function uploadDirect(jobId, files) {

package/package.json

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