modal 1.4.3.dev27__tar.gz → 1.4.3.dev29__tar.gz

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/PKG-INFO

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

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/_environments.py

@@ -75,7 +75,7 @@ class _EnvironmentManager:
                 item.environment_id,
                 client,
                 metadata,
-                is_another_app=True,
+                skip_reload=True,
                 rep=f"Environment.from_name({item.name!r})",
             )
             environments.append(env)
@@ -351,7 +351,7 @@ class _Environment(_Object, type_prefix="en"):
         return _Environment._from_loader(
             _load,
             repr,
-            is_another_app=True,
+            skip_reload=True,
             hydrate_lazily=True,
             name=name,
             load_context_overrides=LoadContext(client=client),

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/_functions.py

@@ -1242,7 +1242,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         )
         rep = f"modal.Function.from_name('{app_name}', '{name}'{environment_rep})"
         return cls._from_loader(
-            _load_remote, rep, is_another_app=True, hydrate_lazily=True, load_context_overrides=load_context_overrides
+            _load_remote, rep, skip_reload=True, hydrate_lazily=True, load_context_overrides=load_context_overrides
         )
 
     @classmethod

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/_grpc_client.py

@@ -44,6 +44,10 @@ _STATUS_TO_EXCEPTION: dict[Status, type[exception._GRPCErrorWrapper]] = {
 
 
 class grpc_error_converter:
+    def __init__(self, *, expect_timeouts: bool = False):
+        """expect_timeouts: if this is set we convert cancelled/deadline_exceeded statuses to exception.TimeoutError"""
+        self._expect_timeouts = expect_timeouts
+
     def __enter__(self):
         pass
 
@@ -52,6 +56,9 @@ class grpc_error_converter:
         use_full_traceback = config.get("traceback")
         with suppress_tb_frame():
             if isinstance(exc, GRPCError):
+                if self._expect_timeouts and exc.status in (Status.CANCELLED, Status.DEADLINE_EXCEEDED):
+                    raise exception.TimeoutError("Timeout expired")
+
                 modal_exc = _STATUS_TO_EXCEPTION[exc.status](exc.message)
                 modal_exc._grpc_message = exc.message
                 modal_exc._grpc_status = exc.status

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/_object.py

@@ -82,7 +82,7 @@ class _Object:
     _load: Optional[Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]]] = None
     _preload: Optional[Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]]]
     _rep: str
-    _is_another_app: bool
+    _skip_reload: bool
     _hydrate_lazily: bool
     _deps: Optional[Callable[..., Sequence["_Object"]]]
     _deduplication_key: Optional[Callable[[], Awaitable[Hashable]]] = None
@@ -113,9 +113,9 @@ class _Object:
         self,
         rep: str,
         load: Optional[Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]]] = None,
-        is_another_app: bool = False,
         preload: Optional[Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]]] = None,
         hydrate_lazily: bool = False,
+        skip_reload: bool = False,
         deps: Optional[Callable[..., Sequence["_Object"]]] = None,
         deduplication_key: Optional[Callable[[], Awaitable[Hashable]]] = None,
         name: Optional[str] = None,
@@ -123,10 +123,10 @@ class _Object:
         load_context_overrides: Optional[LoadContext] = None,
     ):
         self._local_uuid = str(uuid.uuid4())
+        self._rep = rep
         self._load = load
         self._preload = preload
-        self._rep = rep
-        self._is_another_app = is_another_app
+        self._skip_reload = skip_reload
         self._hydrate_lazily = hydrate_lazily
         self._deps = deps
         self._deduplication_key = deduplication_key
@@ -218,7 +218,7 @@ class _Object:
         cls,
         load: Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]],
         rep: str,
-        is_another_app: bool = False,
+        skip_reload: bool = False,
         preload: Optional[Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]]] = None,
         hydrate_lazily: bool = False,
         deps: Optional[Callable[..., Sequence["_Object"]]] = None,
