Rename block to wait

Update type definitions to capture expectations of wait parameter in run

Author: mattt

index.d.ts

@@ -156,7 +156,7 @@ declare module "replicate" {
       identifier: `${string}/${string}` | `${string}/${string}:${string}`,
       options: {
         input: object;
-        wait?: { interval?: number };
+        wait?: boolean | number | { mode?: "poll"; interval?: number };
         webhook?: string;
         webhook_events_filter?: WebhookEventType[];
         signal?: AbortSignal;
@@ -189,6 +189,7 @@ declare module "replicate" {
     wait(
       prediction: Prediction,
       options?: {
+        mode?: "poll";
         interval?: number;
       },
       stop?: (prediction: Prediction) => Promise<boolean>

index.js

@@ -144,11 +144,7 @@ class Replicate {
    * @returns {Promise<object>} - Resolves with the output of running the model
    */
   async run(ref, options, progress) {
-    let { block } = options;
-    const { wait, signal, block: _, ...data } = options;
-
-    // Block if `block` is explicitly true or if `wait` is explicitly true
-    block = block || (block === undefined && wait === true);
+    const { wait, signal, ...data } = options;
 
     const identifier = ModelVersionIdentifier.parse(ref);
 
@@ -157,13 +153,13 @@ class Replicate {
       prediction = await this.predictions.create({
         ...data,
         version: identifier.version,
-        block,
+        wait: wait,
       });
     } else if (identifier.owner && identifier.name) {
       prediction = await this.predictions.create({
         ...data,
         model: `${identifier.owner}/${identifier.name}`,
-        block,
+        wait: wait,
       });
     } else {
       throw new Error("Invalid model version identifier");

lib/predictions.js

@@ -9,11 +9,11 @@ const { transformFileInputs } = require("./util");
  * @param {object} options.input - Required. An object with the model inputs
  * @param {string} [options.webhook] - An HTTPS URL for receiving a webhook when the prediction has new output
  * @param {string[]} [options.webhook_events_filter] - You can change which events trigger webhook requests by specifying webhook events (`start`|`output`|`logs`|`completed`)
- * @param {boolean} [options.block] - Whether to wait until the prediction is completed before returning. Defaults to false
+ * @param {boolean|integer} [options.wait] - Whether to wait until the prediction is completed before returning. If an integer is provided, it will wait for that many seconds. Defaults to false
  * @returns {Promise<object>} Resolves with the created prediction
  */
 async function createPrediction(options) {
-  const { model, version, input, block, ...data } = options;
+  const { model, version, input, wait, ...data } = options;
 
   if (data.webhook) {
     try {
@@ -25,8 +25,12 @@ async function createPrediction(options) {
   }
 
   const headers = {};
-  if (block) {
-    headers["Prefer"] = "wait";
+  if (wait) {
+    if (typeof wait === "number") {
+      headers["Prefer"] = `wait=${wait}`;
+    } else {
+      headers["Prefer"] = "wait";
+    }
   }
 
   let response;