modAL 1.5.3.dev12__py3-none-any.whl → 1.5.3.dev13__py3-none-any.whl

modal/_environments.py

@@ -591,4 +591,4 @@ def ensure_env(environment_name: str | None = None) -> str:
     if environment_name is not None:
         config.override_locally("environment", environment_name)
 
-    return config.get("environment")
+    return config.get("environment") or ""

modal/_grpc_client.py

@@ -54,7 +54,7 @@ class grpc_error_converter:
         with suppress_tb_frame():
             if isinstance(exc, GRPCError):
                 modal_exc = _STATUS_TO_EXCEPTION[exc.status](exc.message)
-                modal_exc._grpc_message = exc.message
+                modal_exc._grpc_message = exc.message or ""
                 modal_exc._grpc_status = exc.status
                 modal_exc._grpc_details = exc.details
                 if use_full_traceback:

modal/_object.py

@@ -23,19 +23,20 @@ EPHEMERAL_OBJECT_HEARTBEAT_SLEEP: int = 300
 
 def _get_environment_name(
     environment_name: str | None = None,
-) -> str | None:
+) -> str:
     """Get environment name from various sources.
 
     Args:
-        environment_name: Explicitly provided environment name (highest priority)
+        environment_name: Explicitly provided environment name (highest priority).
 
     Returns:
-        Environment name from first available source, or config default
+        Environment name from as passed in, from config, or as a null string
+        (which implies workspace-level default).
     """
     if environment_name:
         return environment_name
     else:
-        return config.get("environment")
+        return config.get("environment") or ""
 
 
 def live_method(method):

modal/_output/rich.py

@@ -81,11 +81,11 @@ class FunctionQueuingColumn(ProgressColumn):
         super().__init__()
 
     def render(self, task) -> Text:
-        self.lag = max(task.completed - task.elapsed, self.lag)
+        self.lag = max(task.completed - (task.elapsed or 0), self.lag)
         if task.finished:
-            elapsed = max(task.finished_time, task.completed)
+            elapsed = max(task.finished_time or 0, task.completed)
         else:
-            elapsed = task.elapsed + self.lag
+            elapsed = (task.elapsed or 0) + self.lag
         delta = timedelta(seconds=int(elapsed))
         return Text(str(delta), style="progress.elapsed")
 

modal/_resources.py

