modal 1.0.6.dev10__tar.gz → 1.0.6.dev12__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.6.dev10
+Version: 1.0.6.dev12
 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.dev12}/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.dev12}/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.dev12}/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.dev12",
     ):
         """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.dev12",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.0.6.dev10 → modal-1.0.6.dev12}/modal/image.py

@@ -1222,6 +1222,114 @@ class _Image(_Object, type_prefix="im"):
             gpu_config=parse_gpu_config(gpu),
         )
 
+    def uv_pip_install(
+        self,
+        *packages: Union[str, list[str]],  # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]
+        requirements: Optional[list[str]] = None,  # Passes -r (--requirements) to uv pip install
+        find_links: Optional[str] = None,  # Passes -f (--find-links) to uv pip install
+        index_url: Optional[str] = None,  # Passes -i (--index-url) to uv pip install
+        extra_index_url: Optional[str] = None,  # Passes --extra-index-url to uv pip install
+        pre: bool = False,  # Allow pre-releases using uv pip install --prerelease allow
+        extra_options: str = "",  # Additional options to pass to pip install, e.g. "--no-build-isolation"
+        force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
+        uv_version: Optional[str] = None,  # uv version to use
+        secrets: Sequence[_Secret] = [],
+        gpu: GPU_T = None,
+    ) -> "_Image":
+        """Install a list of Python packages using uv pip install.
+
+        **Examples**
+
+        Simple installation:
+        ```python
+        image = modal.Image.debian_slim().uv_pip_install("torch==2.7.1", "numpy")
+        ```
+
+        This method assumes that:
+        - Python is on the `$PATH` and dependencies are installed with the first Python on the `$PATH`.
+        - Shell supports backticks for substitution
+        - `which` command is on the `$PATH`
+        """
+        pkgs = _flatten_str_args("uv_pip_install", "packages", packages)
+
+        if requirements is None or isinstance(requirements, list):
+            requirements = requirements or []
+        else:
+            raise InvalidError("requirements must be None or a list of strings")
+
+        if not pkgs and not requirements:
+            return self
+        elif not _validate_packages(pkgs):
+            raise InvalidError(
+                "Package list for `Image.uv_pip_install` cannot contain other arguments;"
+                " try the `extra_options` parameter instead."
+            )
+
+        def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
+            commands = ["FROM base"]
+            UV_ROOT = "/.uv"
+            if uv_version is None:
+                commands.append(f"COPY --from=ghcr.io/astral-sh/uv:latest /uv {UV_ROOT}/uv")
+            else:
+                commands.append(f"COPY --from=ghcr.io/astral-sh/uv:{uv_version} /uv {UV_ROOT}/uv")
+
+            # NOTE: Using `which python` assumes:
+            # - python is on the PATH and uv is installing into the first python in the PATH
+            # - the shell supports backticks for substitution
+            # - `which` command is on the PATH
+            uv_pip_args = ["--python `which python`", "--compile-bytecode"]
+            context_files = {}
+
+            if find_links:
+                uv_pip_args.append(f"--find-links {shlex.quote(find_links)}")
+            if index_url:
+                uv_pip_args.append(f"--index-url {shlex.quote(index_url)}")
+            if extra_index_url:
+                uv_pip_args.append(f"--extra-index-url {shlex.quote(extra_index_url)}")
+            if pre:
+                uv_pip_args.append("--prerelease allow")
+            if extra_options:
+                uv_pip_args.append(extra_options)
+
+            if requirements:
+
+                def _generate_paths(idx: int, req: str) -> dict:
+                    local_path = os.path.expanduser(req)
+                    basename = os.path.basename(req)
+
+                    # The requirement files can have the same name but in different directories:
+                    # requirements=["test/requirements.txt", "a/b/c/requirements.txt"]
+                    # To uniquely identify these files, we add a `idx` prefix to every file's basename
+                    # - `test/requirements.txt` -> `/.0_requirements.txt` in context -> `/.uv/0/requirements.txt` to uv
+                    # - `a/b/c/requirements.txt` -> `/.1_requirements.txt` in context -> `/.uv/1/requirements.txt` to uv
+                    return {
+                        "local_path": local_path,
+                        "context_path": f"/.{idx}_{basename}",
+                        "dest_path": f"{UV_ROOT}/{idx}/{basename}",
+                    }
+
+                requirement_paths = [_generate_paths(idx, req) for idx, req in enumerate(requirements)]
+                requirements_cli = " ".join(f"--requirements {req['dest_path']}" for req in requirement_paths)
+                uv_pip_args.append(requirements_cli)
+
+                commands.extend([f"COPY {req['context_path']} {req['dest_path']}" for req in requirement_paths])
+                context_files.update({req["context_path"]: req["local_path"] for req in requirement_paths})
+
+            uv_pip_args.extend(shlex.quote(p) for p in sorted(pkgs))
+            uv_pip_args_joined = " ".join(uv_pip_args)
+
+            commands.append(f"RUN {UV_ROOT}/uv pip install {uv_pip_args_joined}")
+
+            return DockerfileSpec(commands=commands, context_files=context_files)
+
+        return _Image._from_args(
+            base_images={"base": self},
+            dockerfile_function=build_dockerfile,
+            force_build=self.force_build or force_build,
+            gpu_config=parse_gpu_config(gpu),
+            secrets=secrets,
+        )
+
     def poetry_install_from_file(
         self,
         poetry_pyproject_toml: str,

{modal-1.0.6.dev10 → modal-1.0.6.dev12}/modal/image.pyi

@@ -505,6 +505,36 @@ class _Image(modal._object._Object):
         """
         ...
 
