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

modal/image.py

@@ -31,6 +31,9 @@ from ._serialization import serialize
 from ._utils.async_utils import synchronize_api
 from ._utils.blob_utils import MAX_OBJECT_SIZE_BYTES
 from ._utils.deprecation import deprecation_error, deprecation_warning
+from ._utils.docker_utils import (
+    extract_copy_command_patterns,
+)
 from ._utils.function_utils import FunctionInfo
 from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES, retry_transient_errors
 from .client import _Client
@@ -38,7 +41,7 @@ from .cloud_bucket_mount import _CloudBucketMount
 from .config import config, logger, user_config_path
 from .environments import _get_environment_cached
 from .exception import InvalidError, NotFoundError, RemoteError, VersionError
-from .file_pattern_matcher import NON_PYTHON_FILES
+from .file_pattern_matcher import NON_PYTHON_FILES, FilePatternMatcher, _ignore_fn
 from .gpu import GPU_T, parse_gpu_config
 from .mount import _Mount, python_standalone_mount_name
 from .network_file_system import _NetworkFileSystem
@@ -236,6 +239,33 @@ def _get_image_builder_version(server_version: ImageBuilderVersion) -> ImageBuil
     return version
 
 
+def _create_context_mount(
+    docker_commands: Sequence[str],
+    ignore_fn: Callable[[Path], bool],
+    context_dir: Path,
+) -> Optional[_Mount]:
+    """
+    Creates a context mount from a list of docker commands.
+
+    1. Paths are evaluated relative to context_dir.
+    2. First selects inclusions based on COPY commands in the list of commands.
+    3. Then ignore any files as per the ignore predicate.
+    """
+    copy_patterns = extract_copy_command_patterns(docker_commands)
+    if not copy_patterns:
+        return None  # no mount needed
+    include_fn = FilePatternMatcher(*copy_patterns)
+
+    def ignore_with_include(source: Path) -> bool:
+        relative_source = source.relative_to(context_dir)
+        if not include_fn(relative_source) or ignore_fn(relative_source):
+            return True
+
+        return False
+
+    return _Mount._add_local_dir(Path("./"), PurePosixPath("/"), ignore=ignore_with_include)
+
+
 class _ImageRegistryConfig:
     """mdmd:hidden"""
 
@@ -396,7 +426,7 @@ class _Image(_Object, type_prefix="im"):
         build_function: Optional["modal.functions._Function"] = None,
         build_function_input: Optional[api_pb2.FunctionInput] = None,
         image_registry_config: Optional[_ImageRegistryConfig] = None,
-        context_mount: Optional[_Mount] = None,
+        context_mount_function: Optional[Callable[[], Optional[_Mount]]] = None,
         force_build: bool = False,
         # For internal use only.
         _namespace: "api_pb2.DeploymentNamespace.ValueType" = api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
@@ -423,13 +453,15 @@ class _Image(_Object, type_prefix="im"):
             deps = tuple(base_images.values()) + tuple(secrets)
             if build_function:
                 deps += (build_function,)
-            if context_mount:
-                deps += (context_mount,)
             if image_registry_config and image_registry_config.secret:
                 deps += (image_registry_config.secret,)
             return deps
 
         async def _load(self: _Image, resolver: Resolver, existing_object_id: Optional[str]):
+            context_mount = context_mount_function() if context_mount_function else None
+            if context_mount:
+                await resolver.load(context_mount)
+
             if _do_assert_no_mount_layers:
                 for image in base_images.values():
                     # base images can't have
@@ -596,7 +628,7 @@ class _Image(_Object, type_prefix="im"):
         return _Image._from_args(
             base_images={"base": self},
             dockerfile_function=build_dockerfile,
-            context_mount=mount,
+            context_mount_function=lambda: mount,
         )
 
     def add_local_file(self, local_path: Union[str, Path], remote_path: str, *, copy: bool = False) -> "_Image":
@@ -684,7 +716,7 @@ class _Image(_Object, type_prefix="im"):
             #  + make default remote_path="./"
             raise InvalidError("image.add_local_dir() currently only supports absolute remote_path values")
 