@@ -26,10 +26,10 @@ def convert_fn_config_to_resources_config(
             raise InvalidError(f"Cannot specify a CPU limit lower than request: {milli_cpu_max} < {milli_cpu}")
     elif cpu and isinstance(cpu, (float, int)):
         milli_cpu = int(1000 * cpu)
-        milli_cpu_max = None
+        milli_cpu_max = 0
     else:
-        milli_cpu = None
-        milli_cpu_max = None
+        milli_cpu = 0
+        milli_cpu_max = 0
 
     if memory and isinstance(memory, int):
         memory_mb = memory
@@ -47,6 +47,6 @@ def convert_fn_config_to_resources_config(
         gpu_config=parse_gpu_config(gpu),
         memory_mb=memory_mb,
         memory_mb_max=memory_mb_max,
-        ephemeral_disk_mb=ephemeral_disk,
+        ephemeral_disk_mb=ephemeral_disk or 0,
         rdma=rdma or False,
     )

modal/_runtime/user_code_imports.py

@@ -549,7 +549,8 @@ def _get_cls_or_user_cls(
     else:
         # Load the module dynamically for non-serialized class.
         module = importlib.import_module(function_def.module_name)
-        qual_name: str = function_def.function_name
+        # Always use implementation_name to find the class, default to function_name if implementation_name not set.
+        qual_name: str = function_def.implementation_name or function_def.function_name
 
         if not is_global_object(qual_name):
             raise LocalFunctionError("Attempted to load a class defined in a function scope")

modal/_traceback.py

@@ -75,7 +75,7 @@ def append_modal_tb(exc: BaseException, tb_dict: TBDictType, line_cache: LineCac
     setattr(exc, "__line_cache__", line_cache)
 
 
-def reduce_traceback_to_user_code(tb: TracebackType | None, user_source: str) -> TracebackType:
+def reduce_traceback_to_user_code(tb: TracebackType | None, user_source: str) -> TracebackType | None:
     """Return a traceback that does not contain modal entrypoint or synchronicity frames."""
 
     # Step forward all the way through the traceback and drop any "Modal support" frames

modal/_utils/async_utils.py

@@ -1266,3 +1266,8 @@ def deprecate_aio_usage(deprecation_date: tuple[int, int, int], readable_sync_ca
         return MethodWithAio(sync_implementation, _async_proxy, synchronizer, is_classmethod=is_classmethod)
 
     return deco
+
+
+async def async_generator_from_sync(lst: Iterable[T]) -> AsyncGenerator[T, None]:
+    for item in lst:
+        yield item

modal/_utils/blob_utils.py

@@ -444,6 +444,7 @@ class FileUploadSpec:
     mode: int  # file permission bits (last 12 bits of st_mode)
     size: int
     content: bytes | None = None  # Set for very small files to avoid double-read
+    exists_in_store: bool | None = None  # set after existence check
 
     def read_content(self) -> bytes:
         """Read content from source."""

modal/_utils/bytes_io_segment_payload.py

@@ -45,7 +45,8 @@ class BytesIOSegmentPayload(Payload):
         self.segment_length = segment_length
         # seek to start of file segment we are interested in, in order to make .size() evaluate correctly
         self._value.seek(self.initial_seek_pos + segment_start)
-        assert self.segment_length <= super().size
+        base_size = super().size
+        assert base_size is not None and self.segment_length <= base_size
         self.chunk_size = chunk_size
         self.progress_report_cb = progress_report_cb or (lambda *_, **__: None)
         self.reset_state()

modal/_utils/pattern_utils.py

@@ -143,12 +143,12 @@ class Pattern:
             else:
                 return False
         elif self.match_type == MatchType.REGEXP:
-            return self.regexp.match(path) is not None
+            return self.regexp is not None and self.regexp.match(path) is not None
         else:
             return False
 
 
-def read_ignorefile(reader: TextIO) -> list[str]:
+def read_ignorefile(reader: TextIO | None) -> list[str]:
     """Read an ignore file from a reader and return the list of file patterns to
     ignore, applying the following rules:
 

modal/_utils/time_utils.py

@@ -294,7 +294,9 @@ def relative_timestamp(dt: datetime) -> str:
 
 
 def locale_tz() -> tzinfo:
-    return datetime.now().astimezone().tzinfo
+    tz = datetime.now().astimezone().tzinfo
+    assert tz is not None
+    return tz
 
 
 def as_timestamp(arg: datetime | str | None) -> float:

modal/app.py

@@ -1295,6 +1295,7 @@ class _App:
         scaleup_window: int | None = None,  # Stabilization window (seconds) of sustained demand before scaling up
         scaledown_window: int | None = None,  # Max idle time before scaling down (seconds)
         startup_timeout: int = 30,  # Maximum container startup time in seconds
+        name: str | None = None,  # Name of the server
         port: int = 8000,  # Port the HTTP server listens on
         unauthenticated: bool = False,  # Whether the endpoint requires proxy authentication, required by default.
         h2_enabled: bool = False,  # Enable HTTP/2
@@ -1341,6 +1342,7 @@ class _App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.
@@ -1423,7 +1425,7 @@ class _App:
             local_state = self._local_state
 
             # Create the FunctionInfo for the server, note we treat FunctionInfo as a class for servers
-            info = FunctionInfo(None, serialized=serialized, user_cls=user_cls, name_override=user_cls.__name__)
+            info = FunctionInfo(None, serialized=serialized, user_cls=user_cls, name_override=name or user_cls.__name__)
             # Create the service function
             service_function = _Function.from_local(
                 info,

modal/app.pyi

@@ -751,6 +751,7 @@ class _App:
         scaleup_window: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         startup_timeout: int = 30,
+        name: typing.Optional[str] = None,
         port: int = 8000,
         unauthenticated: bool = False,
         h2_enabled: bool = False,
@@ -797,6 +798,7 @@ class _App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.
@@ -1755,6 +1757,7 @@ class App:
         scaleup_window: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         startup_timeout: int = 30,
+        name: typing.Optional[str] = None,
         port: int = 8000,
         unauthenticated: bool = False,
         h2_enabled: bool = False,
@@ -1799,6 +1802,7 @@ class App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.

modal/cli/cluster.py

@@ -51,7 +51,7 @@ async def list_(env: str | None = None, json: bool = False):
             [
                 c.cluster_id,
                 c.app_id,
-                timestamp_to_localized_str(c.started_at, json) if c.started_at else "Pending",
+                timestamp_to_localized_str(c.started_at, json) or "Pending",
                 str(len(c.task_ids)),
             ]
         )

modal/cli/dashboard.py

@@ -21,7 +21,7 @@ async def dashboard(
     if object_id:
         url = f"https://modal.com/id/{object_id}"
     else:
-        env = config.get("environment")
+        env = config.get("environment") or ""
         request = api_pb2.WorkspaceDashboardUrlRequest(environment_name=env)
         client = await _Client.from_env()
         response = await client.stub.WorkspaceDashboardUrlGet(request)

modal/cli/endpoint.py

@@ -207,7 +207,7 @@ async def create(
         raise click.UsageError("--custom-volume-path requires --custom-volume-name.")
 
     env_name = ensure_env(env)
-    environment_name = _get_environment_name(env_name) or ""
+    environment_name = _get_environment_name(env_name)
     client = await _Client.from_env()
 
     compute_region_spec = api_pb2.EndpointComputeRegionSpec()
@@ -271,7 +271,7 @@ async def create(
 async def list_(*, json: bool = False, env: Optional[str] = None):
     """List Endpoints that are provisioning or running in an environment."""
     env_name = ensure_env(env)
-    environment_name = _get_environment_name(env_name) or ""
+    environment_name = _get_environment_name(env_name)
     client = await _Client.from_env()
 
     items: list[api_pb2.EndpointListItem] = []

modal/cli/environment.py

@@ -53,7 +53,7 @@ def list_(json: bool = False):
 
     # determine which environment is currently active, prioritizing the local default
     # over the server default
-    active_env = config.get("environment")
+    active_env = config.get("environment") or ""
     for env in envs:
         if env.default is True and active_env is None:
             active_env = env.name

modal/cli/launch.py

@@ -52,7 +52,7 @@ def _launch_program(
             else:
                 func()
         except Exception as exc:
-            raise _CliUserExecutionError(inspect.getsourcefile(func)) from exc
+            raise _CliUserExecutionError(inspect.getsourcefile(func) or "<unknown>") from exc
 
 
 @launch_cli.command("jupyter", help="Start Jupyter Lab on Modal.")

modal/cli/network_file_system.py

@@ -29,7 +29,7 @@ nfs_cli = ModalGroup(name="nfs", help="Read and edit `modal.NetworkFileSystem` f
 @env_option
 @click.option("--json", is_flag=True, default=False)
 @synchronizer.create_blocking
-async def list_(env: str | None = None, json: bool | None = False):
+async def list_(env: str | None = None, json: bool = False):
     env = ensure_env(env)
 
     client = await _Client.from_env()

modal/cli/profile.py

@@ -71,7 +71,7 @@ async def list_(json: bool | None = False):
             # Catch-all for other exceptions, like incorrect server url
             workspace = "Unknown (profile misconfigured)"
         else:
-            assert hasattr(resp, "username")
+            assert not isinstance(resp, BaseException)
             workspace = resp.username
         content = ["•" if active else "", profile, workspace]
         rows.append((active, content))
@@ -81,8 +81,8 @@ async def list_(json: bool | None = False):
         try:
             env_based_resp = await _lookup_workspace(
                 config.get("server_url", profile=_profile),
-                os.environ.get("MODAL_TOKEN_ID"),
-                os.environ.get("MODAL_TOKEN_SECRET"),
+                os.environ["MODAL_TOKEN_ID"],
+                os.environ.get("MODAL_TOKEN_SECRET", ""),
             )
             env_based_workspace = env_based_resp.username
         except AuthError:

modal/cli/shell.py

@@ -48,7 +48,7 @@ def _passed_forbidden_args(
     passed_forbidden: list[str] = []
     for param in params:
         name = param.name
-        if name is None or allowed(name):
+        if not name or allowed(name):
             continue
         default = param.process_value(ctx, param.get_default(ctx))
         if passed_args.get(name) != default:
@@ -150,7 +150,7 @@ def _start_shell_in_running_container(ref: str, cmd: str, pty: bool) -> None:
 
     assert _is_valid_modal_id(ref, "ta-")
     try:
-        _exec_impl(container_id=ref, command=shlex.split(cmd), pty=pty, object_id_for_v2=object_id_for_v2)
+        _ = _exec_impl(container_id=ref, command=tuple(shlex.split(cmd)), pty=pty, object_id_for_v2=object_id_for_v2)
     except NotFoundError:
         raise ClickException(f"Container '{ref}' not found (is it still running?)")
     except Exception as e:

modal/client.pyi

@@ -37,7 +37,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev12",
+        version: str = "1.5.3.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -207,7 +207,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev12",
+        version: str = "1.5.3.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/cloud_bucket_mount.py

@@ -134,9 +134,10 @@ def cloud_bucket_mounts_to_proto(
         # crude mapping from mount arguments to type.
         if mount.bucket_endpoint_url:
             parse_result = urlparse(mount.bucket_endpoint_url)
-            if parse_result.hostname.endswith("r2.cloudflarestorage.com"):
+            hostname = parse_result.hostname or ""
+            if hostname.endswith("r2.cloudflarestorage.com"):
                 bucket_type = api_pb2.CloudBucketMount.BucketType.R2
-            elif parse_result.hostname.endswith("storage.googleapis.com"):
+            elif hostname.endswith("storage.googleapis.com"):
                 bucket_type = api_pb2.CloudBucketMount.BucketType.GCP
             else:
                 logger.info(

modal/experimental/__init__.py

@@ -141,6 +141,7 @@ async def stop_app(name: str, *, environment_name: str | None = None, client: _C
     """
     client_ = client or await _Client.from_env()
     app = await _App.lookup(name, environment_name=environment_name, client=client_)
+    assert app.app_id
     req = api_pb2.AppStopRequest(app_id=app.app_id, source=api_pb2.APP_STOP_SOURCE_PYTHON_CLIENT)
     await client_.stub.AppStop(req)
 
@@ -174,6 +175,7 @@ async def get_app_objects(
         client = await _Client.from_env()
 
     app = await _App.lookup(app_name, environment_name=environment_name, client=client)
+    assert app.app_id
     req = api_pb2.AppGetLayoutRequest(app_id=app.app_id)
     app_layout_resp = await client.stub.AppGetLayout(req)
 

modal/file_pattern_matcher.py

@@ -201,7 +201,7 @@ class FilePatternMatcher(_AbstractPatternMatcher):
             pattern_strings = Path(self._file_path).read_text("utf8").splitlines()
         else:
             # Use patterns provided in __init__
-            pattern_strings = list(self._pattern_strings)
+            pattern_strings = list(self._pattern_strings or [])
 
         return self._parse_patterns(pattern_strings)
 

modal/functions.pyi

@@ -516,7 +516,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -541,7 +541,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -591,7 +591,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -624,7 +624,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -632,7 +632,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -665,7 +665,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function.

modal/mount.py

@@ -21,7 +21,7 @@ from modal_version import __version__
 from ._load_context import LoadContext
 from ._object import _Object
 from ._resolver import Resolver
-from ._utils.async_utils import TaskContext, aclosing, async_map, synchronize_api
+from ._utils.async_utils import TaskContext, aclosing, async_generator_from_sync, async_map, synchronize_api
 from ._utils.blob_utils import (
     FileUploadSpec,
     blob_upload_file,
@@ -464,38 +464,79 @@ class _Mount(_Object, type_prefix="mo"):
         return ", ".join(local_contents)
 
     @staticmethod
-    async def _get_files(entries: list[_MountEntry]) -> AsyncGenerator[FileUploadSpec, None]:
+    async def _batched_get_missing_files(
+        entries: list[_MountEntry],
+        client: _Client,
+        *,
+        n_concurrent_checksums: int,
+        batch_size: int,
+    ) -> AsyncGenerator[FileUploadSpec, None]:
         loop = asyncio.get_event_loop()
-        with concurrent.futures.ThreadPoolExecutor() as exe:
-            all_files = await loop.run_in_executor(exe, _select_files, entries)
-            logger.debug(f"Computing checksums for {len(all_files)} files using {exe._max_workers} worker threads")
-
-            # Yield FileUploadSpec objects lazily as they're consumed by async_map downstream.
-            # async_map's concurrency limit provides natural backpressure, so we don't need
-            # a separate semaphore here. This keeps memory bounded without creating all tasks upfront.
-            for local_filename, remote_filename in all_files:
+        with concurrent.futures.ThreadPoolExecutor() as e:
+            all_files = await loop.run_in_executor(e, _select_files, entries)
+            logger.debug(f"Computing checksums for {len(all_files)} files using default max workers")
+
+            async def get_spec(work: tuple[Path, PurePosixPath]) -> FileUploadSpec | None:
+                local, remote = work
+
                 try:
-                    logger.debug(f"Mounting {local_filename} as {remote_filename}")
-                    file_spec = await loop.run_in_executor(
-                        exe, get_file_upload_spec_from_path, local_filename, remote_filename
+                    return await loop.run_in_executor(
+                        e,
+                        get_file_upload_spec_from_path,
+                        local,
+                        remote,
                     )
-                    yield file_spec
                 except FileNotFoundError as exc:
                     # Can happen with temporary files (e.g. emacs will write temp files and delete them quickly)
                     logger.info(f"Ignoring file not found: {exc}")
 
+            async def check_existence(batch: list[FileUploadSpec]) -> AsyncGenerator[FileUploadSpec, None]:
+                request = api_pb2.MountBatchedCheckExistenceRequest(
+                    sha256_hex_hashes=[spec.sha256_hex for spec in batch]
+                )
+                response = await client.stub.MountBatchedCheckExistence(request, retry=Retry(base_delay=1))
+                missing_hashes = set(response.missing_sha256_hex_hashes)
+
+                for spec in batch:
+                    spec.exists_in_store = spec.sha256_hex not in missing_hashes
+                    yield spec
+
+            batch: list[FileUploadSpec] = []
+            async with aclosing(
+                async_map(
+                    async_generator_from_sync(all_files),
+                    get_spec,
+                    n_concurrent_checksums,
+                )
+            ) as stream:
+                async for spec in stream:
+                    if spec is None:
+                        continue
+
+                    batch.append(spec)
+                    if len(batch) == batch_size:
+                        async for checked_spec in check_existence(batch):
+                            yield checked_spec
+
+                        batch = []
+
+            if batch:
+                async for checked_spec in check_existence(batch):
+                    yield checked_spec
+
     async def _load_mount(
         self: "_Mount",
         resolver: Resolver,
         load_context: LoadContext,
         existing_object_id: str | None,
     ):
+        assert self._entries is not None
+
         t0 = time.monotonic()
 
         # Asynchronously list and checksum files with a thread pool, then upload them concurrently.
         n_seen, n_finished = 0, 0
         total_uploads, total_bytes = 0, 0
-        accounted_hashes: set[str] = set()
         from modal.output import OutputManager
 
         message_label = _Mount._description(self._entries)
@@ -503,10 +544,14 @@ class _Mount(_Object, type_prefix="mo"):
         output_mgr = OutputManager.get()
         status_row = output_mgr.add_status_row()
 
+        accounted_hashes = set()
+
+        # Assumption is that if a file_spec is provided to this function, we've checked that
+        # the file is not already present in blobnet upstream
         async def _put_file(file_spec: FileUploadSpec) -> api_pb2.MountFile:
             nonlocal n_seen, n_finished, total_uploads, total_bytes
             n_seen += 1
-            status_row.message(f"Creating mount {message_label}: Uploaded {n_finished}/{n_seen} files")
+            status_row.message(f"Creating mount {message_label}: Uploaded {n_finished}/{n_seen} missing files")
 
             remote_filename = file_spec.mount_filename
             mount_file = api_pb2.MountFile(
@@ -515,10 +560,6 @@ class _Mount(_Object, type_prefix="mo"):
                 mode=file_spec.mode,
             )
 
-            if file_spec.sha256_hex in accounted_hashes:
-                n_finished += 1
-                return mount_file
-
             # Try to catch cases where user modified their local files (e.g. changed git branches)
             # between triggering a build and Modal actually uploading the file
             if config.get("build_validation") != "ignore" and file_spec.source_is_path:
@@ -530,50 +571,67 @@ class _Mount(_Object, type_prefix="mo"):
                     elif config.get("build_validation") == "warn":
                         warnings.warn(msg)
 
-            request = api_pb2.MountPutFileRequest(sha256_hex=file_spec.sha256_hex)
-            accounted_hashes.add(file_spec.sha256_hex)
-            response = await load_context.client.stub.MountPutFile(request, retry=Retry(base_delay=1))
-
-            if response.exists:
+            if file_spec.exists_in_store or file_spec.sha256_hex in accounted_hashes:
                 n_finished += 1
                 return mount_file
 
+            accounted_hashes.add(file_spec.sha256_hex)
+
             total_uploads += 1
             total_bytes += file_spec.size
 
             if file_spec.use_blob:
                 logger.debug(f"Creating blob file for {file_spec.source_description} ({file_spec.size} bytes)")
+
                 async with blob_upload_concurrency:
                     with file_spec.source() as fp:
                         blob_id = await blob_upload_file(
                             fp, load_context.client.stub, sha256_hex=file_spec.sha256_hex, md5_hex=file_spec.md5_hex
                         )
+
                 logger.debug(f"Uploading blob file {file_spec.source_description} as {remote_filename}")
-                request2 = api_pb2.MountPutFileRequest(data_blob_id=blob_id, sha256_hex=file_spec.sha256_hex)
+
+                request = api_pb2.MountPutFileRequest(data_blob_id=blob_id, sha256_hex=file_spec.sha256_hex)
             else:
                 logger.debug(
                     f"Uploading file {file_spec.source_description} to {remote_filename} ({file_spec.size} bytes)"
                 )
+
                 if file_spec.content is None:
                     content = await asyncio.to_thread(file_spec.read_content)
                 else:
                     content = file_spec.content
-                request2 = api_pb2.MountPutFileRequest(data=content, sha256_hex=file_spec.sha256_hex)
+
+                request = api_pb2.MountPutFileRequest(data=content, sha256_hex=file_spec.sha256_hex)
 
             start_time = time.monotonic()
             while time.monotonic() - start_time < MOUNT_PUT_FILE_CLIENT_TIMEOUT:
-                response = await load_context.client.stub.MountPutFile(request2, retry=Retry(base_delay=1))
+                response = await load_context.client.stub.MountPutFile(request, retry=Retry(base_delay=1))
+
                 if response.exists:
                     n_finished += 1
                     return mount_file
 
             raise modal.exception.MountUploadTimeoutError(f"Mounting of {file_spec.source_description} timed out")
 
-        # Upload files, or check if they already exist.
+        # todo(ayush): tune these
+        batch_size = 64
+        n_concurrent_checksums = 64
         n_concurrent_uploads = 64
+
+        # Upload files, or check if they already exist.
         files: list[api_pb2.MountFile] = []
         async with aclosing(
-            async_map(_Mount._get_files(self._entries), _put_file, concurrency=n_concurrent_uploads)
+            async_map(
+                _Mount._batched_get_missing_files(
+                    self._entries,
+                    load_context.client,
+                    n_concurrent_checksums=n_concurrent_checksums,
+                    batch_size=batch_size,
+                ),
+                _put_file,
+                concurrency=n_concurrent_uploads,
+            )
         ) as stream:
             async for file in stream:
                 files.append(file)
@@ -777,7 +835,7 @@ async def _create_single_client_dependency_mount(
 ):
     import tempfile
 
-    profile_environment = config.get("environment")
+    profile_environment = config.get("environment") or ""
     abi_tag = "cp" + python_version.replace(".", "")
     mount_name = f"{builder_version}-{abi_tag}-{platform}-{arch}"
 

modal/mount.pyi

@@ -211,8 +211,8 @@ class _Mount(modal._object._Object):
     @staticmethod
     def _description(entries: list[_MountEntry]) -> str: ...
     @staticmethod
-    def _get_files(
-        entries: list[_MountEntry],
+    def _batched_get_missing_files(
+        entries: list[_MountEntry], client: modal.client._Client, *, n_concurrent_checksums: int, batch_size: int
     ) -> collections.abc.AsyncGenerator[modal._utils.blob_utils.FileUploadSpec, None]: ...
     async def _load_mount(
         self: _Mount,
@@ -337,15 +337,27 @@ class Mount(modal.object.Object):
     @staticmethod
     def _description(entries: list[_MountEntry]) -> str: ...
 
-    class ___get_files_spec(typing_extensions.Protocol):
+    class ___batched_get_missing_files_spec(typing_extensions.Protocol):
         def __call__(
-            self, /, entries: list[_MountEntry]
+            self,
+            /,
+            entries: list[_MountEntry],
+            client: modal.client.Client,
+            *,
+            n_concurrent_checksums: int,
+            batch_size: int,
         ) -> typing.Generator[modal._utils.blob_utils.FileUploadSpec, None, None]: ...
         def aio(
-            self, /, entries: list[_MountEntry]
+            self,
+            /,
+            entries: list[_MountEntry],
+            client: modal.client.Client,
+            *,
+            n_concurrent_checksums: int,
+            batch_size: int,
         ) -> collections.abc.AsyncGenerator[modal._utils.blob_utils.FileUploadSpec, None]: ...
 
-    _get_files: typing.ClassVar[___get_files_spec]
+    _batched_get_missing_files: typing.ClassVar[___batched_get_missing_files_spec]
 
     class ___load_mount_spec(typing_extensions.Protocol):
         def __call__(

modal/secret.py

@@ -205,7 +205,7 @@ class _SecretManager:
                 raise
         else:
             req = api_pb2.SecretDeleteRequest(secret_id=obj.object_id)
-            await obj._client.stub.SecretDelete(req)
+            await obj.client.stub.SecretDelete(req)
 
 
 SecretManager = synchronize_api(_SecretManager)
@@ -511,7 +511,7 @@ class _Secret(_Object, type_prefix="st"):
             raise InvalidError(err)
         updates = [api_pb2.SecretUpdateRequest.Update(key=k, value=v) for k, v in env_dict.items()]
         req = api_pb2.SecretUpdateRequest(secret_id=self.object_id, updates=updates)
-        await self._client.stub.SecretUpdate(req)
+        await self.client.stub.SecretUpdate(req)
 
 
 def _split_env_dict_and_resolvable_secrets(secrets: list[_Secret]) -> tuple[dict[str, str], list[_Secret]]:

modal/serving.py

@@ -8,12 +8,12 @@ from typing import TYPE_CHECKING
 
 from synchronicity.async_wrap import asynccontextmanager
 
+from ._object import _get_environment_name
 from ._utils.async_utils import TaskContext, asyncify, synchronize_api
 from ._utils.logger import logger
 from ._watcher import watch
 from .cli.import_refs import ImportRef, import_app_from_ref
 from .client import _Client
-from .config import config
 from .output import OutputManager, enable_output
 from .runner import _run_app, serve_update
 
@@ -109,8 +109,7 @@ async def _serve_app(
         _watcher: For tests only. Supplies a custom async generator of changed file paths instead of
             the default filesystem watcher.
     """
-    if environment_name is None:
-        environment_name = config.get("environment")
+    environment_name = _get_environment_name(environment_name)
 
     client = await _Client.from_env()
 
@@ -122,6 +121,7 @@ async def _serve_app(
         else:
             mounts_to_watch = app._get_watch_mounts()
             watcher = watch(mounts_to_watch)
+        assert app.app_id is not None
         async with TaskContext(grace=0.1) as tc:
             tc.create_task(
                 _run_watch_loop(import_ref, app_id=app.app_id, watcher=watcher, environment_name=environment_name)

{modal-1.5.3.dev12.dist-info → modal-1.5.3.dev13.dist-info}/METADATA

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

{modal-1.5.3.dev12.dist-info → modal-1.5.3.dev13.dist-info}/RECORD

@@ -4,10 +4,10 @@ modal/_billing.py,sha256=VEa-YKFsuKmRfWW1SPiXGiY84RzTTRvo8ILi0V10R28,3483
 modal/_clustered_functions.py,sha256=zOWouWnRA4AbYz5kUbSHghFD9mifDHwfpntxOM_c5NA,2853
 modal/_clustered_functions.pyi,sha256=akbff8aXkp5aJapn72YMXPnzeYa6OFAfuakcy7Jx6wk,1146
 modal/_container_entrypoint.py,sha256=AyhMFBiaApVn1mueur2yrVy7IXR9qdXdwY4IePtVv74,22760
-modal/_environments.py,sha256=qll8SrpXG2tThWpdaRZolVLUanunLwUqkQ-Q8h4h0bU,23551
+modal/_environments.py,sha256=WCJvWCkKlRlU9TPDyNNx9GPVHKiOwk-_l0YoOcvFasA,23557
 modal/_function_variants.py,sha256=tKS1zJJCBJcj9_mKn2s5CdEWcvcskr3usaqEHKZddDg,12552
 modal/_functions.py,sha256=-P6cGdnsCK1iJXpT_UH24VMm6pio5xmIHsfQm94cSps,96897
-modal/_grpc_client.py,sha256=QL5btzOz6zZzTDcgSwFjI3PBy2gkaycyrlP7Jw-jkbY,6962
+modal/_grpc_client.py,sha256=vgCeu1TV6pBkQenHISVE15djX3tzDt_-7IcDIjI6zQw,6968
 modal/_image.py,sha256=TW-0QiFa3Lo1w9khZcE8mgSHQgj-PJ0eChb8IkS2eqo,128738
 modal/_ipython.py,sha256=Bu9fc3hm3xt2O47qLe_d-Mu2jS81LwMsmXNJ1sawBA0,575
 modal/_load_context.py,sha256=wrDqD3KehhFepp0vBhyz_PoLWoRVD0gZHP8dlLHCTiw,4818
@@ -15,27 +15,27 @@ modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_logs.py,sha256=JI2z_n2ivKrVRd6IIntyUfadNDetm1Wtu00GyGXBuG4,16938
 modal/_logs_manager.py,sha256=NsPI1Z1ZxhOFEbhXltU4T-dIlzl5yM44d5Sa1KOIK-o,26069
 modal/_logs_manager.pyi,sha256=FVhHA65unZWosgeQ6fwoLpwLkS0ALRnYMcEYq4dhRKc,39105
-modal/_object.py,sha256=8YXUBrEEvmx45lK5_nshmOX2xNKtPDXGHPzbiJ1YyAE,13503
+modal/_object.py,sha256=E24RIV3ZRhq-TFnir7cURERrFJnF5HXgNGATas7Q1o4,13557
 modal/_partial_function.py,sha256=VWjYZCVmHsQpad7MvVifHUQn4ElGKm5cSsyOLxDQ9Yk,35371
 modal/_resolver.py,sha256=LLDM_84aaJfBdgMZ_50CpXJtQzTw5CNRkbLDOiLZEZ0,5309
-modal/_resources.py,sha256=IS6y7CulfLCjESrpdxFGZr23d5iRCLw6-YQVlE3mKQk,1731
+modal/_resources.py,sha256=e4kEESPhz43IukQpwa3XV4PoiaOE_MqPh7HzlwejSPU,1727
 modal/_serialization.py,sha256=G07UlvH0SPU62twuwgx8MjD49zFX3te-Mg8bwNYfiEU,26594
 modal/_server.py,sha256=dMBRG9UbeVcvAxFkcx1P4Z5e5pqWMdwcpTJQS0AgxmE,13242
 modal/_supports_logs.py,sha256=bt4L4XBlFzzN9BdV3KY-Z8z0g2WpBDlunzgk2Dp1AUI,807
-modal/_traceback.py,sha256=472sH68_BsZGRsHW2vikIrmvaU1nT2TYkVvsuIYj_9Q,6231
+modal/_traceback.py,sha256=AJDEWqGyJi_lNYqTS9ZOj_7pPpqT-9hNGnOJs7PQ8Bw,6238
 modal/_tunnel.py,sha256=iqx11Okxz052dpejoJYcofXEkSB6u1kPFw5DaGFjS2Q,7351
 modal/_tunnel.pyi,sha256=WVP0dkoN__mM73ZQ-r3nHKCXvYlRMmEWW8iw2xrSY6M,14698
 modal/_type_manager.py,sha256=DWjgmjYJuOagw2erin506UUbG2H5UzZCFEekS-7hmfA,9087
 modal/_watcher.py,sha256=f9kOdHga0TZ6Z6wL7h2O67sz3Oj8pDzjfoAYrNE2hik,3505
 modal/_workspace.py,sha256=K_2Xe6_vG5Ab0PR0yg1VtEdi-MwOKjRKvcDPaf-Oj2Q,18163
-modal/app.py,sha256=DQOTSOfei9ojVFJAKgLdxnaSlTIwbXvdKkPH1y3WN9U,71249
-modal/app.pyi,sha256=nATyAaVKh5WZ4O5RLuo8SpztCTX04831TKJVJ7CuZYo,85091
+modal/app.py,sha256=qC1ct4rMAAqSn51vBhzvgO-AKwn46NCoBzVMfOKT6-g,71406
+modal/app.pyi,sha256=cV3a-BoATtixiV4t5fYZuQrsB12Me1AAsupoV74GoUI,85365
 modal/billing.py,sha256=E1-P_P8bJFLp-bTaggYd4BaaViImPB5UdtXiY8VeAZQ,390
 modal/billing.pyi,sha256=4m7VLYNS8IiJ2I3CJx0awvrOM6BILWRVLfdeqtAYr8M,7189
 modal/call_graph.py,sha256=XGALIDn1bLchWo_goyX23bcPjzCZcfqKUo8INIfDapo,1775
 modal/client.py,sha256=NjpAL0fIKabEaN0uXJPEoI1OTjFtXSp4tSck-M-WF3k,16360
-modal/client.pyi,sha256=Att1p5hhwu4NxGYOxkpdmlo7g0k1roiZhUyCSdw4V38,17999
-modal/cloud_bucket_mount.py,sha256=dJ3CZsm7848QJhoFy5mOp62fSivZauVOyo4MJvlx2nw,6802
+modal/client.pyi,sha256=Z6gDh7LtYbTKQnF4oQxl07mou9IEvUNb64tIm9LHDrw,17999
+modal/cloud_bucket_mount.py,sha256=NrdNV9r9aL3QFrlt-Dhtd7_K3f8v1igrHf2FRwgJ1CI,6827
 modal/cloud_bucket_mount.pyi,sha256=0E8d53pMh2KsFa-rMh_i6LxlzW4cMV8drVmmkPHSqZk,8149
 modal/cls.py,sha256=bqfD4yuz5EV7wNHLAaGcUNFseFGK8eyJSkqpfQex-VY,40969
 modal/cls.pyi,sha256=cc5zIn_1wWC89U-Zn9Yks5MXT4yAGhTXCrDpCm-Nm-c,29397
@@ -49,15 +49,15 @@ modal/environments.pyi,sha256=nsTTKXi560DgCZJAV9g_RN2IHfiOiR7C5Wxvd6K4BBQ,20281
 modal/exception.py,sha256=_AUhVBCg6Gb-YUQPNcQaTt2bAGn5n2N3jOhGpPSn4UA,11780
 modal/file_io.py,sha256=GYTa67mrmbTTTBsYQnb51VmwGIo0YY-1qQ3YBhagkmA,21795
 modal/file_io.pyi,sha256=3181-DS07flFWLf2BKjqCOiWIjieEOolf33wx6fBp5c,15377
-modal/file_pattern_matcher.py,sha256=6g_awxudMy_ontBvkznybyeNnwGMj297YrmIHCbREI0,8132
+modal/file_pattern_matcher.py,sha256=CpaNNj7oBlOSewX-AAUZCF8KDxH0_DmgwzfpVGbPYJ4,8138
 modal/functions.py,sha256=EZRcHFfnoYbvawUJnAHF5nIvoo9GX2Djy7mUmOCXmXc,258
-modal/functions.pyi,sha256=LW28ryYyzlh5FSJ54_6oqCMH1PYYJZ0tW5h1VUxfgx0,49526
+modal/functions.pyi,sha256=hQIw3clt9C8X9oy189iwXwStOoCAR_tHzD6qwK0AFAc,49526
 modal/image.py,sha256=c0lUSAoU-Ip3g5DGZ0uhdCzoWSQWh1g0i-7Rxo-Sz-I,160
 modal/image.pyi,sha256=Whbfmda2YLAyzctLEF9uF4FQ5b1canwLojSksRJ4gx8,59716
 modal/io_streams.py,sha256=3fhhb7SDJ69pVUu9J3PiMLBePD9bpiIxPN05SCzf8FE,29118
 modal/io_streams.pyi,sha256=5uQAgwxN3aouY8UJbRmDnRj9vOId5psRaMrU4IpyQgw,24471
-modal/mount.py,sha256=n1jfXvZVG1zKcVHDG8_0ECnzS7eaZCCRsk0XCx-GESo,34632
-modal/mount.pyi,sha256=qxnBG-q1I9KPmXLoSaWn2KMWO_mdAff3z0nW3UlYH6c,15913
+modal/mount.py,sha256=szqKHosJmE4DVbm5tCOBDadMsA1T05ZvZ4sOebWNUZk,36154
+modal/mount.pyi,sha256=ZOlIMlK_oIINrhlm9Z5hRsW88VY-0oNLhwZ4ynldc9w,16357
 modal/network_file_system.py,sha256=w8iI8BJDGLT2jmWyBG9vWpWGnsdkMs8J8TE2519iU38,14030
 modal/network_file_system.pyi,sha256=MS4srjGFl-ogqgNLxYRlj6Ik1ObwZKJ0WrneYKMKk-A,17927
 modal/object.py,sha256=bTeskuY8JFrESjU4_UL_nTwYlBQdOLmVaOX3X6EMxsg,164
@@ -82,11 +82,11 @@ modal/sandbox_fs.py,sha256=GSuPlrLSdQ7fG7c_TGMd-VWs_s6RqQxMvLivdvC6s4s,27002
 modal/sandbox_fs.pyi,sha256=TJWx8h7x3yRC7KUxeF7q62_0a7w1IHufnJL7AYEojAg,45285
 modal/schedule.py,sha256=J0rpNAVcoQjCCzobYFQXHXv1BBPLYATUwGS5prCHp4c,3242
 modal/scheduler_placement.py,sha256=S2-MZQcWCt6NVwIWXUP11KsKZeRDQViJLlOngGUvjkM,1173
-modal/secret.py,sha256=38Ki_fPANzo5Zj64aDBJ_e_WXq3PQsy4f16m2BLfdzk,20651
+modal/secret.py,sha256=yPe0oJH8ISIXDTtGFuPmh6PcENkW_GT0UXYPQ1ai17w,20649
 modal/secret.pyi,sha256=CyRMB8wss-EmqPIvMOGaxRdC-JFEe5DNCBvZmLvROXk,28454
 modal/server.py,sha256=zWoDdtwCEKsKbFfWC4l7-NkpnJJybweC284VIoCavrI,164
 modal/server.pyi,sha256=rlY-WDpPkUc_A9kLZ_0tJoMLdeL_6RXdJovOZS_-uMU,10113
-modal/serving.py,sha256=3nAFUMwFpr5WMHavJYloEF-QTr-7XzXTRb5kagp2nrg,4815
+modal/serving.py,sha256=ag31rhoUgdFr3kmBz92eyoS2HLXa88YrhF_tWHpQZK8,4846
 modal/serving.pyi,sha256=nKgt3i2X93NpAAZzIpbj4fiR1TIJxSXnK659w4UD2sE,3962
 modal/snapshot.py,sha256=D4cOWfY8vXeHfw11dTax-5ciNT0Fo8u5fKmMSBUmDGY,3170
 modal/snapshot.pyi,sha256=bFVDBx15WyngldWHGg9H3RCQRAbkR0N8O1ZHhneEFyA,3528
@@ -101,7 +101,7 @@ modal/workspace.pyi,sha256=aB3LCYnbzD8eyaBMsEfMeMiSHOUdpTdio4rK6nsjHUU,24215
 modal/_output/__init__.py,sha256=xtGN6SPv2zvByrJ32JPao0yJKpxyCIZ-2JMTScrisuQ,28
 modal/_output/manager.py,sha256=lL9fK9_cSJHdVIOcgzjCZEJ90fgNB7_mO7ih_4sk1hI,18097
 modal/_output/pty.py,sha256=EK9e5yNUpwhvbQ4-WWmUJ5elJQnOtCCfMhe5w1zgY5c,10143
-modal/_output/rich.py,sha256=x3PQKzIt_HBbaHOyzsN8gbuS1QsR7eFVD3Bo3GthXss,31845
+modal/_output/rich.py,sha256=6QsXXD-LK0sxd5wiLQS4-sy-pgtBKvAV92flzAmAwKo,31864
 modal/_output/status.py,sha256=c0rdvjoYKtIG7XJqq42TlcKawkYqZWtod38RmRY5IWA,4492
 modal/_runtime/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_runtime/asgi.py,sha256=eDNPsmV6SXl0CwUqgy7yrFDaPdlx4NiWTScXpCTlBFQ,22805
@@ -114,14 +114,14 @@ modal/_runtime/task_lifecycle_manager.py,sha256=NINQF_siXjeRkpd5rBXkE3sAdVxkwFXE
 modal/_runtime/task_lifecycle_manager.pyi,sha256=2r2eSBSfLQsbXrQfVvp73Gth7wZ7zpKJ0KaLgzsCdaQ,4952
 modal/_runtime/telemetry.py,sha256=T1RoAGyjBDr1swiM6pPsGRSITm7LI5FDK18oNXxY08U,5163
 modal/_runtime/user_code_event_loop.py,sha256=HwOuDyCZLOakr_DG7p2MrcscjSQNheIhBBuLgB5I3Cc,3014
-modal/_runtime/user_code_imports.py,sha256=rPCegb7vGZlhVVx2KzINq_1ymLsTgA50j88pZq2Snw8,29710
+modal/_runtime/user_code_imports.py,sha256=5MgewJzAeZqop47FQyB-lEpHBfC50ApHgSb861ErJPA,29863
 modal/_utils/__init__.py,sha256=waLjl5c6IPDhSsdWAm9Bji4e2PVxamYABKAze6CHVXY,28
 modal/_utils/app_utils.py,sha256=88BT4TPLWfYAQwKTHcyzNQRHg8n9B-QE2UyJs96iV-0,108
-modal/_utils/async_utils.py,sha256=4E4i5bReO4NudEwi8zT9kTDKwZsQeuMOFC5O8Rz9_E4,45838
+modal/_utils/async_utils.py,sha256=YHPrrg0JZoEld540gccpU34IkThNZ6AOT-xrYxdyKZQ,45962
 modal/_utils/auth_token_manager.py,sha256=J3EG8lMLUe2t_sHQ0gllj5qQi6j2SpStnMEh9JV4NCk,5124
-modal/_utils/blob_utils.py,sha256=VUYGmrRqmjdsjOEDcqIDeWONouVI4CzL-Rrcn8skNXs,26010
+modal/_utils/blob_utils.py,sha256=VcTUEm7S5drBqB7KezYQxhdfdJyYTddD7xYXjztq6IE,26079
 modal/_utils/browser_utils.py,sha256=Yqq0qU4Id6oaDOdeT1JEmbCN7vj4baNJJraJhRWU8ZI,1085
-modal/_utils/bytes_io_segment_payload.py,sha256=MFe0hs9pSskRLL6iX0vV7bJ_oG-VwIC98oNB3EpsW2w,4272
+modal/_utils/bytes_io_segment_payload.py,sha256=2OrIrjrsJR38a9D7JCITLqGvIPaiWViTQhxtcZlFn_M,4328
 modal/_utils/curl_utils.py,sha256=cZey1GZzyCRafXW4kje1rm739S0rc0TuY6CLG5U_zI8,3447
 modal/_utils/deprecation.py,sha256=X3uIAc8yThIjoHUMaS9ZfFCLAmGXaMysUdD1jEtbQvY,4574
 modal/_utils/display_utils.py,sha256=5XyCCjnMAWeLEEqF0hiLSA6XrrNp-gvXVsLcngN6vAI,317
@@ -137,13 +137,13 @@ modal/_utils/logger.py,sha256=NgbMKFT9chYYt_TU01DdIior5ByYr2gZtrWIk1SFRLc,1782
 modal/_utils/mount_utils.py,sha256=-KkLgkm30_MlsDKmp1NIEqfPhzt2ybSvZUsp1-IBqrU,4973
 modal/_utils/name_utils.py,sha256=k3BHNWjO1-zcUsUV_hF6U1s9yz0EhT4y20bJwiTb4OA,2762
 modal/_utils/package_utils.py,sha256=jYE7WFVzYWIfO0ZJhno_BYHb6Skp48uupOiw1a3yWzw,2056
-modal/_utils/pattern_utils.py,sha256=HOAxuYA1HpKxRHLT1AwqNTZwwNeNrlBCaCXWVcOdyCE,6701
+modal/_utils/pattern_utils.py,sha256=Dtqh0jL07-RJYK2FMBKgkUzAXnN1CUtDAiKdpeJFGro,6736
 modal/_utils/proxy_support.py,sha256=hLA_XojYxzPysOiLqyUbB-SgMLmn_X8WtXTk92xh7g4,3162
 modal/_utils/rand_pb_testing.py,sha256=kwAKIros_g6XPXluiJAktQ79YPkD9SGopKGl83GQ1l0,4361
 modal/_utils/sandbox_fs_utils.py,sha256=rsfo1uDbVSoiY21XERDzsmp-DALcNmlPfJ6jn_2p5T0,15680
 modal/_utils/shell_utils.py,sha256=_2yHrlx4Crx5JWQXECLPQ51kclu8H-U3N7jOkBN7q5U,3390
 modal/_utils/task_command_router_client.py,sha256=ehH7N5XZXM9QazcGITWFoEtw5OlmdgZmqEcCAso4INk,44263
-modal/_utils/time_utils.py,sha256=4mlxFreYBSvyqI5uhzry0aDHluUCwsTGKfEsItqN6og,10927
+modal/_utils/time_utils.py,sha256=JaFyW8y4iimzhrGT5KlQmlXH4oMZrZOGCtUBZAV-gfU,10965
 modal/_vendor/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_vendor/a2wsgi_wsgi.py,sha256=RVLIYVJA8a8o96QxEXYT5tuog2zev2S24XOuAVTXZAs,21872
 modal/_vendor/cloudpickle.py,sha256=gs1rHS6yrerIbAL0mesN6xAmNFaJowRgncJpdAKwmes,59191
@@ -165,26 +165,26 @@ modal/cli/app.py,sha256=5cHqEXuoEYkDXBuYPyU19FuHE8UT1zkr8-epMmLsYfU,22762
 modal/cli/billing.py,sha256=EpVwS6HvsyMWtMCtPVXJ6lP7F4BvHh5Fu7WnsXQ0NfU,10024
 modal/cli/bootstrap.py,sha256=0P7GMEuDdZ-sUm_-lml_8F2YYdmzhAItoDnN4s8T9zo,5269
 modal/cli/changelog.py,sha256=l1litymo-ZH8KWVELnhcXkSYMzcsDCe40yIIUJCVgis,5799
-modal/cli/cluster.py,sha256=9XE-xOYgjVtNUrHLCVYju8Sbe5XSPwIpQ4m7BjTYJLg,4374
+modal/cli/cluster.py,sha256=7u68L1PVlh4NqPoUHn7TrcekqhlpdUVjoVBnqE50-o8,4356
 modal/cli/config.py,sha256=4F67a07bS3h0sR1vMR7N21vE6tI7X5W0TQDwm_kXXdo,1899
 modal/cli/container.py,sha256=UHeoJFSMYlXuvE0kAxbe7Sryrb_v_Tr0KpTF9Vpy23Y,13217
 modal/cli/curl.py,sha256=e0YOuBlWYkVdH125H1v5r1mRy0oLKGRU4qgPOHOrHLA,4523
-modal/cli/dashboard.py,sha256=YBHkRNY8fwZg472mn83ZpKWkaWbbiHj1Rg_0vMwOT7w,910
+modal/cli/dashboard.py,sha256=v3ME8R77JksAW-mlJnn8PAi1Q6_dIoTxJTJQDsYWy8c,916
 modal/cli/dict.py,sha256=20KQa1kZu5THlneed-F_2sxcZriY0vYxcfe12XYIkLk,5152
-modal/cli/endpoint.py,sha256=9_dgP3lMxj6TJnNtfTT8kNodzDJOszSgQYMSxTqoggw,14233
+modal/cli/endpoint.py,sha256=7e2E-9Q-a30Aj2bYCMXm_zmxtKGtUt0Lg7JVNKHQgRA,14221
 modal/cli/entry_point.py,sha256=Z5f-kE2OumaNsuCZU_P_E2pfLB1JGQTL-55MAp3r1ys,5074
-modal/cli/environment.py,sha256=MUDWsMyc-uGuy6rgXvRq0FzxZl5dTrvpyq4dMdrWHOM,14872
+modal/cli/environment.py,sha256=DrgD2qVt9ODmJnU2LPjrkmGJsKtfKq1fFLxCkXnttfg,14878
 modal/cli/image.py,sha256=tj50yttndufoqMNW3EjQu48kci-VkgWWC8-IPgCdtqs,6946
 modal/cli/import_refs.py,sha256=s3OeBuFZJNh0S8EaaEiqUnAPETRTrWdOk-jkO7yRVr4,15506
-modal/cli/launch.py,sha256=1cPg9y7zIETMeg6_5HBPpX3hbL4uKe-yXf49bXx8tSY,4482
+modal/cli/launch.py,sha256=AJCXsRsK77EoJhiUSk6n3m5HAhgLh4AmhdINdwKgGCM,4497
 modal/cli/logo.py,sha256=plv82syvPb8j3qrR1A_nojZwp823t3VEXaDlrx1jkt0,3221
-modal/cli/network_file_system.py,sha256=HPuSzV0BaVurGhJbOahIV53sbfuZ0okNAdbdQZbPhrk,7687
-modal/cli/profile.py,sha256=uvxK76pJEF7DHXZhCm_za4-KL74HBOGUk2lSdQtkxhY,3674
+modal/cli/network_file_system.py,sha256=WA54LgcF3ZJv3kQgdTm9tkbwKCxA2XXGCdC3nUPdTLY,7680
+modal/cli/profile.py,sha256=b7AYNrKsSvBecaUotnRqqVxvdWMynY-Ynj69fT-kL6U,3684
 modal/cli/queues.py,sha256=eSeAUC_itVMFPQKcZJozipzUTvDaHzYJinao1_H7eXA,6620
 modal/cli/run.py,sha256=hGSKdhBATIkZATPECf8ytxZNTza5rzngqIQnN_B4Mww,22639
 modal/cli/secret.py,sha256=fg_g-iA_FkF7_0_24P_0Y3k_dCfcFbOzFo7vzIiHaLQ,8253
 modal/cli/selector.py,sha256=OJr9Ua3K_l-qu3N3-I8z8oVq8lBakws2-XgfheR5p-c,4741
-modal/cli/shell.py,sha256=cSDRK2PspHPgX37rV-yZeQMtxHBLGs5WH7UJaoGb9Vc,16844
+modal/cli/shell.py,sha256=K7AwuH-WBIIx0-haBpA8NANZM6a_wVko-Ab6LKVmmzc,16851
 modal/cli/skills.py,sha256=oniDafrmu_ARYTlButnlXbKE9XlEU1-EFz-eO4tdnFY,11954
 modal/cli/token.py,sha256=yvCBs6L0yjATZIRc5vo-ZCWA01cnkk3yaMm2hBceUFI,4309
 modal/cli/utils.py,sha256=oAhQVoojdsj3cf5xvr4IDSptrCI4ndEJ7ZPmBlsP5Yw,6891
@@ -193,12 +193,12 @@ modal/cli/workspace.py,sha256=HJD4Kpc7QHc_jVLXkHwnMRSxTvAoDklMz8qzYxAKL-8,6964
 modal/cli/programs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal/cli/programs/run_jupyter.py,sha256=IJw8nds8Cjl9j4dxBqMGxhz-bIyVX0kle7jbt8HFOhM,2688
 modal/cli/programs/vscode.py,sha256=E1aJPU7b8RWWj-JX71DifsCoLYsCAnre7lATiBJjUms,3386
-modal/experimental/__init__.py,sha256=H7ESdOADNvJ2coE-jn3Z2i0-d7xKTfFbP1wBhRuhgI4,8804
+modal/experimental/__init__.py,sha256=1xJ_dfyOC4zTJvjp0YPikt8Vqz-FT2TA-XSHwKxanaM,8848
 modal/experimental/flash.py,sha256=GAJ1c-EGL8M3_loAkqr5gdUfySMHY3U_oc6RywfZ8-0,34245
 modal/experimental/flash.pyi,sha256=lpTqJFZRMGWscw0xpYZVdBMnAYjj16asXE4_64A6itQ,17774
 modal/experimental/ipython.py,sha256=kJ6o9wkAY_MiSb7paewI7f1MJAeqdi8TX5pBdhr_mUI,2925
 modal/skills/modal/SKILL.md,sha256=WzLjYJ1utjc_ZOf6qZTPwB6wxxwRYB5PibdvIf_FLy0,5316
-modal-1.5.3.dev12.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.5.3.dev13.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=9-b8vl2EsLWD9zJqpCK8IUi5h44Bjn3i3rSdedZV4bA,6415
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -218,14 +218,14 @@ modal_proto/api_pb2_grpc.pyi,sha256=-475ldsbyuJI3_nlxXQZWTpYCNyb7ZRWyCLfVrsoFtE,
 modal_proto/modal_api_grpc.py,sha256=euK3tQIa1XKkHAJsa51Q8tQAXz6fZObBqJRMJ9pI0Wc,28629
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_proto/task_command_router_grpc.py,sha256=UurJEgLeAc2CCdEsCOFE9DgIQy1ra6bXHXJLNBK81Mg,21284
-modal_proto/task_command_router_pb2.py,sha256=mq7jUxEaAfIew74jVNiK_aIkcvOJMtuKhsEpcdqx1_8,41085
-modal_proto/task_command_router_pb2.pyi,sha256=ly0RiPmOy8v7a_G3EXdTMHjccVF71q-DbwBvoTf0aAM,45980
+modal_proto/task_command_router_pb2.py,sha256=4cyDT_uPGi54blsO663bnSzUe7aBFqi9F4iM8N1JPaU,41130
+modal_proto/task_command_router_pb2.pyi,sha256=5xfhnwtTDTmJo1Nv0tPBJrYzb0aeilY2Lm92wWT_6yw,46211
 modal_proto/task_command_router_pb2_grpc.py,sha256=zuFkJgKcswB2ftjnyEgs70dp61VMA7gK0h0uzR3gYFw,42563
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=UjAJFqz9DpOFXP04fVm5lB2eAyTtjOg3oKjfWei8yLU,14262
-modal_version/__init__.py,sha256=9KRyE7nBUW79innsV2uhRloZp7RsK-Q30sg-RTbkda8,121
+modal_version/__init__.py,sha256=Um2GJBNkdlqLx4iwnG4VlmVlwyVVkXxEWmuQkl2n1OY,121
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.5.3.dev12.dist-info/METADATA,sha256=78wD0VqR2U8Z1qvXEEcM2tegFs-hfCuKIrUVV9n4ngU,2513
-modal-1.5.3.dev12.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.5.3.dev12.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.5.3.dev12.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.5.3.dev12.dist-info/RECORD,,
+modal-1.5.3.dev13.dist-info/METADATA,sha256=fdvWhsITojfDDd3_dZLcNeaEwamZbv7p9sXjrcC9gc0,2513
+modal-1.5.3.dev13.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.5.3.dev13.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.5.3.dev13.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.5.3.dev13.dist-info/RECORD,,

modal_proto/task_command_router_pb2.py

@@ -17,7 +17,7 @@ from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
 from modal_proto import api_pb2 as modal__proto_dot_api__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%modal_proto/task_command_router.proto\x12\x19modal.task_command_router\x1a\x1bgoogle/protobuf/empty.proto\x1a\x15modal_proto/api.proto\"X\n\x1aSandboxStdinWriteV2Request\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0e\n\x06offset\x18\x02 \x01(\x04\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x0b\n\x03\x65of\x18\x04 \x01(\x08\"\x1d\n\x1bSandboxStdinWriteV2Response\"\x8c\x01\n\x19SandboxStdioReadV2Request\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0e\n\x06offset\x18\x02 \x01(\x04\x12N\n\x0f\x66ile_descriptor\x18\x03 \x01(\x0e\x32\x35.modal.task_command_router.SandboxStdioFileDescriptor\"C\n\x1aSandboxStdioReadV2Response\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\x12\x17\n\x0fstarting_offset\x18\x02 \x01(\x04\"C\n\x1fSandboxWaitUntilReadyTcrRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07timeout\x18\x02 \x01(\x02\"4\n SandboxWaitUntilReadyTcrResponse\x12\x10\n\x08ready_at\x18\x01 \x01(\x01\"\x82\x03\n\x1aTaskContainerCreateRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x16\n\x0e\x63ontainer_name\x18\x02 \x01(\t\x12\x10\n\x08image_id\x18\x03 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x05 \x03(\t\x12K\n\x03\x65nv\x18\x06 \x03(\x0b\x32>.modal.task_command_router.TaskContainerCreateRequest.EnvEntry\x12\x0f\n\x07workdir\x18\x07 \x01(\t\x12\x12\n\nsecret_ids\x18\x08 \x03(\t\x12\x30\n\rvolume_mounts\x18\t \x03(\x0b\x32\x19.modal.client.VolumeMount\x12\x38\n\x0enetwork_access\x18\n \x01(\x0b\x32\x1b.modal.client.NetworkAccessH\x00\x88\x01\x01\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x11\n\x0f_network_access\"K\n\x1bTaskContainerCreateResponse\x12\x14\n\x0c\x63ontainer_id\x18\x01 \x01(\t\x12\x16\n\x0e\x63ontainer_name\x18\x02 \x01(\t\"^\n\x17TaskContainerGetRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x16\n\x0e\x63ontainer_name\x18\x02 \x01(\t\x12\x1a\n\x12include_terminated\x18\x03 \x01(\x08\"[\n\x18TaskContainerGetResponse\x12?\n\tcontainer\x18\x01 \x01(\x0b\x32,.modal.task_command_router.TaskContainerInfo\"~\n\x11TaskContainerInfo\x12\x14\n\x0c\x63ontainer_id\x18\x01 \x01(\t\x12\x16\n\x0e\x63ontainer_name\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\t\x12+\n\x06result\x18\x04 \x01(\x0b\x32\x1b.modal.client.GenericResult\"G\n\x18TaskContainerListRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x1a\n\x12include_terminated\x18\x02 \x01(\x08\"]\n\x19TaskContainerListResponse\x12@\n\ncontainers\x18\x01 \x03(\x0b\x32,.modal.task_command_router.TaskContainerInfo\"F\n\x1dTaskContainerTerminateRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x14\n\x0c\x63ontainer_id\x18\x02 \x01(\t\" \n\x1eTaskContainerTerminateResponse\"R\n\x18TaskContainerWaitRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x14\n\x0c\x63ontainer_id\x18\x02 \x01(\t\x12\x0f\n\x07timeout\x18\x03 \x01(\x02\"H\n\x19TaskContainerWaitResponse\x12+\n\x06result\x18\x01 \x01(\x0b\x32\x1b.modal.client.GenericResult\"7\n\x13TaskExecPollRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"G\n\x14TaskExecPollResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status\"\x9b\x04\n\x14TaskExecStartRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_args\x18\x03 \x03(\t\x12\x46\n\rstdout_config\x18\x04 \x01(\x0e\x32/.modal.task_command_router.TaskExecStdoutConfig\x12\x46\n\rstderr_config\x18\x05 \x01(\x0e\x32/.modal.task_command_router.TaskExecStderrConfig\x12\x19\n\x0ctimeout_secs\x18\x06 \x01(\rH\x00\x88\x01\x01\x12\x14\n\x07workdir\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x12\n\nsecret_ids\x18\x08 \x03(\t\x12,\n\x08pty_info\x18\t \x01(\x0b\x32\x15.modal.client.PTYInfoH\x02\x88\x01\x01\x12\x15\n\rruntime_debug\x18\n \x01(\x08\x12\x14\n\x0c\x63ontainer_id\x18\x0b \x01(\t\x12\x45\n\x03\x65nv\x18\x0c \x03(\x0b\x32\x38.modal.task_command_router.TaskExecStartRequest.EnvEntry\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x0f\n\r_timeout_secsB\n\n\x08_workdirB\x0b\n\t_pty_info\"\x17\n\x15TaskExecStartResponse\">\n\x1aTaskExecStdinStatusRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"H\n\x1bTaskExecStdinStatusResponse\x12\x19\n\x11num_bytes_written\x18\x01 \x01(\x04\x12\x0e\n\x06\x63losed\x18\x02 \x01(\x08\"h\n\x19TaskExecStdinWriteRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\x0b\n\x03\x65of\x18\x05 \x01(\x08\"\x1c\n\x1aTaskExecStdinWriteResponse\"\x1d\n\x1bTaskExecStdinWriteStreamEnd\"\xce\x01\n\x1fTaskExecStdinWriteStreamRequest\x12I\n\x05start\x18\x01 \x01(\x0b\x32\x38.modal.task_command_router.TaskExecStdinWriteStreamStartH\x00\x12\x0e\n\x04\x64\x61ta\x18\x02 \x01(\x0cH\x00\x12\x45\n\x03\x65nd\x18\x03 \x01(\x0b\x32\x36.modal.task_command_router.TaskExecStdinWriteStreamEndH\x00\x42\t\n\x07payload\"\"\n TaskExecStdinWriteStreamResponse\"Q\n\x1dTaskExecStdinWriteStreamStart\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\"\x9d\x01\n\x18TaskExecStdioReadRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12O\n\x0f\x66ile_descriptor\x18\x04 \x01(\x0e\x32\x36.modal.task_command_router.TaskExecStdioFileDescriptor\")\n\x19TaskExecStdioReadResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"7\n\x13TaskExecWaitRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"G\n\x14TaskExecWaitResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status\"\xa0\x01\n\x19TaskMountDirectoryRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\x0c\x12\x10\n\x08image_id\x18\x03 \x01(\t\x12-\n customer_supplied_encryption_key\x18\x04 \x01(\x0cH\x00\x88\x01\x01\x42#\n!_customer_supplied_encryption_key\"+\n\x18TaskReloadVolumesRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\"\x1b\n\x19TaskReloadVolumesResponse\"c\n\x1bTaskSetNetworkAccessRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x33\n\x0enetwork_access\x18\x02 \x01(\x0b\x32\x1b.modal.client.NetworkAccess\"\x1e\n\x1cTaskSetNetworkAccessResponse\"\xd0\x01\n\x1cTaskSnapshotDirectoryRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\x0c\x12\x13\n\x0bsnapshot_id\x18\x03 \x01(\t\x12\x18\n\x0bttl_seconds\x18\x04 \x01(\x03H\x00\x88\x01\x01\x12-\n customer_supplied_encryption_key\x18\x05 \x01(\x0cH\x01\x88\x01\x01\x42\x0e\n\x0c_ttl_secondsB#\n!_customer_supplied_encryption_key\"1\n\x1dTaskSnapshotDirectoryResponse\x12\x10\n\x08image_id\x18\x01 \x01(\t\"\xc3\x01\n\x1dTaskSnapshotFilesystemRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x13\n\x0bsnapshot_id\x18\x02 \x01(\t\x12\x18\n\x0bttl_seconds\x18\x03 \x01(\x03H\x00\x88\x01\x01\x12-\n customer_supplied_encryption_key\x18\x04 \x01(\x0cH\x01\x88\x01\x01\x42\x0e\n\x0c_ttl_secondsB#\n!_customer_supplied_encryption_key\"2\n\x1eTaskSnapshotFilesystemResponse\x12\x10\n\x08image_id\x18\x01 \x01(\t\"E\n\x19TaskSnapshotMemoryRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x17\n\x0fidempotency_key\x18\x02 \x01(\t\"1\n\x1aTaskSnapshotMemoryResponse\x12\x13\n\x0bsnapshot_id\x18\x01 \x01(\t\"<\n\x1bTaskUnmountDirectoryRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\x0c*p\n\x1aSandboxStdioFileDescriptor\x12(\n$SANDBOX_STDIO_FILE_DESCRIPTOR_STDOUT\x10\x00\x12(\n$SANDBOX_STDIO_FILE_DESCRIPTOR_STDERR\x10\x01*\x81\x01\n\x14TaskExecStderrConfig\x12#\n\x1fTASK_EXEC_STDERR_CONFIG_DEVNULL\x10\x00\x12 \n\x1cTASK_EXEC_STDERR_CONFIG_PIPE\x10\x01\x12\"\n\x1eTASK_EXEC_STDERR_CONFIG_STDOUT\x10\x02*u\n\x1bTaskExecStdioFileDescriptor\x12*\n&TASK_EXEC_STDIO_FILE_DESCRIPTOR_STDOUT\x10\x00\x12*\n&TASK_EXEC_STDIO_FILE_DESCRIPTOR_STDERR\x10\x01*]\n\x14TaskExecStdoutConfig\x12#\n\x1fTASK_EXEC_STDOUT_CONFIG_DEVNULL\x10\x00\x12 \n\x1cTASK_EXEC_STDOUT_CONFIG_PIPE\x10\x01\x32\xba\x16\n\x11TaskCommandRouter\x12\x84\x01\n\x13SandboxStdinWriteV2\x12\x35.modal.task_command_router.SandboxStdinWriteV2Request\x1a\x36.modal.task_command_router.SandboxStdinWriteV2Response\x12\x83\x01\n\x12SandboxStdioReadV2\x12\x34.modal.task_command_router.SandboxStdioReadV2Request\x1a\x35.modal.task_command_router.SandboxStdioReadV2Response0\x01\x12\x90\x01\n\x15SandboxWaitUntilReady\x12:.modal.task_command_router.SandboxWaitUntilReadyTcrRequest\x1a;.modal.task_command_router.SandboxWaitUntilReadyTcrResponse\x12\x84\x01\n\x13TaskContainerCreate\x12\x35.modal.task_command_router.TaskContainerCreateRequest\x1a\x36.modal.task_command_router.TaskContainerCreateResponse\x12{\n\x10TaskContainerGet\x12\x32.modal.task_command_router.TaskContainerGetRequest\x1a\x33.modal.task_command_router.TaskContainerGetResponse\x12~\n\x11TaskContainerList\x12\x33.modal.task_command_router.TaskContainerListRequest\x1a\x34.modal.task_command_router.TaskContainerListResponse\x12\x8d\x01\n\x16TaskContainerTerminate\x12\x38.modal.task_command_router.TaskContainerTerminateRequest\x1a\x39.modal.task_command_router.TaskContainerTerminateResponse\x12~\n\x11TaskContainerWait\x12\x33.modal.task_command_router.TaskContainerWaitRequest\x1a\x34.modal.task_command_router.TaskContainerWaitResponse\x12o\n\x0cTaskExecPoll\x12..modal.task_command_router.TaskExecPollRequest\x1a/.modal.task_command_router.TaskExecPollResponse\x12r\n\rTaskExecStart\x12/.modal.task_command_router.TaskExecStartRequest\x1a\x30.modal.task_command_router.TaskExecStartResponse\x12\x84\x01\n\x13TaskExecStdinStatus\x12\x35.modal.task_command_router.TaskExecStdinStatusRequest\x1a\x36.modal.task_command_router.TaskExecStdinStatusResponse\x12\x81\x01\n\x12TaskExecStdinWrite\x12\x34.modal.task_command_router.TaskExecStdinWriteRequest\x1a\x35.modal.task_command_router.TaskExecStdinWriteResponse\x12\x95\x01\n\x18TaskExecStdinWriteStream\x12:.modal.task_command_router.TaskExecStdinWriteStreamRequest\x1a;.modal.task_command_router.TaskExecStdinWriteStreamResponse(\x01\x12\x80\x01\n\x11TaskExecStdioRead\x12\x33.modal.task_command_router.TaskExecStdioReadRequest\x1a\x34.modal.task_command_router.TaskExecStdioReadResponse0\x01\x12o\n\x0cTaskExecWait\x12..modal.task_command_router.TaskExecWaitRequest\x1a/.modal.task_command_router.TaskExecWaitResponse\x12\x62\n\x12TaskMountDirectory\x12\x34.modal.task_command_router.TaskMountDirectoryRequest\x1a\x16.google.protobuf.Empty\x12~\n\x11TaskReloadVolumes\x12\x33.modal.task_command_router.TaskReloadVolumesRequest\x1a\x34.modal.task_command_router.TaskReloadVolumesResponse\x12\x87\x01\n\x14TaskSetNetworkAccess\x12\x36.modal.task_command_router.TaskSetNetworkAccessRequest\x1a\x37.modal.task_command_router.TaskSetNetworkAccessResponse\x12\x8a\x01\n\x15TaskSnapshotDirectory\x12\x37.modal.task_command_router.TaskSnapshotDirectoryRequest\x1a\x38.modal.task_command_router.TaskSnapshotDirectoryResponse\x12\x8d\x01\n\x16TaskSnapshotFilesystem\x12\x38.modal.task_command_router.TaskSnapshotFilesystemRequest\x1a\x39.modal.task_command_router.TaskSnapshotFilesystemResponse\x12\x81\x01\n\x12TaskSnapshotMemory\x12\x34.modal.task_command_router.TaskSnapshotMemoryRequest\x1a\x35.modal.task_command_router.TaskSnapshotMemoryResponse\x12\x66\n\x14TaskUnmountDirectory\x12\x36.modal.task_command_router.TaskUnmountDirectoryRequest\x1a\x16.google.protobuf.EmptyB&Z$github.com/modal-labs/modal/go/protob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%modal_proto/task_command_router.proto\x12\x19modal.task_command_router\x1a\x1bgoogle/protobuf/empty.proto\x1a\x15modal_proto/api.proto\"X\n\x1aSandboxStdinWriteV2Request\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0e\n\x06offset\x18\x02 \x01(\x04\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x0b\n\x03\x65of\x18\x04 \x01(\x08\"\x1d\n\x1bSandboxStdinWriteV2Response\"\x8c\x01\n\x19SandboxStdioReadV2Request\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0e\n\x06offset\x18\x02 \x01(\x04\x12N\n\x0f\x66ile_descriptor\x18\x03 \x01(\x0e\x32\x35.modal.task_command_router.SandboxStdioFileDescriptor\"C\n\x1aSandboxStdioReadV2Response\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\x12\x17\n\x0fstarting_offset\x18\x02 \x01(\x04\"C\n\x1fSandboxWaitUntilReadyTcrRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07timeout\x18\x02 \x01(\x02\"4\n SandboxWaitUntilReadyTcrResponse\x12\x10\n\x08ready_at\x18\x01 \x01(\x01\"\x82\x03\n\x1aTaskContainerCreateRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x16\n\x0e\x63ontainer_name\x18\x02 \x01(\t\x12\x10\n\x08image_id\x18\x03 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x05 \x03(\t\x12K\n\x03\x65nv\x18\x06 \x03(\x0b\x32>.modal.task_command_router.TaskContainerCreateRequest.EnvEntry\x12\x0f\n\x07workdir\x18\x07 \x01(\t\x12\x12\n\nsecret_ids\x18\x08 \x03(\t\x12\x30\n\rvolume_mounts\x18\t \x03(\x0b\x32\x19.modal.client.VolumeMount\x12\x38\n\x0enetwork_access\x18\n \x01(\x0b\x32\x1b.modal.client.NetworkAccessH\x00\x88\x01\x01\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x11\n\x0f_network_access\"K\n\x1bTaskContainerCreateResponse\x12\x14\n\x0c\x63ontainer_id\x18\x01 \x01(\t\x12\x16\n\x0e\x63ontainer_name\x18\x02 \x01(\t\"^\n\x17TaskContainerGetRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x16\n\x0e\x63ontainer_name\x18\x02 \x01(\t\x12\x1a\n\x12include_terminated\x18\x03 \x01(\x08\"[\n\x18TaskContainerGetResponse\x12?\n\tcontainer\x18\x01 \x01(\x0b\x32,.modal.task_command_router.TaskContainerInfo\"~\n\x11TaskContainerInfo\x12\x14\n\x0c\x63ontainer_id\x18\x01 \x01(\t\x12\x16\n\x0e\x63ontainer_name\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\t\x12+\n\x06result\x18\x04 \x01(\x0b\x32\x1b.modal.client.GenericResult\"G\n\x18TaskContainerListRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x1a\n\x12include_terminated\x18\x02 \x01(\x08\"]\n\x19TaskContainerListResponse\x12@\n\ncontainers\x18\x01 \x03(\x0b\x32,.modal.task_command_router.TaskContainerInfo\"F\n\x1dTaskContainerTerminateRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x14\n\x0c\x63ontainer_id\x18\x02 \x01(\t\" \n\x1eTaskContainerTerminateResponse\"R\n\x18TaskContainerWaitRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x14\n\x0c\x63ontainer_id\x18\x02 \x01(\t\x12\x0f\n\x07timeout\x18\x03 \x01(\x02\"H\n\x19TaskContainerWaitResponse\x12+\n\x06result\x18\x01 \x01(\x0b\x32\x1b.modal.client.GenericResult\"7\n\x13TaskExecPollRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"G\n\x14TaskExecPollResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status\"\x9b\x04\n\x14TaskExecStartRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_args\x18\x03 \x03(\t\x12\x46\n\rstdout_config\x18\x04 \x01(\x0e\x32/.modal.task_command_router.TaskExecStdoutConfig\x12\x46\n\rstderr_config\x18\x05 \x01(\x0e\x32/.modal.task_command_router.TaskExecStderrConfig\x12\x19\n\x0ctimeout_secs\x18\x06 \x01(\rH\x00\x88\x01\x01\x12\x14\n\x07workdir\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x12\n\nsecret_ids\x18\x08 \x03(\t\x12,\n\x08pty_info\x18\t \x01(\x0b\x32\x15.modal.client.PTYInfoH\x02\x88\x01\x01\x12\x15\n\rruntime_debug\x18\n \x01(\x08\x12\x14\n\x0c\x63ontainer_id\x18\x0b \x01(\t\x12\x45\n\x03\x65nv\x18\x0c \x03(\x0b\x32\x38.modal.task_command_router.TaskExecStartRequest.EnvEntry\x1a*\n\x08\x45nvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x0f\n\r_timeout_secsB\n\n\x08_workdirB\x0b\n\t_pty_info\"\x17\n\x15TaskExecStartResponse\">\n\x1aTaskExecStdinStatusRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"H\n\x1bTaskExecStdinStatusResponse\x12\x19\n\x11num_bytes_written\x18\x01 \x01(\x04\x12\x0e\n\x06\x63losed\x18\x02 \x01(\x08\"h\n\x19TaskExecStdinWriteRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\x0b\n\x03\x65of\x18\x05 \x01(\x08\"\x1c\n\x1aTaskExecStdinWriteResponse\"\x1d\n\x1bTaskExecStdinWriteStreamEnd\"\xce\x01\n\x1fTaskExecStdinWriteStreamRequest\x12I\n\x05start\x18\x01 \x01(\x0b\x32\x38.modal.task_command_router.TaskExecStdinWriteStreamStartH\x00\x12\x0e\n\x04\x64\x61ta\x18\x02 \x01(\x0cH\x00\x12\x45\n\x03\x65nd\x18\x03 \x01(\x0b\x32\x36.modal.task_command_router.TaskExecStdinWriteStreamEndH\x00\x42\t\n\x07payload\"\"\n TaskExecStdinWriteStreamResponse\"Q\n\x1dTaskExecStdinWriteStreamStart\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\"\x9d\x01\n\x18TaskExecStdioReadRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12O\n\x0f\x66ile_descriptor\x18\x04 \x01(\x0e\x32\x36.modal.task_command_router.TaskExecStdioFileDescriptor\")\n\x19TaskExecStdioReadResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"7\n\x13TaskExecWaitRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"G\n\x14TaskExecWaitResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status\"\xa0\x01\n\x19TaskMountDirectoryRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\x0c\x12\x10\n\x08image_id\x18\x03 \x01(\t\x12-\n customer_supplied_encryption_key\x18\x04 \x01(\x0cH\x00\x88\x01\x01\x42#\n!_customer_supplied_encryption_key\"A\n\x18TaskReloadVolumesRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x14\n\x0c\x63ontainer_id\x18\x02 \x01(\t\"\x1b\n\x19TaskReloadVolumesResponse\"c\n\x1bTaskSetNetworkAccessRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x33\n\x0enetwork_access\x18\x02 \x01(\x0b\x32\x1b.modal.client.NetworkAccess\"\x1e\n\x1cTaskSetNetworkAccessResponse\"\xd0\x01\n\x1cTaskSnapshotDirectoryRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\x0c\x12\x13\n\x0bsnapshot_id\x18\x03 \x01(\t\x12\x18\n\x0bttl_seconds\x18\x04 \x01(\x03H\x00\x88\x01\x01\x12-\n customer_supplied_encryption_key\x18\x05 \x01(\x0cH\x01\x88\x01\x01\x42\x0e\n\x0c_ttl_secondsB#\n!_customer_supplied_encryption_key\"1\n\x1dTaskSnapshotDirectoryResponse\x12\x10\n\x08image_id\x18\x01 \x01(\t\"\xc3\x01\n\x1dTaskSnapshotFilesystemRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x13\n\x0bsnapshot_id\x18\x02 \x01(\t\x12\x18\n\x0bttl_seconds\x18\x03 \x01(\x03H\x00\x88\x01\x01\x12-\n customer_supplied_encryption_key\x18\x04 \x01(\x0cH\x01\x88\x01\x01\x42\x0e\n\x0c_ttl_secondsB#\n!_customer_supplied_encryption_key\"2\n\x1eTaskSnapshotFilesystemResponse\x12\x10\n\x08image_id\x18\x01 \x01(\t\"E\n\x19TaskSnapshotMemoryRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x17\n\x0fidempotency_key\x18\x02 \x01(\t\"1\n\x1aTaskSnapshotMemoryResponse\x12\x13\n\x0bsnapshot_id\x18\x01 \x01(\t\"<\n\x1bTaskUnmountDirectoryRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\x0c*p\n\x1aSandboxStdioFileDescriptor\x12(\n$SANDBOX_STDIO_FILE_DESCRIPTOR_STDOUT\x10\x00\x12(\n$SANDBOX_STDIO_FILE_DESCRIPTOR_STDERR\x10\x01*\x81\x01\n\x14TaskExecStderrConfig\x12#\n\x1fTASK_EXEC_STDERR_CONFIG_DEVNULL\x10\x00\x12 \n\x1cTASK_EXEC_STDERR_CONFIG_PIPE\x10\x01\x12\"\n\x1eTASK_EXEC_STDERR_CONFIG_STDOUT\x10\x02*u\n\x1bTaskExecStdioFileDescriptor\x12*\n&TASK_EXEC_STDIO_FILE_DESCRIPTOR_STDOUT\x10\x00\x12*\n&TASK_EXEC_STDIO_FILE_DESCRIPTOR_STDERR\x10\x01*]\n\x14TaskExecStdoutConfig\x12#\n\x1fTASK_EXEC_STDOUT_CONFIG_DEVNULL\x10\x00\x12 \n\x1cTASK_EXEC_STDOUT_CONFIG_PIPE\x10\x01\x32\xba\x16\n\x11TaskCommandRouter\x12\x84\x01\n\x13SandboxStdinWriteV2\x12\x35.modal.task_command_router.SandboxStdinWriteV2Request\x1a\x36.modal.task_command_router.SandboxStdinWriteV2Response\x12\x83\x01\n\x12SandboxStdioReadV2\x12\x34.modal.task_command_router.SandboxStdioReadV2Request\x1a\x35.modal.task_command_router.SandboxStdioReadV2Response0\x01\x12\x90\x01\n\x15SandboxWaitUntilReady\x12:.modal.task_command_router.SandboxWaitUntilReadyTcrRequest\x1a;.modal.task_command_router.SandboxWaitUntilReadyTcrResponse\x12\x84\x01\n\x13TaskContainerCreate\x12\x35.modal.task_command_router.TaskContainerCreateRequest\x1a\x36.modal.task_command_router.TaskContainerCreateResponse\x12{\n\x10TaskContainerGet\x12\x32.modal.task_command_router.TaskContainerGetRequest\x1a\x33.modal.task_command_router.TaskContainerGetResponse\x12~\n\x11TaskContainerList\x12\x33.modal.task_command_router.TaskContainerListRequest\x1a\x34.modal.task_command_router.TaskContainerListResponse\x12\x8d\x01\n\x16TaskContainerTerminate\x12\x38.modal.task_command_router.TaskContainerTerminateRequest\x1a\x39.modal.task_command_router.TaskContainerTerminateResponse\x12~\n\x11TaskContainerWait\x12\x33.modal.task_command_router.TaskContainerWaitRequest\x1a\x34.modal.task_command_router.TaskContainerWaitResponse\x12o\n\x0cTaskExecPoll\x12..modal.task_command_router.TaskExecPollRequest\x1a/.modal.task_command_router.TaskExecPollResponse\x12r\n\rTaskExecStart\x12/.modal.task_command_router.TaskExecStartRequest\x1a\x30.modal.task_command_router.TaskExecStartResponse\x12\x84\x01\n\x13TaskExecStdinStatus\x12\x35.modal.task_command_router.TaskExecStdinStatusRequest\x1a\x36.modal.task_command_router.TaskExecStdinStatusResponse\x12\x81\x01\n\x12TaskExecStdinWrite\x12\x34.modal.task_command_router.TaskExecStdinWriteRequest\x1a\x35.modal.task_command_router.TaskExecStdinWriteResponse\x12\x95\x01\n\x18TaskExecStdinWriteStream\x12:.modal.task_command_router.TaskExecStdinWriteStreamRequest\x1a;.modal.task_command_router.TaskExecStdinWriteStreamResponse(\x01\x12\x80\x01\n\x11TaskExecStdioRead\x12\x33.modal.task_command_router.TaskExecStdioReadRequest\x1a\x34.modal.task_command_router.TaskExecStdioReadResponse0\x01\x12o\n\x0cTaskExecWait\x12..modal.task_command_router.TaskExecWaitRequest\x1a/.modal.task_command_router.TaskExecWaitResponse\x12\x62\n\x12TaskMountDirectory\x12\x34.modal.task_command_router.TaskMountDirectoryRequest\x1a\x16.google.protobuf.Empty\x12~\n\x11TaskReloadVolumes\x12\x33.modal.task_command_router.TaskReloadVolumesRequest\x1a\x34.modal.task_command_router.TaskReloadVolumesResponse\x12\x87\x01\n\x14TaskSetNetworkAccess\x12\x36.modal.task_command_router.TaskSetNetworkAccessRequest\x1a\x37.modal.task_command_router.TaskSetNetworkAccessResponse\x12\x8a\x01\n\x15TaskSnapshotDirectory\x12\x37.modal.task_command_router.TaskSnapshotDirectoryRequest\x1a\x38.modal.task_command_router.TaskSnapshotDirectoryResponse\x12\x8d\x01\n\x16TaskSnapshotFilesystem\x12\x38.modal.task_command_router.TaskSnapshotFilesystemRequest\x1a\x39.modal.task_command_router.TaskSnapshotFilesystemResponse\x12\x81\x01\n\x12TaskSnapshotMemory\x12\x34.modal.task_command_router.TaskSnapshotMemoryRequest\x1a\x35.modal.task_command_router.TaskSnapshotMemoryResponse\x12\x66\n\x14TaskUnmountDirectory\x12\x36.modal.task_command_router.TaskUnmountDirectoryRequest\x1a\x16.google.protobuf.EmptyB&Z$github.com/modal-labs/modal/go/protob\x06proto3')
 
 _SANDBOXSTDIOFILEDESCRIPTOR = DESCRIPTOR.enum_types_by_name['SandboxStdioFileDescriptor']
 SandboxStdioFileDescriptor = enum_type_wrapper.EnumTypeWrapper(_SANDBOXSTDIOFILEDESCRIPTOR)
@@ -425,14 +425,14 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _TASKCONTAINERCREATEREQUEST_ENVENTRY._serialized_options = b'8\001'
   _TASKEXECSTARTREQUEST_ENVENTRY._options = None
   _TASKEXECSTARTREQUEST_ENVENTRY._serialized_options = b'8\001'
-  _SANDBOXSTDIOFILEDESCRIPTOR._serialized_start=4520
-  _SANDBOXSTDIOFILEDESCRIPTOR._serialized_end=4632
-  _TASKEXECSTDERRCONFIG._serialized_start=4635
-  _TASKEXECSTDERRCONFIG._serialized_end=4764
-  _TASKEXECSTDIOFILEDESCRIPTOR._serialized_start=4766
-  _TASKEXECSTDIOFILEDESCRIPTOR._serialized_end=4883
-  _TASKEXECSTDOUTCONFIG._serialized_start=4885
-  _TASKEXECSTDOUTCONFIG._serialized_end=4978
+  _SANDBOXSTDIOFILEDESCRIPTOR._serialized_start=4542
+  _SANDBOXSTDIOFILEDESCRIPTOR._serialized_end=4654
+  _TASKEXECSTDERRCONFIG._serialized_start=4657
+  _TASKEXECSTDERRCONFIG._serialized_end=4786
+  _TASKEXECSTDIOFILEDESCRIPTOR._serialized_start=4788
+  _TASKEXECSTDIOFILEDESCRIPTOR._serialized_end=4905
+  _TASKEXECSTDOUTCONFIG._serialized_start=4907
+  _TASKEXECSTDOUTCONFIG._serialized_end=5000
   _SANDBOXSTDINWRITEV2REQUEST._serialized_start=120
   _SANDBOXSTDINWRITEV2REQUEST._serialized_end=208
   _SANDBOXSTDINWRITEV2RESPONSE._serialized_start=210
@@ -506,27 +506,27 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _TASKMOUNTDIRECTORYREQUEST._serialized_start=3455
   _TASKMOUNTDIRECTORYREQUEST._serialized_end=3615
   _TASKRELOADVOLUMESREQUEST._serialized_start=3617
-  _TASKRELOADVOLUMESREQUEST._serialized_end=3660
-  _TASKRELOADVOLUMESRESPONSE._serialized_start=3662
-  _TASKRELOADVOLUMESRESPONSE._serialized_end=3689
-  _TASKSETNETWORKACCESSREQUEST._serialized_start=3691
-  _TASKSETNETWORKACCESSREQUEST._serialized_end=3790
-  _TASKSETNETWORKACCESSRESPONSE._serialized_start=3792
-  _TASKSETNETWORKACCESSRESPONSE._serialized_end=3822
-  _TASKSNAPSHOTDIRECTORYREQUEST._serialized_start=3825
-  _TASKSNAPSHOTDIRECTORYREQUEST._serialized_end=4033
-  _TASKSNAPSHOTDIRECTORYRESPONSE._serialized_start=4035
-  _TASKSNAPSHOTDIRECTORYRESPONSE._serialized_end=4084
-  _TASKSNAPSHOTFILESYSTEMREQUEST._serialized_start=4087
-  _TASKSNAPSHOTFILESYSTEMREQUEST._serialized_end=4282
-  _TASKSNAPSHOTFILESYSTEMRESPONSE._serialized_start=4284
-  _TASKSNAPSHOTFILESYSTEMRESPONSE._serialized_end=4334
-  _TASKSNAPSHOTMEMORYREQUEST._serialized_start=4336
-  _TASKSNAPSHOTMEMORYREQUEST._serialized_end=4405
-  _TASKSNAPSHOTMEMORYRESPONSE._serialized_start=4407
-  _TASKSNAPSHOTMEMORYRESPONSE._serialized_end=4456
-  _TASKUNMOUNTDIRECTORYREQUEST._serialized_start=4458
-  _TASKUNMOUNTDIRECTORYREQUEST._serialized_end=4518
-  _TASKCOMMANDROUTER._serialized_start=4981
-  _TASKCOMMANDROUTER._serialized_end=7855
+  _TASKRELOADVOLUMESREQUEST._serialized_end=3682
+  _TASKRELOADVOLUMESRESPONSE._serialized_start=3684
+  _TASKRELOADVOLUMESRESPONSE._serialized_end=3711
+  _TASKSETNETWORKACCESSREQUEST._serialized_start=3713
+  _TASKSETNETWORKACCESSREQUEST._serialized_end=3812
+  _TASKSETNETWORKACCESSRESPONSE._serialized_start=3814
+  _TASKSETNETWORKACCESSRESPONSE._serialized_end=3844
+  _TASKSNAPSHOTDIRECTORYREQUEST._serialized_start=3847
+  _TASKSNAPSHOTDIRECTORYREQUEST._serialized_end=4055
+  _TASKSNAPSHOTDIRECTORYRESPONSE._serialized_start=4057
+  _TASKSNAPSHOTDIRECTORYRESPONSE._serialized_end=4106
+  _TASKSNAPSHOTFILESYSTEMREQUEST._serialized_start=4109
+  _TASKSNAPSHOTFILESYSTEMREQUEST._serialized_end=4304
+  _TASKSNAPSHOTFILESYSTEMRESPONSE._serialized_start=4306
+  _TASKSNAPSHOTFILESYSTEMRESPONSE._serialized_end=4356
+  _TASKSNAPSHOTMEMORYREQUEST._serialized_start=4358
+  _TASKSNAPSHOTMEMORYREQUEST._serialized_end=4427
+  _TASKSNAPSHOTMEMORYRESPONSE._serialized_start=4429
+  _TASKSNAPSHOTMEMORYRESPONSE._serialized_end=4478
+  _TASKUNMOUNTDIRECTORYREQUEST._serialized_start=4480
+  _TASKUNMOUNTDIRECTORYREQUEST._serialized_end=4540
+  _TASKCOMMANDROUTER._serialized_start=5003
+  _TASKCOMMANDROUTER._serialized_end=7877
 # @@protoc_insertion_point(module_scope)

modal_proto/task_command_router_pb2.pyi

@@ -855,13 +855,17 @@ class TaskReloadVolumesRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     TASK_ID_FIELD_NUMBER: builtins.int
+    CONTAINER_ID_FIELD_NUMBER: builtins.int
     task_id: builtins.str
+    container_id: builtins.str
+    """Fully qualified target container ID. Empty targets the main container."""
     def __init__(
         self,
         *,
         task_id: builtins.str = ...,
+        container_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["task_id", b"task_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["container_id", b"container_id", "task_id", b"task_id"]) -> None: ...
 
 global___TaskReloadVolumesRequest = TaskReloadVolumesRequest
 

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.5.3.dev12"
+__version__ = "1.5.3.dev13"