modal 0.3.11 → 0.3.13

package/dist/index.cjs

@@ -48,6 +48,7 @@ __export(index_exports, {
   Sandbox: () => Sandbox2,
   SandboxFile: () => SandboxFile,
   Secret: () => Secret,
+  Volume: () => Volume,
   initializeClient: () => initializeClient
 });
 module.exports = __toCommonJS(index_exports);
@@ -37891,6 +37892,7 @@ function imageBuilderVersion(version) {
 
 // src/client.ts
 var defaultProfile = getProfile(process.env["MODAL_PROFILE"]);
+var modalAuthToken;
 function authMiddleware(profile) {
   return async function* authMiddleware2(call, options) {
     if (!profile.tokenId || !profile.tokenSecret) {
@@ -37907,6 +37909,25 @@ function authMiddleware(profile) {
     options.metadata.set("x-modal-client-version", "1.0.0");
     options.metadata.set("x-modal-token-id", tokenId);
     options.metadata.set("x-modal-token-secret", tokenSecret);
+    if (modalAuthToken) {
+      options.metadata.set("x-modal-auth-token", modalAuthToken);
+    }
+    const prevOnHeader = options.onHeader;
+    options.onHeader = (header) => {
+      const token = header.get("x-modal-auth-token");
+      if (token) {
+        modalAuthToken = token;
+      }
+      prevOnHeader?.(header);
+    };
+    const prevOnTrailer = options.onTrailer;
+    options.onTrailer = (trailer) => {
+      const token = trailer.get("x-modal-auth-token");
+      if (token) {
+        modalAuthToken = token;
+      }
+      prevOnTrailer?.(trailer);
+    };
     return yield* call.next(call.request, options);
   };
 }
@@ -38012,6 +38033,17 @@ var retryMiddleware = async function* retryMiddleware2(call, options) {
     }
   }
 };
+var inputPlaneClients = {};
+var getOrCreateInputPlaneClient = (serverUrl) => {
+  const client2 = inputPlaneClients[serverUrl];
+  if (client2) {
+    return client2;
+  }
+  const profile = { ...clientProfile, serverUrl };
+  const newClient = createClient(profile);
+  inputPlaneClients[serverUrl] = newClient;
+  return newClient;
+};
 function createClient(profile) {
   const channel = (0, import_nice_grpc.createChannel)(profile.serverUrl, void 0, {
     "grpc.max_receive_message_length": 100 * 1024 * 1024,
@@ -38048,7 +38080,6 @@ async function fromRegistryInternal(appId, tag, imageRegistryConfig) {
       dockerfileCommands: [`FROM ${tag}`],
       imageRegistryConfig
     },
-    namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
     builderVersion: imageBuilderVersion()
   });
   let result;
@@ -38607,7 +38638,6 @@ var Secret = class _Secret {
     try {
       const resp = await client.secretGetOrCreate({
         deploymentName: name,
-        namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
         environmentName: environmentName(options?.environment),
         requiredKeys: options?.requiredKeys ?? []
       });
@@ -38650,6 +38680,12 @@ var App = class _App {
         `Timeout must be a multiple of 1000ms, got ${options.timeout}`
       );
     }
+    const volumeMounts = options.volumes ? Object.entries(options.volumes).map(([mountPath, volume]) => ({
+      volumeId: volume.volumeId,
+      mountPath,
+      allowBackgroundCommits: true,
+      readOnly: false
+    })) : [];
     const createResp = await client.sandboxCreate({
       appId: this.appId,
       definition: {
@@ -38664,13 +38700,26 @@ var App = class _App {
           // https://modal.com/docs/guide/resources
           milliCpu: Math.round(1e3 * (options.cpu ?? 0.125)),
           memoryMb: options.memory ?? 128
-        }
+        },
+        volumeMounts
       }
     });
     return new Sandbox2(createResp.sandboxId);
   }
-  async imageFromRegistry(tag) {
-    return await fromRegistryInternal(this.appId, tag);
+  async imageFromRegistry(tag, secret) {
+    let imageRegistryConfig;
+    if (secret) {
+      if (!(secret instanceof Secret)) {
+        throw new TypeError(
+          "secret must be a reference to an existing Secret, e.g. `await Secret.fromName('my_secret')`"
+        );
+      }
+      imageRegistryConfig = {
+        registryAuthType: 4 /* REGISTRY_AUTH_TYPE_STATIC_CREDS */,
+        secretId: secret.secretId
+      };
+    }
+    return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
   }
   async imageFromAwsEcr(tag, secret) {
     if (!(secret instanceof Secret)) {
@@ -38684,6 +38733,18 @@ var App = class _App {
     };
     return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
   }
+  async imageFromGcpArtifactRegistry(tag, secret) {
+    if (!(secret instanceof Secret)) {
+      throw new TypeError(
+        "secret must be a reference to an existing Secret, e.g. `await Secret.fromName('my_secret')`"
+      );
+    }
+    const imageRegistryConfig = {
+      registryAuthType: 2 /* REGISTRY_AUTH_TYPE_GCP */,
+      secretId: secret.secretId
+    };
+    return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
+  }
 };
 
 // src/cls.ts
@@ -39074,7 +39135,22 @@ var ControlPlaneInvocation = class _ControlPlaneInvocation {
     return new _ControlPlaneInvocation(functionCallId);
   }
   async awaitOutput(timeout) {
-    return await pollFunctionOutput(this.functionCallId, timeout);
+    return await pollFunctionOutput(
+      (timeoutMillis) => this.#getOutput(timeoutMillis),
+      timeout
+    );
+  }
+  async #getOutput(timeoutMillis) {
+    const response = await client.functionGetOutputs({
+      functionCallId: this.functionCallId,
+      maxValues: 1,
+      timeout: timeoutMillis / 1e3,
+      // Backend needs seconds
+      lastEntryId: "0-0",
+      clearOnSuccess: true,
+      requestedAt: timeNowSeconds()
+    });
+    return response.outputs ? response.outputs[0] : void 0;
   }
   async retry(retryCount) {
     if (!this.input) {
@@ -39092,33 +39168,72 @@ var ControlPlaneInvocation = class _ControlPlaneInvocation {
     this.inputJwt = functionRetryResponse.inputJwts[0];
   }
 };
+var InputPlaneInvocation = class _InputPlaneInvocation {
+  client;
+  functionId;
+  input;
+  attemptToken;
+  constructor(client2, functionId, input, attemptToken) {
+    this.client = client2;
+    this.functionId = functionId;
+    this.input = input;
+    this.attemptToken = attemptToken;
+  }
+  static async create(inputPlaneUrl, functionId, input) {
+    const functionPutInputsItem = {
+      idx: 0,
+      input,
+      r2Failed: false,
+      r2LatencyMs: 0
+    };
+    const client2 = getOrCreateInputPlaneClient(inputPlaneUrl);
+    const attemptStartResponse = await client2.attemptStart({
+      functionId,
+      input: functionPutInputsItem
+    });
+    return new _InputPlaneInvocation(
+      client2,
+      functionId,
+      functionPutInputsItem,
+      attemptStartResponse.attemptToken
+    );
+  }
+  async awaitOutput(timeout) {
+    return await pollFunctionOutput(
+      (timeoutMillis) => this.#getOutput(timeoutMillis),
+      timeout
+    );
+  }
+  async #getOutput(timeoutMillis) {
+    const response = await this.client.attemptAwait({
+      attemptToken: this.attemptToken,
+      requestedAt: timeNowSeconds(),
+      timeoutSecs: timeoutMillis / 1e3
+    });
+    return response.output;
+  }
+  async retry(_retryCount) {
+    const attemptRetryResponse = await this.client.attemptRetry({
+      functionId: this.functionId,
+      input: this.input,
+      attemptToken: this.attemptToken
+    });
+    this.attemptToken = attemptRetryResponse.attemptToken;
+  }
+};
 function timeNowSeconds() {
   return Date.now() / 1e3;
 }
-async function pollFunctionOutput(functionCallId, timeout) {
+async function pollFunctionOutput(getOutput, timeout) {
   const startTime = Date.now();
   let pollTimeout = outputsTimeout;
   if (timeout !== void 0) {
     pollTimeout = Math.min(timeout, outputsTimeout);
   }
   while (true) {
-    let response;
-    try {
-      response = await client.functionGetOutputs({
-        functionCallId,
-        maxValues: 1,
-        timeout: pollTimeout / 1e3,
-        // Backend needs seconds
-        lastEntryId: "0-0",
-        clearOnSuccess: true,
-        requestedAt: timeNowSeconds()
-      });
-    } catch (err) {
-      throw new Error(`FunctionGetOutputs failed: ${err}`);
-    }
-    const outputs = response.outputs;
-    if (outputs.length > 0) {
-      return await processResult(outputs[0].result, outputs[0].dataFormat);
+    const output = await getOutput(pollTimeout);
+    if (output) {
+      return await processResult(output.result, output.dataFormat);
     }
     if (timeout !== void 0) {
       const remainingTime = timeout - (Date.now() - startTime);
@@ -39212,20 +39327,25 @@ var maxSystemRetries = 8;
 var Function_ = class _Function_ {
   functionId;
   methodName;
+  inputPlaneUrl;
   /** @ignore */
-  constructor(functionId, methodName) {
+  constructor(functionId, methodName, inputPlaneUrl) {
     this.functionId = functionId;
     this.methodName = methodName;
+    this.inputPlaneUrl = inputPlaneUrl;
   }
   static async lookup(appName, name, options = {}) {
     try {
       const resp = await client.functionGet({
         appName,
         objectTag: name,
-        namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
         environmentName: environmentName(options.environment)
       });
-      return new _Function_(resp.functionId);
+      return new _Function_(
+        resp.functionId,
+        void 0,
+        resp.handleMetadata?.inputPlaneUrl
+      );
     } catch (err) {
       if (err instanceof import_nice_grpc4.ClientError && err.code === import_nice_grpc4.Status.NOT_FOUND)
         throw new NotFoundError(`Function '${appName}/${name}' not found`);
@@ -39235,11 +39355,7 @@ var Function_ = class _Function_ {
   // Execute a single input into a remote Function.
   async remote(args = [], kwargs = {}) {
     const input = await this.#createInput(args, kwargs);
-    const invocation = await ControlPlaneInvocation.create(
-      this.functionId,
-      input,
-      4 /* FUNCTION_CALL_INVOCATION_TYPE_SYNC */
-    );
+    const invocation = await this.#createRemoteInvocation(input);
     let retryCount = 0;
     while (true) {
       try {
@@ -39254,6 +39370,20 @@ var Function_ = class _Function_ {
       }
     }
   }
+  async #createRemoteInvocation(input) {
+    if (this.inputPlaneUrl) {
+      return await InputPlaneInvocation.create(
+        this.inputPlaneUrl,
+        this.functionId,
+        input
+      );
+    }
+    return await ControlPlaneInvocation.create(
+      this.functionId,
+      input,
+      4 /* FUNCTION_CALL_INVOCATION_TYPE_SYNC */
+    );
+  }
   // Spawn a single input into a remote function.
   async spawn(args = [], kwargs = {}) {
     const input = await this.#createInput(args, kwargs);
@@ -39315,11 +39445,13 @@ var Cls = class _Cls {
   #serviceFunctionId;
   #schema;
   #methodNames;
+  #inputPlaneUrl;
   /** @ignore */
-  constructor(serviceFunctionId, schema, methodNames) {
+  constructor(serviceFunctionId, schema, methodNames, inputPlaneUrl) {
     this.#serviceFunctionId = serviceFunctionId;
     this.#schema = schema;
     this.#methodNames = methodNames;
+    this.#inputPlaneUrl = inputPlaneUrl;
   }
   static async lookup(appName, name, options = {}) {
     try {
@@ -39327,7 +39459,6 @@ var Cls = class _Cls {
       const serviceFunction = await client.functionGet({
         appName,
         objectTag: serviceFunctionName,
-        namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
         environmentName: environmentName(options.environment)
       });
       const parameterInfo = serviceFunction.handleMetadata?.classParameterInfo;
@@ -39347,7 +39478,12 @@ var Cls = class _Cls {
           "Cls requires Modal deployments using client v0.67 or later."
         );
       }
-      return new _Cls(serviceFunction.functionId, schema, methodNames);
+      return new _Cls(
+        serviceFunction.functionId,
+        schema,
+        methodNames,
+        serviceFunction.handleMetadata?.inputPlaneUrl
+      );
     } catch (err) {
       if (err instanceof import_nice_grpc5.ClientError && err.code === import_nice_grpc5.Status.NOT_FOUND)
         throw new NotFoundError(`Class '${appName}/${name}' not found`);
@@ -39364,7 +39500,7 @@ var Cls = class _Cls {
     }
     const methods = /* @__PURE__ */ new Map();
     for (const name of this.#methodNames) {
-      methods.set(name, new Function_(functionId, name));
+      methods.set(name, new Function_(functionId, name, this.#inputPlaneUrl));
     }
     return new ClsInstance(methods);
   }
@@ -39515,7 +39651,6 @@ var Queue = class _Queue {
     const resp = await client.queueGetOrCreate({
       deploymentName: name,
       objectCreationType: options.createIfMissing ? 1 /* OBJECT_CREATION_TYPE_CREATE_IF_MISSING */ : void 0,
-      namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
       environmentName: environmentName(options.environment)
     });
     return new _Queue(resp.queueId);
@@ -39693,6 +39828,30 @@ var Queue = class _Queue {
     }
   }
 };
+
+// src/volume.ts
+var import_nice_grpc7 = require("nice-grpc");
+var Volume = class _Volume {
+  volumeId;
+  /** @ignore */
+  constructor(volumeId) {
+    this.volumeId = volumeId;
+  }
+  static async fromName(name, options) {
+    try {
+      const resp = await client.volumeGetOrCreate({
+        deploymentName: name,
+        environmentName: environmentName(options?.environment),
+        objectCreationType: options?.createIfMissing ? 1 /* OBJECT_CREATION_TYPE_CREATE_IF_MISSING */ : 0 /* OBJECT_CREATION_TYPE_UNSPECIFIED */
+      });
+      return new _Volume(resp.volumeId);
+    } catch (err) {
+      if (err instanceof import_nice_grpc7.ClientError && err.code === import_nice_grpc7.Status.NOT_FOUND)
+        throw new NotFoundError(err.details);
+      throw err;
+    }
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   App,
@@ -39713,5 +39872,6 @@ var Queue = class _Queue {
   Sandbox,
   SandboxFile,
   Secret,
+  Volume,
   initializeClient
 });

package/dist/index.d.cts

@@ -200,6 +200,19 @@ declare class Secret {
     static fromName(name: string, options?: SecretFromNameOptions): Promise<Secret>;
 }
 
+/** Options for `Volume.fromName()`. */
+type VolumeFromNameOptions = {
+    environment?: string;
+    createIfMissing?: boolean;
+};
+/** Volumes provide persistent storage that can be mounted in Modal functions. */
+declare class Volume {
+    readonly volumeId: string;
+    /** @ignore */
+    constructor(volumeId: string);
+    static fromName(name: string, options?: VolumeFromNameOptions): Promise<Volume>;
+}
+
 /** Options for functions that find deployed Modal objects. */
 type LookupOptions = {
     environment?: string;
@@ -226,6 +239,8 @@ type SandboxCreateOptions = {
      * Default behavior is to sleep indefinitely until timeout or termination.
      */
     command?: string[];
+    /** Mount points for Modal Volumes. */
+    volumes?: Record<string, Volume>;
 };
 /** Represents a deployed Modal App. */
 declare class App {
@@ -235,8 +250,9 @@ declare class App {
     /** Lookup a deployed app by name, or create if it does not exist. */
     static lookup(name: string, options?: LookupOptions): Promise<App>;
     createSandbox(image: Image, options?: SandboxCreateOptions): Promise<Sandbox>;
-    imageFromRegistry(tag: string): Promise<Image>;
+    imageFromRegistry(tag: string, secret?: Secret): Promise<Image>;
     imageFromAwsEcr(tag: string, secret: Secret): Promise<Image>;
+    imageFromGcpArtifactRegistry(tag: string, secret: Secret): Promise<Image>;
 }
 
 /** Options for initializing a client at runtime. */
@@ -283,8 +299,9 @@ declare class Function_ {
     #private;
     readonly functionId: string;
     readonly methodName: string | undefined;
+    readonly inputPlaneUrl: string | undefined;
     /** @ignore */
-    constructor(functionId: string, methodName?: string);
+    constructor(functionId: string, methodName?: string, inputPlaneUrl?: string);
     static lookup(appName: string, name: string, options?: LookupOptions): Promise<Function_>;
     remote(args?: any[], kwargs?: Record<string, any>): Promise<any>;
     spawn(args?: any[], kwargs?: Record<string, any>): Promise<FunctionCall>;
@@ -294,7 +311,7 @@ declare class Function_ {
 declare class Cls {
     #private;
     /** @ignore */
-    constructor(serviceFunctionId: string, schema: ClassParameterSpec[], methodNames: string[]);
+    constructor(serviceFunctionId: string, schema: ClassParameterSpec[], methodNames: string[], inputPlaneUrl?: string);
     static lookup(appName: string, name: string, options?: LookupOptions): Promise<Cls>;
     /** Create a new instance of the Cls with parameters. */
     instance(params?: Record<string, any>): Promise<ClsInstance>;
@@ -435,4 +452,4 @@ declare class Queue {
     iterate(options?: QueueIterateOptions): AsyncGenerator<any, void, unknown>;
 }
 
-export { App, type ClientOptions, Cls, ClsInstance, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, FunctionTimeoutError, Function_, Image, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, initializeClient };
+export { App, type ClientOptions, Cls, ClsInstance, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, FunctionTimeoutError, Function_, Image, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, Volume, type VolumeFromNameOptions, initializeClient };

package/dist/index.d.ts

@@ -200,6 +200,19 @@ declare class Secret {
     static fromName(name: string, options?: SecretFromNameOptions): Promise<Secret>;
 }
 
+/** Options for `Volume.fromName()`. */
+type VolumeFromNameOptions = {
+    environment?: string;
+    createIfMissing?: boolean;
+};
+/** Volumes provide persistent storage that can be mounted in Modal functions. */
+declare class Volume {
+    readonly volumeId: string;
+    /** @ignore */
+    constructor(volumeId: string);
+    static fromName(name: string, options?: VolumeFromNameOptions): Promise<Volume>;
+}
+
 /** Options for functions that find deployed Modal objects. */
 type LookupOptions = {
     environment?: string;
@@ -226,6 +239,8 @@ type SandboxCreateOptions = {
      * Default behavior is to sleep indefinitely until timeout or termination.
      */
     command?: string[];
+    /** Mount points for Modal Volumes. */
+    volumes?: Record<string, Volume>;
 };
 /** Represents a deployed Modal App. */
 declare class App {
@@ -235,8 +250,9 @@ declare class App {
     /** Lookup a deployed app by name, or create if it does not exist. */
     static lookup(name: string, options?: LookupOptions): Promise<App>;
     createSandbox(image: Image, options?: SandboxCreateOptions): Promise<Sandbox>;
-    imageFromRegistry(tag: string): Promise<Image>;
+    imageFromRegistry(tag: string, secret?: Secret): Promise<Image>;
     imageFromAwsEcr(tag: string, secret: Secret): Promise<Image>;
+    imageFromGcpArtifactRegistry(tag: string, secret: Secret): Promise<Image>;
 }
 
 /** Options for initializing a client at runtime. */
@@ -283,8 +299,9 @@ declare class Function_ {
     #private;
     readonly functionId: string;
     readonly methodName: string | undefined;
+    readonly inputPlaneUrl: string | undefined;
     /** @ignore */
-    constructor(functionId: string, methodName?: string);
+    constructor(functionId: string, methodName?: string, inputPlaneUrl?: string);
     static lookup(appName: string, name: string, options?: LookupOptions): Promise<Function_>;
     remote(args?: any[], kwargs?: Record<string, any>): Promise<any>;
     spawn(args?: any[], kwargs?: Record<string, any>): Promise<FunctionCall>;
@@ -294,7 +311,7 @@ declare class Function_ {
 declare class Cls {
     #private;
     /** @ignore */
-    constructor(serviceFunctionId: string, schema: ClassParameterSpec[], methodNames: string[]);
+    constructor(serviceFunctionId: string, schema: ClassParameterSpec[], methodNames: string[], inputPlaneUrl?: string);
     static lookup(appName: string, name: string, options?: LookupOptions): Promise<Cls>;
     /** Create a new instance of the Cls with parameters. */
     instance(params?: Record<string, any>): Promise<ClsInstance>;
@@ -435,4 +452,4 @@ declare class Queue {
     iterate(options?: QueueIterateOptions): AsyncGenerator<any, void, unknown>;
 }
 
-export { App, type ClientOptions, Cls, ClsInstance, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, FunctionTimeoutError, Function_, Image, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, initializeClient };
+export { App, type ClientOptions, Cls, ClsInstance, ContainerProcess, type DeleteOptions, type EphemeralOptions, type ExecOptions, FunctionCall, type FunctionCallCancelOptions, type FunctionCallGetOptions, FunctionTimeoutError, Function_, Image, InternalFailure, InvalidError, type LookupOptions, type ModalReadStream, type ModalWriteStream, NotFoundError, Queue, type QueueClearOptions, QueueEmptyError, QueueFullError, type QueueGetOptions, type QueueIterateOptions, type QueueLenOptions, type QueuePutOptions, RemoteError, Sandbox, type SandboxCreateOptions, SandboxFile, type SandboxFileMode, Secret, type SecretFromNameOptions, type StdioBehavior, type StreamMode, Volume, type VolumeFromNameOptions, initializeClient };

package/dist/index.js

@@ -37843,6 +37843,7 @@ function imageBuilderVersion(version) {
 
 // src/client.ts
 var defaultProfile = getProfile(process.env["MODAL_PROFILE"]);
+var modalAuthToken;
 function authMiddleware(profile) {
   return async function* authMiddleware2(call, options) {
     if (!profile.tokenId || !profile.tokenSecret) {
@@ -37859,6 +37860,25 @@ function authMiddleware(profile) {
     options.metadata.set("x-modal-client-version", "1.0.0");
     options.metadata.set("x-modal-token-id", tokenId);
     options.metadata.set("x-modal-token-secret", tokenSecret);
+    if (modalAuthToken) {
+      options.metadata.set("x-modal-auth-token", modalAuthToken);
+    }
+    const prevOnHeader = options.onHeader;
+    options.onHeader = (header) => {
+      const token = header.get("x-modal-auth-token");
+      if (token) {
+        modalAuthToken = token;
+      }
+      prevOnHeader?.(header);
+    };
+    const prevOnTrailer = options.onTrailer;
+    options.onTrailer = (trailer) => {
+      const token = trailer.get("x-modal-auth-token");
+      if (token) {
+        modalAuthToken = token;
+      }
+      prevOnTrailer?.(trailer);
+    };
     return yield* call.next(call.request, options);
   };
 }
@@ -37964,6 +37984,17 @@ var retryMiddleware = async function* retryMiddleware2(call, options) {
     }
   }
 };
+var inputPlaneClients = {};
+var getOrCreateInputPlaneClient = (serverUrl) => {
+  const client2 = inputPlaneClients[serverUrl];
+  if (client2) {
+    return client2;
+  }
+  const profile = { ...clientProfile, serverUrl };
+  const newClient = createClient(profile);
+  inputPlaneClients[serverUrl] = newClient;
+  return newClient;
+};
 function createClient(profile) {
   const channel = createChannel(profile.serverUrl, void 0, {
     "grpc.max_receive_message_length": 100 * 1024 * 1024,
@@ -38000,7 +38031,6 @@ async function fromRegistryInternal(appId, tag, imageRegistryConfig) {
       dockerfileCommands: [`FROM ${tag}`],
       imageRegistryConfig
     },
-    namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
     builderVersion: imageBuilderVersion()
   });
   let result;
@@ -38559,7 +38589,6 @@ var Secret = class _Secret {
     try {
       const resp = await client.secretGetOrCreate({
         deploymentName: name,
-        namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
         environmentName: environmentName(options?.environment),
         requiredKeys: options?.requiredKeys ?? []
       });
@@ -38602,6 +38631,12 @@ var App = class _App {
         `Timeout must be a multiple of 1000ms, got ${options.timeout}`
       );
     }
+    const volumeMounts = options.volumes ? Object.entries(options.volumes).map(([mountPath, volume]) => ({
+      volumeId: volume.volumeId,
+      mountPath,
+      allowBackgroundCommits: true,
+      readOnly: false
+    })) : [];
     const createResp = await client.sandboxCreate({
       appId: this.appId,
       definition: {
@@ -38616,13 +38651,26 @@ var App = class _App {
           // https://modal.com/docs/guide/resources
           milliCpu: Math.round(1e3 * (options.cpu ?? 0.125)),
           memoryMb: options.memory ?? 128
-        }
+        },
+        volumeMounts
       }
     });
     return new Sandbox2(createResp.sandboxId);
   }
-  async imageFromRegistry(tag) {
-    return await fromRegistryInternal(this.appId, tag);
+  async imageFromRegistry(tag, secret) {
+    let imageRegistryConfig;
+    if (secret) {
+      if (!(secret instanceof Secret)) {
+        throw new TypeError(
+          "secret must be a reference to an existing Secret, e.g. `await Secret.fromName('my_secret')`"
+        );
+      }
+      imageRegistryConfig = {
+        registryAuthType: 4 /* REGISTRY_AUTH_TYPE_STATIC_CREDS */,
+        secretId: secret.secretId
+      };
+    }
+    return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
   }
   async imageFromAwsEcr(tag, secret) {
     if (!(secret instanceof Secret)) {
@@ -38636,6 +38684,18 @@ var App = class _App {
     };
     return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
   }
+  async imageFromGcpArtifactRegistry(tag, secret) {
+    if (!(secret instanceof Secret)) {
+      throw new TypeError(
+        "secret must be a reference to an existing Secret, e.g. `await Secret.fromName('my_secret')`"
+      );
+    }
+    const imageRegistryConfig = {
+      registryAuthType: 2 /* REGISTRY_AUTH_TYPE_GCP */,
+      secretId: secret.secretId
+    };
+    return await fromRegistryInternal(this.appId, tag, imageRegistryConfig);
+  }
 };
 
 // src/cls.ts
@@ -39026,7 +39086,22 @@ var ControlPlaneInvocation = class _ControlPlaneInvocation {
     return new _ControlPlaneInvocation(functionCallId);
   }
   async awaitOutput(timeout) {
-    return await pollFunctionOutput(this.functionCallId, timeout);
+    return await pollFunctionOutput(
+      (timeoutMillis) => this.#getOutput(timeoutMillis),
+      timeout
+    );
+  }
+  async #getOutput(timeoutMillis) {
+    const response = await client.functionGetOutputs({
+      functionCallId: this.functionCallId,
+      maxValues: 1,
+      timeout: timeoutMillis / 1e3,
+      // Backend needs seconds
+      lastEntryId: "0-0",
+      clearOnSuccess: true,
+      requestedAt: timeNowSeconds()
+    });
+    return response.outputs ? response.outputs[0] : void 0;
   }
   async retry(retryCount) {
     if (!this.input) {
@@ -39044,33 +39119,72 @@ var ControlPlaneInvocation = class _ControlPlaneInvocation {
     this.inputJwt = functionRetryResponse.inputJwts[0];
   }
 };
+var InputPlaneInvocation = class _InputPlaneInvocation {
+  client;
+  functionId;
+  input;
+  attemptToken;
+  constructor(client2, functionId, input, attemptToken) {
+    this.client = client2;
+    this.functionId = functionId;
+    this.input = input;
+    this.attemptToken = attemptToken;
+  }
+  static async create(inputPlaneUrl, functionId, input) {
+    const functionPutInputsItem = {
+      idx: 0,
+      input,
+      r2Failed: false,
+      r2LatencyMs: 0
+    };
+    const client2 = getOrCreateInputPlaneClient(inputPlaneUrl);
+    const attemptStartResponse = await client2.attemptStart({
+      functionId,
+      input: functionPutInputsItem
+    });
+    return new _InputPlaneInvocation(
+      client2,
+      functionId,
+      functionPutInputsItem,
+      attemptStartResponse.attemptToken
+    );
+  }
+  async awaitOutput(timeout) {
+    return await pollFunctionOutput(
+      (timeoutMillis) => this.#getOutput(timeoutMillis),
+      timeout
+    );
+  }
+  async #getOutput(timeoutMillis) {
+    const response = await this.client.attemptAwait({
+      attemptToken: this.attemptToken,
+      requestedAt: timeNowSeconds(),
+      timeoutSecs: timeoutMillis / 1e3
+    });
+    return response.output;
+  }
+  async retry(_retryCount) {
+    const attemptRetryResponse = await this.client.attemptRetry({
+      functionId: this.functionId,
+      input: this.input,
+      attemptToken: this.attemptToken
+    });
+    this.attemptToken = attemptRetryResponse.attemptToken;
+  }
+};
 function timeNowSeconds() {
   return Date.now() / 1e3;
 }
-async function pollFunctionOutput(functionCallId, timeout) {
+async function pollFunctionOutput(getOutput, timeout) {
   const startTime = Date.now();
   let pollTimeout = outputsTimeout;
   if (timeout !== void 0) {
     pollTimeout = Math.min(timeout, outputsTimeout);
   }
   while (true) {
-    let response;
-    try {
-      response = await client.functionGetOutputs({
-        functionCallId,
-        maxValues: 1,
-        timeout: pollTimeout / 1e3,
-        // Backend needs seconds
-        lastEntryId: "0-0",
-        clearOnSuccess: true,
-        requestedAt: timeNowSeconds()
-      });
-    } catch (err) {
-      throw new Error(`FunctionGetOutputs failed: ${err}`);
-    }
-    const outputs = response.outputs;
-    if (outputs.length > 0) {
-      return await processResult(outputs[0].result, outputs[0].dataFormat);
+    const output = await getOutput(pollTimeout);
+    if (output) {
+      return await processResult(output.result, output.dataFormat);
     }
     if (timeout !== void 0) {
       const remainingTime = timeout - (Date.now() - startTime);
@@ -39164,20 +39278,25 @@ var maxSystemRetries = 8;
 var Function_ = class _Function_ {
   functionId;
   methodName;
+  inputPlaneUrl;
   /** @ignore */
-  constructor(functionId, methodName) {
+  constructor(functionId, methodName, inputPlaneUrl) {
     this.functionId = functionId;
     this.methodName = methodName;
+    this.inputPlaneUrl = inputPlaneUrl;
   }
   static async lookup(appName, name, options = {}) {
     try {
       const resp = await client.functionGet({
         appName,
         objectTag: name,
-        namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
         environmentName: environmentName(options.environment)
       });
-      return new _Function_(resp.functionId);
+      return new _Function_(
+        resp.functionId,
+        void 0,
+        resp.handleMetadata?.inputPlaneUrl
+      );
     } catch (err) {
       if (err instanceof ClientError4 && err.code === Status4.NOT_FOUND)
         throw new NotFoundError(`Function '${appName}/${name}' not found`);
@@ -39187,11 +39306,7 @@ var Function_ = class _Function_ {
   // Execute a single input into a remote Function.
   async remote(args = [], kwargs = {}) {
     const input = await this.#createInput(args, kwargs);
-    const invocation = await ControlPlaneInvocation.create(
-      this.functionId,
-      input,
-      4 /* FUNCTION_CALL_INVOCATION_TYPE_SYNC */
-    );
+    const invocation = await this.#createRemoteInvocation(input);
     let retryCount = 0;
     while (true) {
       try {
@@ -39206,6 +39321,20 @@ var Function_ = class _Function_ {
       }
     }
   }
+  async #createRemoteInvocation(input) {
+    if (this.inputPlaneUrl) {
+      return await InputPlaneInvocation.create(
+        this.inputPlaneUrl,
+        this.functionId,
+        input
+      );
+    }
+    return await ControlPlaneInvocation.create(
+      this.functionId,
+      input,
+      4 /* FUNCTION_CALL_INVOCATION_TYPE_SYNC */
+    );
+  }
   // Spawn a single input into a remote function.
   async spawn(args = [], kwargs = {}) {
     const input = await this.#createInput(args, kwargs);
@@ -39267,11 +39396,13 @@ var Cls = class _Cls {
   #serviceFunctionId;
   #schema;
   #methodNames;
+  #inputPlaneUrl;
   /** @ignore */
-  constructor(serviceFunctionId, schema, methodNames) {
+  constructor(serviceFunctionId, schema, methodNames, inputPlaneUrl) {
     this.#serviceFunctionId = serviceFunctionId;
     this.#schema = schema;
     this.#methodNames = methodNames;
+    this.#inputPlaneUrl = inputPlaneUrl;
   }
   static async lookup(appName, name, options = {}) {
     try {
@@ -39279,7 +39410,6 @@ var Cls = class _Cls {
       const serviceFunction = await client.functionGet({
         appName,
         objectTag: serviceFunctionName,
-        namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
         environmentName: environmentName(options.environment)
       });
       const parameterInfo = serviceFunction.handleMetadata?.classParameterInfo;
@@ -39299,7 +39429,12 @@ var Cls = class _Cls {
           "Cls requires Modal deployments using client v0.67 or later."
         );
       }
-      return new _Cls(serviceFunction.functionId, schema, methodNames);
+      return new _Cls(
+        serviceFunction.functionId,
+        schema,
+        methodNames,
+        serviceFunction.handleMetadata?.inputPlaneUrl
+      );
     } catch (err) {
       if (err instanceof ClientError5 && err.code === Status5.NOT_FOUND)
         throw new NotFoundError(`Class '${appName}/${name}' not found`);
@@ -39316,7 +39451,7 @@ var Cls = class _Cls {
     }
     const methods = /* @__PURE__ */ new Map();
     for (const name of this.#methodNames) {
-      methods.set(name, new Function_(functionId, name));
+      methods.set(name, new Function_(functionId, name, this.#inputPlaneUrl));
     }
     return new ClsInstance(methods);
   }
@@ -39467,7 +39602,6 @@ var Queue = class _Queue {
     const resp = await client.queueGetOrCreate({
       deploymentName: name,
       objectCreationType: options.createIfMissing ? 1 /* OBJECT_CREATION_TYPE_CREATE_IF_MISSING */ : void 0,
-      namespace: 1 /* DEPLOYMENT_NAMESPACE_WORKSPACE */,
       environmentName: environmentName(options.environment)
     });
     return new _Queue(resp.queueId);
@@ -39645,6 +39779,30 @@ var Queue = class _Queue {
     }
   }
 };
+
+// src/volume.ts
+import { ClientError as ClientError7, Status as Status7 } from "nice-grpc";
+var Volume = class _Volume {
+  volumeId;
+  /** @ignore */
+  constructor(volumeId) {
+    this.volumeId = volumeId;
+  }
+  static async fromName(name, options) {
+    try {
+      const resp = await client.volumeGetOrCreate({
+        deploymentName: name,
+        environmentName: environmentName(options?.environment),
+        objectCreationType: options?.createIfMissing ? 1 /* OBJECT_CREATION_TYPE_CREATE_IF_MISSING */ : 0 /* OBJECT_CREATION_TYPE_UNSPECIFIED */
+      });
+      return new _Volume(resp.volumeId);
+    } catch (err) {
+      if (err instanceof ClientError7 && err.code === Status7.NOT_FOUND)
+        throw new NotFoundError(err.details);
+      throw err;
+    }
+  }
+};
 export {
   App,
   Cls,
@@ -39664,5 +39822,6 @@ export {
   Sandbox2 as Sandbox,
   SandboxFile,
   Secret,
+  Volume,
   initializeClient
 };

package/package.json

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