Merge branch 'main' into jonathon/mod-3535-snapshots-capture-referenc…

…es-to-modal-objects-which-become
modal-labs · Sep 3, 2024 · e15c4ad · e15c4ad
2 parents 5336ec7 + a1c5289
commit e15c4ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/modal/functions.py b/modal/functions.py
@@ -832,7 +832,7 @@ async def _load(self: _Function, resolver: Resolver, existing_object_id: Optiona
                     _experimental_concurrent_cancellations=True,
                     _experimental_task_templates=[
                         api_pb2.TaskTemplate(
-                            priority=1,
+                            rank=1,
                             resources=convert_fn_config_to_resources_config(
                                 cpu=cpu, memory=memory, gpu=_experimental_gpu, ephemeral_disk=ephemeral_disk
                             ),

diff --git a/modal_proto/api.proto b/modal_proto/api.proto
@@ -2081,9 +2081,10 @@ message TaskStats {
 }
 
 message TaskTemplate {
-  uint32 priority = 1;
+  uint32 rank = 1;
   Resources resources = 2;
-  uint32 concurrent_inputs = 3;
+  uint32 target_concurrent_inputs = 3;
+  uint32 max_concurrent_inputs = 4;
 }
 
 message TokenFlowCreateRequest {

diff --git a/modal_version/_version_generated.py b/modal_version/_version_generated.py
@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2024
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 74  # git: 1a1dbe2
+build_number = 75  # git: 7f072e6