@@ -232,12 +232,12 @@ class _Object:
         obj._init(
             rep,
             load,
-            is_another_app,
-            preload,
-            hydrate_lazily,
-            deps,
-            deduplication_key,
-            name,
+            skip_reload=skip_reload,
+            preload=preload,
+            hydrate_lazily=hydrate_lazily,
+            deps=deps,
+            deduplication_key=deduplication_key,
+            name=name,
             load_context_overrides=load_context_overrides,
         )
         return obj
@@ -268,7 +268,7 @@ class _Object:
         object_id: str,
         client: _Client,
         handle_metadata: Optional[Message],
-        is_another_app: bool = False,
+        skip_reload: bool = False,
         rep: Optional[str] = None,
     ) -> Self:
         obj_cls: type[Self]
@@ -287,7 +287,7 @@ class _Object:
         # Instantiate provider
         obj = _Object.__new__(obj_cls)
         rep = rep or f"modal.{obj_cls.__name__.strip('_')}.from_id({object_id!r})"
-        obj._init(rep, is_another_app=is_another_app)
+        obj._init(rep, skip_reload=skip_reload)
         obj._hydrate(object_id, client, handle_metadata)
 
         return obj

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/_resolver.py

@@ -44,8 +44,7 @@ class Resolver:
         *,
         existing_object_id: Optional[str] = None,
     ):
-        if obj._is_hydrated and obj._is_another_app:
-            # No need to reload this, it won't typically change
+        if obj._is_hydrated and obj._skip_reload:
             if obj.local_uuid not in self._local_uuid_to_future:
                 # a bit dumb - but we still need to store a reference to the object here
                 # to be able to include all referenced objects when setting up the app
@@ -89,12 +88,11 @@ class Resolver:
                     await obj._load(obj, self, load_context, existing_object_id)
 
                     # Check that the id of functions didn't change