-        mount = _Mount._add_local_dir(Path(local_path), Path(remote_path), ignore)
+        mount = _Mount._add_local_dir(Path(local_path), PurePosixPath(remote_path), ignore=_ignore_fn(ignore))
         return self._add_mount_layer_or_copy(mount, copy=copy)
 
     def copy_local_file(self, local_path: Union[str, Path], remote_path: Union[str, Path] = "./") -> "_Image":
@@ -695,7 +727,6 @@ class _Image(_Object, type_prefix="im"):
         """
         # TODO(elias): add pending deprecation with suggestion to use add_* instead
         basename = str(Path(local_path).name)
-        mount = _Mount.from_local_file(local_path, remote_path=f"/{basename}")
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
             return DockerfileSpec(commands=["FROM base", f"COPY {basename} {remote_path}"], context_files={})
@@ -703,7 +734,7 @@ class _Image(_Object, type_prefix="im"):
         return _Image._from_args(
             base_images={"base": self},
             dockerfile_function=build_dockerfile,
-            context_mount=mount,
+            context_mount_function=lambda: _Mount.from_local_file(local_path, remote_path=f"/{basename}"),
         )
 
     def add_local_python_source(
@@ -790,15 +821,15 @@ class _Image(_Object, type_prefix="im"):
         ```
         """
 
-        mount = _Mount._add_local_dir(Path(local_path), Path("/"), ignore)
-
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
             return DockerfileSpec(commands=["FROM base", f"COPY . {remote_path}"], context_files={})
 
         return _Image._from_args(
             base_images={"base": self},
             dockerfile_function=build_dockerfile,
-            context_mount=mount,
+            context_mount_function=lambda: _Mount._add_local_dir(
+                Path(local_path), PurePosixPath("/"), ignore=_ignore_fn(ignore)
+            ),
         )
 
     def pip_install(
@@ -1156,12 +1187,29 @@ class _Image(_Object, type_prefix="im"):
         # modal.Mount with local files to supply as build context for COPY commands
         context_mount: Optional[_Mount] = None,
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
+        ignore: Union[Sequence[str], Callable[[Path], bool]] = (),
     ) -> "_Image":
         """Extend an image with arbitrary Dockerfile-like commands."""
         cmds = _flatten_str_args("dockerfile_commands", "dockerfile_commands", dockerfile_commands)
         if not cmds:
             return self
 
+        if context_mount:
+            if ignore:
+                raise InvalidError("Cannot set both `context_mount` and `ignore`")
+
+            def identity_context_mount_fn() -> Optional[_Mount]:
+                return context_mount
+
+            context_mount_function = identity_context_mount_fn
+        else:
+
+            def auto_created_context_mount_fn() -> Optional[_Mount]:
+                # use COPY commands and ignore patterns to construct implicit context mount
+                return _create_context_mount(cmds, ignore_fn=_ignore_fn(ignore), context_dir=Path.cwd())
+
+            context_mount_function = auto_created_context_mount_fn
+
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
             return DockerfileSpec(commands=["FROM base", *cmds], context_files=context_files)
 
@@ -1170,7 +1218,7 @@ class _Image(_Object, type_prefix="im"):
             dockerfile_function=build_dockerfile,
             secrets=secrets,
             gpu_config=parse_gpu_config(gpu),
-            context_mount=context_mount,
+            context_mount_function=context_mount_function,
             force_build=self.force_build or force_build,
         )
 
