modal 0.72.5__py3-none-any.whl → 0.72.48__py3-none-any.whl

modal/functions.pyi

@@ -1,5 +1,6 @@
 import collections.abc
 import google.protobuf.message
+import modal._object
 import modal._utils.async_utils
 import modal._utils.function_utils
 import modal.app
@@ -133,17 +134,20 @@ ReturnType = typing.TypeVar("ReturnType", covariant=True)
 
 OriginalReturnType = typing.TypeVar("OriginalReturnType", covariant=True)
 
-class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object._Object):
+SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
+
+class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal._object._Object):
     _info: typing.Optional[modal._utils.function_utils.FunctionInfo]
     _serve_mounts: frozenset[modal.mount._Mount]
     _app: typing.Optional[modal.app._App]
     _obj: typing.Optional[modal.cls._Obj]
+    _webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig]
     _web_url: typing.Optional[str]
     _function_name: typing.Optional[str]
     _is_method: bool
     _spec: typing.Optional[_FunctionSpec]
     _tag: str
-    _raw_f: typing.Callable[..., typing.Any]
+    _raw_f: typing.Optional[collections.abc.Callable[..., typing.Any]]
     _build_args: dict
     _is_generator: typing.Optional[bool]
     _cluster_size: typing.Optional[int]
@@ -197,7 +201,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
         _experimental_buffer_containers: typing.Optional[int] = None,
         _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_custom_scaling_factor: typing.Optional[float] = None,
-    ) -> None: ...
+    ) -> _Function: ...
     def _bind_parameters(
         self,
         obj: modal.cls._Obj,
@@ -228,6 +232,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
     def info(self) -> modal._utils.function_utils.FunctionInfo: ...
     @property
     def spec(self) -> _FunctionSpec: ...
+    def _is_web_endpoint(self) -> bool: ...
     def get_build_def(self) -> str: ...
     def _initialize_from_empty(self): ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
@@ -254,10 +259,10 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
     def local(self, *args: P.args, **kwargs: P.kwargs) -> OriginalReturnType: ...
     async def _experimental_spawn(self, *args: P.args, **kwargs: P.kwargs) -> _FunctionCall[ReturnType]: ...
     async def spawn(self, *args: P.args, **kwargs: P.kwargs) -> _FunctionCall[ReturnType]: ...
-    def get_raw_f(self) -> typing.Callable[..., typing.Any]: ...
+    def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
     async def get_current_stats(self) -> FunctionStats: ...
 
-    class __map_spec(typing_extensions.Protocol):
+    class __map_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False
         ) -> modal._utils.async_utils.AsyncOrSyncIterable: ...
@@ -269,9 +274,9 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
             return_exceptions: bool = False,
         ) -> typing.AsyncGenerator[typing.Any, None]: ...
 
-    map: __map_spec
+    map: __map_spec[typing_extensions.Self]
 
-    class __starmap_spec(typing_extensions.Protocol):
+    class __starmap_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
             input_iterator: typing.Iterable[typing.Sequence[typing.Any]],
@@ -289,13 +294,13 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
             return_exceptions: bool = False,
         ) -> typing.AsyncIterable[typing.Any]: ...
 
-    starmap: __starmap_spec
+    starmap: __starmap_spec[typing_extensions.Self]
 
-    class __for_each_spec(typing_extensions.Protocol):
+    class __for_each_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False): ...
         async def aio(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False): ...
 
-    for_each: __for_each_spec
+    for_each: __for_each_spec[typing_extensions.Self]
 
 ReturnType_INNER = typing.TypeVar("ReturnType_INNER", covariant=True)
 
@@ -306,12 +311,13 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     _serve_mounts: frozenset[modal.mount.Mount]
     _app: typing.Optional[modal.app.App]
     _obj: typing.Optional[modal.cls.Obj]
+    _webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig]
     _web_url: typing.Optional[str]
     _function_name: typing.Optional[str]
     _is_method: bool
     _spec: typing.Optional[_FunctionSpec]
     _tag: str
-    _raw_f: typing.Callable[..., typing.Any]
+    _raw_f: typing.Optional[collections.abc.Callable[..., typing.Any]]
     _build_args: dict
     _is_generator: typing.Optional[bool]
     _cluster_size: typing.Optional[int]
@@ -366,7 +372,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
         _experimental_buffer_containers: typing.Optional[int] = None,
         _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_custom_scaling_factor: typing.Optional[float] = None,
