modal 0.68.31__py3-none-any.whl → 0.68.42__py3-none-any.whl

modal/functions.pyi

@@ -100,6 +100,7 @@ class _FunctionSpec:
     memory: typing.Union[int, tuple[int, int], None]
     ephemeral_disk: typing.Optional[int]
     scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement]
+    proxy: typing.Optional[modal.proxy._Proxy]
 
     def __init__(
         self,
@@ -121,6 +122,7 @@ class _FunctionSpec:
         memory: typing.Union[int, tuple[int, int], None],
         ephemeral_disk: typing.Optional[int],
         scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement],
+        proxy: typing.Optional[modal.proxy._Proxy],
     ) -> None: ...
     def __repr__(self): ...
     def __eq__(self, other): ...
@@ -206,12 +208,12 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
     async def keep_warm(self, warm_pool_size: int) -> None: ...
     @classmethod
     def from_name(
-        cls: type[_Function], app_name: str, tag: str, namespace=1, environment_name: typing.Optional[str] = None
+        cls: type[_Function], app_name: str, name: str, namespace=1, environment_name: typing.Optional[str] = None
     ) -> _Function: ...
     @staticmethod
     async def lookup(
         app_name: str,
-        tag: str,
+        name: str,
         namespace=1,
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
@@ -381,14 +383,14 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
 
     @classmethod
     def from_name(
-        cls: type[Function], app_name: str, tag: str, namespace=1, environment_name: typing.Optional[str] = None
+        cls: type[Function], app_name: str, name: str, namespace=1, environment_name: typing.Optional[str] = None
     ) -> Function: ...
 
     class __lookup_spec(typing_extensions.Protocol):
         def __call__(
             self,
             app_name: str,
-            tag: str,
+            name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -396,7 +398,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
         async def aio(
             self,
             app_name: str,
-            tag: str,
+            name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,

modal/image.py

@@ -571,21 +571,6 @@ class _Image(_Object, type_prefix="im"):
         obj.force_build = force_build
         return obj
 
-    def extend(self, **kwargs) -> "_Image":
-        """mdmd:hidden"""
-        deprecation_error(
-            (2024, 3, 7),
-            "`Image.extend` is deprecated; please use a higher-level method, such as `Image.dockerfile_commands`.",
-        )
-
-        def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
-            return DockerfileSpec(
-                commands=kwargs.pop("dockerfile_commands", []),
-                context_files=kwargs.pop("context_files", {}),
-            )
-
-        return _Image._from_args(base_images={"base": self}, dockerfile_function=build_dockerfile, **kwargs)
-
     def copy_mount(self, mount: _Mount, remote_path: Union[str, Path] = ".") -> "_Image":
         """Copy the entire contents of a `modal.Mount` into an image.
         Useful when files only available locally are required during the image

modal/image.pyi

@@ -92,19 +92,6 @@ class _Image(modal.object._Object):
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
     ): ...
-    def extend(
-        self,
-        *,
-        secrets: typing.Optional[collections.abc.Sequence[modal.secret._Secret]] = None,
-        gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
-        build_function: typing.Optional[modal.functions._Function] = None,
-        build_function_input: typing.Optional[modal_proto.api_pb2.FunctionInput] = None,
-        image_registry_config: typing.Optional[_ImageRegistryConfig] = None,
-        context_mount: typing.Optional[modal.mount._Mount] = None,
-        force_build: bool = False,
-        _namespace: int = 1,
-        _do_assert_no_mount_layers: bool = True,
-    ) -> _Image: ...
     def copy_mount(self, mount: modal.mount._Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> _Image: ...
     def add_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
@@ -364,19 +351,6 @@ class Image(modal.object.Object):
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
     ): ...
-    def extend(
-        self,
-        *,
-        secrets: typing.Optional[collections.abc.Sequence[modal.secret.Secret]] = None,
-        gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
-        build_function: typing.Optional[modal.functions.Function] = None,
-        build_function_input: typing.Optional[modal_proto.api_pb2.FunctionInput] = None,
-        image_registry_config: typing.Optional[_ImageRegistryConfig] = None,
-        context_mount: typing.Optional[modal.mount.Mount] = None,
-        force_build: bool = False,
-        _namespace: int = 1,
-        _do_assert_no_mount_layers: bool = True,
-    ) -> Image: ...
     def copy_mount(self, mount: modal.mount.Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> Image: ...
     def add_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False

modal/mount.py

@@ -22,6 +22,7 @@ from modal_version import __version__
 from ._resolver import Resolver
 from ._utils.async_utils import aclosing, async_map, synchronize_api
 from ._utils.blob_utils import FileUploadSpec, blob_upload_file, get_file_upload_spec_from_path
+from ._utils.deprecation import renamed_parameter
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
 from ._utils.package_utils import get_module_mount_info
@@ -623,8 +624,9 @@ class _Mount(_Object, type_prefix="mo"):
         return mount
 
     @staticmethod
+    @renamed_parameter((2024, 12, 18), "label", "name")
     def from_name(
-        label: str,
+        name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         environment_name: Optional[str] = None,
     ) -> "_Mount":
@@ -632,7 +634,7 @@ class _Mount(_Object, type_prefix="mo"):
 
         async def _load(provider: _Mount, resolver: Resolver, existing_object_id: Optional[str]):
             req = api_pb2.MountGetOrCreateRequest(
-                deployment_name=label,
+                deployment_name=name,
                 namespace=namespace,
                 environment_name=_get_environment_name(environment_name, resolver),
             )
@@ -642,15 +644,16 @@ class _Mount(_Object, type_prefix="mo"):
         return _Mount._from_loader(_load, "Mount()")
 
     @classmethod
+    @renamed_parameter((2024, 12, 18), "label", "name")
     async def lookup(
         cls: type["_Mount"],
-        label: str,
+        name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         client: Optional[_Client] = None,
         environment_name: Optional[str] = None,
     ) -> "_Mount":
         """mdmd:hidden"""
-        obj = _Mount.from_name(label, namespace=namespace, environment_name=environment_name)
+        obj = _Mount.from_name(name, namespace=namespace, environment_name=environment_name)
         if client is None:
             client = await _Client.from_env()
         resolver = Resolver(client=client)

modal/mount.pyi

@@ -139,11 +139,11 @@ class _Mount(modal.object._Object):
         ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool], None] = None,
     ) -> _Mount: ...
     @staticmethod
-    def from_name(label: str, namespace=1, environment_name: typing.Optional[str] = None) -> _Mount: ...
+    def from_name(name: str, namespace=1, environment_name: typing.Optional[str] = None) -> _Mount: ...
     @classmethod
     async def lookup(
         cls: type[_Mount],
-        label: str,
+        name: str,
         namespace=1,
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
@@ -231,11 +231,11 @@ class Mount(modal.object.Object):
         ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool], None] = None,
     ) -> Mount: ...
     @staticmethod
-    def from_name(label: str, namespace=1, environment_name: typing.Optional[str] = None) -> Mount: ...
+    def from_name(name: str, namespace=1, environment_name: typing.Optional[str] = None) -> Mount: ...
     @classmethod
     def lookup(
         cls: type[Mount],
-        label: str,
+        name: str,
         namespace=1,
         client: typing.Optional[modal.client.Client] = None,
         environment_name: typing.Optional[str] = None,

modal/network_file_system.py

@@ -15,7 +15,7 @@ from modal_proto import api_pb2
 from ._resolver import Resolver
 from ._utils.async_utils import TaskContext, aclosing, async_map, sync_or_async_iter, synchronize_api
 from ._utils.blob_utils import LARGE_FILE_LIMIT, blob_iter, blob_upload_file
-from ._utils.deprecation import deprecation_error
+from ._utils.deprecation import renamed_parameter
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.hash_utils import get_sha256_hex
 from ._utils.name_utils import check_object_name
@@ -91,18 +91,9 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
     """
 
     @staticmethod
-    def new(cloud: Optional[str] = None):
-        """mdmd:hidden"""
-        message = (
-            "`NetworkFileSystem.new` is deprecated."
-            " Please use `NetworkFileSystem.from_name` (for persisted)"
-            " or `NetworkFileSystem.ephemeral` (for ephemeral) network filesystems instead."
-        )
-        deprecation_error((2024, 3, 20), message)
-
-    @staticmethod
+    @renamed_parameter((2024, 12, 18), "label", "name")
     def from_name(
-        label: str,
+        name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         environment_name: Optional[str] = None,
         create_if_missing: bool = False,
@@ -121,11 +112,11 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
             pass
         ```
         """
-        check_object_name(label, "NetworkFileSystem")
+        check_object_name(name, "NetworkFileSystem")
 
         async def _load(self: _NetworkFileSystem, resolver: Resolver, existing_object_id: Optional[str]):
             req = api_pb2.SharedVolumeGetOrCreateRequest(
-                deployment_name=label,
+                deployment_name=name,
                 namespace=namespace,
                 environment_name=_get_environment_name(environment_name, resolver),
                 object_creation_type=(api_pb2.OBJECT_CREATION_TYPE_CREATE_IF_MISSING if create_if_missing else None),
@@ -136,7 +127,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
             except GRPCError as exc:
                 if exc.status == Status.NOT_FOUND and exc.message == "App has wrong entity vo":
                     raise InvalidError(
-                        f"Attempted to mount: `{label}` as a NetworkFileSystem " + "which already exists as a Volume"
+                        f"Attempted to mount: `{name}` as a NetworkFileSystem " + "which already exists as a Volume"
                     )
                 raise
 
@@ -176,8 +167,9 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
             yield cls._new_hydrated(response.shared_volume_id, client, None, is_another_app=True)
 
     @staticmethod
+    @renamed_parameter((2024, 12, 18), "label", "name")
     async def lookup(
-        label: str,
+        name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         client: Optional[_Client] = None,
         environment_name: Optional[str] = None,
@@ -194,7 +186,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         ```
         """
         obj = _NetworkFileSystem.from_name(
-            label, namespace=namespace, environment_name=environment_name, create_if_missing=create_if_missing
+            name, namespace=namespace, environment_name=environment_name, create_if_missing=create_if_missing
         )
         if client is None:
             client = await _Client.from_env()
@@ -223,8 +215,9 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         return resp.shared_volume_id
 
     @staticmethod
-    async def delete(label: str, client: Optional[_Client] = None, environment_name: Optional[str] = None):
-        obj = await _NetworkFileSystem.lookup(label, client=client, environment_name=environment_name)
+    @renamed_parameter((2024, 12, 18), "label", "name")
+    async def delete(name: str, client: Optional[_Client] = None, environment_name: Optional[str] = None):
+        obj = await _NetworkFileSystem.lookup(name, client=client, environment_name=environment_name)
         req = api_pb2.SharedVolumeDeleteRequest(shared_volume_id=obj.object_id)
         await retry_transient_errors(obj._client.stub.SharedVolumeDelete, req)
 

modal/network_file_system.pyi

@@ -13,11 +13,9 @@ def network_file_system_mount_protos(
 ) -> list[modal_proto.api_pb2.SharedVolumeMount]: ...
 
 class _NetworkFileSystem(modal.object._Object):
-    @staticmethod
-    def new(cloud: typing.Optional[str] = None): ...
     @staticmethod
     def from_name(
-        label: str, namespace=1, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
+        name: str, namespace=1, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
     ) -> _NetworkFileSystem: ...
     @classmethod
     def ephemeral(
@@ -28,7 +26,7 @@ class _NetworkFileSystem(modal.object._Object):
     ) -> typing.AsyncContextManager[_NetworkFileSystem]: ...
     @staticmethod
     async def lookup(
-        label: str,
+        name: str,
         namespace=1,
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
@@ -43,7 +41,7 @@ class _NetworkFileSystem(modal.object._Object):
     ) -> str: ...
     @staticmethod
     async def delete(
-        label: str, client: typing.Optional[modal.client._Client] = None, environment_name: typing.Optional[str] = None
+        name: str, client: typing.Optional[modal.client._Client] = None, environment_name: typing.Optional[str] = None
     ): ...
     async def write_file(
         self,
@@ -71,10 +69,8 @@ class _NetworkFileSystem(modal.object._Object):
 class NetworkFileSystem(modal.object.Object):
     def __init__(self, *args, **kwargs): ...
     @staticmethod
-    def new(cloud: typing.Optional[str] = None): ...
-    @staticmethod
     def from_name(
-        label: str, namespace=1, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
+        name: str, namespace=1, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
     ) -> NetworkFileSystem: ...
     @classmethod
     def ephemeral(
@@ -87,7 +83,7 @@ class NetworkFileSystem(modal.object.Object):
     class __lookup_spec(typing_extensions.Protocol):
         def __call__(
             self,
-            label: str,
+            name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -95,7 +91,7 @@ class NetworkFileSystem(modal.object.Object):
         ) -> NetworkFileSystem: ...
         async def aio(
             self,
-            label: str,
+            name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -125,13 +121,13 @@ class NetworkFileSystem(modal.object.Object):
     class __delete_spec(typing_extensions.Protocol):
         def __call__(
             self,
-            label: str,
+            name: str,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
         ): ...
         async def aio(
             self,
-            label: str,
+            name: str,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
         ): ...

modal/partial_function.py

@@ -138,29 +138,6 @@ PartialFunction = synchronize_api(_PartialFunction)
 def _find_partial_methods_for_user_cls(user_cls: type[Any], flags: int) -> dict[str, _PartialFunction]:
     """Grabs all method on a user class, and returns partials. Includes legacy methods."""
 
-    # Build up a list of legacy attributes to check
-    check_attrs: list[str] = []
-    if flags & _PartialFunctionFlags.BUILD:
-        check_attrs += ["__build__", "__abuild__"]
-    if flags & _PartialFunctionFlags.ENTER_POST_SNAPSHOT:
-        check_attrs += ["__enter__", "__aenter__"]
-    if flags & _PartialFunctionFlags.EXIT:
-        check_attrs += ["__exit__", "__aexit__"]
-
-    # Grab legacy lifecycle methods
-    for attr in check_attrs:
-        if hasattr(user_cls, attr):
-            suggested = attr.strip("_")
-            if is_async := suggested.startswith("a"):
-                suggested = suggested[1:]
-            async_suggestion = " (on an async method)" if is_async else ""
-            message = (
-                f"Using `{attr}` methods for class lifecycle management is deprecated."
-                f" Please try using the `modal.{suggested}` decorator{async_suggestion} instead."
-                " See https://modal.com/docs/guide/lifecycle-functions for more information."
-            )
-            deprecation_error((2024, 2, 21), message)
-
     partial_functions: dict[str, _PartialFunction] = {}
     for parent_cls in reversed(user_cls.mro()):
         if parent_cls is not object:
@@ -634,12 +611,6 @@ def _exit(_warn_parentheses_missing=None) -> Callable[[ExitHandlerType], _Partia
         if isinstance(f, _PartialFunction):
             _disallow_wrapping_method(f, "exit")
 
-        if callable_has_non_self_params(f):
-            message = (
-                "Support for decorating parameterized methods with `@exit` has been deprecated."
-                " Please update your code by removing the parameters."
-            )
-            deprecation_error((2024, 2, 23), message)
         return _PartialFunction(f, _PartialFunctionFlags.EXIT)
 
     return wrapper

modal/queue.py

@@ -13,7 +13,7 @@ from modal_proto import api_pb2
 from ._resolver import Resolver
 from ._serialization import deserialize, serialize
 from ._utils.async_utils import TaskContext, synchronize_api, warn_if_generator_is_not_consumed
-from ._utils.deprecation import deprecation_error
+from ._utils.deprecation import renamed_parameter
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
 from .client import _Client
@@ -94,15 +94,6 @@ class _Queue(_Object, type_prefix="qu"):
     Partition keys must be non-empty and must not exceed 64 bytes.
     """
 
-    @staticmethod
-    def new():
-        """mdmd:hidden"""
-        message = (
-            "`Queue.new` is deprecated."
-            " Please use `Queue.from_name` (for persisted) or `Queue.ephemeral` (for ephemeral) queues instead."
-        )
-        deprecation_error((2024, 3, 19), message)
-
     def __init__(self):
         """mdmd:hidden"""
         raise RuntimeError("Queue() is not allowed. Please use `Queue.from_name(...)` or `Queue.ephemeral()` instead.")
@@ -154,8 +145,9 @@ class _Queue(_Object, type_prefix="qu"):
             yield cls._new_hydrated(response.queue_id, client, None, is_another_app=True)
 
     @staticmethod
+    @renamed_parameter((2024, 12, 18), "label", "name")
     def from_name(
-        label: str,
+        name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         environment_name: Optional[str] = None,
         create_if_missing: bool = False,
@@ -171,11 +163,11 @@ class _Queue(_Object, type_prefix="qu"):
         q.put(123)
         ```
         """
-        check_object_name(label, "Queue")
+        check_object_name(name, "Queue")
 
         async def _load(self: _Queue, resolver: Resolver, existing_object_id: Optional[str]):
             req = api_pb2.QueueGetOrCreateRequest(
-                deployment_name=label,
+                deployment_name=name,
                 namespace=namespace,
                 environment_name=_get_environment_name(environment_name, resolver),
                 object_creation_type=(api_pb2.OBJECT_CREATION_TYPE_CREATE_IF_MISSING if create_if_missing else None),
@@ -186,8 +178,9 @@ class _Queue(_Object, type_prefix="qu"):
         return _Queue._from_loader(_load, "Queue()", is_another_app=True, hydrate_lazily=True)
 
     @staticmethod
+    @renamed_parameter((2024, 12, 18), "label", "name")
     async def lookup(
-        label: str,
+        name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         client: Optional[_Client] = None,
         environment_name: Optional[str] = None,
@@ -204,7 +197,7 @@ class _Queue(_Object, type_prefix="qu"):
         ```
         """
         obj = _Queue.from_name(
-            label, namespace=namespace, environment_name=environment_name, create_if_missing=create_if_missing
+            name, namespace=namespace, environment_name=environment_name, create_if_missing=create_if_missing
         )
         if client is None:
             client = await _Client.from_env()
@@ -213,8 +206,9 @@ class _Queue(_Object, type_prefix="qu"):
         return obj
 
     @staticmethod
-    async def delete(label: str, *, client: Optional[_Client] = None, environment_name: Optional[str] = None):
-        obj = await _Queue.lookup(label, client=client, environment_name=environment_name)
+    @renamed_parameter((2024, 12, 18), "label", "name")
+    async def delete(name: str, *, client: Optional[_Client] = None, environment_name: Optional[str] = None):
+        obj = await _Queue.lookup(name, client=client, environment_name=environment_name)
         req = api_pb2.QueueDeleteRequest(queue_id=obj.object_id)
         await retry_transient_errors(obj._client.stub.QueueDelete, req)
 

modal/queue.pyi

@@ -6,8 +6,6 @@ import typing
 import typing_extensions
 
 class _Queue(modal.object._Object):
-    @staticmethod
-    def new(): ...
     def __init__(self): ...
     @staticmethod
     def validate_partition_key(partition: typing.Optional[str]) -> bytes: ...
@@ -20,11 +18,11 @@ class _Queue(modal.object._Object):
     ) -> typing.AsyncContextManager[_Queue]: ...
     @staticmethod
     def from_name(
-        label: str, namespace=1, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
+        name: str, namespace=1, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
     ) -> _Queue: ...
     @staticmethod
     async def lookup(
-        label: str,
+        name: str,
         namespace=1,
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
@@ -32,7 +30,7 @@ class _Queue(modal.object._Object):
     ) -> _Queue: ...
     @staticmethod
     async def delete(
-        label: str,
+        name: str,
         *,
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
@@ -89,8 +87,6 @@ class _Queue(modal.object._Object):
 class Queue(modal.object.Object):
     def __init__(self): ...
     @staticmethod
-    def new(): ...
-    @staticmethod
     def validate_partition_key(partition: typing.Optional[str]) -> bytes: ...
     @classmethod
     def ephemeral(
@@ -101,13 +97,13 @@ class Queue(modal.object.Object):
     ) -> synchronicity.combined_types.AsyncAndBlockingContextManager[Queue]: ...
     @staticmethod
     def from_name(
-        label: str, namespace=1, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
+        name: str, namespace=1, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
     ) -> Queue: ...
 
     class __lookup_spec(typing_extensions.Protocol):
         def __call__(
             self,
-            label: str,
+            name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -115,7 +111,7 @@ class Queue(modal.object.Object):
         ) -> Queue: ...
         async def aio(
             self,
-            label: str,
+            name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -127,14 +123,14 @@ class Queue(modal.object.Object):
     class __delete_spec(typing_extensions.Protocol):
         def __call__(
             self,
-            label: str,
+            name: str,
             *,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
         ): ...
         async def aio(
             self,
-            label: str,
+            name: str,
             *,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,

modal/sandbox.py

@@ -118,6 +118,8 @@ class _Sandbox(_Object, type_prefix="sb"):
             for _, cloud_bucket_mount in cloud_bucket_mounts:
                 if cloud_bucket_mount.secret:
                     deps.append(cloud_bucket_mount.secret)
+            if proxy:
+                deps.append(proxy)
             return deps
 
         async def _load(self: _Sandbox, resolver: Resolver, _existing_object_id: Optional[str]):

modal/secret.py

@@ -9,6 +9,7 @@ from modal_proto import api_pb2
 from ._resolver import Resolver
 from ._runtime.execution_context import is_local
 from ._utils.async_utils import synchronize_api
+from ._utils.deprecation import renamed_parameter
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
 from .client import _Client
@@ -161,8 +162,9 @@ class _Secret(_Object, type_prefix="st"):
         return _Secret._from_loader(_load, "Secret.from_dotenv()", hydrate_lazily=True)
 
     @staticmethod
+    @renamed_parameter((2024, 12, 18), "label", "name")
     def from_name(
-        label: str,  # Some global identifier, such as "aws-secret"
+        name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         environment_name: Optional[str] = None,
         required_keys: list[
@@ -186,7 +188,7 @@ class _Secret(_Object, type_prefix="st"):
 
         async def _load(self: _Secret, resolver: Resolver, existing_object_id: Optional[str]):
             req = api_pb2.SecretGetOrCreateRequest(
-                deployment_name=label,
+                deployment_name=name,
                 namespace=namespace,
                 environment_name=_get_environment_name(environment_name, resolver),
                 required_keys=required_keys,
@@ -203,8 +205,9 @@ class _Secret(_Object, type_prefix="st"):
         return _Secret._from_loader(_load, "Secret()", hydrate_lazily=True)
 
     @staticmethod
+    @renamed_parameter((2024, 12, 18), "label", "name")
     async def lookup(
-        label: str,
+        name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         client: Optional[_Client] = None,
         environment_name: Optional[str] = None,
@@ -212,7 +215,7 @@ class _Secret(_Object, type_prefix="st"):
     ) -> "_Secret":
         """mdmd:hidden"""
         obj = _Secret.from_name(
-            label, namespace=namespace, environment_name=environment_name, required_keys=required_keys
+            name, namespace=namespace, environment_name=environment_name, required_keys=required_keys
         )
         if client is None:
             client = await _Client.from_env()

modal/secret.pyi

@@ -12,11 +12,11 @@ class _Secret(modal.object._Object):
     def from_dotenv(path=None, *, filename=".env"): ...
     @staticmethod
     def from_name(
-        label: str, namespace=1, environment_name: typing.Optional[str] = None, required_keys: list[str] = []
+        name: str, namespace=1, environment_name: typing.Optional[str] = None, required_keys: list[str] = []
     ) -> _Secret: ...
     @staticmethod
     async def lookup(
-        label: str,
+        name: str,
         namespace=1,
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
@@ -42,13 +42,13 @@ class Secret(modal.object.Object):
     def from_dotenv(path=None, *, filename=".env"): ...
     @staticmethod
     def from_name(
-        label: str, namespace=1, environment_name: typing.Optional[str] = None, required_keys: list[str] = []
+        name: str, namespace=1, environment_name: typing.Optional[str] = None, required_keys: list[str] = []
     ) -> Secret: ...
 
     class __lookup_spec(typing_extensions.Protocol):
         def __call__(
             self,
-            label: str,
+            name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -56,7 +56,7 @@ class Secret(modal.object.Object):
         ) -> Secret: ...
         async def aio(
             self,
-            label: str,
+            name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,