@@ -1400,11 +1448,15 @@ class _Image(_Object, type_prefix="im"):
         modal.Image.from_registry("nvcr.io/nvidia/pytorch:22.12-py3")
         ```
         """
-        context_mount = None
-        if add_python:
-            context_mount = _Mount.from_name(
-                python_standalone_mount_name(add_python),
-                namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
+
+        def context_mount_function() -> Optional[_Mount]:
+            return (
+                _Mount.from_name(
+                    python_standalone_mount_name(add_python),
+                    namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
+                )
+                if add_python
+                else None
             )
 
         if "image_registry_config" not in kwargs and secret is not None:
@@ -1417,7 +1469,7 @@ class _Image(_Object, type_prefix="im"):
 
         return _Image._from_args(
             dockerfile_function=build_dockerfile,
-            context_mount=context_mount,
+            context_mount_function=context_mount_function,
             force_build=force_build,
             **kwargs,
         )
@@ -1531,6 +1583,7 @@ class _Image(_Object, type_prefix="im"):
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
         add_python: Optional[str] = None,
+        ignore: Union[Sequence[str], Callable[[Path], bool]] = (),
     ) -> "_Image":
         """Build a Modal image from a local Dockerfile.
 
@@ -1542,22 +1595,23 @@ class _Image(_Object, type_prefix="im"):
         ```python
         image = modal.Image.from_dockerfile("./Dockerfile", add_python="3.12")
         ```
+        """
 
-        If your Dockerfile uses `COPY` instructions which copy data from the local context of the
-        build into the image, this local data must be uploaded to Modal via a context mount:
+        if context_mount:
+            if ignore:
+                raise InvalidError("Cannot set both `context_mount` and `ignore`")
 
-        ```python
-        image = modal.Image.from_dockerfile(
-            "./Dockerfile",
-            context_mount=modal.Mount.from_local_dir(
-                local_path="src",
-                remote_path=".",  # to current WORKDIR
-            ),
-        )
-        ```
+            def identity_context_mount_fn() -> Optional[_Mount]:
+                return context_mount
 
-        The context mount will allow a `COPY src/ src/` instruction to succeed in Modal's remote builder.
-        """
+            context_mount_function = identity_context_mount_fn
+        else:
+
+            def auto_created_context_mount_fn() -> Optional[_Mount]:
+                lines = Path(path).read_text("utf8").splitlines()
+                return _create_context_mount(lines, ignore_fn=_ignore_fn(ignore), context_dir=Path.cwd())
+
+            context_mount_function = auto_created_context_mount_fn
 
         # --- Build the base dockerfile
 
@@ -1569,7 +1623,7 @@ class _Image(_Object, type_prefix="im"):
         gpu_config = parse_gpu_config(gpu)
         base_image = _Image._from_args(
             dockerfile_function=build_dockerfile_base,
-            context_mount=context_mount,
+            context_mount_function=context_mount_function,
             gpu_config=gpu_config,
             secrets=secrets,
         )
@@ -1578,13 +1632,15 @@ class _Image(_Object, type_prefix="im"):
         # This happening in two steps is probably a vestigial consequence of previous limitations,
         # but it will be difficult to merge them without forcing rebuilds of images.
 
-        if add_python:
-            context_mount = _Mount.from_name(
-                python_standalone_mount_name(add_python),
-                namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
+        def add_python_mount():
+            return (
+                _Mount.from_name(
+                    python_standalone_mount_name(add_python),
+                    namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
+                )
+                if add_python
+                else None
             )
-        else:
-            context_mount = None
 
         def build_dockerfile_python(version: ImageBuilderVersion) -> DockerfileSpec:
             commands = _Image._registry_setup_commands("base", version, [], add_python)
@@ -1595,7 +1651,7 @@ class _Image(_Object, type_prefix="im"):
         return _Image._from_args(
             base_images={"base": base_image},
             dockerfile_function=build_dockerfile_python,
-            context_mount=context_mount,
+            context_mount_function=add_python_mount,
             force_build=force_build,
         )
 

modal/image.pyi

@@ -44,6 +44,11 @@ def _make_pip_install_args(
 def _get_image_builder_version(
     server_version: typing.Literal["2023.12", "2024.04", "2024.10"],
 ) -> typing.Literal["2023.12", "2024.04", "2024.10"]: ...
+def _create_context_mount(
+    docker_commands: collections.abc.Sequence[str],
+    ignore_fn: typing.Callable[[pathlib.Path], bool],
+    context_dir: pathlib.Path,
+) -> typing.Optional[modal.mount._Mount]: ...
 
 class _ImageRegistryConfig:
     def __init__(self, registry_auth_type: int = 0, secret: typing.Optional[modal.secret._Secret] = None): ...
@@ -87,7 +92,7 @@ class _Image(modal.object._Object):
         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,
+        context_mount_function: typing.Optional[typing.Callable[[], typing.Optional[modal.mount._Mount]]] = None,
         force_build: bool = False,
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
@@ -195,6 +200,7 @@ class _Image(modal.object._Object):
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         context_mount: typing.Optional[modal.mount._Mount] = None,
         force_build: bool = False,
+        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = (),
     ) -> _Image: ...
     def entrypoint(self, entrypoint_commands: list[str]) -> _Image: ...
     def shell(self, shell_commands: list[str]) -> _Image: ...
@@ -280,6 +286,7 @@ class _Image(modal.object._Object):
         secrets: collections.abc.Sequence[modal.secret._Secret] = [],
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,
+        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = (),
     ) -> _Image: ...
     @staticmethod
     def debian_slim(python_version: typing.Optional[str] = None, force_build: bool = False) -> _Image: ...
@@ -346,7 +353,7 @@ class Image(modal.object.Object):
         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,
+        context_mount_function: typing.Optional[typing.Callable[[], typing.Optional[modal.mount.Mount]]] = None,
         force_build: bool = False,
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
@@ -454,6 +461,7 @@ class Image(modal.object.Object):
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         context_mount: typing.Optional[modal.mount.Mount] = None,
         force_build: bool = False,
+        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = (),
     ) -> Image: ...
     def entrypoint(self, entrypoint_commands: list[str]) -> Image: ...
     def shell(self, shell_commands: list[str]) -> Image: ...
@@ -539,6 +547,7 @@ class Image(modal.object.Object):
         secrets: collections.abc.Sequence[modal.secret.Secret] = [],
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,
+        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = (),
     ) -> Image: ...
     @staticmethod
     def debian_slim(python_version: typing.Optional[str] = None, force_build: bool = False) -> Image: ...

modal/mount.py

@@ -16,6 +16,7 @@ from typing import Callable, Optional, Sequence, Union
 from google.protobuf.message import Message
 
 import modal.exception
+import modal.file_pattern_matcher
 from modal_proto import api_pb2
 from modal_version import __version__
 
@@ -105,7 +106,7 @@ class _MountFile(_MountEntry):
         return str(self.local_file)
 
     def get_files_to_upload(self):
-        local_file = self.local_file.expanduser().absolute()
+        local_file = self.local_file.resolve()
         if not local_file.exists():
             raise FileNotFoundError(local_file)
 
@@ -131,6 +132,8 @@ class _MountDir(_MountEntry):
         return str(self.local_dir.expanduser().absolute())
 
     def get_files_to_upload(self):
+        # we can't use .resolve() eagerly here since that could end up "renaming" symlinked files
+        # see test_mount_directory_with_symlinked_file
         local_dir = self.local_dir.expanduser().absolute()
 
         if not local_dir.exists():
@@ -145,10 +148,11 @@ class _MountDir(_MountEntry):
             gen = (dir_entry.path for dir_entry in os.scandir(local_dir) if dir_entry.is_file())
 
         for local_filename in gen:
-            if not self.ignore(Path(local_filename)):
-                local_relpath = Path(local_filename).expanduser().absolute().relative_to(local_dir)
+            local_path = Path(local_filename)
+            if not self.ignore(local_path):
+                local_relpath = local_path.expanduser().absolute().relative_to(local_dir)
                 mount_path = self.remote_path / local_relpath.as_posix()
-                yield local_filename, mount_path
+                yield local_path.resolve(), mount_path
 
     def watch_entry(self):
         return self.local_dir.resolve().expanduser(), None
@@ -322,12 +326,9 @@ class _Mount(_Object, type_prefix="mo"):
     @staticmethod
     def _add_local_dir(
         local_path: Path,
-        remote_path: Path,
-        ignore: Union[Sequence[str], Callable[[Path], bool]] = [],
+        remote_path: PurePosixPath,
+        ignore: Callable[[Path], bool] = modal.file_pattern_matcher._NOTHING,
     ):
-        if isinstance(ignore, list):
-            ignore = FilePatternMatcher(*ignore)
-
         return _Mount._new()._extend(
             _MountDir(
                 local_dir=local_path,

modal/mount.pyi

@@ -94,8 +94,8 @@ class _Mount(modal.object._Object):
     @staticmethod
     def _add_local_dir(
         local_path: pathlib.Path,
-        remote_path: pathlib.Path,
-        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
+        remote_path: pathlib.PurePosixPath,
+        ignore: typing.Callable[[pathlib.Path], bool] = modal.file_pattern_matcher._NOTHING,
     ): ...
     def add_local_dir(
         self,
@@ -176,8 +176,8 @@ class Mount(modal.object.Object):
     @staticmethod
     def _add_local_dir(
         local_path: pathlib.Path,
-        remote_path: pathlib.Path,
-        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
+        remote_path: pathlib.PurePosixPath,
+        ignore: typing.Callable[[pathlib.Path], bool] = modal.file_pattern_matcher._NOTHING,
     ): ...
     def add_local_dir(
         self,

modal/partial_function.py

@@ -253,7 +253,7 @@ def _web_endpoint(
     custom_domains: Optional[
         Iterable[str]
     ] = None,  # Create an endpoint using a custom domain fully-qualified domain name (FQDN).
-    requires_proxy_auth: bool = False,  # Require Proxy-Authorization HTTP Headers on requests to the endpoint
+    requires_proxy_auth: bool = False,  # Require Proxy-Authorization HTTP Headers on requests
     wait_for_response: bool = True,  # DEPRECATED: this must always be True now
 ) -> Callable[[Callable[P, ReturnType]], _PartialFunction[P, ReturnType, ReturnType]]:
     """Register a basic web endpoint with this application.
@@ -316,7 +316,7 @@ def _asgi_app(
     *,
     label: Optional[str] = None,  # Label for created endpoint. Final subdomain will be <workspace>--<label>.modal.run.
     custom_domains: Optional[Iterable[str]] = None,  # Deploy this endpoint on a custom domain.
-    requires_proxy_auth: bool = False,  # Require Proxy-Authorization HTTP Headers on requests to the endpoint
+    requires_proxy_auth: bool = False,  # Require Proxy-Authorization HTTP Headers on requests
     wait_for_response: bool = True,  # DEPRECATED: this must always be True now
 ) -> Callable[[Callable[..., Any]], _PartialFunction]:
     """Decorator for registering an ASGI app with a Modal function.
@@ -392,7 +392,7 @@ def _wsgi_app(
     *,
     label: Optional[str] = None,  # Label for created endpoint. Final subdomain will be <workspace>--<label>.modal.run.
     custom_domains: Optional[Iterable[str]] = None,  # Deploy this endpoint on a custom domain.
-    requires_proxy_auth: bool = False,  # Require Proxy-Authorization HTTP Headers on requests to the endpoint
+    requires_proxy_auth: bool = False,  # Require Proxy-Authorization HTTP Headers on requests
     wait_for_response: bool = True,  # DEPRECATED: this must always be True now
 ) -> Callable[[Callable[..., Any]], _PartialFunction]:
     """Decorator for registering a WSGI app with a Modal function.
@@ -469,7 +469,7 @@ def _web_server(
     startup_timeout: float = 5.0,  # Maximum number of seconds to wait for the web server to start.
     label: Optional[str] = None,  # Label for created endpoint. Final subdomain will be <workspace>--<label>.modal.run.
     custom_domains: Optional[Iterable[str]] = None,  # Deploy this endpoint on a custom domain.
-    requires_proxy_auth: bool = False,  # Require Proxy-Authorization HTTP Headers on requests to the endpoint
+    requires_proxy_auth: bool = False,  # Require Proxy-Authorization HTTP Headers on requests
 ) -> Callable[[Callable[..., Any]], _PartialFunction]:
     """Decorator that registers an HTTP web server inside the container.
 

modal/runner.py

@@ -30,7 +30,7 @@ from .exception import InteractiveTimeoutError, InvalidError, RemoteError, _CliU
 from .functions import _Function
 from .object import _get_environment_name, _Object
 from .output import _get_output_manager, enable_output
-from .running_app import RunningApp
+from .running_app import RunningApp, running_app_from_layout
 from .sandbox import _Sandbox
 from .secret import _Secret
 from .stream_type import StreamType
@@ -54,15 +54,19 @@ async def _heartbeat(client: _Client, app_id: str) -> None:
 
 async def _init_local_app_existing(client: _Client, existing_app_id: str, environment_name: str) -> RunningApp:
     # Get all the objects first
-    obj_req = api_pb2.AppGetObjectsRequest(app_id=existing_app_id, only_class_function=True)
+    obj_req = api_pb2.AppGetLayoutRequest(app_id=existing_app_id)
     obj_resp, _ = await gather_cancel_on_exc(
-        retry_transient_errors(client.stub.AppGetObjects, obj_req),
+        retry_transient_errors(client.stub.AppGetLayout, obj_req),
         # Cache the environment associated with the app now as we will use it later
         _get_environment_cached(environment_name, client),
     )
     app_page_url = f"https://modal.com/apps/{existing_app_id}"  # TODO (elias): this should come from the backend
-    object_ids = {item.tag: item.object.object_id for item in obj_resp.items}
-    return RunningApp(existing_app_id, app_page_url=app_page_url, tag_to_object_id=object_ids, client=client)
+    return running_app_from_layout(
+        existing_app_id,
+        obj_resp.app_layout,
+        client,
+        app_page_url=app_page_url,
+    )
 
 
 async def _init_local_app_new(

modal/running_app.py

@@ -4,16 +4,42 @@ from typing import Optional
 
 from google.protobuf.message import Message
 
+from modal._utils.grpc_utils import get_proto_oneof
+from modal_proto import api_pb2
+
 from .client import _Client
 
 
 @dataclass
 class RunningApp:
     app_id: str
+    client: _Client
     environment_name: Optional[str] = None
     app_page_url: Optional[str] = None
     app_logs_url: Optional[str] = None
     tag_to_object_id: dict[str, str] = field(default_factory=dict)
     object_handle_metadata: dict[str, Optional[Message]] = field(default_factory=dict)
     interactive: bool = False
-    client: Optional[_Client] = None
+
+
+def running_app_from_layout(
+    app_id: str,
+    app_layout: api_pb2.AppLayout,
+    client: _Client,
+    environment_name: Optional[str] = None,
+    app_page_url: Optional[str] = None,
+) -> RunningApp:
+    tag_to_object_id = dict(**app_layout.function_ids, **app_layout.class_ids)
+    object_handle_metadata = {}
+    for obj in app_layout.objects:
+        handle_metadata: Optional[Message] = get_proto_oneof(obj, "handle_metadata_oneof")
+        object_handle_metadata[obj.object_id] = handle_metadata
+
+    return RunningApp(
+        app_id,
+        client,
+        environment_name=environment_name,
+        tag_to_object_id=tag_to_object_id,
+        object_handle_metadata=object_handle_metadata,
+        app_page_url=app_page_url,
+    )

{modal-0.68.42.dist-info → modal-0.70.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.68.42
+Version: 0.70.2
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com
@@ -21,7 +21,7 @@ Requires-Dist: fastapi
 Requires-Dist: grpclib (==0.4.7)
 Requires-Dist: protobuf (!=4.24.0,<6.0,>=3.19)
 Requires-Dist: rich (>=12.0.0)
-Requires-Dist: synchronicity (~=0.9.7)
+Requires-Dist: synchronicity (~=0.9.8)
 Requires-Dist: toml
 Requires-Dist: typer (>=0.9)
 Requires-Dist: types-certifi