modal 0.74.5__tar.gz → 0.74.7__tar.gz

{modal-0.74.5 → modal-0.74.7}/PKG-INFO

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

{modal-0.74.5 → modal-0.74.7}/modal/_container_entrypoint.py

@@ -33,7 +33,7 @@ from modal._partial_function import (
     _find_callables_for_obj,
     _PartialFunctionFlags,
 )
-from modal._serialization import deserialize_params
+from modal._serialization import deserialize, deserialize_params
 from modal._utils.async_utils import TaskContext, synchronizer
 from modal._utils.function_utils import (
     callable_has_non_self_params,
@@ -394,7 +394,17 @@ def main(container_args: api_pb2.ContainerArguments, client: Client):
     with container_io_manager.heartbeats(is_snapshotting_function), UserCodeEventLoop() as event_loop:
         # If this is a serialized function, fetch the definition from the server
         if function_def.definition_type == api_pb2.Function.DEFINITION_TYPE_SERIALIZED:
-            ser_usr_cls, ser_fun = container_io_manager.get_serialized_function()
+            assert function_def.function_serialized or function_def.class_serialized
+
+            if function_def.function_serialized:
+                ser_fun = deserialize(function_def.function_serialized, _client)
+            else:
+                ser_fun = None
+
+            if function_def.class_serialized:
+                ser_usr_cls = deserialize(function_def.class_serialized, _client)
+            else:
+                ser_usr_cls = None
         else:
             ser_usr_cls, ser_fun = None, None
 

{modal-0.74.5 → modal-0.74.7}/modal/_resolver.py

@@ -1,6 +1,8 @@
 # Copyright Modal Labs 2023
 import asyncio
 import contextlib
+import os
+import tempfile
 import typing
 from asyncio import Future
 from collections.abc import Hashable
@@ -46,6 +48,7 @@ class Resolver:
     _app_id: Optional[str]
     _deduplication_cache: dict[Hashable, Future]
     _client: _Client
+    _build_start: float
 
     def __init__(
         self,
@@ -73,6 +76,11 @@ class Resolver:
         self._environment_name = environment_name
         self._deduplication_cache = {}
 
+        with tempfile.TemporaryFile() as temp_file:
+            # Use file mtime to track build start time because we will later compare this baseline
+            # to the mtime on mounted files, and want those measurements to have the same resolution.
+            self._build_start = os.fstat(temp_file.fileno()).st_mtime
+
     @property
     def app_id(self) -> Optional[str]:
         return self._app_id
@@ -85,6 +93,10 @@ class Resolver:
     def environment_name(self):
         return self._environment_name
 
+    @property
+    def build_start(self) -> float:
+        return self._build_start
+
     async def preload(self, obj, existing_object_id: Optional[str]):
         if obj._preload is not None:
             await obj._preload(obj, self, existing_object_id)

{modal-0.74.5 → modal-0.74.7}/modal/_runtime/container_io_manager.py

@@ -450,28 +450,6 @@ class _ContainerIOManager:
 
             await asyncio.sleep(DYNAMIC_CONCURRENCY_INTERVAL_SECS)
 
-    async def get_serialized_function(self) -> tuple[Optional[Any], Optional[Callable[..., Any]]]:
-        # Fetch the serialized function definition
-        request = api_pb2.FunctionGetSerializedRequest(function_id=self.function_id)
-        response = await self._client.stub.FunctionGetSerialized(request)
-        if response.function_serialized:
-            fun = self.deserialize(response.function_serialized)
-        else:
-            fun = None
-
-        if response.class_serialized:
-            cls = self.deserialize(response.class_serialized)
-        else:
-            cls = None
-
-        return cls, fun
-
-    def serialize(self, obj: Any) -> bytes:
-        return serialize(obj)
-
-    def deserialize(self, data: bytes) -> Any:
-        return deserialize(data, self._client)
-
     @synchronizer.no_io_translation
     def serialize_data_format(self, obj: Any, data_format: int) -> bytes:
         return serialize_data_format(obj, data_format)
@@ -680,20 +658,20 @@ class _ContainerIOManager:
 
     def serialize_exception(self, exc: BaseException) -> bytes:
         try:
-            return self.serialize(exc)
+            return serialize(exc)
         except Exception as serialization_exc:
             # We can't always serialize exceptions.
             err = f"Failed to serialize exception {exc} of type {type(exc)}: {serialization_exc}"
             logger.info(err)
-            return self.serialize(SerializationError(err))
+            return serialize(SerializationError(err))
 
     def serialize_traceback(self, exc: BaseException) -> tuple[Optional[bytes], Optional[bytes]]:
         serialized_tb, tb_line_cache = None, None
 
         try:
             tb_dict, line_cache = extract_traceback(exc, self.task_id)
-            serialized_tb = self.serialize(tb_dict)
-            tb_line_cache = self.serialize(line_cache)
+            serialized_tb = serialize(tb_dict)
+            tb_line_cache = serialize(line_cache)
         except Exception:
             logger.info("Failed to serialize exception traceback.")
 

{modal-0.74.5 → modal-0.74.7}/modal/_runtime/container_io_manager.pyi

@@ -100,11 +100,6 @@ class _ContainerIOManager:
     def stop_heartbeat(self): ...
     def dynamic_concurrency_manager(self) -> typing.AsyncContextManager[None]: ...
     async def _dynamic_concurrency_loop(self): ...
-    async def get_serialized_function(
-        self,
-    ) -> tuple[typing.Optional[typing.Any], typing.Optional[collections.abc.Callable[..., typing.Any]]]: ...
-    def serialize(self, obj: typing.Any) -> bytes: ...
-    def deserialize(self, data: bytes) -> typing.Any: ...
     def serialize_data_format(self, obj: typing.Any, data_format: int) -> bytes: ...
     async def format_blob_data(self, data: bytes) -> dict[str, typing.Any]: ...
     def get_data_in(self, function_call_id: str) -> collections.abc.AsyncIterator[typing.Any]: ...
@@ -234,18 +229,6 @@ class ContainerIOManager:
 
     _dynamic_concurrency_loop: ___dynamic_concurrency_loop_spec[typing_extensions.Self]
 
-    class __get_serialized_function_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(
-            self,
-        ) -> tuple[typing.Optional[typing.Any], typing.Optional[collections.abc.Callable[..., typing.Any]]]: ...
-        async def aio(
-            self,
-        ) -> tuple[typing.Optional[typing.Any], typing.Optional[collections.abc.Callable[..., typing.Any]]]: ...
-
-    get_serialized_function: __get_serialized_function_spec[typing_extensions.Self]
-
-    def serialize(self, obj: typing.Any) -> bytes: ...
-    def deserialize(self, data: bytes) -> typing.Any: ...
     def serialize_data_format(self, obj: typing.Any, data_format: int) -> bytes: ...
 
     class __format_blob_data_spec(typing_extensions.Protocol[SUPERSELF]):

{modal-0.74.5 → modal-0.74.7}/modal/_utils/blob_utils.py

@@ -292,6 +292,7 @@ async def blob_iter(blob_id: str, stub: ModalClientModal) -> AsyncIterator[bytes
 class FileUploadSpec:
     source: Callable[[], Union[AbstractContextManager, BinaryIO]]
     source_description: Any
+    source_is_path: bool
     mount_filename: str
 
     use_blob: bool
@@ -328,6 +329,7 @@ def _get_file_upload_spec(
     return FileUploadSpec(
         source=source,
         source_description=source_description,
+        source_is_path=isinstance(source_description, Path),
         mount_filename=mount_filename.as_posix(),
         use_blob=use_blob,
         content=content,

{modal-0.74.5 → modal-0.74.7}/modal/client.pyi

@@ -27,7 +27,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.5"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.7"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -85,7 +85,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.5"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.7"
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-0.74.5 → modal-0.74.7}/modal/config.py

@@ -87,7 +87,7 @@ import os
 import typing
 import warnings
 from textwrap import dedent
-from typing import Any, Optional
+from typing import Any, Callable, Optional
 
 from google.protobuf.empty_pb2 import Empty
 
@@ -199,6 +199,15 @@ def _to_boolean(x: object) -> bool:
     return str(x).lower() not in {"", "0", "false"}
 
 
+def _check_value(options: list[str]) -> Callable[[str], str]:
+    def checker(x: str) -> str:
+        if x not in options:
+            raise ValueError(f"Must be one of {options}.")
+        return x
+
+    return checker
+
+
 class _Setting(typing.NamedTuple):
     default: typing.Any = None
     transform: typing.Callable[[str], typing.Any] = lambda x: x  # noqa: E731
@@ -232,6 +241,7 @@ _SETTINGS = {
     "snapshot_debug": _Setting(False, transform=_to_boolean),
     "cuda_checkpoint_path": _Setting("/__modal/.bin/cuda-checkpoint"),  # Used for snapshotting GPU memory.
     "function_schemas": _Setting(False, transform=_to_boolean),
+    "build_validation": _Setting("error", transform=_check_value(["error", "warn", "ignore"])),
 }
 
 
@@ -253,10 +263,17 @@ class Config:
             profile = _profile
         s = _SETTINGS[key]
         env_var_key = "MODAL_" + key.upper()
+
+        def transform(val: str) -> Any:
+            try:
+                return s.transform(val)
+            except Exception as e:
+                raise InvalidError(f"Invalid value for {key} config ({val!r}): {e}")
+
         if use_env and env_var_key in os.environ:
-            return s.transform(os.environ[env_var_key])
+            return transform(os.environ[env_var_key])
         elif profile in _user_config and key in _user_config[profile]:
-            return s.transform(_user_config[profile][key])
+            return transform(_user_config[profile][key])
         else:
             return s.default
 

{modal-0.74.5 → modal-0.74.7}/modal/mount.py

@@ -9,6 +9,7 @@ import sys
 import sysconfig
 import time
 import typing
+import warnings
 from collections.abc import AsyncGenerator
 from pathlib import Path, PurePosixPath
 from typing import Callable, Optional, Sequence, Union
@@ -532,6 +533,17 @@ class _Mount(_Object, type_prefix="mo"):
                 n_finished += 1
                 return mount_file
 
+            # Try to catch cases where user modified their local files (e.g. changed git branches)
+            # between triggering a build and Modal actually uploading the file
+            if config.get("build_validation") != "ignore" and file_spec.source_is_path:
+                mtime = os.stat(file_spec.source_description).st_mtime
+                if mtime > resolver.build_start:
+                    msg = f"{file_spec.source_description} was modified during build process."
+                    if config.get("build_validation") == "error":
+                        raise modal.exception.ExecutionError(msg)
+                    elif config.get("build_validation") == "warn":
+                        warnings.warn(msg)
+
             request = api_pb2.MountPutFileRequest(sha256_hex=file_spec.sha256_hex)
             accounted_hashes.add(file_spec.sha256_hex)
             response = await retry_transient_errors(resolver.client.stub.MountPutFile, request, base_delay=1)

{modal-0.74.5 → modal-0.74.7}/modal.egg-info/PKG-INFO

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

{modal-0.74.5 → modal-0.74.7}/modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 5  # git: 2e65784
+build_number = 7  # git: 52311ba