-                    # Persisted refs are ignored because their life cycle is managed independently.
                     if (
-                        not obj._is_another_app
-                        and existing_object_id is not None
+                        existing_object_id is not None
                         and existing_object_id.startswith("fu-")
                         and obj.object_id != existing_object_id
+                        and not obj._skip_reload
                     ):
                         raise Exception(
                             f"Tried creating an object using existing id {existing_object_id} "

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/_runtime/user_code_imports.py

@@ -570,7 +570,7 @@ def import_class_service(
             service_function_hydration_data.object_id,
             _client,
             service_function_hydration_data.function_handle_metadata,
-            is_another_app=True,  # this skips re-loading the function, which is required since it doesn't have a loader
+            skip_reload=True,  # this skips re-loading the function, which is required since it doesn't have a loader
         )
         _cls = modal.cls._Cls.from_local(cls_or_user_cls, active_app, _service_function)
         # hydration of the class itself - just sets the id and triggers some side effects
@@ -625,7 +625,7 @@ def import_server_service(
             service_function_hydration_data.object_id,
             _client,
             service_function_hydration_data.function_handle_metadata,
-            is_another_app=True,  # this skips re-loading the function, which is required since it doesn't have a loader
+            skip_reload=True,  # this skips re-loading the function, which is required since it doesn't have a loader
         )
 
         _server = modal._server._Server._from_local(cls_or_user_cls, active_app, _service_function)

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/_utils/task_command_router_client.py

@@ -5,6 +5,7 @@ import json
 import socket
 import ssl
 import time
+import typing
 import urllib.parse
 import weakref
 from contextlib import suppress
@@ -16,7 +17,7 @@ from grpclib import GRPCError, Status
 from grpclib.exceptions import StreamTerminatedError
 
 from modal.config import logger
-from modal.exception import ExecTimeoutError
+from modal.exception import ExecTimeoutError, TimeoutError as ModalTimeoutError
 from modal_proto import api_pb2, task_command_router_pb2 as sr_pb2
 from modal_proto.task_command_router_grpc import TaskCommandRouterStub
 
@@ -72,13 +73,24 @@ async def call_with_retries_on_transient_errors(
     base_delay_secs: float = 0.01,
     delay_factor: float = 2,
     max_retries: Optional[int] = 10,
+    exclude_status_codes: Optional[list[Status]] = None,
+    expect_timeouts: bool = False,  # when True we convert TimeoutError to exception.TimeoutError and don't retry"""
 ):
     """Call func() with transient error retries and exponential backoff.
 
     Authentication retries are expected to be handled by the caller.
+
+    Args:
+        exclude_status_codes: gRPC status codes to exclude from retry logic even if
+            they are in RETRYABLE_GRPC_STATUS_CODES. Use this to let certain errors
+            (e.g. DEADLINE_EXCEEDED) propagate immediately rather than being retried.
     """
     delay_secs = base_delay_secs
     num_retries = 0
+    exclude_status_codes = exclude_status_codes or []
+
+    def is_retryable_status(status: Status) -> bool:
+        return status in RETRYABLE_GRPC_STATUS_CODES and status not in exclude_status_codes
 
     async def sleep_and_update_delay_and_num_retries_remaining(e: Exception):
         nonlocal delay_secs, num_retries
@@ -91,7 +103,7 @@ async def call_with_retries_on_transient_errors(
         try:
             return await func()
         except GRPCError as e:
-            if (max_retries is None or num_retries < max_retries) and e.status in RETRYABLE_GRPC_STATUS_CODES:
+            if (max_retries is None or num_retries < max_retries) and is_retryable_status(e.status):
                 await sleep_and_update_delay_and_num_retries_remaining(e)
             else:
                 raise e
@@ -108,7 +120,16 @@ async def call_with_retries_on_transient_errors(
                 await sleep_and_update_delay_and_num_retries_remaining(e)
             else:
                 raise e
-        except (OSError, asyncio.TimeoutError) as e:
+        except asyncio.TimeoutError as e:
+            if expect_timeouts:
+                # grpclib raises TimeoutError for the client-side timeout/deadlines
+                raise ModalTimeoutError("Timeout expired")
+
+            if max_retries is None or num_retries < max_retries:
+                await sleep_and_update_delay_and_num_retries_remaining(e)
+            else:
+                raise ConnectionError(str(e))
+        except OSError as e:
             if max_retries is None or num_retries < max_retries:
                 await sleep_and_update_delay_and_num_retries_remaining(e)
             else:
@@ -186,6 +207,15 @@ class TaskCommandRouterClient:
             closed_error_message="Unable to perform operation on a detached sandbox",
         )
 
+        async def send_request(event: grpclib.events.SendRequest) -> None:
+            idempotency_key = typing.cast(Optional[str], event.metadata.get("x-idempotency-key"))
+            if idempotency_key is None:
+                logger.debug(f"Sending request to {event.method_name}")
+            else:
+                logger.debug(f"Sending request to {event.method_name} ({idempotency_key[:8]})")
+
+        grpclib.events.listen(channel, grpclib.events.SendRequest, send_request)
+
         try:
             await _connect_channel(channel)
         except socket.gaierror as exc:
@@ -618,9 +648,28 @@ class TaskCommandRouterClient:
             )
 
     async def snapshot_directory(
-        self, request: sr_pb2.TaskSnapshotDirectoryRequest
+        self, request: sr_pb2.TaskSnapshotDirectoryRequest, **kwargs
     ) -> sr_pb2.TaskSnapshotDirectoryResponse:
         with grpc_error_converter():
             return await call_with_retries_on_transient_errors(
-                lambda: self._call_with_auth_retry(self._stub.TaskSnapshotDirectory, request)
+                lambda: self._call_with_auth_retry(self._stub.TaskSnapshotDirectory, request, **kwargs)
+            )
+
+    async def snapshot_filesystem(
+        self, request: sr_pb2.TaskSnapshotFilesystemRequest, *, timeout: Optional[int] = None, **kwargs
+    ) -> sr_pb2.TaskSnapshotFilesystemResponse:
+        expect_timeouts = timeout is not None
+        with grpc_error_converter(expect_timeouts=expect_timeouts):
+            # note: TaskSnapshotFilesystem has a timeout concept with multiple variants:
+            # * Normally it would time out on the client side inside of grpclib - this causes an asyncio.TimeoutError
+            # * It also propagates the timeout to the server however, which could potentially trigger, in particular
+            #   if an in-progress requests is idempotently rejoined as a retry. These errors appear to be propagated
+            #   as Status.CANCELLED at the time of writing this, but we may change the backend to return
+            #   DEADLINE_EXCEEDED in the future, so we want to make the code compatible with both here:
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(
+                    self._stub.TaskSnapshotFilesystem, request, timeout=timeout, **kwargs
+                ),
+                exclude_status_codes=[Status.DEADLINE_EXCEEDED, Status.CANCELLED],
+                expect_timeouts=expect_timeouts,  # client wanted a timeout - raise as such immediately
             )

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/cli/queues.py