-    ) -> None: ...
+    ) -> Function: ...
     def _bind_parameters(
         self,
         obj: modal.cls.Obj,
@@ -375,11 +381,11 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
         kwargs: dict[str, typing.Any],
     ) -> Function: ...
 
-    class __keep_warm_spec(typing_extensions.Protocol):
+    class __keep_warm_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, warm_pool_size: int) -> None: ...
         async def aio(self, warm_pool_size: int) -> None: ...
 
-    keep_warm: __keep_warm_spec
+    keep_warm: __keep_warm_spec[typing_extensions.Self]
 
     @classmethod
     def from_name(
@@ -416,6 +422,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     def info(self) -> modal._utils.function_utils.FunctionInfo: ...
     @property
     def spec(self) -> _FunctionSpec: ...
+    def _is_web_endpoint(self) -> bool: ...
     def get_build_def(self) -> str: ...
     def _initialize_from_empty(self): ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
@@ -428,7 +435,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     @property
     def cluster_size(self) -> int: ...
 
-    class ___map_spec(typing_extensions.Protocol):
+    class ___map_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, input_queue: modal.parallel_map.SynchronizedQueue, order_outputs: bool, return_exceptions: bool
         ) -> typing.Generator[typing.Any, None, None]: ...
@@ -436,70 +443,70 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
             self, input_queue: modal.parallel_map.SynchronizedQueue, order_outputs: bool, return_exceptions: bool
         ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
-    _map: ___map_spec
+    _map: ___map_spec[typing_extensions.Self]
 
-    class ___call_function_spec(typing_extensions.Protocol[ReturnType_INNER]):
+    class ___call_function_spec(typing_extensions.Protocol[ReturnType_INNER, SUPERSELF]):
         def __call__(self, args, kwargs) -> ReturnType_INNER: ...
         async def aio(self, args, kwargs) -> ReturnType_INNER: ...
 
-    _call_function: ___call_function_spec[ReturnType]
+    _call_function: ___call_function_spec[ReturnType, typing_extensions.Self]
 
-    class ___call_function_nowait_spec(typing_extensions.Protocol):
+    class ___call_function_nowait_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, args, kwargs, function_call_invocation_type: int) -> _Invocation: ...
         async def aio(self, args, kwargs, function_call_invocation_type: int) -> _Invocation: ...
 
-    _call_function_nowait: ___call_function_nowait_spec
+    _call_function_nowait: ___call_function_nowait_spec[typing_extensions.Self]
 
-    class ___call_generator_spec(typing_extensions.Protocol):
+    class ___call_generator_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, args, kwargs): ...
         def aio(self, args, kwargs): ...
 
-    _call_generator: ___call_generator_spec
+    _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class ___call_generator_nowait_spec(typing_extensions.Protocol):
+    class ___call_generator_nowait_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, args, kwargs): ...
         async def aio(self, args, kwargs): ...
 
-    _call_generator_nowait: ___call_generator_nowait_spec
+    _call_generator_nowait: ___call_generator_nowait_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    remote: __remote_spec[P, ReturnType]
+    remote: __remote_spec[ReturnType, P, typing_extensions.Self]
 
-    class __remote_gen_spec(typing_extensions.Protocol):
+    class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
         def aio(self, *args, **kwargs) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
-    remote_gen: __remote_gen_spec
+    remote_gen: __remote_gen_spec[typing_extensions.Self]
 
     def _is_local(self): ...
     def _get_info(self) -> modal._utils.function_utils.FunctionInfo: ...
     def _get_obj(self) -> typing.Optional[modal.cls.Obj]: ...
     def local(self, *args: P.args, **kwargs: P.kwargs) -> OriginalReturnType: ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    _experimental_spawn: ___experimental_spawn_spec[P, ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[ReturnType, P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    spawn: __spawn_spec[P, ReturnType]
+    spawn: __spawn_spec[ReturnType, P, typing_extensions.Self]
 
-    def get_raw_f(self) -> typing.Callable[..., typing.Any]: ...
+    def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 
-    class __get_current_stats_spec(typing_extensions.Protocol):
+    class __get_current_stats_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self) -> FunctionStats: ...
         async def aio(self) -> FunctionStats: ...
 
-    get_current_stats: __get_current_stats_spec
+    get_current_stats: __get_current_stats_spec[typing_extensions.Self]
 
-    class __map_spec(typing_extensions.Protocol):
+    class __map_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False
         ) -> modal._utils.async_utils.AsyncOrSyncIterable: ...