+    def uv_pip_install(
+        self,
+        *packages: typing.Union[str, list[str]],
+        requirements: typing.Optional[list[str]] = None,
+        find_links: typing.Optional[str] = None,
+        index_url: typing.Optional[str] = None,
+        extra_index_url: typing.Optional[str] = None,
+        pre: bool = False,
+        extra_options: str = "",
+        force_build: bool = False,
+        uv_version: typing.Optional[str] = None,
+        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
+    ) -> _Image:
+        """Install a list of Python packages using uv pip install.
+
+        **Examples**
+
+        Simple installation:
+        ```python
+        image = modal.Image.debian_slim().uv_pip_install("torch==2.7.1", "numpy")
+        ```
+
+        This method assumes that:
+        - Python is on the `$PATH` and dependencies are installed with the first Python on the `$PATH`.
+        - Shell supports backticks for substitution
+        - `which` command is on the `$PATH`
+        """
+        ...
+
     def poetry_install_from_file(
         self,
         poetry_pyproject_toml: str,
@@ -1348,6 +1378,36 @@ class Image(modal.object.Object):
         """
         ...
 
+    def uv_pip_install(
+        self,
+        *packages: typing.Union[str, list[str]],
+        requirements: typing.Optional[list[str]] = None,
+        find_links: typing.Optional[str] = None,
+        index_url: typing.Optional[str] = None,
+        extra_index_url: typing.Optional[str] = None,
+        pre: bool = False,
+        extra_options: str = "",
+        force_build: bool = False,
+        uv_version: typing.Optional[str] = None,
+        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
+    ) -> Image:
+        """Install a list of Python packages using uv pip install.
+
+        **Examples**
+
+        Simple installation:
+        ```python
+        image = modal.Image.debian_slim().uv_pip_install("torch==2.7.1", "numpy")
+        ```
+
+        This method assumes that:
+        - Python is on the `$PATH` and dependencies are installed with the first Python on the `$PATH`.
+        - Shell supports backticks for substitution
+        - `which` command is on the `$PATH`
+        """
+        ...
+
     def poetry_install_from_file(
         self,
         poetry_pyproject_toml: str,

{modal-1.0.6.dev10 → modal-1.0.6.dev12}/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.dev12}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.6.dev10
+Version: 1.0.6.dev12
 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.dev12}/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 {