modal 1.0.6.dev58__py3-none-any.whl → 1.2.3.dev7__py3-none-any.whl

modal_proto/api.proto

@@ -4,9 +4,9 @@ option go_package = "github.com/modal-labs/modal/go/proto";
 
 package modal.client;
 
-import "modal_proto/options.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 
 enum AppDeployVisibility {
@@ -111,6 +111,7 @@ enum DataFormat {
   DATA_FORMAT_PICKLE = 1; // Cloudpickle
   DATA_FORMAT_ASGI = 2; // "Asgi" protobuf message
   DATA_FORMAT_GENERATOR_DONE = 3; // "GeneratorDone" protobuf message
+  DATA_FORMAT_CBOR = 4;
 }
 
 enum DeploymentNamespace {
@@ -240,6 +241,13 @@ enum SystemErrorCode {
   SYSTEM_ERROR_CODE_NOSPC = 28;         // ENOSPC: No space left on device
 }
 
+enum TaskSnapshotBehavior {
+  TASK_SNAPSHOT_BEHAVIOR_UNSPECIFIED = 0;
+  TASK_SNAPSHOT_BEHAVIOR_SNAPSHOT = 1;
+  TASK_SNAPSHOT_BEHAVIOR_RESTORE = 2;
+  TASK_SNAPSHOT_BEHAVIOR_NONE = 3;
+}
+
 enum TaskState {
   TASK_STATE_UNSPECIFIED = 0;
   TASK_STATE_CREATED = 6;
@@ -289,10 +297,11 @@ message AppClientDisconnectRequest {
 }
 
 message AppCreateRequest {
-  string client_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string client_id = 1;
   string description = 2;    // Human readable label for the app
   string environment_name = 5;
   AppState app_state = 6;
+  map<string, string> tags = 7;  // Additional metadata to attach to the App
 }
 
 message AppCreateResponse {
@@ -302,7 +311,7 @@ message AppCreateResponse {
 }
 
 message AppDeployRequest {
-  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string app_id = 1;
   reserved 2; // namespace
   string name = 3;
   string object_entity = 4;
@@ -358,6 +367,7 @@ message AppGetLogsRequest {
   float timeout = 2;
   string last_entry_id = 4;
   string function_id = 5;
+  string parametrized_function_id = 11;
   string input_id = 6;
   string task_id = 7;
   string function_call_id = 9;
@@ -390,6 +400,14 @@ message AppGetOrCreateResponse {
   string app_id = 1;
 }
 
+message AppGetTagsRequest {
+  string app_id = 1;
+}
+
+message AppGetTagsResponse {
+  map<string, string> tags = 1;
+}
+
 message AppHeartbeatRequest {
   string app_id = 1;
 }
@@ -427,7 +445,7 @@ message AppLookupResponse {
 }
 
 message AppPublishRequest {
-  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string app_id = 1;
   string name = 2;
   string deployment_tag = 3;  // Additional metadata to identify a deployment
   AppState app_state = 4;  // Published app will be in this state
@@ -437,6 +455,7 @@ message AppPublishRequest {
   uint32 rollback_version = 8;  // Unused by client, but used internally
   string client_version = 9;  // Unused by client, but used internally
   CommitInfo commit_info = 10;  // Git information for deployment tracking
+  map<string, string> tags = 11;  // Additional metadata to attach to the App
 }
 
 message AppPublishResponse {
@@ -458,8 +477,14 @@ message AppSetObjectsRequest {
   reserved 6;
 }
 
+message AppSetTagsRequest {
+  string app_id = 1;
+  map<string, string> tags = 2;
+}
+
+
 message AppStopRequest {
-  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string app_id = 1;
   AppStopSource source = 2;
 }
 
@@ -621,11 +646,26 @@ message AuthTokenGetResponse {
   string token = 1;
 }
 
+// Message representing the current (coalesced) state of the autoscaler configuration
+// As well as the different sources that were used to create it.
+message AutoscalerConfiguration {
+  // The settings that are currently in effect.
+  AutoscalerSettings settings = 1;
+  // For tracking the source of the overridden value; keys correspond to fields in `settings`.
+  map<string, UserActionInfo> override_events = 2;
+  // The default settings that are used when no static settings are provided and no overrides are in effect.
+  AutoscalerSettings default_settings = 3;
+  // The static settings that were used to initialize the configuration.
+  AutoscalerSettings static_settings = 4;
+  // The merge of all overrides that were used to create the current configuration.
+  AutoscalerSettings override_settings = 5;
+}
+
 message AutoscalerSettings {
   // A collection of user-configurable settings for Function autoscaling
   // These are used for static configuration and for dynamic autoscaler updates
 
-  // Minimum containers when scale-to-zero is not deisired; pka "keep_warm" or "warm_pool_size"
+  // Minimum containers when scale-to-zero is not desired; pka "keep_warm" or "warm_pool_size"
   optional uint32 min_containers = 1;
   // Limit on the number of containers that can be running for each Function; pka "concurrency_limit"
   optional uint32 max_containers = 2;
@@ -635,6 +675,15 @@ message AutoscalerSettings {
   optional uint32 scaleup_window = 4;
   // Maximum amount of time a container can be idle before being scaled down, in seconds; pka "container_idle_timeout"
   optional uint32 scaledown_window = 5;
+  reserved 6;
+}
+
+// Used for flash autoscaling
+message AutoscalingMetrics {
+  double cpu_usage_percent = 1;
+  double memory_usage_percent = 2;
+  uint32 concurrent_requests = 3;
+  double timestamp = 4;
 }
 
 message BaseImage {
@@ -696,7 +745,7 @@ message CheckpointInfo {
 }
 
 message ClassCreateRequest {
-  string app_id = 1  [ (modal.options.audit_target_attr) = true ];
+  string app_id = 1 ;
   string existing_class_id = 2;
   repeated ClassMethod methods = 3;
   reserved 4; // removed class_function_id
@@ -801,6 +850,12 @@ message CloudBucketMount {
     GCP = 3;
   }
 
+  enum MetadataTTLType {
+    METADATA_TTL_TYPE_UNSPECIFIED = 0;
+    METADATA_TTL_TYPE_MINIMAL = 1;
+    METADATA_TTL_TYPE_INDEFINITE = 2;
+  }
+
   string bucket_name = 1;
   string mount_path = 2;
   string credentials_secret_id = 3;
@@ -810,6 +865,11 @@ message CloudBucketMount {
   optional string bucket_endpoint_url = 7;
   optional string key_prefix = 8;
   optional string oidc_auth_role_arn = 9;
+  bool force_path_style = 10;
+  oneof metadata_ttl_oneof {
+    MetadataTTLType metadata_ttl_type = 11;
+    uint64 metadata_ttl_seconds = 12;
+  }
 }
 
 message ClusterGetRequest {
@@ -858,6 +918,7 @@ message ContainerArguments {  // This is used to pass data from the worker to th
   string environment_name = 13;
   optional string checkpoint_id = 14;
   AppLayout app_layout = 15;
+  string input_plane_server_url = 16;
 }
 
 message ContainerCheckpointRequest {
@@ -1029,12 +1090,19 @@ message ContainerReloadVolumesRequest {
 message ContainerReloadVolumesResponse { }
 
 message ContainerStopRequest {
-  string task_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string task_id = 1;
 }
 
 message ContainerStopResponse {
 }
 
+
+message CreationInfo {
+  // This message is used in metadata for resource objects like Dict, Queue, Volume, etc.
+  double created_at = 1;  // Timestamp of resource creation
+  string created_by = 2;  // User name or service name
+}
+
 message CustomDomainConfig {
   string name = 1;
 }
@@ -1090,7 +1158,7 @@ message DictEntry {
 }
 
 message DictGetOrCreateRequest {
-  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
+  string deployment_name = 1;
   reserved 2; // removed namespace
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;
@@ -1099,6 +1167,7 @@ message DictGetOrCreateRequest {
 
 message DictGetOrCreateResponse {
   string dict_id = 1;
+  DictMetadata metadata = 2;
 }
 
 message DictGetRequest {
@@ -1125,15 +1194,24 @@ message DictLenResponse {
 
 message DictListRequest {
   string environment_name = 1;
+  ListPagination pagination = 2;
 }
 
 message DictListResponse {
   message DictInfo {
     string name = 1;
-    double created_at = 2;
+    double created_at = 2;  // Superseded by metadata, used by clients up to 1.1.2
+    string dict_id = 3;
+    DictMetadata metadata = 4;
   }
 
   repeated DictInfo dicts = 1;
+  string environment_name = 2;
+}
+
+message DictMetadata {
+  string name = 1;
+  CreationInfo creation_info = 2;
 }
 
 message DictPopRequest {
@@ -1147,7 +1225,7 @@ message DictPopResponse {
 }
 
 message DictUpdateRequest {
-  string dict_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string dict_id = 1;
   repeated DictEntry updates = 2;
   bool if_not_exists = 3;
 }
@@ -1173,7 +1251,7 @@ message DomainCertificateVerifyResponse {
 }
 
 message DomainCreateRequest {
-  string domain_name = 1  [ (modal.options.audit_target_attr) = true ];
+  string domain_name = 1 ;
 }
 
 message DomainCreateResponse {
@@ -1189,14 +1267,14 @@ message DomainListResponse {
 }
 
 message EnvironmentCreateRequest {
-  string name = 1 [ (modal.options.audit_target_attr) = true ];
+  string name = 1;
 }
 
 message EnvironmentDeleteRequest {
-  string name = 1 [ (modal.options.audit_target_attr) = true ];
+  string name = 1;
 }
 message EnvironmentGetOrCreateRequest {
-  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
+  string deployment_name = 1;
   ObjectCreationType object_creation_type = 2;
 }
 
@@ -1210,6 +1288,12 @@ message EnvironmentListItem {
   string webhook_suffix = 2;
   double created_at = 3;
   bool default = 4;
+  bool is_managed = 5;
+  string environment_id = 6;
+  optional int32 max_concurrent_tasks = 7;
+  optional int32 max_concurrent_gpus = 8;
+  int32 current_concurrent_tasks = 9;
+  int32 current_concurrent_gpus = 10;
 }
 
 message EnvironmentListResponse {
@@ -1230,9 +1314,11 @@ message EnvironmentSettings {
 }
 
 message EnvironmentUpdateRequest {
-  string current_name = 1 [ (modal.options.audit_target_attr) = true ];
+  string current_name = 1;
   google.protobuf.StringValue name = 2;
   google.protobuf.StringValue web_suffix = 3;
+  optional int32 max_concurrent_tasks = 4;
+  optional int32 max_concurrent_gpus = 5;
 }
 
 // A file entry when listing files in a volume or network file system.
@@ -1287,6 +1373,19 @@ message FlashContainerRegisterResponse {
   string url = 1;
 }
 
+message FlashProxyUpstreamRequest {
+  uint32 upstream_requests = 1;
+  double timestamp = 2;
+}
+
+message FlashSetTargetSlotsMetricsRequest {
+  // TODO(claudia): add other metrics to use in autoscaling decisions
+  string function_id = 1;
+  uint32 target_slots = 2;
+}
+
+message FlashSetTargetSlotsMetricsResponse {}
+
 message Function {
   string module_name = 1;
   string function_name = 2;
@@ -1446,6 +1545,10 @@ message Function {
   string flash_service_label = 84;
 
   bool enable_gpu_snapshot = 85; // GPU memory snapshotting (alpha)
+
+  uint32 startup_timeout_secs = 86;
+  repeated DataFormat supported_input_formats = 87; // can be used as inputs
+  repeated DataFormat supported_output_formats = 88;
 }
 
 message FunctionAsyncInvokeRequest {
@@ -1464,6 +1567,7 @@ message FunctionBindParamsRequest {
   bytes serialized_params = 2;
   FunctionOptions function_options = 3;
   string environment_name = 4;
+  string auth_secret = 5; // Only used for the input plane.
 }
 
 message FunctionBindParamsResponse {
@@ -1484,10 +1588,23 @@ message FunctionCallCancelRequest {
   optional string function_id = 3; // Only provided for sync input cancellation on the input plane. Async input cancellation does not provide this field this.
 }
 
-message FunctionCallGetDataRequest {
+message FunctionCallFromIdRequest {
+  string function_call_id = 1;
+}
+
+// Everything you need to build a FunctionCallHandler.
+message FunctionCallFromIdResponse {
   string function_call_id = 1;
+  int32 num_inputs = 2;
+}
+
+message FunctionCallGetDataRequest {
+  oneof call_info {
+    string function_call_id = 1;
+    string attempt_token = 3;
+  }
   uint64 last_index = 2;
-  reserved 3; // attempt_token
+  bool use_gapless_read = 4;
 }
 
 message FunctionCallInfo {
@@ -1514,14 +1631,16 @@ message FunctionCallListResponse {
 }
 
 message FunctionCallPutDataRequest {
-  string function_call_id = 1;
+  oneof call_info {
+    string function_call_id = 1;
+    string attempt_token = 3;
+  }
   repeated DataChunk data_chunks = 2;
-  reserved 3; // attempt_token
 }
 
 message FunctionCreateRequest {
   Function function = 1;
-  string app_id = 2  [ (modal.options.audit_target_attr) = true ];
+  string app_id = 2 ;
   Schedule schedule = 6 [deprecated=true]; // Deprecated: now passed in the Function definition
   string existing_function_id = 7;
   reserved 8;  // defer_updates
@@ -1604,6 +1723,10 @@ message FunctionData {
 
   repeated string flash_service_urls = 34;
   string flash_service_label = 35;
+
+  uint32 startup_timeout_secs = 36;
+  repeated DataFormat supported_input_formats = 37;
+  repeated DataFormat supported_output_formats = 38;
 }
 
 message FunctionExtended {
@@ -1618,6 +1741,12 @@ message FunctionExtended {
   }
 }
 
+message FunctionFinishInputsRequest {
+  string function_id = 1;
+  string function_call_id = 2;
+  uint32 num_inputs = 3;
+}
+
 
 message FunctionGetCallGraphRequest {
   // TODO: use input_id once we switch client submit API to return those.
@@ -1651,6 +1780,8 @@ message FunctionGetInputsItem {
   string function_call_id = 5;
   FunctionCallInvocationType function_call_invocation_type = 6;
   uint32 retry_count = 7;
+  optional int32 function_map_idx = 8; // intercepted and only used by the worker.
+  string attempt_token = 9;
 }
 
 message FunctionGetInputsRequest {
@@ -1691,6 +1822,7 @@ message FunctionGetOutputsRequest {
   // The jwts the client expects the server to be processing. This is optional and used for sync inputs only.
   repeated string input_jwts = 9;
   optional int32 start_idx = 10; // for async batch requests. this indicates which index to start from.
+  optional int32 end_idx = 11; // for async batch requests. this indicates which index to end at.
 }
 
 message FunctionGetOutputsResponse {
@@ -1743,6 +1875,9 @@ message FunctionHandleMetadata {
   optional string input_plane_region = 47;
   // Use optional to ensure unset values default to None instead of 0
   optional uint64 max_object_size_bytes = 48;
+  repeated string _experimental_flash_urls = 49; // (Optional) urls for flash services
+  repeated DataFormat supported_input_formats = 50;
+  repeated DataFormat supported_output_formats = 51;
 }
 
 message FunctionInput {
@@ -1792,11 +1927,15 @@ message FunctionOptions {
   optional uint32 max_concurrent_inputs = 14;
   optional uint32 batch_max_size = 15;
   optional uint64 batch_linger_ms = 16;
+  optional SchedulerPlacement scheduler_placement = 17;
+  optional string cloud_provider_str = 18;
+  bool replace_cloud_bucket_mounts = 19;
+  repeated CloudBucketMount cloud_bucket_mounts = 20;
 }
 
 message FunctionPrecreateRequest {
   string app_id = 1;
-  string function_name = 2  [ (modal.options.audit_target_attr) = true ];
+  string function_name = 2 ;
   string existing_function_id = 3;
   Function.FunctionType function_type = 4;
   WebhookConfig webhook_config = 5;
@@ -1805,6 +1944,8 @@ message FunctionPrecreateRequest {
   // Mapping of method names to method definitions, only non-empty for class service functions
   map<string, MethodDefinition> method_definitions = 8;
   FunctionSchema function_schema = 9;
+  repeated DataFormat supported_input_formats = 10;
+  repeated DataFormat supported_output_formats = 11;
 }
 
 message FunctionPrecreateResponse {
@@ -1816,7 +1957,8 @@ message FunctionPutInputsItem {
   int32 idx = 1;
   FunctionInput input = 2;
   bool r2_failed = 3;
-  uint64 r2_latency_ms = 4;
+  reserved 4; // r2_latency_ms
+  uint64 r2_throughput_bytes_s = 5;
 }
 
 message FunctionPutInputsRequest {
@@ -1842,6 +1984,8 @@ message FunctionPutOutputsItem {
   double output_created_at = 4;
   DataFormat data_format = 7; // for result.data_oneof
   uint32 retry_count = 8;
+  string function_call_id = 9; // injected by the worker
+  optional int32 function_map_idx = 10; // injected by the worker
 }
 
 message FunctionPutOutputsRequest {
@@ -1922,6 +2066,8 @@ message GenericResult {  // Used for both tasks and function outputs
     // Terminates the function and all remaining inputs.
     GENERIC_STATUS_INIT_FAILURE = 5;
     GENERIC_STATUS_INTERNAL_FAILURE = 6;
+    // Used when sandboxes are terminated due to idle_timeout
+    GENERIC_STATUS_IDLE_TIMEOUT = 7;
   }
 
   GenericStatus status = 1; // Status of the task or function output.
@@ -1964,6 +2110,9 @@ message Image {
 
   // Build arguments for the image (--build-arg) for ARG substitution in Dockerfile.
   map<string, string> build_args = 22;
+
+  // Volume mount for RUN commands
+  repeated VolumeMount volume_mounts = 23;
 }
 
 message ImageContextFile {
@@ -1971,6 +2120,10 @@ message ImageContextFile {
   bytes data = 2;
 }
 
+message ImageDeleteRequest {
+  string image_id = 1;
+}
+
 message ImageFromIdRequest {
   string image_id = 1;
 }
@@ -1982,7 +2135,7 @@ message ImageFromIdResponse {
 
 message ImageGetOrCreateRequest {
   Image image = 2;
-  string app_id = 4 [ (modal.options.audit_target_attr) = true ];
+  string app_id = 4;
   string existing_image_id = 5;  // ignored
   string build_function_id = 6;
   bool force_build = 7;
@@ -2069,6 +2222,63 @@ message InputInfo {
   bool task_first_input = 7;
 }
 
+message ListPagination {
+  int32 max_objects = 1;
+  double created_before = 2;
+}
+
+message MapAwaitRequest {
+  oneof call_info {
+    string function_call_id = 1;
+    string map_token = 5;
+  }
+  string last_entry_id = 2;
+  double requested_at = 3; // Used for waypoints.
+  float timeout = 4;
+}
+
+message MapAwaitResponse {
+  repeated FunctionGetOutputsItem outputs = 1;
+  string last_entry_id = 2;
+}
+
+message MapCheckInputsRequest {
+  string last_entry_id = 1;
+  float timeout = 2;
+  repeated string attempt_tokens = 3;
+}
+
+message MapCheckInputsResponse {
+  repeated bool lost = 1;
+}
+
+message MapStartOrContinueItem {
+  FunctionPutInputsItem input = 1;
+  optional string attempt_token = 2; // None if this is a fresh input, otherwise it is the attempt token for a retry.
+}
+
+message MapStartOrContinueRequest {
+  string function_id = 1;
+  string parent_input_id = 2;
+  // Clients will send call_info on map continue requests.
+  oneof call_info {
+    string function_call_id = 3;
+    string map_token = 5;
+  }
+  repeated MapStartOrContinueItem items = 4;
+}
+
+message MapStartOrContinueResponse {
+  // function_id and function_call_id are not necessary if map_token is provided.
+  // All 3 will be sent until it is safe to only send map_token.
+  string map_token = 6;
+  string function_id = 1;
+  string function_call_id = 2;
+  uint32 max_inputs_outstanding = 3;
+  repeated string attempt_tokens = 4;
+  FunctionRetryPolicy retry_policy = 5;
+}
+
 message MethodDefinition {
   string function_name = 1;
   Function.FunctionType function_type = 2;
@@ -2077,6 +2287,8 @@ message MethodDefinition {
   WebUrlInfo web_url_info = 5;
   repeated CustomDomainInfo custom_domain_info = 6;
   FunctionSchema function_schema = 7;
+  repeated DataFormat supported_input_formats = 8;
+  repeated DataFormat supported_output_formats = 9;
 }
 
 message MountFile {
@@ -2237,6 +2449,7 @@ message PTYInfo {
     PTY_TYPE_SHELL = 2;  // Replace function with shell
   }
   PTYType pty_type = 7;
+  bool no_terminate_on_idle_stdin = 8;
 }
 
 message PortSpec {
@@ -2253,12 +2466,13 @@ message Proxy {
   string name = 1;
   double created_at = 2;
   string environment_name = 3;
-  string proxy_id = 5;
   repeated ProxyIp proxy_ips = 4;
+  string proxy_id = 5;
+  string region = 6;
 }
 
 message ProxyAddIpRequest {
-  string proxy_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string proxy_id = 1;
 }
 
 message ProxyAddIpResponse {
@@ -2266,8 +2480,9 @@ message ProxyAddIpResponse {
 }
 
 message ProxyCreateRequest {
-  string name = 1 [ (modal.options.audit_target_attr) = true ];
+  string name = 1;
   string environment_name = 2;
+  string region = 3;
 }
 
 message ProxyCreateResponse {
@@ -2275,11 +2490,11 @@ message ProxyCreateResponse {
 }
 
 message ProxyDeleteRequest {
-  string proxy_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string proxy_id = 1;
 }
 
 message ProxyGetOrCreateRequest {
-  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
+  string deployment_name = 1;
   reserved 2; // namespace
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;  // must be UNSPECIFIED
@@ -2290,7 +2505,7 @@ message ProxyGetOrCreateResponse {
 }
 
 message ProxyGetRequest {
-  string name = 1 [ (modal.options.audit_target_attr) = true ];
+  string name = 1;
   string environment_name = 2;
 }
 
@@ -2318,7 +2533,7 @@ message ProxyListResponse {
 }
 
 message ProxyRemoveIpRequest {
-  string proxy_ip = 1 [ (modal.options.audit_target_attr) = true ];
+  string proxy_ip = 1;
 }
 
 message QueueClearRequest {
@@ -2328,7 +2543,7 @@ message QueueClearRequest {
 }
 
 message QueueDeleteRequest {
-  string queue_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string queue_id = 1;
 }
 
 message QueueGetOrCreateRequest {
@@ -2340,6 +2555,7 @@ message QueueGetOrCreateRequest {
 
 message QueueGetOrCreateResponse {
   string queue_id = 1;
+  QueueMetadata metadata = 2;
 }
 
 message QueueGetRequest {
@@ -2374,19 +2590,27 @@ message QueueLenResponse {
 
 message QueueListRequest {
   string environment_name = 1;
-  // Allow client to report a bounded total size to reduce the number of partitions that need to be checked
-  int32 total_size_limit = 2;
+  int32 total_size_limit = 2;  // Limit on "number of partitions" reported, since checking them is costly
+  ListPagination pagination = 3;
 }
 
 message QueueListResponse {
   message QueueInfo {
     string name = 1;
-    double created_at = 2;
+    double created_at = 2;  // Superseded by metadata, used by clients up to 1.1.2
     int32 num_partitions = 3;
     int32 total_size = 4;
+    string queue_id = 5;
+    QueueMetadata metadata = 6;
   }
 
   repeated QueueInfo queues = 1;
+  string environment_name = 2;
+}
+
+message QueueMetadata {
+  string name = 1;
+  CreationInfo creation_info = 2;
 }
 
 message QueueNextItemsRequest {
@@ -2463,7 +2687,7 @@ message Sandbox {
   Resources resources = 5;
   CloudProvider cloud_provider = 6;  // Deprecated at some point
 
-  uint32 timeout_secs = 7;
+  uint32 timeout_secs = 7; // The max lifetime of a sandbox in seconds.
 
   optional string workdir = 8;
 
@@ -2520,10 +2744,33 @@ message Sandbox {
 
   // If set, the sandbox will be created with a name.
   optional string name = 30;
+
+  // Experimental options
+  map<string, bool> experimental_options = 31;
+
+  repeated string preload_path_prefixes = 32; // Internal use only.
+
+  // Optional idle timeout in seconds. If set, the sandbox will be terminated after being idle for this duration.
+  optional uint32 idle_timeout_secs = 33;
+
+  // If set, the sandbox will be created with direct sandbox commands enabled.
+  // Exec commands for the sandbox will be issued directly to the sandbox
+  // command router running on the Modal worker.
+  bool direct_sandbox_commands_enabled = 34;
+}
+
+message SandboxCreateConnectTokenRequest {
+  string sandbox_id = 1;
+  string user_metadata = 2;
+}
+
+message SandboxCreateConnectTokenResponse {
+  string url = 1;
+  string token = 2;
 }
 
 message SandboxCreateRequest {
-  string app_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string app_id = 1;
   Sandbox definition = 2;
   string environment_name = 3; // *DEPRECATED* 7/16/2025
 }
@@ -2624,6 +2871,19 @@ message SandboxRestoreResponse {
   string sandbox_id = 1;
 }
 
+message SandboxSnapshotFsAsyncGetRequest {
+  string image_id = 1;
+  float timeout = 2;
+}
+
+message SandboxSnapshotFsAsyncRequest {
+  string sandbox_id = 1;
+}
+
+message SandboxSnapshotFsAsyncResponse {
+  string image_id = 1;
+}
+
 message SandboxSnapshotFsRequest {
   string sandbox_id = 1;
   float timeout = 2;
@@ -2676,6 +2936,14 @@ message SandboxTag {
   string tag_value = 2;
 }
 
+message SandboxTagsGetRequest {
+  string sandbox_id = 1;
+}
+
+message SandboxTagsGetResponse {
+  repeated SandboxTag tags = 1;
+}
+
 message SandboxTagsSetRequest {
   string environment_name = 1;
   string sandbox_id = 2;
@@ -2720,23 +2988,18 @@ message Schedule {
 }
 
 message SchedulerPlacement {
-  // TODO(irfansharif):
-  // - Fold in cloud, resource needs here too.
-  // - Allow specifying list of zones, cloud, fallback and alternative
-  //   GPU types.
-
   repeated string regions = 4;
-  // TODO(irfansharif): Make these two repeated.
-  optional string _zone = 2; // admin-only
-  optional string _lifecycle = 3; // admin-only, "on-demand" or "spot", else ignored
-  repeated string _instance_types = 5; // admin-only
+  optional string _zone = 2; // TODO: Deprecate
+  optional string _lifecycle = 3; // TODO: Deprecate
+  repeated string _instance_types = 5; // TODO: Deprecate
+  bool nonpreemptible = 6;
 
   reserved 1;
 }
 
 message SecretCreateRequest {  // Not used by client anymore
   map<string, string> env_dict = 1;
-  string app_id = 2 [ (modal.options.audit_target_attr) = true ];
+  string app_id = 2;
   string template_type = 3;  // todo: not used?
   string existing_secret_id = 4;
 }
@@ -2750,7 +3013,7 @@ message SecretDeleteRequest {
 }
 
 message SecretGetOrCreateRequest {
-  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
+  string deployment_name = 1;
   reserved 2; // removed namespace
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;  // Not used atm
@@ -2761,25 +3024,35 @@ message SecretGetOrCreateRequest {
 
 message SecretGetOrCreateResponse {
   string secret_id = 1;
+  SecretMetadata metadata = 2;
 }
 
 message SecretListItem {
   string label = 1;
-  double created_at = 2;
+  double created_at = 2;  // Superseded by metadata, used by clients up to 1.1.2
   double last_used_at = 3;
-  string environment_name = 4;
+  string environment_name = 4;  // Unused by client
   string secret_id = 5;
+  SecretMetadata metadata = 6;
 }
 
 message SecretListRequest {
-  string environment_name = 1; // leaving empty will assume a singular environment
+  string environment_name = 1;
+  ListPagination pagination = 2;
 }
 
 message SecretListResponse {
   repeated SecretListItem items = 1;
-  string environment_name = 2; // the environment that was listed (useful when relying on "default" logic)
+  string environment_name = 2;
+}
+
+message SecretMetadata {
+  string name = 1;
+  CreationInfo creation_info = 2;
 }
 
+// SharedVolume in the backend corresponds to NetworkFileSystem in the current API
+
 message SharedVolumeDeleteRequest {
   string shared_volume_id = 1;
 }
@@ -2797,7 +3070,7 @@ message SharedVolumeGetFileResponse {
 }
 
 message SharedVolumeGetOrCreateRequest {
-  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
+  string deployment_name = 1;
   reserved 2; // removed namespace
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;
@@ -2841,11 +3114,11 @@ message SharedVolumeMount {
   string mount_path = 1;
   string shared_volume_id = 2;
   CloudProvider cloud_provider = 3;
-  bool allow_cross_region = 4;
+  reserved 4; // allow_cross_region
 }
 
 message SharedVolumePutFileRequest {
-  string shared_volume_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string shared_volume_id = 1;
   string path = 2;
   string sha256_hex = 3;
   oneof data_oneof {
@@ -2860,7 +3133,7 @@ message SharedVolumePutFileResponse {
 }
 
 message SharedVolumeRemoveFileRequest {
-  string shared_volume_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string shared_volume_id = 1;
   string path = 2;
   bool recursive = 3;
 }
@@ -2878,14 +3151,27 @@ message TaskClusterHelloRequest {
 message TaskClusterHelloResponse {
   string cluster_id = 1;
   uint32 cluster_rank = 2;
-  // All IP addresses in cluster, ordered by cluster rank
+  // All IPv6 addresses in cluster, ordered by cluster rank
   repeated string container_ips = 3;
+  repeated string container_ipv4_ips = 4;
 }
 
 message TaskCurrentInputsResponse {
   repeated string input_ids = 1;
 }
 
+// Used to get a JWT and URL for direct access to a task command router
+// running on the modal-worker, so the client can issue exec commands (and other
+// operations as they become available) directly to the worker.
+message TaskGetCommandRouterAccessRequest {
+  string task_id = 1;
+}
+
+message TaskGetCommandRouterAccessResponse {
+  string jwt = 1;
+  string url = 2;
+}
+
 message TaskInfo {
   string id = 1;
   double started_at = 2;
@@ -2894,6 +3180,8 @@ message TaskInfo {
   double enqueued_at = 5;
   string gpu_type = 6;
   string sandbox_id = 7;
+  TaskSnapshotBehavior snapshot_behavior = 8;
+  GPUConfig gpu_config = 9;
 }
 
 message TaskListRequest {
@@ -2926,6 +3214,7 @@ message TaskLogsBatch {
   bool eof = 14;
   string pty_exec_id = 15;  // Used for interactive functions
   string root_function_id = 16;
+  uint32 ttl_days = 17;
 }
 
 message TaskProgress {
@@ -3016,10 +3305,16 @@ message UploadUrlList {
   repeated string items = 1;
 }
 
+// Used for capturing context about an action performed by a user
+message UserActionInfo {
+  string user_id = 1;
+  double timestamp = 2;
+}
+
 message VolumeCommitRequest {
   // NOTE(staffan): Mounting a volume in multiple locations is not supported, so volume_id alone uniquely identifies
   // a volume mount.
-  string volume_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string volume_id = 1;
 }
 
 message VolumeCommitResponse {
@@ -3077,7 +3372,7 @@ message VolumeGetFileResponse {
 }
 
 message VolumeGetOrCreateRequest {
-  string deployment_name = 1 [ (modal.options.audit_target_attr) = true ];
+  string deployment_name = 1;
   reserved 2; // removed namespace
   string environment_name = 3;
   ObjectCreationType object_creation_type = 4;
@@ -3087,7 +3382,7 @@ message VolumeGetOrCreateRequest {
 
 message VolumeGetOrCreateResponse {
   string volume_id = 1;
-  VolumeFsVersion version = 2;
+  VolumeFsVersion version = 2;  // Not used directly; version is part of the metadata
   VolumeMetadata metadata = 3;
 }
 
@@ -3120,11 +3415,13 @@ message VolumeListFilesResponse {
 message VolumeListItem {
   string label = 1;  // app name of object entity app
   string volume_id = 2;
-  double created_at = 3;
+  double created_at = 3;  // Superseded by metadata, used by clients up to 1.1.2
+  VolumeMetadata metadata = 4;
 }
 
 message VolumeListRequest {
   string environment_name = 1;
+  ListPagination pagination = 2;
 }
 
 message VolumeListResponse {
@@ -3134,6 +3431,8 @@ message VolumeListResponse {
 
 message VolumeMetadata {
   VolumeFsVersion version = 1;
+  string name = 2;
+  CreationInfo creation_info = 3;
 }
 
 message VolumeMount {
@@ -3225,19 +3524,19 @@ message VolumeReloadRequest {
 }
 
 message VolumeRemoveFile2Request {
-  string volume_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string volume_id = 1;
   string path = 2;
   bool recursive = 3;
 }
 
 message VolumeRemoveFileRequest {
-  string volume_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string volume_id = 1;
   string path = 2;
   bool recursive = 3;
 }
 
 message VolumeRenameRequest {
-  string volume_id = 1 [ (modal.options.audit_target_attr) = true ];
+  string volume_id = 1;
   string name = 2;
 }
 
@@ -3261,13 +3560,31 @@ message WebUrlInfo {
 message WebhookConfig {
   WebhookType type = 1;
   string method = 2;
-  string requested_suffix = 4;
+  string requested_suffix = 4;  // User-supplied "label" component of URL
   WebhookAsyncMode async_mode = 5;
   repeated CustomDomainConfig custom_domains = 6;
   uint32 web_server_port = 7;
   float web_server_startup_timeout = 8;
   bool web_endpoint_docs = 9;
   bool requires_proxy_auth = 10;
+  string ephemeral_suffix = 11;  // Additional URL suffix added for ephemeral Apps
+}
+
+message WorkspaceBillingReportItem {
+  string object_id = 1;
+  string description = 2;
+  string environment_name = 3;
+  google.protobuf.Timestamp interval = 4;
+  string cost = 5;
+  map<string, string> tags = 6;
+}
+
+message WorkspaceBillingReportRequest {
+  // Workspace ID will be implicit in the request metadata
+  google.protobuf.Timestamp start_timestamp = 1;
+  google.protobuf.Timestamp end_timestamp = 2;
+  string resolution = 3;  // e.g. 'd' or 'h'; server defines what we accept
+  repeated string tag_names = 4;
 }
 
 message WorkspaceNameLookupResponse {
@@ -3287,17 +3604,17 @@ service ModalClient {
   rpc AppGetLogs(AppGetLogsRequest) returns (stream TaskLogsBatch);
   rpc AppGetObjects(AppGetObjectsRequest) returns (AppGetObjectsResponse);
   rpc AppGetOrCreate(AppGetOrCreateRequest) returns (AppGetOrCreateResponse);
+  rpc AppGetTags(AppGetTagsRequest) returns (AppGetTagsResponse);
   rpc AppHeartbeat(AppHeartbeatRequest) returns (google.protobuf.Empty);
   rpc AppList(AppListRequest) returns (AppListResponse);
   rpc AppLookup(AppLookupRequest) returns (AppLookupResponse);
   rpc AppPublish(AppPublishRequest) returns (AppPublishResponse);
   rpc AppRollback(AppRollbackRequest) returns (google.protobuf.Empty);
   rpc AppSetObjects(AppSetObjectsRequest) returns (google.protobuf.Empty);
+  rpc AppSetTags(AppSetTagsRequest) returns (google.protobuf.Empty);
   rpc AppStop(AppStopRequest) returns (google.protobuf.Empty);
 
   // Input Plane
-  // These RPCs are experimental, not deployed to production, and can be changed / removed
-  // without needing to worry about backwards compatibility.
   rpc AttemptAwait(AttemptAwaitRequest) returns (AttemptAwaitResponse);
   rpc AttemptRetry(AttemptRetryRequest) returns (AttemptRetryResponse);
   rpc AttemptStart(AttemptStartRequest) returns (AttemptStartResponse);
@@ -3363,16 +3680,19 @@ service ModalClient {
   rpc FlashContainerDeregister(FlashContainerDeregisterRequest) returns (google.protobuf.Empty);
   rpc FlashContainerList(FlashContainerListRequest) returns (FlashContainerListResponse);
   rpc FlashContainerRegister(FlashContainerRegisterRequest) returns (FlashContainerRegisterResponse);
+  rpc FlashSetTargetSlotsMetrics(FlashSetTargetSlotsMetricsRequest) returns (FlashSetTargetSlotsMetricsResponse);
 
   // Functions
   rpc FunctionAsyncInvoke(FunctionAsyncInvokeRequest) returns (FunctionAsyncInvokeResponse);
   rpc FunctionBindParams(FunctionBindParamsRequest) returns (FunctionBindParamsResponse);
   rpc FunctionCallCancel(FunctionCallCancelRequest) returns (google.protobuf.Empty);
+  rpc FunctionCallFromId(FunctionCallFromIdRequest) returns (FunctionCallFromIdResponse);
   rpc FunctionCallGetDataIn(FunctionCallGetDataRequest) returns (stream DataChunk);
   rpc FunctionCallGetDataOut(FunctionCallGetDataRequest) returns (stream DataChunk);
   rpc FunctionCallList(FunctionCallListRequest) returns (FunctionCallListResponse);
   rpc FunctionCallPutDataOut(FunctionCallPutDataRequest) returns (google.protobuf.Empty);
   rpc FunctionCreate(FunctionCreateRequest) returns (FunctionCreateResponse);
+  rpc FunctionFinishInputs(FunctionFinishInputsRequest) returns (google.protobuf.Empty); // For map RPCs, to signal that all inputs have been sent
   rpc FunctionGet(FunctionGetRequest) returns (FunctionGetResponse);
   rpc FunctionGetCallGraph(FunctionGetCallGraphRequest) returns (FunctionGetCallGraphResponse);
   rpc FunctionGetCurrentStats(FunctionGetCurrentStatsRequest) returns (FunctionStats);
@@ -3389,10 +3709,16 @@ service ModalClient {
   rpc FunctionUpdateSchedulingParams(FunctionUpdateSchedulingParamsRequest) returns (FunctionUpdateSchedulingParamsResponse);
 
   // Images
+  rpc ImageDelete(ImageDeleteRequest) returns (google.protobuf.Empty);
   rpc ImageFromId(ImageFromIdRequest) returns (ImageFromIdResponse);
   rpc ImageGetOrCreate(ImageGetOrCreateRequest) returns (ImageGetOrCreateResponse);
   rpc ImageJoinStreaming(ImageJoinStreamingRequest) returns (stream ImageJoinStreamingResponse);
 
+  // Input Plane Map
+  rpc MapAwait(MapAwaitRequest) returns (MapAwaitResponse);
+  rpc MapCheckInputs(MapCheckInputsRequest) returns (MapCheckInputsResponse);
+  rpc MapStartOrContinue(MapStartOrContinueRequest) returns (MapStartOrContinueResponse);
+
   // Mounts
   rpc MountGetOrCreate(MountGetOrCreateRequest) returns (MountGetOrCreateResponse);
   rpc MountPutFile(MountPutFileRequest) returns (MountPutFileResponse);
@@ -3422,6 +3748,7 @@ service ModalClient {
 
   // Sandboxes
   rpc SandboxCreate(SandboxCreateRequest) returns (SandboxCreateResponse);
+  rpc SandboxCreateConnectToken(SandboxCreateConnectTokenRequest) returns (SandboxCreateConnectTokenResponse);
   rpc SandboxGetFromName(SandboxGetFromNameRequest) returns (SandboxGetFromNameResponse);
   rpc SandboxGetLogs(SandboxGetLogsRequest) returns (stream TaskLogsBatch);
   rpc SandboxGetResourceUsage(SandboxGetResourceUsageRequest) returns (SandboxGetResourceUsageResponse);
@@ -3431,9 +3758,12 @@ service ModalClient {
   rpc SandboxRestore(SandboxRestoreRequest) returns (SandboxRestoreResponse);
   rpc SandboxSnapshot(SandboxSnapshotRequest) returns (SandboxSnapshotResponse);
   rpc SandboxSnapshotFs(SandboxSnapshotFsRequest) returns (SandboxSnapshotFsResponse);
+  rpc SandboxSnapshotFsAsync(SandboxSnapshotFsAsyncRequest) returns (SandboxSnapshotFsAsyncResponse);
+  rpc SandboxSnapshotFsAsyncGet(SandboxSnapshotFsAsyncGetRequest) returns (SandboxSnapshotFsResponse);
   rpc SandboxSnapshotGet(SandboxSnapshotGetRequest) returns (SandboxSnapshotGetResponse);
   rpc SandboxSnapshotWait(SandboxSnapshotWaitRequest) returns (SandboxSnapshotWaitResponse);
   rpc SandboxStdinWrite(SandboxStdinWriteRequest) returns (SandboxStdinWriteResponse);
+  rpc SandboxTagsGet(SandboxTagsGetRequest) returns (SandboxTagsGetResponse);
   rpc SandboxTagsSet(SandboxTagsSetRequest) returns (google.protobuf.Empty);
   rpc SandboxTerminate(SandboxTerminateRequest) returns (SandboxTerminateResponse);
   rpc SandboxWait(SandboxWaitRequest) returns (SandboxWaitResponse);
@@ -3457,6 +3787,7 @@ service ModalClient {
   // Tasks
   rpc TaskClusterHello(TaskClusterHelloRequest) returns (TaskClusterHelloResponse);
   rpc TaskCurrentInputs(google.protobuf.Empty) returns (TaskCurrentInputsResponse);
+  rpc TaskGetCommandRouterAccess(TaskGetCommandRouterAccessRequest) returns (TaskGetCommandRouterAccessResponse);
   rpc TaskList(TaskListRequest) returns (TaskListResponse);
   rpc TaskResult(TaskResultRequest) returns (google.protobuf.Empty);
 
@@ -3488,5 +3819,6 @@ service ModalClient {
   rpc VolumeRename(VolumeRenameRequest) returns (google.protobuf.Empty);
 
   // Workspaces
+  rpc WorkspaceBillingReport(WorkspaceBillingReportRequest) returns (stream WorkspaceBillingReportItem);
   rpc WorkspaceNameLookup(google.protobuf.Empty) returns (WorkspaceNameLookupResponse);
 }