@@ -106,7 +106,7 @@ async def list_(*, json: bool = False, env: Optional[str] = None):
             break
         finished = await retrieve_page(items[-1].metadata.creation_info.created_at)
 
-    queues = [_Queue._new_hydrated(item.queue_id, client, item.metadata, is_another_app=True) for item in items]
+    queues = [_Queue._new_hydrated(item.queue_id, client, item.metadata, skip_reload=True) for item in items]
 
     rows = []
     for obj, resp_data in zip(queues, items):

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/cli/secret.py

@@ -55,7 +55,7 @@ async def list_(env: Optional[str] = None, json: bool = False):
             break
         finished = await retrieve_page(items[-1].metadata.creation_info.created_at)
 
-    secrets = [_Secret._new_hydrated(item.secret_id, client, item.metadata, is_another_app=True) for item in items]
+    secrets = [_Secret._new_hydrated(item.secret_id, client, item.metadata, skip_reload=True) for item in items]
 
     rows = []
     for obj, resp_data in zip(secrets, items):

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/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.dev27",
+        version: str = "1.4.3.dev29",
     ):
         """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.dev27",
+        version: str = "1.4.3.dev29",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/cls.py

@@ -519,7 +519,7 @@ class _Cls(_Object, type_prefix="cs"):
         new_cls = _Cls._from_loader(
             _load_from_base,
             rep=f"{self._name}.{method_name}(...)",
-            is_another_app=True,
+            skip_reload=True,
             deps=lambda: [],
             load_context_overrides=self._load_context_overrides,
             hydrate_lazily=True,
@@ -680,7 +680,7 @@ More information on class parameterization can be found here: https://modal.com/
         cls = cls._from_loader(
             _load_remote,
             rep,
-            is_another_app=True,
+            skip_reload=True,
             hydrate_lazily=True,
             load_context_overrides=load_context_overrides,
         )

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/dict.py

@@ -198,7 +198,7 @@ class _DictManager:
                 item.dict_id,
                 client,
                 item.metadata,
-                is_another_app=True,
+                skip_reload=True,
                 rep=_Dict._repr(item.name, environment_name),
             )
             for item in items
@@ -354,7 +354,7 @@ class _Dict(_Object, type_prefix="di"):
                 response.dict_id,
                 client,
                 response.metadata,
-                is_another_app=True,
+                skip_reload=True,
                 rep="modal.Dict.ephemeral()",
             )
 
@@ -393,7 +393,7 @@ class _Dict(_Object, type_prefix="di"):
         return _Dict._from_loader(
             _load,
             rep,
-            is_another_app=True,
+            skip_reload=True,
             hydrate_lazily=True,
             name=name,
             load_context_overrides=LoadContext(environment_name=environment_name, client=client),
@@ -436,7 +436,7 @@ class _Dict(_Object, type_prefix="di"):
         return _Dict._from_loader(
             _load,
             rep,
-            is_another_app=True,
+            skip_reload=True,
             hydrate_lazily=True,
             load_context_overrides=LoadContext(client=client),
         )

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/functions.pyi

@@ -420,7 +420,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."""
             ...
@@ -429,7 +429,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]:
@@ -456,7 +456,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.
 
@@ -479,7 +479,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: ...
@@ -487,7 +487,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.
 
@@ -508,7 +508,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.dev27 → modal-1.4.3.dev29}/modal/mount.py

@@ -664,7 +664,7 @@ class _Mount(_Object, type_prefix="mo"):
         return _Mount._from_loader(
             _load,
             "Mount()",
-            is_another_app=True,
+            skip_reload=True,
             hydrate_lazily=True,
             load_context_overrides=LoadContext(environment_name=environment_name, client=client),
         )

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/network_file_system.py