@@ -511,9 +518,9 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
             return_exceptions: bool = False,
         ) -> typing.AsyncGenerator[typing.Any, None]: ...
 
-    map: __map_spec
+    map: __map_spec[typing_extensions.Self]
 
-    class __starmap_spec(typing_extensions.Protocol):
+    class __starmap_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
             input_iterator: typing.Iterable[typing.Sequence[typing.Any]],
@@ -531,15 +538,15 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
             return_exceptions: bool = False,
         ) -> typing.AsyncIterable[typing.Any]: ...
 
-    starmap: __starmap_spec
+    starmap: __starmap_spec[typing_extensions.Self]
 
-    class __for_each_spec(typing_extensions.Protocol):
+    class __for_each_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False): ...
         async def aio(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False): ...
 
-    for_each: __for_each_spec
+    for_each: __for_each_spec[typing_extensions.Self]
 
-class _FunctionCall(typing.Generic[ReturnType], modal.object._Object):
+class _FunctionCall(typing.Generic[ReturnType], modal._object._Object):
     _is_generator: bool
 
     def _invocation(self): ...
@@ -558,29 +565,29 @@ class FunctionCall(typing.Generic[ReturnType], modal.object.Object):
     def __init__(self, *args, **kwargs): ...
     def _invocation(self): ...
 
-    class __get_spec(typing_extensions.Protocol[ReturnType_INNER]):
+    class __get_spec(typing_extensions.Protocol[ReturnType_INNER, SUPERSELF]):
         def __call__(self, timeout: typing.Optional[float] = None) -> ReturnType_INNER: ...
         async def aio(self, timeout: typing.Optional[float] = None) -> ReturnType_INNER: ...
 
-    get: __get_spec[ReturnType]
+    get: __get_spec[ReturnType, typing_extensions.Self]
 
-    class __get_gen_spec(typing_extensions.Protocol):
+    class __get_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self) -> typing.Generator[typing.Any, None, None]: ...
         def aio(self) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
-    get_gen: __get_gen_spec
+    get_gen: __get_gen_spec[typing_extensions.Self]
 
-    class __get_call_graph_spec(typing_extensions.Protocol):
+    class __get_call_graph_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self) -> list[modal.call_graph.InputInfo]: ...
         async def aio(self) -> list[modal.call_graph.InputInfo]: ...
 
-    get_call_graph: __get_call_graph_spec
+    get_call_graph: __get_call_graph_spec[typing_extensions.Self]
 
-    class __cancel_spec(typing_extensions.Protocol):
+    class __cancel_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, terminate_containers: bool = False): ...
         async def aio(self, terminate_containers: bool = False): ...
 
-    cancel: __cancel_spec
+    cancel: __cancel_spec[typing_extensions.Self]
 
     class __from_id_spec(typing_extensions.Protocol):
         def __call__(

modal/gpu.py

@@ -9,8 +9,9 @@ from .exception import InvalidError
 
 @dataclass(frozen=True)
 class _GPUConfig:
-    type: "api_pb2.GPUType.V"
+    type: "api_pb2.GPUType.V"  # Deprecated, at some point
     count: int
+    gpu_type: str
     memory: int = 0
 
     def _to_proto(self) -> api_pb2.GPUConfig:
@@ -19,6 +20,7 @@ class _GPUConfig:
             type=self.type,
             count=self.count,
             memory=self.memory,
+            gpu_type=self.gpu_type,
         )
 
 
@@ -26,14 +28,14 @@ class T4(_GPUConfig):
     """
     [NVIDIA T4 Tensor Core](https://www.nvidia.com/en-us/data-center/tesla-t4/) GPU class.
 
-    A low-cost data center GPU based on the Turing architecture, providing 16GiB of GPU memory.
+    A low-cost data center GPU based on the Turing architecture, providing 16GB of GPU memory.
     """
 
     def __init__(
         self,
         count: int = 1,  # Number of GPUs per container. Defaults to 1.
     ):
-        super().__init__(api_pb2.GPU_TYPE_T4, count, 0)
+        super().__init__(api_pb2.GPU_TYPE_T4, count, "T4")
 
     def __repr__(self):
         return f"GPU(T4, count={self.count})"
