modal 0.3.20 → 0.3.22

package/dist/index.cjs

@@ -31,7 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   AlreadyExistsError: () => AlreadyExistsError,
-  App: () => App,
+  App: () => App2,
   CloudBucketMount: () => CloudBucketMount2,
   Cls: () => Cls,
   ClsInstance: () => ClsInstance,
@@ -6520,6 +6520,104 @@ var AutoscalerSettings = {
     return message;
   }
 };
+function createBaseAutoscalingMetrics() {
+  return { cpuUsagePercent: 0, memoryUsagePercent: 0, concurrentRequests: 0, timestamp: 0 };
+}
+var AutoscalingMetrics = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.cpuUsagePercent !== 0) {
+      writer.uint32(9).double(message.cpuUsagePercent);
+    }
+    if (message.memoryUsagePercent !== 0) {
+      writer.uint32(17).double(message.memoryUsagePercent);
+    }
+    if (message.concurrentRequests !== 0) {
+      writer.uint32(24).uint32(message.concurrentRequests);
+    }
+    if (message.timestamp !== 0) {
+      writer.uint32(33).double(message.timestamp);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseAutoscalingMetrics();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 9) {
+            break;
+          }
+          message.cpuUsagePercent = reader.double();
+          continue;
+        }
+        case 2: {
+          if (tag !== 17) {
+            break;
+          }
+          message.memoryUsagePercent = reader.double();
+          continue;
+        }
+        case 3: {
+          if (tag !== 24) {
+            break;
+          }
+          message.concurrentRequests = reader.uint32();
+          continue;
+        }
+        case 4: {
+          if (tag !== 33) {
+            break;
+          }
+          message.timestamp = reader.double();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      cpuUsagePercent: isSet3(object.cpuUsagePercent) ? globalThis.Number(object.cpuUsagePercent) : 0,
+      memoryUsagePercent: isSet3(object.memoryUsagePercent) ? globalThis.Number(object.memoryUsagePercent) : 0,
+      concurrentRequests: isSet3(object.concurrentRequests) ? globalThis.Number(object.concurrentRequests) : 0,
+      timestamp: isSet3(object.timestamp) ? globalThis.Number(object.timestamp) : 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.cpuUsagePercent !== 0) {
+      obj.cpuUsagePercent = message.cpuUsagePercent;
+    }
+    if (message.memoryUsagePercent !== 0) {
+      obj.memoryUsagePercent = message.memoryUsagePercent;
+    }
+    if (message.concurrentRequests !== 0) {
+      obj.concurrentRequests = Math.round(message.concurrentRequests);
+    }
+    if (message.timestamp !== 0) {
+      obj.timestamp = message.timestamp;
+    }
+    return obj;
+  },
+  create(base) {
+    return AutoscalingMetrics.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseAutoscalingMetrics();
+    message.cpuUsagePercent = object.cpuUsagePercent ?? 0;
+    message.memoryUsagePercent = object.memoryUsagePercent ?? 0;
+    message.concurrentRequests = object.concurrentRequests ?? 0;
+    message.timestamp = object.timestamp ?? 0;
+    return message;
+  }
+};
 function createBaseBaseImage() {
   return { imageId: "", dockerTag: "" };
 }
@@ -35073,6 +35171,108 @@ var TaskCurrentInputsResponse = {
     return message;
   }
 };