@@ -134,7 +134,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         return _NetworkFileSystem._from_loader(
             _load,
             "NetworkFileSystem()",
-            is_another_app=True,
+            skip_reload=True,
             hydrate_lazily=True,
             load_context_overrides=LoadContext(environment_name=environment_name, client=client),
         )
@@ -174,7 +174,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
                 response.shared_volume_id,
                 client,
                 None,
-                is_another_app=True,
+                skip_reload=True,
                 rep="modal.NetworkFileSystem.ephemeral()",
             )
 

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/object.pyi

@@ -24,7 +24,7 @@ class Object:
         ]
     ]
     _rep: str
-    _is_another_app: bool
+    _skip_reload: bool
     _hydrate_lazily: bool
     _deps: typing.Optional[collections.abc.Callable[..., collections.abc.Sequence[Object]]]
     _deduplication_key: typing.Optional[
@@ -60,7 +60,6 @@ class Object:
                     None,
                 ]
             ] = None,
-            is_another_app: bool = False,
             preload: typing.Optional[
                 collections.abc.Callable[
                     [
@@ -73,6 +72,7 @@ class Object:
                 ]
             ] = None,
             hydrate_lazily: bool = False,
+            skip_reload: bool = False,
             deps: typing.Optional[collections.abc.Callable[..., collections.abc.Sequence[Object]]] = None,
             deduplication_key: typing.Optional[collections.abc.Callable[[], collections.abc.Hashable]] = None,
             name: typing.Optional[str] = None,
@@ -94,7 +94,6 @@ class Object:
                     collections.abc.Awaitable[None],
                 ]
             ] = None,