@@ -43,7 +45,7 @@ class L4(_GPUConfig):
     """
     [NVIDIA L4 Tensor Core](https://www.nvidia.com/en-us/data-center/l4/) GPU class.
 
-    A mid-tier data center GPU based on the Ada Lovelace architecture, providing 24GiB of GPU memory.
+    A mid-tier data center GPU based on the Ada Lovelace architecture, providing 24GB of GPU memory.
     Includes RTX (ray tracing) support.
     """
 
@@ -51,7 +53,7 @@ class L4(_GPUConfig):
         self,
         count: int = 1,  # Number of GPUs per container. Defaults to 1.
     ):
-        super().__init__(api_pb2.GPU_TYPE_L4, count, 0)
+        super().__init__(api_pb2.GPU_TYPE_L4, count, "L4")
 
     def __repr__(self):
         return f"GPU(L4, count={self.count})"
@@ -61,30 +63,21 @@ class A100(_GPUConfig):
     """
     [NVIDIA A100 Tensor Core](https://www.nvidia.com/en-us/data-center/a100/) GPU class.
 
-    The flagship data center GPU of the Ampere architecture. Available in 40GiB and 80GiB GPU memory configurations.
+    The flagship data center GPU of the Ampere architecture. Available in 40GB and 80GB GPU memory configurations.
     """
 
     def __init__(
         self,
         *,
         count: int = 1,  # Number of GPUs per container. Defaults to 1.
-        size: Union[str, None] = None,  # Select GiB configuration of GPU device: "40GB" or "80GB". Defaults to "40GB".
+        size: Union[str, None] = None,  # Select GB configuration of GPU device: "40GB" or "80GB". Defaults to "40GB".
     ):
-        allowed_size_values = {"40GB", "80GB"}
-
-        if size:
-            if size not in allowed_size_values:
-                raise ValueError(
-                    f"size='{size}' is invalid. A100s can only have memory values of {allowed_size_values}."
-                )
-            memory = int(size.replace("GB", ""))
+        if size == "40GB" or not size:
+            super().__init__(api_pb2.GPU_TYPE_A100, count, "A100-40GB", 40)
+        elif size == "80GB":
+            super().__init__(api_pb2.GPU_TYPE_A100_80GB, count, "A100-80GB", 80)
         else:
-            memory = 40
-
-        if memory == 80:
-            super().__init__(api_pb2.GPU_TYPE_A100_80GB, count, memory)
-        else:
-            super().__init__(api_pb2.GPU_TYPE_A100, count, memory)
+            raise ValueError(f"size='{size}' is invalid. A100s can only have memory values of 40GB or 80GB.")
 
     def __repr__(self):
         if self.memory == 80:
@@ -97,7 +90,7 @@ class A10G(_GPUConfig):
     """
     [NVIDIA A10G Tensor Core](https://www.nvidia.com/en-us/data-center/products/a10-gpu/) GPU class.
 
-    A mid-tier data center GPU based on the Ampere architecture, providing 24 GiB of memory.
+    A mid-tier data center GPU based on the Ampere architecture, providing 24 GB of memory.
     A10G GPUs deliver up to 3.3x better ML training performance, 3x better ML inference performance,
     and 3x better graphics performance, in comparison to NVIDIA T4 GPUs.
     """
@@ -109,7 +102,7 @@ class A10G(_GPUConfig):
         # Useful if you have very large models that don't fit on a single GPU.
         count: int = 1,
     ):
-        super().__init__(api_pb2.GPU_TYPE_A10G, count)
+        super().__init__(api_pb2.GPU_TYPE_A10G, count, "A10G")
 
     def __repr__(self):
         return f"GPU(A10G, count={self.count})"
@@ -131,7 +124,7 @@ class H100(_GPUConfig):
         # Useful if you have very large models that don't fit on a single GPU.
         count: int = 1,
     ):
-        super().__init__(api_pb2.GPU_TYPE_H100, count)
+        super().__init__(api_pb2.GPU_TYPE_H100, count, "H100")
 
     def __repr__(self):
         return f"GPU(H100, count={self.count})"
@@ -152,7 +145,7 @@ class L40S(_GPUConfig):
         # Useful if you have very large models that don't fit on a single GPU.
         count: int = 1,
     ):
-        super().__init__(api_pb2.GPU_TYPE_L40S, count)
+        super().__init__(api_pb2.GPU_TYPE_L40S, count, "L40S")
 
     def __repr__(self):
         return f"GPU(L40S, count={self.count})"
