modal 1.4.3.dev5__tar.gz → 1.4.3.dev6__tar.gz

{modal-1.4.3.dev5 → modal-1.4.3.dev6}/PKG-INFO

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

{modal-1.4.3.dev5 → modal-1.4.3.dev6}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.3.dev5",
+        version: str = "1.4.3.dev6",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -175,7 +175,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.3.dev5",
+        version: str = "1.4.3.dev6",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.3.dev5 → modal-1.4.3.dev6}/modal/exception.py

@@ -90,7 +90,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
     def __repr__(self) -> str:
         return f"{type(self).__name__}({self._message!r})"
 
-    def _warn_on_grpc_error_attribute_access(self) -> None:
+    def _attribute_warning(self) -> None:
         from ._utils.deprecation import deprecation_warning  # Avoid circular import
 
         exc_type = type(self).__name__
@@ -104,7 +104,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def message(self) -> str:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_message
 
     @message.setter
@@ -113,7 +113,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def status(self) -> grpclib.Status:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_status
 
     @status.setter
@@ -122,7 +122,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def details(self) -> Any:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_details
 
     @details.setter

{modal-1.4.3.dev5 → modal-1.4.3.dev6}/modal/functions.pyi

@@ -347,7 +347,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
@@ -356,7 +356,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -383,7 +383,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -406,7 +406,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -414,7 +414,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -435,7 +435,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.4.3.dev5 → modal-1.4.3.dev6}/modal/sandbox.py

@@ -268,22 +268,28 @@ class _Sandbox(_Object, type_prefix="sb"):
         if pty:
             pty_info = _Sandbox._default_pty_info()
 
-        def _deps() -> list[_Object]:
-            deps: list[_Object] = [image] + list(mounts) + list(secrets)
+        async def _load(
+            self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
+        ):
+            # An already-hydrated image (e.g. one returned by
+            # `Sandbox.snapshot_directory`) is skipped — there's nothing to load.
+            dep_tasks: list = []
+            if not image._is_hydrated:
+                dep_tasks.append(resolver.load(image, load_context))
+            for dep in list(mounts) + list(secrets):
+                dep_tasks.append(resolver.load(dep, load_context))
             for _, vol in validated_network_file_systems:
-                deps.append(vol)
+                dep_tasks.append(resolver.load(vol, load_context))
             for _, vol in validated_volumes:
-                deps.append(vol)
+                dep_tasks.append(resolver.load(vol, load_context))
             for _, cloud_bucket_mount in cloud_bucket_mounts:
                 if cloud_bucket_mount.secret:
-                    deps.append(cloud_bucket_mount.secret)
+                    dep_tasks.append(resolver.load(cloud_bucket_mount.secret, load_context))
             if proxy:
-                deps.append(proxy)
-            return deps
+                dep_tasks.append(resolver.load(proxy, load_context))
+            if dep_tasks:
+                await asyncio.gather(*dep_tasks)
 
-        async def _load(
-            self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
-        ):
             # Validate that the same volume (by object_id) isn't mounted at multiple paths
             validate_volumes_by_object_id(validated_volumes)
 
@@ -363,7 +369,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             sandbox_id = create_resp.sandbox_id
             self._hydrate(sandbox_id, load_context.client, None)
 
-        return _Sandbox._from_loader(_load, "Sandbox()", deps=_deps, load_context_overrides=LoadContext.empty())
+        return _Sandbox._from_loader(_load, "Sandbox()", load_context_overrides=LoadContext.empty())
 
     @staticmethod
     async def create(
@@ -689,12 +695,17 @@ class _Sandbox(_Object, type_prefix="sb"):
                 allowed_cidrs=cidr_allowlist,
             )
 
-        def _deps() -> list[_Object]:
-            return [image] + list(secrets)
-
         async def _load(
             self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
         ):
+            dep_tasks: list = []
+            if not image._is_hydrated:
+                dep_tasks.append(resolver.load(image, load_context))
+            for secret in secrets:
+                dep_tasks.append(resolver.load(secret, load_context))
+            if dep_tasks:
+                await asyncio.gather(*dep_tasks)
+
             definition = api_pb2.Sandbox(
                 entrypoint_args=args,
                 image_id=image.object_id,
@@ -732,7 +743,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                 for t in create_resp.tunnels
             }
 
-        obj = _Sandbox._from_loader(_load, "Sandbox()", deps=_deps, load_context_overrides=LoadContext.empty())
+        obj = _Sandbox._from_loader(_load, "Sandbox()", load_context_overrides=LoadContext.empty())
 
         app_id: Optional[str] = None
         app_client: Optional[_Client] = None
@@ -906,19 +917,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         if resp.result.status != api_pb2.GenericResult.GENERIC_STATUS_SUCCESS:
             raise ExecutionError(resp.result.exception)
 
-        image_id = resp.image_id
-        metadata = resp.image_metadata
-
-        async def _load(self: _Image, resolver: Resolver, load_context: LoadContext, existing_object_id: Optional[str]):
-            # no need to hydrate again since we do it eagerly below
-            pass
-
-        rep = "Image()"
-        # TODO: use ._new_hydrated instead
-        image = _Image._from_loader(_load, rep, hydrate_lazily=True, load_context_overrides=LoadContext.empty())
-        image._hydrate(image_id, self._client, metadata)  # hydrating eagerly since we have all of the data
-
-        return image
+        return _Image._new_hydrated(resp.image_id, self._client, resp.image_metadata)
 
     async def mount_image(self, path: Union[PurePosixPath, str], image: _Image):
         """Mount an Image at a specified path in a running Sandbox.
@@ -1032,7 +1031,8 @@ class _Sandbox(_Object, type_prefix="sb"):
             raise InvalidError(f"Snapshot path must be absolute; got: {posix_path}")
         path_bytes = posix_path.as_posix().encode("utf8")
 
-        req = sr_pb2.TaskSnapshotDirectoryRequest(task_id=task_id, path=path_bytes)
+        snapshot_id = str(uuid.uuid4())
+        req = sr_pb2.TaskSnapshotDirectoryRequest(task_id=task_id, path=path_bytes, snapshot_id=snapshot_id)
         res = await command_router_client.snapshot_directory(req)
         return _Image._new_hydrated(res.image_id, self._client, None)
 

{modal-1.4.3.dev5 → modal-1.4.3.dev6}/modal.egg-info/PKG-INFO

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