-            is_another_app: bool = False,
             preload: typing.Optional[
                 collections.abc.Callable[
                     [
@@ -107,6 +106,7 @@ class Object:
                 ]
             ] = None,
             hydrate_lazily: bool = False,
+            skip_reload: bool = False,
             deps: typing.Optional[collections.abc.Callable[..., collections.abc.Sequence[Object]]] = None,
             deduplication_key: typing.Optional[
                 collections.abc.Callable[[], collections.abc.Awaitable[collections.abc.Hashable]]
@@ -148,7 +148,7 @@ class Object:
                 None,
             ],
             rep: str,
-            is_another_app: bool = False,
+            skip_reload: bool = False,
             preload: typing.Optional[
                 collections.abc.Callable[
                     [
@@ -180,7 +180,7 @@ class Object:
                 collections.abc.Awaitable[None],
             ],
             rep: str,
-            is_another_app: bool = False,
+            skip_reload: bool = False,
             preload: typing.Optional[
                 collections.abc.Callable[
                     [
@@ -216,7 +216,7 @@ class Object:
         object_id: str,
         client: modal.client.Client,
         handle_metadata: typing.Optional[google.protobuf.message.Message],
-        is_another_app: bool = False,
+        skip_reload: bool = False,
         rep: typing.Optional[str] = None,
     ) -> typing_extensions.Self: ...
     def _hydrate_from_other(self, other: typing_extensions.Self): ...

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/proxy.py

@@ -43,7 +43,7 @@ class _Proxy(_Object, type_prefix="pr"):
         return _Proxy._from_loader(
             _load,
             rep,
-            is_another_app=True,
+            skip_reload=True,
             load_context_overrides=LoadContext(client=client, environment_name=environment_name),
         )
 

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/queue.py

@@ -163,7 +163,7 @@ class _QueueManager:
                 item.queue_id,
                 client,
                 item.metadata,
-                is_another_app=True,
+                skip_reload=True,
                 rep=_Queue._repr(item.name, environment_name),
             )
             for item in items
@@ -353,7 +353,7 @@ class _Queue(_Object, type_prefix="qu"):
         async with TaskContext() as tc:
             request = api_pb2.QueueHeartbeatRequest(queue_id=response.queue_id)
             tc.infinite_loop(lambda: client.stub.QueueHeartbeat(request), sleep=_heartbeat_sleep)
-            yield cls._new_hydrated(response.queue_id, client, response.metadata, is_another_app=True)
+            yield cls._new_hydrated(response.queue_id, client, response.metadata, skip_reload=True)
 
     @staticmethod
     def from_name(
@@ -389,7 +389,7 @@ class _Queue(_Object, type_prefix="qu"):
         return _Queue._from_loader(
             _load,
             rep,
-            is_another_app=True,
+            skip_reload=True,
             hydrate_lazily=True,
             name=name,
             load_context_overrides=LoadContext(environment_name=environment_name, client=client),
@@ -432,7 +432,7 @@ class _Queue(_Object, type_prefix="qu"):
         return _Queue._from_loader(
             _load,
             rep,
-            is_another_app=True,
+            skip_reload=True,
             hydrate_lazily=True,
             load_context_overrides=LoadContext(client=client),
         )

{modal-1.4.3.dev27 → modal-1.4.3.dev29}/modal/sandbox.py

@@ -74,7 +74,7 @@ _default_image: _Image = _Image.debian_slim()
 # We need some bytes of overhead for the rest of the command line besides the args,
 # e.g. 'runsc exec ...'. So we use 2**16 as the limit.
 ARG_MAX_BYTES = 2**16
-
+TTL_NO_EXPIRY_SENTINEL = -1
 
 if TYPE_CHECKING:
     import modal.app
@@ -955,9 +955,29 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         Returns an [`Image`](https://modal.com/docs/reference/modal.Image) object which
         can be used to spawn a new Sandbox with the same filesystem.
+
+        `timeout` If the snapshot does not return within that window, the call is cancelled
+        and `modal.exception.TimeoutError` is raised.
         """
+        if os.environ.get("MODAL_USE_LEGACY_FILESYSTEM_SNAPSHOT") == "1":
+            return await self._legacy_snapshot_filesystem(timeout)
+
         self._ensure_v1("snapshot_filesystem")
-        await self._get_task_id()  # Ensure the sandbox has started
+
+        task_id = await self._get_task_id()
+        command_router_client = await self._get_command_router_client(task_id)
+
+        req = sr_pb2.TaskSnapshotFilesystemRequest(
+            task_id=task_id,
+            snapshot_id=str(uuid.uuid4()),
+            ttl_seconds=TTL_NO_EXPIRY_SENTINEL,
+        )
+        res = await command_router_client.snapshot_filesystem(req, timeout=float(timeout))
+        return _Image._new_hydrated(res.image_id, self._client, None)
+
+    async def _legacy_snapshot_filesystem(self, timeout: int = 55) -> _Image:
+        self._ensure_v1("snapshot_filesystem")
+        await self._get_task_id()
         req = api_pb2.SandboxSnapshotFsRequest(sandbox_id=self.object_id, timeout=timeout)
         resp = await self._client.stub.SandboxSnapshotFs(req)
 
@@ -1048,7 +1068,7 @@ class _Sandbox(_Object, type_prefix="sb"):
     async def snapshot_directory(self, path: Union[PurePosixPath, str]) -> _Image:
         """Snapshot a directory in a running Sandbox, creating a new Image with its content.
 
-        Directory snapshots are currently persisted for 30 days after they were last created or used.
+        Directory snapshots are currently persisted for 30 days after they were created.
 
         Usage:
         ```py notest
@@ -1071,7 +1091,12 @@ class _Sandbox(_Object, type_prefix="sb"):
         path_bytes = posix_path.as_posix().encode("utf8")
 
         snapshot_id = str(uuid.uuid4())
-        req = sr_pb2.TaskSnapshotDirectoryRequest(task_id=task_id, path=path_bytes, snapshot_id=snapshot_id)
+        req = sr_pb2.TaskSnapshotDirectoryRequest(
+            task_id=task_id,
+            path=path_bytes,
+            snapshot_id=snapshot_id,
+            ttl_seconds=None,  # pretending to be old client for now - set server decide on retention
+        )
         res = await command_router_client.snapshot_directory(req)
         return _Image._new_hydrated(res.image_id, self._client, None)