+function createBaseTaskGetAutoscalingMetricsRequest() {
+  return { taskId: "" };
+}
+var TaskGetAutoscalingMetricsRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.taskId !== "") {
+      writer.uint32(10).string(message.taskId);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTaskGetAutoscalingMetricsRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.taskId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { taskId: isSet3(object.taskId) ? globalThis.String(object.taskId) : "" };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.taskId !== "") {
+      obj.taskId = message.taskId;
+    }
+    return obj;
+  },
+  create(base) {
+    return TaskGetAutoscalingMetricsRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTaskGetAutoscalingMetricsRequest();
+    message.taskId = object.taskId ?? "";
+    return message;
+  }
+};
+function createBaseTaskGetAutoscalingMetricsResponse() {
+  return { metrics: void 0 };
+}
+var TaskGetAutoscalingMetricsResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.metrics !== void 0) {
+      AutoscalingMetrics.encode(message.metrics, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTaskGetAutoscalingMetricsResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.metrics = AutoscalingMetrics.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { metrics: isSet3(object.metrics) ? AutoscalingMetrics.fromJSON(object.metrics) : void 0 };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.metrics !== void 0) {
+      obj.metrics = AutoscalingMetrics.toJSON(message.metrics);
+    }
+    return obj;
+  },
+  create(base) {
+    return TaskGetAutoscalingMetricsResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTaskGetAutoscalingMetricsResponse();
+    message.metrics = object.metrics !== void 0 && object.metrics !== null ? AutoscalingMetrics.fromPartial(object.metrics) : void 0;
+    return message;
+  }
+};
 function createBaseTaskInfo() {
   return {
     id: "",
@@ -40979,6 +41179,15 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    /** Used for flash autoscaling */
+    taskGetAutoscalingMetrics: {
+      name: "TaskGetAutoscalingMetrics",
+      requestType: TaskGetAutoscalingMetricsRequest,
+      requestStream: false,
+      responseType: TaskGetAutoscalingMetricsResponse,
+      responseStream: false,
+      options: {}
+    },
     taskList: {
       name: "TaskList",
       requestType: TaskListRequest,
@@ -41563,11 +41772,20 @@ var Image2 = class _Image {
   #imageId;
   #tag;
   #imageRegistryConfig;
+  #layers;
   /** @ignore */
-  constructor(imageId, tag, imageRegistryConfig) {
+  constructor(imageId, tag, imageRegistryConfig, layers) {
     this.#imageId = imageId;
     this.#tag = tag;
     this.#imageRegistryConfig = imageRegistryConfig;
+    this.#layers = layers || [
+      {
+        commands: [],
+        secrets: void 0,
+        gpuConfig: void 0,
+        forceBuild: false
+      }
+    ];
   }
   get imageId() {
     return this.#imageId;
@@ -41652,6 +41870,42 @@ var Image2 = class _Image {
     }
     return new _Image("", tag, imageRegistryConfig);
   }
+  static validateDockerfileCommands(commands) {
+    for (const command of commands) {
+      const trimmed = command.trim().toUpperCase();
+      if (trimmed.startsWith("COPY ") && !trimmed.startsWith("COPY --FROM=")) {
+        throw new InvalidError(
+          "COPY commands that copy from local context are not yet supported."
+        );
+      }
+    }
+  }
+  /**
+   * Extend an image with arbitrary Dockerfile-like commands.
+   *
+   * Each call creates a new Image layer that will be built sequentially.
+   * The provided options apply only to this layer.
+   *
+   * @param commands - Array of Dockerfile commands as strings
+   * @param options - Optional configuration for this layer's build
+   * @returns A new Image instance
+   */
+  dockerfileCommands(commands, options) {
+    if (commands.length === 0) {
+      return this;
+    }
+    _Image.validateDockerfileCommands(commands);
+    const newLayer = {
+      commands: [...commands],
+      secrets: options?.secrets,
+      gpuConfig: options?.gpu ? parseGpuConfig(options.gpu) : void 0,
+      forceBuild: options?.forceBuild
+    };
+    return new _Image("", this.#tag, this.#imageRegistryConfig, [
+      ...this.#layers,
+      newLayer
+    ]);
+  }
   /**
    * Eagerly builds an Image on Modal.
    *
@@ -41661,58 +41915,75 @@ var Image2 = class _Image {
     if (this.imageId !== "") {
       return this;
     }
-    const resp = await client.imageGetOrCreate({
-      appId: app.appId,
-      image: {
-        dockerfileCommands: [`FROM ${this.#tag}`],
-        imageRegistryConfig: this.#imageRegistryConfig
-      },
-      builderVersion: imageBuilderVersion()
-    });
-    let result;
-    let metadata = void 0;
-    if (resp.result?.status) {
-      result = resp.result;
-      metadata = resp.metadata;
-    } else {
-      let lastEntryId = "";
-      let resultJoined = void 0;
-      while (!resultJoined) {
-        for await (const item of client.imageJoinStreaming({
-          imageId: resp.imageId,
-          timeout: 55,
-          lastEntryId
-        })) {
-          if (item.entryId) lastEntryId = item.entryId;
-          if (item.result?.status) {
-            resultJoined = item.result;
-            metadata = item.metadata;
-            break;
+    let baseImageId;
+    for (let i = 0; i < this.#layers.length; i++) {
+      const layer = this.#layers[i];
+      const secretIds = layer.secrets?.map((secret) => secret.secretId) || [];
+      const gpuConfig = layer.gpuConfig;
+      let dockerfileCommands;
+      let baseImages;
+      if (i === 0) {
+        dockerfileCommands = [`FROM ${this.#tag}`, ...layer.commands];
+        baseImages = [];
+      } else {
+        dockerfileCommands = ["FROM base", ...layer.commands];
+        baseImages = [{ dockerTag: "base", imageId: baseImageId }];
+      }
+      const resp = await client.imageGetOrCreate({
+        appId: app.appId,
+        image: Image.create({
+          dockerfileCommands,
+          imageRegistryConfig: this.#imageRegistryConfig,
+          secretIds,
+          gpuConfig,
+          contextFiles: [],
+          baseImages
+        }),
+        builderVersion: imageBuilderVersion(),
+        forceBuild: layer.forceBuild || false
+      });
+      let result;
+      if (resp.result?.status) {
+        result = resp.result;
+      } else {
+        let lastEntryId = "";
+        let resultJoined = void 0;
+        while (!resultJoined) {
+          for await (const item of client.imageJoinStreaming({
+            imageId: resp.imageId,
+            timeout: 55,
+            lastEntryId
+          })) {
+            if (item.entryId) lastEntryId = item.entryId;
+            if (item.result?.status) {
+              resultJoined = item.result;
+              break;
+            }
           }
         }
+        result = resultJoined;
       }
-      result = resultJoined;
-    }
-    void metadata;
-    if (result.status === 2 /* GENERIC_STATUS_FAILURE */) {
-      throw new Error(
-        `Image build for ${resp.imageId} failed with the exception:
+      if (result.status === 2 /* GENERIC_STATUS_FAILURE */) {
+        throw new Error(
+          `Image build for ${resp.imageId} failed with the exception:
 ${result.exception}`
-      );
-    } else if (result.status === 3 /* GENERIC_STATUS_TERMINATED */) {
-      throw new Error(
-        `Image build for ${resp.imageId} terminated due to external shut-down. Please try again.`
-      );
-    } else if (result.status === 4 /* GENERIC_STATUS_TIMEOUT */) {
-      throw new Error(
-        `Image build for ${resp.imageId} timed out. Please try again with a larger timeout parameter.`
-      );
-    } else if (result.status !== 1 /* GENERIC_STATUS_SUCCESS */) {
-      throw new Error(
-        `Image build for ${resp.imageId} failed with unknown status: ${result.status}`
-      );
+        );
+      } else if (result.status === 3 /* GENERIC_STATUS_TERMINATED */) {
+        throw new Error(
+          `Image build for ${resp.imageId} terminated due to external shut-down. Please try again.`
+        );
+      } else if (result.status === 4 /* GENERIC_STATUS_TIMEOUT */) {
+        throw new Error(
+          `Image build for ${resp.imageId} timed out. Please try again with a larger timeout parameter.`
+        );
+      } else if (result.status !== 1 /* GENERIC_STATUS_SUCCESS */) {
+        throw new Error(
+          `Image build for ${resp.imageId} failed with unknown status: ${result.status}`
+        );
+      }
+      baseImageId = resp.imageId;
     }
-    this.#imageId = resp.imageId;
+    this.#imageId = baseImageId;
     return this;
   }
   /** Delete an Image by ID. Warning: This removes an *entire Image*, and cannot be undone. */
@@ -42464,7 +42735,7 @@ function parseGpuConfig(gpu) {
     gpuType: gpuType.toUpperCase()
   };
 }
-var App = class _App {
+var App2 = class _App {
   appId;
   name;
   /** @ignore */
@@ -42491,7 +42762,12 @@ var App = class _App {
     const gpuConfig = parseGpuConfig(options.gpu);
     if (options.timeout && options.timeout % 1e3 !== 0) {
       throw new Error(
-        `Timeout must be a multiple of 1000ms, got ${options.timeout}`
+        `timeout must be a multiple of 1000ms, got ${options.timeout}`
+      );
+    }
+    if (options.idleTimeout && options.idleTimeout % 1e3 !== 0) {
+      throw new Error(
+        `idleTimeout must be a multiple of 1000ms, got ${options.idleTimeout}`
       );
     }
     await image.build(this);
@@ -42570,6 +42846,7 @@ var App = class _App {
           entrypointArgs: options.command ?? ["sleep", "48h"],
           imageId: image.imageId,
           timeoutSecs: options.timeout != void 0 ? options.timeout / 1e3 : 600,
+          idleTimeoutSecs: options.idleTimeout != void 0 ? options.idleTimeout / 1e3 : void 0,
           workdir: options.workdir ?? void 0,
           networkAccess,
           resources: {

package/dist/index.d.cts

@@ -1,5 +1,22 @@
 import { BinaryWriter, BinaryReader } from '@bufbuild/protobuf/wire';
 
+declare enum GPUType {
+    /**
+     * GPU_TYPE_UNSPECIFIED - Note: this enum is no longer used by current clients - don't add new types
+     * Old clients still send it, so we use it server-side for compatibility
+     */
+    GPU_TYPE_UNSPECIFIED = 0,
+    GPU_TYPE_T4 = 1,
+    GPU_TYPE_A100 = 2,
+    GPU_TYPE_A10G = 3,
+    GPU_TYPE_ANY = 4,
+    GPU_TYPE_A100_80GB = 8,
+    GPU_TYPE_L4 = 9,
+    GPU_TYPE_H100 = 10,
+    GPU_TYPE_L40S = 11,
+    GPU_TYPE_H200 = 12,
+    UNRECOGNIZED = -1
+}
 declare enum ParameterType {
     PARAM_TYPE_UNSPECIFIED = 0,
     PARAM_TYPE_STRING = 1,
@@ -40,6 +57,13 @@ interface ClassParameterSpec {
     fullType: GenericPayloadType | undefined;
 }
 declare const ClassParameterSpec: MessageFns<ClassParameterSpec>;
+interface GPUConfig {
+    /** Deprecated, at some point */
+    type: GPUType;
+    count: number;
+    gpuType: string;
+}
+declare const GPUConfig: MessageFns<GPUConfig>;
 interface GenericPayloadType {
     baseType: ParameterType;
     /** sub-type for generic types like lists */
@@ -85,11 +109,27 @@ declare class Secret {
 
 /** Options for deleting an Image. */
 type ImageDeleteOptions = Record<never, never>;
+/** Options for Image.dockerfileCommands(). */
+type ImageDockerfileCommandsOptions = {
+    /** Secrets that will be made available to this layer's build environment. */
+    secrets?: Secret[];
+    /** GPU reservation for this layer's build environment (e.g. "A100", "T4:2", "A100-80GB:4"). */
+    gpu?: string;
+    /** Ignore cached builds for this layer, similar to 'docker build --no-cache'. */
+    forceBuild?: boolean;
+};
+/** Represents a single image layer with its build configuration. */
+type Layer = {
+    commands: string[];
+    secrets?: Secret[];
+    gpuConfig?: GPUConfig;
+    forceBuild?: boolean;
+};
 /** A container image, used for starting Sandboxes. */
 declare class Image {
     #private;
     /** @ignore */
-    constructor(imageId: string, tag: string, imageRegistryConfig?: ImageRegistryConfig);
+    constructor(imageId: string, tag: string, imageRegistryConfig?: ImageRegistryConfig, layers?: Layer[]);
     get imageId(): string;
     /**
      * Creates an Image from an Image ID
@@ -118,6 +158,18 @@ declare class Image {
      * @param secret - A Secret containing credentials for registry authentication.
      */
     static fromGcpArtifactRegistry(tag: string, secret: Secret): Image;
+    private static validateDockerfileCommands;
+    /**
+     * Extend an image with arbitrary Dockerfile-like commands.
+     *
+     * Each call creates a new Image layer that will be built sequentially.
+     * The provided options apply only to this layer.
+     *
+     * @param commands - Array of Dockerfile commands as strings
+     * @param options - Optional configuration for this layer's build
+     * @returns A new Image instance
+     */
+    dockerfileCommands(commands: string[], options?: ImageDockerfileCommandsOptions): Image;
     /**
      * Eagerly builds an Image on Modal.
      *
@@ -418,6 +470,8 @@ type SandboxCreateOptions = {
     gpu?: string;
     /** Timeout of the Sandbox container, defaults to 10 minutes. */
     timeout?: number;
+    /** The amount of time in milliseconds that a sandbox can be idle before being terminated. */
+    idleTimeout?: number;
     /** Working directory of the Sandbox. */
     workdir?: string;
     /**
@@ -745,4 +799,4 @@ declare class Queue {
     iterate(options?: QueueIterateOptions): AsyncGenerator<any, void, unknown>;
 }
 
-export { AlreadyExistsError, App, type ClientOptions, CloudBucketMount, Cls, type ClsBatchingOptions, type ClsConcurrencyOptions, ClsInstance, type ClsOptions, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, type FunctionStats, FunctionTimeoutError, Function_, Image, type ImageDeleteOptions, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Proxy, type ProxyFromNameOptions, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Retries, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, type SandboxListOptions, SandboxTimeoutError, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, Tunnel, type UpdateAutoscalerOptions, Volume, type VolumeFromNameOptions, initializeClient };
+export { AlreadyExistsError, App, type ClientOptions, CloudBucketMount, Cls, type ClsBatchingOptions, type ClsConcurrencyOptions, ClsInstance, type ClsOptions, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, type FunctionStats, FunctionTimeoutError, Function_, Image, type ImageDeleteOptions, type ImageDockerfileCommandsOptions, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Proxy, type ProxyFromNameOptions, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Retries, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, type SandboxListOptions, SandboxTimeoutError, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, Tunnel, type UpdateAutoscalerOptions, Volume, type VolumeFromNameOptions, initializeClient };

package/dist/index.d.ts

@@ -1,5 +1,22 @@
 import { BinaryWriter, BinaryReader } from '@bufbuild/protobuf/wire';
 
+declare enum GPUType {
+    /**
+     * GPU_TYPE_UNSPECIFIED - Note: this enum is no longer used by current clients - don't add new types
+     * Old clients still send it, so we use it server-side for compatibility
+     */
+    GPU_TYPE_UNSPECIFIED = 0,
+    GPU_TYPE_T4 = 1,
+    GPU_TYPE_A100 = 2,
+    GPU_TYPE_A10G = 3,
+    GPU_TYPE_ANY = 4,
+    GPU_TYPE_A100_80GB = 8,
+    GPU_TYPE_L4 = 9,
+    GPU_TYPE_H100 = 10,
+    GPU_TYPE_L40S = 11,
+    GPU_TYPE_H200 = 12,
+    UNRECOGNIZED = -1
+}
 declare enum ParameterType {
     PARAM_TYPE_UNSPECIFIED = 0,
     PARAM_TYPE_STRING = 1,
@@ -40,6 +57,13 @@ interface ClassParameterSpec {
     fullType: GenericPayloadType | undefined;
 }
 declare const ClassParameterSpec: MessageFns<ClassParameterSpec>;
+interface GPUConfig {
+    /** Deprecated, at some point */
+    type: GPUType;
+    count: number;
+    gpuType: string;
+}
+declare const GPUConfig: MessageFns<GPUConfig>;
 interface GenericPayloadType {
     baseType: ParameterType;
     /** sub-type for generic types like lists */
@@ -85,11 +109,27 @@ declare class Secret {
 
 /** Options for deleting an Image. */
 type ImageDeleteOptions = Record<never, never>;
+/** Options for Image.dockerfileCommands(). */
+type ImageDockerfileCommandsOptions = {
+    /** Secrets that will be made available to this layer's build environment. */
+    secrets?: Secret[];
+    /** GPU reservation for this layer's build environment (e.g. "A100", "T4:2", "A100-80GB:4"). */
+    gpu?: string;
+    /** Ignore cached builds for this layer, similar to 'docker build --no-cache'. */
+    forceBuild?: boolean;
+};
+/** Represents a single image layer with its build configuration. */
+type Layer = {
+    commands: string[];
+    secrets?: Secret[];
+    gpuConfig?: GPUConfig;
+    forceBuild?: boolean;
+};
 /** A container image, used for starting Sandboxes. */
 declare class Image {
     #private;
     /** @ignore */
-    constructor(imageId: string, tag: string, imageRegistryConfig?: ImageRegistryConfig);
+    constructor(imageId: string, tag: string, imageRegistryConfig?: ImageRegistryConfig, layers?: Layer[]);
     get imageId(): string;
     /**
      * Creates an Image from an Image ID
@@ -118,6 +158,18 @@ declare class Image {
      * @param secret - A Secret containing credentials for registry authentication.
      */
     static fromGcpArtifactRegistry(tag: string, secret: Secret): Image;
+    private static validateDockerfileCommands;
+    /**
+     * Extend an image with arbitrary Dockerfile-like commands.
+     *
+     * Each call creates a new Image layer that will be built sequentially.
+     * The provided options apply only to this layer.
+     *
+     * @param commands - Array of Dockerfile commands as strings
+     * @param options - Optional configuration for this layer's build
+     * @returns A new Image instance
+     */
+    dockerfileCommands(commands: string[], options?: ImageDockerfileCommandsOptions): Image;
     /**
      * Eagerly builds an Image on Modal.
      *
@@ -418,6 +470,8 @@ type SandboxCreateOptions = {
     gpu?: string;
     /** Timeout of the Sandbox container, defaults to 10 minutes. */
     timeout?: number;
+    /** The amount of time in milliseconds that a sandbox can be idle before being terminated. */
+    idleTimeout?: number;
     /** Working directory of the Sandbox. */
     workdir?: string;
     /**
@@ -745,4 +799,4 @@ declare class Queue {
     iterate(options?: QueueIterateOptions): AsyncGenerator<any, void, unknown>;
 }
 
-export { AlreadyExistsError, App, type ClientOptions, CloudBucketMount, Cls, type ClsBatchingOptions, type ClsConcurrencyOptions, ClsInstance, type ClsOptions, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, type FunctionStats, FunctionTimeoutError, Function_, Image, type ImageDeleteOptions, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Proxy, type ProxyFromNameOptions, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Retries, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, type SandboxListOptions, SandboxTimeoutError, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, Tunnel, type UpdateAutoscalerOptions, Volume, type VolumeFromNameOptions, initializeClient };
+export { AlreadyExistsError, App, type ClientOptions, CloudBucketMount, Cls, type ClsBatchingOptions, type ClsConcurrencyOptions, ClsInstance, type ClsOptions, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, type FunctionStats, FunctionTimeoutError, Function_, Image, type ImageDeleteOptions, type ImageDockerfileCommandsOptions, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Proxy, type ProxyFromNameOptions, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Retries, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, type SandboxListOptions, SandboxTimeoutError, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, Tunnel, type UpdateAutoscalerOptions, Volume, type VolumeFromNameOptions, initializeClient };

package/dist/index.js

@@ -6460,6 +6460,104 @@ var AutoscalerSettings = {
     return message;
   }
 };
+function createBaseAutoscalingMetrics() {
+  return { cpuUsagePercent: 0, memoryUsagePercent: 0, concurrentRequests: 0, timestamp: 0 };
+}
+var AutoscalingMetrics = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.cpuUsagePercent !== 0) {
+      writer.uint32(9).double(message.cpuUsagePercent);
+    }
+    if (message.memoryUsagePercent !== 0) {
+      writer.uint32(17).double(message.memoryUsagePercent);
+    }
+    if (message.concurrentRequests !== 0) {
+      writer.uint32(24).uint32(message.concurrentRequests);
+    }
+    if (message.timestamp !== 0) {
+      writer.uint32(33).double(message.timestamp);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseAutoscalingMetrics();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 9) {
+            break;
+          }
+          message.cpuUsagePercent = reader.double();
+          continue;
+        }
+        case 2: {
+          if (tag !== 17) {
+            break;
+          }
+          message.memoryUsagePercent = reader.double();
+          continue;
+        }
+        case 3: {
+          if (tag !== 24) {
+            break;
+          }
+          message.concurrentRequests = reader.uint32();
+          continue;
+        }
+        case 4: {
+          if (tag !== 33) {
+            break;
+          }
+          message.timestamp = reader.double();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      cpuUsagePercent: isSet3(object.cpuUsagePercent) ? globalThis.Number(object.cpuUsagePercent) : 0,
+      memoryUsagePercent: isSet3(object.memoryUsagePercent) ? globalThis.Number(object.memoryUsagePercent) : 0,
+      concurrentRequests: isSet3(object.concurrentRequests) ? globalThis.Number(object.concurrentRequests) : 0,
+      timestamp: isSet3(object.timestamp) ? globalThis.Number(object.timestamp) : 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.cpuUsagePercent !== 0) {
+      obj.cpuUsagePercent = message.cpuUsagePercent;
+    }
+    if (message.memoryUsagePercent !== 0) {
+      obj.memoryUsagePercent = message.memoryUsagePercent;
+    }
+    if (message.concurrentRequests !== 0) {
+      obj.concurrentRequests = Math.round(message.concurrentRequests);
+    }
+    if (message.timestamp !== 0) {
+      obj.timestamp = message.timestamp;
+    }
+    return obj;
+  },
+  create(base) {
+    return AutoscalingMetrics.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseAutoscalingMetrics();
+    message.cpuUsagePercent = object.cpuUsagePercent ?? 0;
+    message.memoryUsagePercent = object.memoryUsagePercent ?? 0;
+    message.concurrentRequests = object.concurrentRequests ?? 0;
+    message.timestamp = object.timestamp ?? 0;
+    return message;
+  }
+};
 function createBaseBaseImage() {
   return { imageId: "", dockerTag: "" };
 }
@@ -35013,6 +35111,108 @@ var TaskCurrentInputsResponse = {
     return message;
   }
 };
+function createBaseTaskGetAutoscalingMetricsRequest() {
+  return { taskId: "" };
+}
+var TaskGetAutoscalingMetricsRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.taskId !== "") {
+      writer.uint32(10).string(message.taskId);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTaskGetAutoscalingMetricsRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.taskId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { taskId: isSet3(object.taskId) ? globalThis.String(object.taskId) : "" };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.taskId !== "") {
+      obj.taskId = message.taskId;
+    }
+    return obj;
+  },
+  create(base) {
+    return TaskGetAutoscalingMetricsRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTaskGetAutoscalingMetricsRequest();
+    message.taskId = object.taskId ?? "";
+    return message;
+  }
+};
+function createBaseTaskGetAutoscalingMetricsResponse() {
+  return { metrics: void 0 };
+}
+var TaskGetAutoscalingMetricsResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.metrics !== void 0) {
+      AutoscalingMetrics.encode(message.metrics, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTaskGetAutoscalingMetricsResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.metrics = AutoscalingMetrics.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { metrics: isSet3(object.metrics) ? AutoscalingMetrics.fromJSON(object.metrics) : void 0 };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.metrics !== void 0) {
+      obj.metrics = AutoscalingMetrics.toJSON(message.metrics);
+    }
+    return obj;
+  },
+  create(base) {
+    return TaskGetAutoscalingMetricsResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTaskGetAutoscalingMetricsResponse();
+    message.metrics = object.metrics !== void 0 && object.metrics !== null ? AutoscalingMetrics.fromPartial(object.metrics) : void 0;
+    return message;
+  }
+};
 function createBaseTaskInfo() {
   return {
     id: "",
@@ -40919,6 +41119,15 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    /** Used for flash autoscaling */
+    taskGetAutoscalingMetrics: {
+      name: "TaskGetAutoscalingMetrics",
+      requestType: TaskGetAutoscalingMetricsRequest,
+      requestStream: false,
+      responseType: TaskGetAutoscalingMetricsResponse,
+      responseStream: false,
+      options: {}
+    },
     taskList: {
       name: "TaskList",
       requestType: TaskListRequest,
@@ -41509,11 +41718,20 @@ var Image2 = class _Image {
   #imageId;
   #tag;
   #imageRegistryConfig;
+  #layers;
   /** @ignore */
-  constructor(imageId, tag, imageRegistryConfig) {
+  constructor(imageId, tag, imageRegistryConfig, layers) {
     this.#imageId = imageId;
     this.#tag = tag;
     this.#imageRegistryConfig = imageRegistryConfig;
+    this.#layers = layers || [
+      {
+        commands: [],
+        secrets: void 0,
+        gpuConfig: void 0,
+        forceBuild: false
+      }
+    ];
   }
   get imageId() {
     return this.#imageId;
@@ -41598,6 +41816,42 @@ var Image2 = class _Image {
     }
     return new _Image("", tag, imageRegistryConfig);
   }
+  static validateDockerfileCommands(commands) {
+    for (const command of commands) {
+      const trimmed = command.trim().toUpperCase();
+      if (trimmed.startsWith("COPY ") && !trimmed.startsWith("COPY --FROM=")) {
+        throw new InvalidError(
+          "COPY commands that copy from local context are not yet supported."
+        );
+      }
+    }
+  }
+  /**
+   * Extend an image with arbitrary Dockerfile-like commands.
+   *
+   * Each call creates a new Image layer that will be built sequentially.
+   * The provided options apply only to this layer.
+   *
+   * @param commands - Array of Dockerfile commands as strings
+   * @param options - Optional configuration for this layer's build
+   * @returns A new Image instance
+   */
+  dockerfileCommands(commands, options) {
+    if (commands.length === 0) {
+      return this;
+    }
+    _Image.validateDockerfileCommands(commands);
+    const newLayer = {
+      commands: [...commands],
+      secrets: options?.secrets,
+      gpuConfig: options?.gpu ? parseGpuConfig(options.gpu) : void 0,
+      forceBuild: options?.forceBuild
+    };
+    return new _Image("", this.#tag, this.#imageRegistryConfig, [
+      ...this.#layers,
+      newLayer
+    ]);
+  }
   /**
    * Eagerly builds an Image on Modal.
    *
@@ -41607,58 +41861,75 @@ var Image2 = class _Image {
     if (this.imageId !== "") {
       return this;
     }
-    const resp = await client.imageGetOrCreate({
-      appId: app.appId,
-      image: {
-        dockerfileCommands: [`FROM ${this.#tag}`],
-        imageRegistryConfig: this.#imageRegistryConfig
-      },
-      builderVersion: imageBuilderVersion()
-    });
-    let result;
-    let metadata = void 0;
-    if (resp.result?.status) {
-      result = resp.result;
-      metadata = resp.metadata;
-    } else {
-      let lastEntryId = "";
-      let resultJoined = void 0;
-      while (!resultJoined) {
-        for await (const item of client.imageJoinStreaming({
-          imageId: resp.imageId,
-          timeout: 55,
-          lastEntryId
-        })) {
-          if (item.entryId) lastEntryId = item.entryId;
-          if (item.result?.status) {
-            resultJoined = item.result;
-            metadata = item.metadata;
-            break;
+    let baseImageId;
+    for (let i = 0; i < this.#layers.length; i++) {
+      const layer = this.#layers[i];
+      const secretIds = layer.secrets?.map((secret) => secret.secretId) || [];
+      const gpuConfig = layer.gpuConfig;
+      let dockerfileCommands;
+      let baseImages;
+      if (i === 0) {
+        dockerfileCommands = [`FROM ${this.#tag}`, ...layer.commands];
+        baseImages = [];
+      } else {
+        dockerfileCommands = ["FROM base", ...layer.commands];
+        baseImages = [{ dockerTag: "base", imageId: baseImageId }];
+      }
+      const resp = await client.imageGetOrCreate({
+        appId: app.appId,
+        image: Image.create({
+          dockerfileCommands,
+          imageRegistryConfig: this.#imageRegistryConfig,
+          secretIds,
+          gpuConfig,
+          contextFiles: [],
+          baseImages
+        }),
+        builderVersion: imageBuilderVersion(),
+        forceBuild: layer.forceBuild || false
+      });
+      let result;
+      if (resp.result?.status) {
+        result = resp.result;
+      } else {
+        let lastEntryId = "";
+        let resultJoined = void 0;
+        while (!resultJoined) {
+          for await (const item of client.imageJoinStreaming({
+            imageId: resp.imageId,
+            timeout: 55,
+            lastEntryId
+          })) {
+            if (item.entryId) lastEntryId = item.entryId;
+            if (item.result?.status) {
+              resultJoined = item.result;
+              break;
+            }
           }
         }
+        result = resultJoined;
       }
-      result = resultJoined;
-    }
-    void metadata;
-    if (result.status === 2 /* GENERIC_STATUS_FAILURE */) {
-      throw new Error(
-        `Image build for ${resp.imageId} failed with the exception:
+      if (result.status === 2 /* GENERIC_STATUS_FAILURE */) {
+        throw new Error(
+          `Image build for ${resp.imageId} failed with the exception:
 ${result.exception}`
-      );
-    } else if (result.status === 3 /* GENERIC_STATUS_TERMINATED */) {
-      throw new Error(
-        `Image build for ${resp.imageId} terminated due to external shut-down. Please try again.`
-      );
-    } else if (result.status === 4 /* GENERIC_STATUS_TIMEOUT */) {
-      throw new Error(
-        `Image build for ${resp.imageId} timed out. Please try again with a larger timeout parameter.`
-      );
-    } else if (result.status !== 1 /* GENERIC_STATUS_SUCCESS */) {
-      throw new Error(
-        `Image build for ${resp.imageId} failed with unknown status: ${result.status}`
-      );
+        );
+      } else if (result.status === 3 /* GENERIC_STATUS_TERMINATED */) {
+        throw new Error(
+          `Image build for ${resp.imageId} terminated due to external shut-down. Please try again.`
+        );
+      } else if (result.status === 4 /* GENERIC_STATUS_TIMEOUT */) {
+        throw new Error(
+          `Image build for ${resp.imageId} timed out. Please try again with a larger timeout parameter.`
+        );
+      } else if (result.status !== 1 /* GENERIC_STATUS_SUCCESS */) {
+        throw new Error(
+          `Image build for ${resp.imageId} failed with unknown status: ${result.status}`
+        );
+      }
+      baseImageId = resp.imageId;
     }
-    this.#imageId = resp.imageId;
+    this.#imageId = baseImageId;
     return this;
   }
   /** Delete an Image by ID. Warning: This removes an *entire Image*, and cannot be undone. */
@@ -42410,7 +42681,7 @@ function parseGpuConfig(gpu) {
     gpuType: gpuType.toUpperCase()
   };
 }
-var App = class _App {
+var App2 = class _App {
   appId;
   name;
   /** @ignore */
@@ -42437,7 +42708,12 @@ var App = class _App {
     const gpuConfig = parseGpuConfig(options.gpu);
     if (options.timeout && options.timeout % 1e3 !== 0) {
       throw new Error(
-        `Timeout must be a multiple of 1000ms, got ${options.timeout}`
+        `timeout must be a multiple of 1000ms, got ${options.timeout}`
+      );
+    }
+    if (options.idleTimeout && options.idleTimeout % 1e3 !== 0) {
+      throw new Error(
+        `idleTimeout must be a multiple of 1000ms, got ${options.idleTimeout}`
       );
     }
     await image.build(this);
@@ -42516,6 +42792,7 @@ var App = class _App {
           entrypointArgs: options.command ?? ["sleep", "48h"],
           imageId: image.imageId,
           timeoutSecs: options.timeout != void 0 ? options.timeout / 1e3 : 600,
+          idleTimeoutSecs: options.idleTimeout != void 0 ? options.idleTimeout / 1e3 : void 0,
           workdir: options.workdir ?? void 0,
           networkAccess,
           resources: {
@@ -43952,7 +44229,7 @@ var Proxy2 = class _Proxy {
 };
 export {
   AlreadyExistsError,
-  App,
+  App2 as App,
   CloudBucketMount2 as CloudBucketMount,
   Cls,
   ClsInstance,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modal",
-  "version": "0.3.20",
+  "version": "0.3.22",
   "description": "Modal client library for JavaScript",
   "license": "Apache-2.0",
   "homepage": "https://modal.com/docs",