@@ -162,7 +155,7 @@ class Any(_GPUConfig):
     """Selects any one of the GPU classes available within Modal, according to availability."""
 
     def __init__(self, *, count: int = 1):
-        super().__init__(api_pb2.GPU_TYPE_ANY, count)
+        super().__init__(api_pb2.GPU_TYPE_ANY, count, "ANY")
 
     def __repr__(self):
         return f"GPU(Any, count={self.count})"

modal/image.py

@@ -26,6 +26,7 @@ from grpclib.exceptions import GRPCError, StreamTerminatedError
 
 from modal_proto import api_pb2
 
+from ._object import _Object, live_method_gen
 from ._resolver import Resolver
 from ._serialization import serialize
 from ._utils.async_utils import synchronize_api
@@ -46,7 +47,6 @@ from .file_pattern_matcher import NON_PYTHON_FILES, FilePatternMatcher, _ignore_
 from .gpu import GPU_T, parse_gpu_config
 from .mount import _Mount, python_standalone_mount_name
 from .network_file_system import _NetworkFileSystem
-from .object import _Object, live_method_gen
 from .output import _get_output_manager
 from .scheduler_placement import SchedulerPlacement
 from .secret import _Secret
@@ -82,6 +82,11 @@ class _AutoDockerIgnoreSentinel:
 
 AUTO_DOCKERIGNORE = _AutoDockerIgnoreSentinel()
 
+COPY_DEPRECATION_MESSAGE_PATTERN = """modal.Image.copy_* methods will soon be deprecated.
+
+Use {replacement} instead, which is functionally and performance-wise equivalent.
+"""
+
 
 def _validate_python_version(
     python_version: Optional[str], builder_version: ImageBuilderVersion, allow_micro_granularity: bool = True
@@ -657,13 +662,16 @@ class _Image(_Object, type_prefix="im"):
         return obj
 
     def copy_mount(self, mount: _Mount, remote_path: Union[str, Path] = ".") -> "_Image":
-        """Copy the entire contents of a `modal.Mount` into an image.
+        """
+        **Deprecated**: Use image.add_local_dir(..., copy=True) or similar instead.
+
+        Copy the entire contents of a `modal.Mount` into an image.
         Useful when files only available locally are required during the image
         build process.
 
         **Example**
 
-        ```python
+        ```python notest
         static_images_dir = "./static"
         # place all static images in root of mount
         mount = modal.Mount.from_local_dir(static_images_dir, remote_path="/")
@@ -736,7 +744,6 @@ class _Image(_Object, type_prefix="im"):
         **Usage:**
 
         ```python
-        from pathlib import Path
         from modal import FilePatternMatcher
 
         image = modal.Image.debian_slim().add_local_dir(
@@ -768,7 +775,7 @@ class _Image(_Object, type_prefix="im"):
         image = modal.Image.debian_slim().add_local_dir(
             "~/assets",
             remote_path="/assets",
-            ignore=FilePatternMatcher.from_file(Path("/path/to/ignorefile")),
+            ignore=FilePatternMatcher.from_file("/path/to/ignorefile"),
         )
         ```
         """
@@ -786,7 +793,9 @@ class _Image(_Object, type_prefix="im"):
         This works in a similar way to [`COPY`](https://docs.docker.com/engine/reference/builder/#copy)
         works in a `Dockerfile`.
         """
-        # TODO(elias): add pending deprecation with suggestion to use add_* instead
+        deprecation_warning(
+            (2024, 1, 13), COPY_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_file"), pending=True
+        )
         basename = str(Path(local_path).name)
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
@@ -845,14 +854,17 @@ class _Image(_Object, type_prefix="im"):
         # Which follows dockerignore syntax.
         ignore: Union[Sequence[str], Callable[[Path], bool]] = [],
     ) -> "_Image":
