modal 1.0.6.dev10__tar.gz → 1.0.6.dev11__tar.gz

{modal-1.0.6.dev10 → modal-1.0.6.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.6.dev10
+Version: 1.0.6.dev11
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-1.0.6.dev10 → modal-1.0.6.dev11}/modal/_functions.py

@@ -40,6 +40,7 @@ from ._utils.async_utils import (
     synchronizer,
     warn_if_generator_is_not_consumed,
 )
+from ._utils.blob_utils import MAX_OBJECT_SIZE_BYTES
 from ._utils.deprecation import deprecation_warning, warn_if_passing_namespace
 from ._utils.function_utils import (
     ATTEMPT_TIMEOUT_GRACE_PERIOD,
@@ -145,6 +146,7 @@ class _Invocation:
             args,
             kwargs,
             stub,
+            max_object_size_bytes=function._max_object_size_bytes,
             method_name=function._use_method_name,
             function_call_invocation_type=function_call_invocation_type,
         )
@@ -386,7 +388,13 @@ class _InputPlaneInvocation:
         function_id = function.object_id
         control_plane_stub = client.stub
         # Note: Blob upload is done on the control plane stub, not the input plane stub!
-        input_item = await _create_input(args, kwargs, control_plane_stub, method_name=function._use_method_name)
+        input_item = await _create_input(
+            args,
+            kwargs,
+            control_plane_stub,
+            max_object_size_bytes=function._max_object_size_bytes,
+            method_name=function._use_method_name,
+        )
 
         request = api_pb2.AttemptStartRequest(
             function_id=function_id,
@@ -1414,6 +1422,15 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         self._definition_id = metadata.definition_id
         self._input_plane_url = metadata.input_plane_url
         self._input_plane_region = metadata.input_plane_region
+        # The server may pass back a larger max object size for some input plane users. This applies to input plane
+        # users only - anyone using the control plane will get the standard limit.
+        # There are some cases like FunctionPrecreate where this value is not set at all. We expect that this field
+        # will eventually be hydrated with the correct value, but just to be defensive, if the field is not set we use
+        # MAX_OBJECT_SIZE_BYTES, otherwise it would get set to 0. Accidentally using 0 would cause us to blob upload
+        # everything, so let's avoid that.
+        self._max_object_size_bytes = (
+            metadata.max_object_size_bytes if metadata.HasField("max_object_size_bytes") else MAX_OBJECT_SIZE_BYTES
+        )
 
     def _get_metadata(self):
         # Overridden concrete implementation of base class method
@@ -1430,6 +1447,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             function_schema=self._metadata.function_schema if self._metadata else None,
             input_plane_url=self._input_plane_url,
             input_plane_region=self._input_plane_region,
+            max_object_size_bytes=self._max_object_size_bytes,
         )
 
     def _check_no_web_url(self, fn_name: str):

{modal-1.0.6.dev10 → modal-1.0.6.dev11}/modal/_utils/function_utils.py

@@ -34,7 +34,6 @@ from ..exception import (
 from ..mount import ROOT_DIR, _is_modal_path, _Mount
 from .blob_utils import (
     MAX_ASYNC_OBJECT_SIZE_BYTES,
-    MAX_OBJECT_SIZE_BYTES,
     blob_download,
     blob_upload_with_r2_failure_info,
 )
@@ -518,12 +517,13 @@ async def _process_result(result: api_pb2.GenericResult, data_format: int, stub,
 
 def should_upload(
     num_bytes: int,
+    max_object_size_bytes: int,
     function_call_invocation_type: Optional["api_pb2.FunctionCallInvocationType.ValueType"],
 ) -> bool:
     """
     Determine if the input should be uploaded to blob storage.
     """
-    return num_bytes > MAX_OBJECT_SIZE_BYTES or (
+    return num_bytes > max_object_size_bytes or (
         function_call_invocation_type == api_pb2.FUNCTION_CALL_INVOCATION_TYPE_ASYNC
         and num_bytes > MAX_ASYNC_OBJECT_SIZE_BYTES
     )
@@ -534,6 +534,7 @@ async def _create_input(
     kwargs,
     stub: ModalClientModal,
     *,
+    max_object_size_bytes: int,
     idx: Optional[int] = None,
     method_name: Optional[str] = None,
     function_call_invocation_type: Optional["api_pb2.FunctionCallInvocationType.ValueType"] = None,
@@ -548,7 +549,7 @@ async def _create_input(
 
     args_serialized = serialize((args, kwargs))
 
-    if should_upload(len(args_serialized), function_call_invocation_type):
+    if should_upload(len(args_serialized), max_object_size_bytes, function_call_invocation_type):
         args_blob_id, r2_failed, r2_latency_ms = await blob_upload_with_r2_failure_info(args_serialized, stub)
         return api_pb2.FunctionPutInputsItem(
             input=api_pb2.FunctionInput(

{modal-1.0.6.dev10 → modal-1.0.6.dev11}/modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev10",
+        version: str = "1.0.6.dev11",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -160,7 +160,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev10",
+        version: str = "1.0.6.dev11",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.0.6.dev10 → modal-1.0.6.dev11}/modal/parallel_map.py

@@ -139,7 +139,14 @@ async def _map_invocation(
         idx = inputs_created
         update_state(set_inputs_created=inputs_created + 1)
         (args, kwargs) = argskwargs
-        return await _create_input(args, kwargs, client.stub, idx=idx, method_name=function._use_method_name)
+        return await _create_input(
+            args,
+            kwargs,
+            client.stub,
+            max_object_size_bytes=function._max_object_size_bytes,
+            idx=idx,
+            method_name=function._use_method_name,
+        )
 
     async def input_iter():
         while 1:

{modal-1.0.6.dev10 → modal-1.0.6.dev11}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.6.dev10
+Version: 1.0.6.dev11
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-1.0.6.dev10 → modal-1.0.6.dev11}/modal_proto/api.proto

@@ -1724,6 +1724,8 @@ message FunctionHandleMetadata {
   FunctionSchema function_schema = 45;
   optional string input_plane_url = 46;
   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;
 }
 
 message FunctionInput {