-        """Copy a directory into the image as a part of building the image.
+        """
+        **Deprecated**: Use image.add_local_dir instead
+
+        Copy a directory into the image as a part of building the image.
 
         This works in a similar way to [`COPY`](https://docs.docker.com/engine/reference/builder/#copy)
         works in a `Dockerfile`.
 
         **Usage:**
 
-        ```python
+        ```python notest
         from pathlib import Path
         from modal import FilePatternMatcher
 
@@ -885,10 +897,13 @@ class _Image(_Object, type_prefix="im"):
         image = modal.Image.debian_slim().copy_local_dir(
             "~/assets",
             remote_path="/assets",
-            ignore=FilePatternMatcher.from_file(Path("/path/to/ignorefile")),
+            ignore=FilePatternMatcher.from_file("/path/to/ignorefile"),
         )
         ```
         """
+        deprecation_warning(
+            (2024, 1, 13), COPY_DEPRECATION_MESSAGE_PATTERN.format(replacement="image.add_local_dir"), pending=True
+        )
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
             return DockerfileSpec(commands=["FROM base", f"COPY . {remote_path}"], context_files={})
@@ -1282,7 +1297,6 @@ class _Image(_Object, type_prefix="im"):
         **Usage:**
 
         ```python
-        from pathlib import Path
         from modal import FilePatternMatcher
 
         # By default a .dockerignore file is used if present in the current working directory
@@ -1314,10 +1328,17 @@ class _Image(_Object, type_prefix="im"):
         # You can also read ignore patterns from a file.
         image = modal.Image.debian_slim().dockerfile_commands(
             ["COPY data /data"],
-            ignore=FilePatternMatcher.from_file(Path("/path/to/dockerignore")),
+            ignore=FilePatternMatcher.from_file("/path/to/dockerignore"),
         )
         ```
         """
+        if context_mount is not None:
+            deprecation_warning(
+                (2025, 1, 13),
+                "`context_mount` is deprecated."
+                + " Files are now automatically added to the build context based on the commands.",
+                pending=True,
+            )
         cmds = _flatten_str_args("dockerfile_commands", "dockerfile_commands", dockerfile_commands)
         if not cmds:
             return self
@@ -1506,7 +1527,8 @@ class _Image(_Object, type_prefix="im"):
                 "COPY /python/. /usr/local",
                 "ENV TERMINFO_DIRS=/etc/terminfo:/lib/terminfo:/usr/share/terminfo:/usr/lib/terminfo",
             ]
-            if add_python < "3.13":
+            python_minor = add_python.split(".")[1]
+            if int(python_minor) < 13:
                 # Previous versions did not include the `python` binary, but later ones do.
                 # (The important factor is not the Python version itself, but the standalone dist version.)
                 # We insert the command in the list at the position it was previously always added
@@ -1712,7 +1734,6 @@ class _Image(_Object, type_prefix="im"):
         **Usage:**
 
         ```python
-        from pathlib import Path
         from modal import FilePatternMatcher
 
         # By default a .dockerignore file is used if present in the current working directory
@@ -1750,10 +1771,17 @@ class _Image(_Object, type_prefix="im"):
         image = modal.Image.from_dockerfile(
             "./Dockerfile",
             add_python="3.12",
-            ignore=FilePatternMatcher.from_file(Path("/path/to/dockerignore")),
+            ignore=FilePatternMatcher.from_file("/path/to/dockerignore"),
         )
         ```
         """
+        if context_mount is not None:
+            deprecation_warning(
+                (2025, 1, 13),
+                "`context_mount` is deprecated."
+                + " Files are now automatically added to the build context based on the commands in the Dockerfile.",
+                pending=True,
+            )
 
         # --- Build the base dockerfile
 
@@ -2025,11 +2053,11 @@ class _Image(_Object, type_prefix="im"):
         try:
             yield
         except Exception as exc:
-            if self.object_id is None:
-                # Might be initialized later
+            if not self.is_hydrated:
+                # Might be hydrated later
                 self.inside_exceptions.append(exc)
             elif env_image_id == self.object_id:
-                # Image is already initialized (we can remove this case later
+                # Image is already hydrated (we can remove this case later
                 # when we don't hydrate objects so early)
                 raise
             if not isinstance(exc, ImportError):
@@ -2044,9 +2072,9 @@ class _Image(_Object, type_prefix="im"):
         last_entry_id: str = ""
 
         request = api_pb2.ImageJoinStreamingRequest(
-            image_id=self._object_id, timeout=55, last_entry_id=last_entry_id, include_logs_for_finished=True
+            image_id=self.object_id, timeout=55, last_entry_id=last_entry_id, include_logs_for_finished=True
         )
-        async for response in self._client.stub.ImageJoinStreaming.unary_stream(request):
+        async for response in self.client.stub.ImageJoinStreaming.unary_stream(request):
             if response.result.status:
                 return
             if response.entry_id: