modAL 1.0.4__tar.gz → 1.0.4.dev2__tar.gz

{modal-1.0.4 → modal-1.0.4.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.4
+Version: 1.0.4.dev2
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -22,7 +22,7 @@ Requires-Dist: click~=8.1.0
 Requires-Dist: grpclib==0.4.7
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
-Requires-Dist: synchronicity~=0.9.15
+Requires-Dist: synchronicity~=0.9.13
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-1.0.4 → modal-1.0.4.dev2}/modal/_partial_function.py

@@ -789,12 +789,12 @@ def _batched(
         )
     if max_batch_size < 1:
         raise InvalidError("max_batch_size must be a positive integer.")
-    if max_batch_size > MAX_MAX_BATCH_SIZE:
-        raise InvalidError(f"max_batch_size cannot be greater than {MAX_MAX_BATCH_SIZE}.")
+    if max_batch_size >= MAX_MAX_BATCH_SIZE:
+        raise InvalidError(f"max_batch_size must be less than {MAX_MAX_BATCH_SIZE}.")
     if wait_ms < 0:
         raise InvalidError("wait_ms must be a non-negative integer.")
-    if wait_ms > MAX_BATCH_WAIT_MS:
-        raise InvalidError(f"wait_ms cannot be greater than {MAX_BATCH_WAIT_MS}.")
+    if wait_ms >= MAX_BATCH_WAIT_MS:
+        raise InvalidError(f"wait_ms must be less than {MAX_BATCH_WAIT_MS}.")
 
     flags = _PartialFunctionFlags.CALLABLE_INTERFACE | _PartialFunctionFlags.BATCHED
     params = _PartialFunctionParams(batch_max_size=max_batch_size, batch_wait_ms=wait_ms)

{modal-1.0.4 → modal-1.0.4.dev2}/modal/_utils/async_utils.py

@@ -647,9 +647,7 @@ class StopSentinelType: ...
 STOP_SENTINEL = StopSentinelType()
 
 
-async def async_merge(
-    *generators: AsyncGenerator[T, None], cancellation_timeout: float = 10.0
-) -> AsyncGenerator[T, None]:
+async def async_merge(*generators: AsyncGenerator[T, None]) -> AsyncGenerator[T, None]:
     """
     Asynchronously merges multiple async generators into a single async generator.
 
@@ -694,9 +692,8 @@ async def async_merge(
 
     async def producer(generator: AsyncGenerator[T, None]):
         try:
-            async with aclosing(generator) as stream:
-                async for item in stream:
-                    await queue.put(ValueWrapper(item))
+            async for item in generator:
+                await queue.put(ValueWrapper(item))
         except Exception as e:
             await queue.put(ExceptionWrapper(e))
 
@@ -738,20 +735,15 @@ async def async_merge(
             new_output_task = asyncio.create_task(queue.get())
 
     finally:
-        unfinished_tasks = [t for t in tasks | {new_output_task} if not t.done()]
-        for t in unfinished_tasks:
-            t.cancel()
-        try:
-            await asyncio.wait_for(
-                asyncio.shield(
-                    # we need to `shield` the `gather` to ensure cooperation with the timeout
-                    # all underlying tasks have been marked as cancelled at this point anyway
-                    asyncio.gather(*unfinished_tasks, return_exceptions=True)
-                ),
-                timeout=cancellation_timeout,
-            )
-        except asyncio.TimeoutError:
-            logger.debug("Timed out while cleaning up async_merge")
+        if not new_output_task.done():
+            new_output_task.cancel()
+        for task in tasks:
+            if not task.done():
+                try:
+                    task.cancel()
+                    await task
+                except asyncio.CancelledError:
+                    pass
 
 
 async def callable_to_agen(awaitable: Callable[[], Awaitable[T]]) -> AsyncGenerator[T, None]:
@@ -769,34 +761,16 @@ async def gather_cancel_on_exc(*coros_or_futures):
         raise
 
 
-async def prevent_cancellation_abortion(coro):
-    # if this is cancelled, it will wait for coro cancellation handling
-    # and then unconditionally re-raises a CancelledError, even if the underlying coro
-    # doesn't re-raise the cancellation itself
-    t = asyncio.create_task(coro)
-    try:
-        return await asyncio.shield(t)
-    except asyncio.CancelledError:
-        if t.cancelled():
-            # coro cancelled itself - reraise
-            raise
-        t.cancel()  # cancel task
-        await t  # this *normally* reraises
-        raise  # if the above somehow resolved, by swallowing cancellation - we still raise
-
-
 async def async_map(
     input_generator: AsyncGenerator[T, None],
     async_mapper_func: Callable[[T], Awaitable[V]],
     concurrency: int,
-    cancellation_timeout: float = 10.0,
 ) -> AsyncGenerator[V, None]:
     queue: asyncio.Queue[Union[ValueWrapper[T], StopSentinelType]] = asyncio.Queue(maxsize=concurrency * 2)
 
     async def producer() -> AsyncGenerator[V, None]:
-        async with aclosing(input_generator) as stream:
-            async for item in stream:
-                await queue.put(ValueWrapper(item))
+        async for item in input_generator:
+            await queue.put(ValueWrapper(item))
 
         for _ in range(concurrency):
             await queue.put(STOP_SENTINEL)
@@ -810,17 +784,14 @@ async def async_map(
         while True:
             item = await queue.get()
             if isinstance(item, ValueWrapper):
-                res = await prevent_cancellation_abortion(async_mapper_func(item.value))
-                yield res
+                yield await async_mapper_func(item.value)
             elif isinstance(item, ExceptionWrapper):
                 raise item.value
             else:
                 assert_type(item, StopSentinelType)
                 break
 
-    async with aclosing(
-        async_merge(*[worker() for i in range(concurrency)], producer(), cancellation_timeout=cancellation_timeout)
-    ) as stream:
+    async with aclosing(async_merge(*[worker() for _ in range(concurrency)], producer())) as stream:
         async for item in stream:
             yield item
 

{modal-1.0.4 → modal-1.0.4.dev2}/modal/cli/network_file_system.py

@@ -203,11 +203,8 @@ async def rm(
 ):
     ensure_env(env)
     volume = _NetworkFileSystem.from_name(volume_name)
-    console = Console()
     try:
         await volume.remove_file(remote_path, recursive=recursive)
-        console.print(OutputManager.step_completed(f"{remote_path} was deleted successfully!"))
-
     except GRPCError as exc:
         if exc.status in (Status.NOT_FOUND, Status.INVALID_ARGUMENT):
             raise UsageError(exc.message)

{modal-1.0.4 → modal-1.0.4.dev2}/modal/cli/run.py

@@ -27,7 +27,6 @@ from ..functions import Function
 from ..image import Image
 from ..output import enable_output
 from ..runner import deploy_app, interactive_shell, run_app
-from ..secret import Secret
 from ..serving import serve_app
 from ..volume import Volume
 from .import_refs import (
@@ -532,10 +531,6 @@ def shell(
             " Can be used multiple times."
         ),
     ),
-    secret: Optional[list[str]] = typer.Option(
-        default=None,
-        help=("Name of a `modal.Secret` to mount inside the shell (if not using REF). Can be used multiple times."),
-    ),
     cpu: Optional[int] = typer.Option(default=None, help="Number of CPUs to allocate to the shell (if not using REF)."),
     memory: Optional[int] = typer.Option(
         default=None, help="Memory to allocate for the shell, in MiB (if not using REF)."
@@ -665,7 +660,6 @@ def shell(
     else:
         modal_image = Image.from_registry(image, add_python=add_python) if image else None
         volumes = {} if volume is None else {f"/mnt/{vol}": Volume.from_name(vol) for vol in volume}
-        secrets = [] if secret is None else [Secret.from_name(s) for s in secret]
         start_shell = partial(
             interactive_shell,
             image=modal_image,
@@ -674,7 +668,6 @@ def shell(
             gpu=gpu,
             cloud=cloud,
             volumes=volumes,
-            secrets=secrets,
             region=region.split(",") if region else [],
             pty=pty,
         )

{modal-1.0.4 → modal-1.0.4.dev2}/modal/cli/volume.py

@@ -245,10 +245,8 @@ async def rm(
 ):
     ensure_env(env)
     volume = _Volume.from_name(volume_name, environment_name=env)
-    console = Console()
     try:
         await volume.remove_file(remote_path, recursive=recursive)
-        console.print(OutputManager.step_completed(f"{remote_path} was deleted successfully!"))
     except GRPCError as exc:
         if exc.status in (Status.NOT_FOUND, Status.INVALID_ARGUMENT):
             raise UsageError(exc.message)

{modal-1.0.4 → modal-1.0.4.dev2}/modal/client.pyi

@@ -27,7 +27,11 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.0.4"
+        self,
+        server_url: str,
+        client_type: int,
+        credentials: typing.Optional[tuple[str, str]],
+        version: str = "1.0.4.dev2",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -86,7 +90,11 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.0.4"
+        self,
+        server_url: str,
+        client_type: int,
+        credentials: typing.Optional[tuple[str, str]],
+        version: str = "1.0.4.dev2",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.4 → modal-1.0.4.dev2}/modal/cls.py

@@ -75,7 +75,6 @@ def _get_class_constructor_signature(user_cls: type) -> inspect.Signature:
 
 @dataclasses.dataclass()
 class _ServiceOptions:
-    # Note that default values should always be "untruthy" so we can detect when they are not set
     secrets: typing.Collection[_Secret] = ()
     validated_volumes: typing.Sequence[tuple[str, _Volume]] = ()
     resources: Optional[api_pb2.Resources] = None
@@ -89,25 +88,6 @@ class _ServiceOptions:
     batch_max_size: Optional[int] = None
     batch_wait_ms: Optional[int] = None
 
-    def merge_options(self, new_options: "_ServiceOptions") -> "_ServiceOptions":
-        """Implement protobuf-like MergeFrom semantics for this dataclass.
-
-        This mostly exists to support "stacking" of `.with_options()` calls.
-        """
-        new_options_dict = dataclasses.asdict(new_options)
-
-        # Resources needs special merge handling because individual fields are parameters in the public API
-        merged_resources = api_pb2.Resources()
-        if self.resources:
-            merged_resources.MergeFrom(self.resources)
-        if new_resources := new_options_dict.pop("resources"):
-            merged_resources.MergeFrom(new_resources)
-        self.resources = merged_resources
-
-        for key, value in new_options_dict.items():
-            if value:  # Only overwrite data when the value was set in the new options
-                setattr(self, key, value)
-
 
 def _bind_instance_method(cls: "_Cls", service_function: _Function, method_name: str):
     """Binds an "instance service function" to a specific method using metadata for that method
@@ -684,32 +664,15 @@ More information on class parameterization can be found here: https://modal.com/
         container_idle_timeout: Optional[int] = None,  # Now called `scaledown_window`
         allow_concurrent_inputs: Optional[int] = None,  # See `.with_concurrency`
     ) -> "_Cls":
-        """Override the static Function configuration at runtime.
-
-        This method will return a new instance of the cls that will autoscale independently of the
-        original instance. Note that options cannot be "unset" with this method (i.e., if a GPU
-        is configured in the `@app.cls()` decorator, passing `gpu=None` here will not create a
-        CPU-only instance).
+        """Create an instance of the Cls with configuration options overridden with new values.
 
         **Usage:**
 
-        You can use this method after looking up the Cls from a deployed App or if you have a
-        direct reference to a Cls from another Function or local entrypoint on its App:
-
         ```python notest
         Model = modal.Cls.from_name("my_app", "Model")
         ModelUsingGPU = Model.with_options(gpu="A100")
-        ModelUsingGPU().generate.remote(input_prompt)  # Run with an A100 GPU
+        ModelUsingGPU().generate.remote(42)  # will run with an A100 GPU
         ```
-
-        The method can be called multiple times to "stack" updates:
-
-        ```python notest
-        Model.with_options(gpu="A100").with_options(scaledown_window=300)  # Use an A100 with slow scaledown
-        ```
-
-        Note that container arguments (i.e. `volumes` and `secrets`) passed in subsequent calls
-        will not be merged.
         """
         retry_policy = _parse_retries(retries, f"Class {self.__name__}" if self._user_cls else "")
         if gpu or cpu or memory:
@@ -742,23 +705,21 @@ More information on class parameterization can be found here: https://modal.com/
 
         cls = _Cls._from_loader(_load_from_base, rep=f"{self._name}.with_options(...)", is_another_app=True, deps=_deps)
         cls._initialize_from_other(self)
-
-        new_options = _ServiceOptions(
+        cls._options = dataclasses.replace(
+            cls._options,
             secrets=secrets,
-            validated_volumes=validate_volumes(volumes),
             resources=resources,
             retry_policy=retry_policy,
             max_containers=max_containers,
             buffer_containers=buffer_containers,
             scaledown_window=scaledown_window,
             timeout_secs=timeout,
+            validated_volumes=validate_volumes(volumes),
             # Note: set both for backwards / forwards compatibility
             # But going forward `.with_concurrency` is the preferred method with distinct parameterization
             max_concurrent_inputs=allow_concurrent_inputs,
             target_concurrent_inputs=allow_concurrent_inputs,
         )
-
-        cls._options.merge_options(new_options)
         return cls
 
     def with_concurrency(self: "_Cls", *, max_inputs: int, target_inputs: Optional[int] = None) -> "_Cls":
@@ -785,9 +746,9 @@ More information on class parameterization can be found here: https://modal.com/
             _load_from_base, rep=f"{self._name}.with_concurrency(...)", is_another_app=True, deps=_deps
         )
         cls._initialize_from_other(self)
-
-        concurrency_options = _ServiceOptions(max_concurrent_inputs=max_inputs, target_concurrent_inputs=target_inputs)
-        cls._options.merge_options(concurrency_options)
+        cls._options = dataclasses.replace(
+            cls._options, max_concurrent_inputs=max_inputs, target_concurrent_inputs=target_inputs
+        )
         return cls
 
     def with_batching(self: "_Cls", *, max_batch_size: int, wait_ms: int) -> "_Cls":
@@ -814,9 +775,7 @@ More information on class parameterization can be found here: https://modal.com/
             _load_from_base, rep=f"{self._name}.with_concurrency(...)", is_another_app=True, deps=_deps
         )
         cls._initialize_from_other(self)
-
-        batching_options = _ServiceOptions(batch_max_size=max_batch_size, batch_wait_ms=wait_ms)
-        cls._options.merge_options(batching_options)
+        cls._options = dataclasses.replace(cls._options, batch_max_size=max_batch_size, batch_wait_ms=wait_ms)
         return cls
 
     @staticmethod

{modal-1.0.4 → modal-1.0.4.dev2}/modal/cls.pyi

@@ -37,7 +37,6 @@ class _ServiceOptions:
     batch_max_size: typing.Optional[int]
     batch_wait_ms: typing.Optional[int]
 
-    def merge_options(self, new_options: _ServiceOptions) -> _ServiceOptions: ...
     def __init__(
         self,
         secrets: typing.Collection[modal.secret._Secret] = (),

{modal-1.0.4 → modal-1.0.4.dev2}/modal/file_io.py

@@ -144,12 +144,11 @@ class _FileIO(Generic[T]):
     _task_id: str = ""
     _file_descriptor: str = ""
     _client: _Client
-    _watch_output_buffer: list[Union[Optional[bytes],Exception]] = []
+    _watch_output_buffer: list[Optional[bytes]] = []
 
     def __init__(self, client: _Client, task_id: str) -> None:
         self._client = client
         self._task_id = task_id
-        self._watch_output_buffer = []
 
     def _validate_mode(self, mode: str) -> None:
         if not any(char in mode for char in "rwax"):
@@ -174,7 +173,11 @@ class _FileIO(Generic[T]):
                 raise ValueError(f"Invalid file mode: {mode}")
             seen_chars.add(char)
 
-    async def _consume_output(self, exec_id: str) -> AsyncIterator[Union[Optional[bytes], Exception]]:
+    def _handle_error(self, error: api_pb2.SystemErrorMessage) -> None:
+        error_class = ERROR_MAPPING.get(error.error_code, FilesystemExecutionError)
+        raise error_class(error.error_message)
+
+    async def _consume_output(self, exec_id: str) -> AsyncIterator[Optional[bytes]]:
         req = api_pb2.ContainerFilesystemExecGetOutputRequest(
             exec_id=exec_id,
             timeout=55,
@@ -184,8 +187,7 @@ class _FileIO(Generic[T]):
                 yield None
                 break
             if batch.HasField("error"):
-                error_class = ERROR_MAPPING.get(batch.error.error_code, FilesystemExecutionError)
-                yield error_class(batch.error.error_message)
+                self._handle_error(batch.error)
             for message in batch.output:
                 yield message
 
@@ -234,8 +236,6 @@ class _FileIO(Generic[T]):
                     if data is None:
                         completed = True
                         break
-                    if isinstance(data, Exception):
-                        raise data
                     output += data
             except (GRPCError, StreamTerminatedError) as exc:
                 if retries_remaining > 0:
@@ -475,8 +475,6 @@ class _FileIO(Generic[T]):
                     item = self._watch_output_buffer.pop(0)
                     if item is None:
                         break
-                    if isinstance(item, Exception):
-                        raise item
                     buffer += item
                     # a single event may be split across multiple messages
                     # the end of an event is marked by two newlines

{modal-1.0.4 → modal-1.0.4.dev2}/modal/file_io.pyi

@@ -1,6 +1,7 @@
 import _typeshed
 import enum
 import modal.client
+import modal_proto.api_pb2
 import typing
 import typing_extensions
 
@@ -32,11 +33,12 @@ class _FileIO(typing.Generic[T]):
     _task_id: str
     _file_descriptor: str
     _client: modal.client._Client
-    _watch_output_buffer: list[typing.Union[bytes, None, Exception]]
+    _watch_output_buffer: list[typing.Optional[bytes]]
 
     def __init__(self, client: modal.client._Client, task_id: str) -> None: ...
     def _validate_mode(self, mode: str) -> None: ...
-    def _consume_output(self, exec_id: str) -> typing.AsyncIterator[typing.Union[bytes, None, Exception]]: ...
+    def _handle_error(self, error: modal_proto.api_pb2.SystemErrorMessage) -> None: ...
+    def _consume_output(self, exec_id: str) -> typing.AsyncIterator[typing.Optional[bytes]]: ...
     async def _consume_watch_output(self, exec_id: str) -> None: ...
     async def _parse_watch_output(self, event: bytes) -> typing.Optional[FileWatchEvent]: ...
     async def _wait(self, exec_id: str) -> bytes: ...
@@ -110,14 +112,15 @@ class FileIO(typing.Generic[T]):
     _task_id: str
     _file_descriptor: str
     _client: modal.client.Client
-    _watch_output_buffer: list[typing.Union[bytes, None, Exception]]
+    _watch_output_buffer: list[typing.Optional[bytes]]
 
     def __init__(self, client: modal.client.Client, task_id: str) -> None: ...
     def _validate_mode(self, mode: str) -> None: ...
+    def _handle_error(self, error: modal_proto.api_pb2.SystemErrorMessage) -> None: ...
 
     class ___consume_output_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, exec_id: str) -> typing.Iterator[typing.Union[bytes, None, Exception]]: ...
-        def aio(self, /, exec_id: str) -> typing.AsyncIterator[typing.Union[bytes, None, Exception]]: ...
+        def __call__(self, /, exec_id: str) -> typing.Iterator[typing.Optional[bytes]]: ...
+        def aio(self, /, exec_id: str) -> typing.AsyncIterator[typing.Optional[bytes]]: ...
 
     _consume_output: ___consume_output_spec[typing_extensions.Self]
 

{modal-1.0.4 → modal-1.0.4.dev2}/modal/sandbox.py

@@ -105,7 +105,6 @@ class _Sandbox(_Object, type_prefix="sb"):
         proxy: Optional[_Proxy] = None,
         _experimental_scheduler_placement: Optional[SchedulerPlacement] = None,
         enable_snapshot: bool = False,
-        verbose: bool = False,
     ) -> "_Sandbox":
         """mdmd:hidden"""
 
@@ -206,7 +205,6 @@ class _Sandbox(_Object, type_prefix="sb"):
                 network_access=network_access,
                 proxy_id=(proxy.object_id if proxy else None),
                 enable_snapshot=enable_snapshot,
-                verbose=verbose,
             )
 
             # Note - `resolver.app_id` will be `None` for app-less sandboxes
@@ -255,8 +253,6 @@ class _Sandbox(_Object, type_prefix="sb"):
         unencrypted_ports: Sequence[int] = [],
         # Reference to a Modal Proxy to use in front of this Sandbox.
         proxy: Optional[_Proxy] = None,
-        # Enable verbose logging for sandbox operations.
-        verbose: bool = False,
         # Enable memory snapshots.
         _experimental_enable_snapshot: bool = False,
         _experimental_scheduler_placement: Optional[
@@ -302,7 +298,6 @@ class _Sandbox(_Object, type_prefix="sb"):
             _experimental_enable_snapshot=_experimental_enable_snapshot,
             _experimental_scheduler_placement=_experimental_scheduler_placement,
             client=client,
-            verbose=verbose,
         )
 
     @staticmethod
@@ -347,7 +342,6 @@ class _Sandbox(_Object, type_prefix="sb"):
             SchedulerPlacement
         ] = None,  # Experimental controls over fine-grained scheduling (alpha).
         client: Optional[_Client] = None,
-        verbose: bool = False,
     ):
         # This method exposes some internal arguments (currently `mounts`) which are not in the public API
         # `mounts` is currently only used by modal shell (cli) to provide a function's mounts to the
@@ -382,7 +376,6 @@ class _Sandbox(_Object, type_prefix="sb"):
             proxy=proxy,
             _experimental_scheduler_placement=_experimental_scheduler_placement,
             enable_snapshot=_experimental_enable_snapshot,
-            verbose=verbose,
         )
         obj._enable_snapshot = _experimental_enable_snapshot
 

{modal-1.0.4 → modal-1.0.4.dev2}/modal/sandbox.pyi

@@ -63,7 +63,6 @@ class _Sandbox(modal._object._Object):
         proxy: typing.Optional[modal.proxy._Proxy] = None,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         enable_snapshot: bool = False,
-        verbose: bool = False,
     ) -> _Sandbox: ...
     @staticmethod
     async def create(
@@ -91,7 +90,6 @@ class _Sandbox(modal._object._Object):
         h2_ports: collections.abc.Sequence[int] = [],
         unencrypted_ports: collections.abc.Sequence[int] = [],
         proxy: typing.Optional[modal.proxy._Proxy] = None,
-        verbose: bool = False,
         _experimental_enable_snapshot: bool = False,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         client: typing.Optional[modal.client._Client] = None,
@@ -126,7 +124,6 @@ class _Sandbox(modal._object._Object):
         _experimental_enable_snapshot: bool = False,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         client: typing.Optional[modal.client._Client] = None,
-        verbose: bool = False,
     ): ...
     def _hydrate_metadata(self, handle_metadata: typing.Optional[google.protobuf.message.Message]): ...
     @staticmethod
@@ -239,7 +236,6 @@ class Sandbox(modal.object.Object):
         proxy: typing.Optional[modal.proxy.Proxy] = None,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         enable_snapshot: bool = False,
-        verbose: bool = False,
     ) -> Sandbox: ...
 
     class __create_spec(typing_extensions.Protocol):
@@ -272,7 +268,6 @@ class Sandbox(modal.object.Object):
             h2_ports: collections.abc.Sequence[int] = [],
             unencrypted_ports: collections.abc.Sequence[int] = [],
             proxy: typing.Optional[modal.proxy.Proxy] = None,
-            verbose: bool = False,
             _experimental_enable_snapshot: bool = False,
             _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
             client: typing.Optional[modal.client.Client] = None,
@@ -306,7 +301,6 @@ class Sandbox(modal.object.Object):
             h2_ports: collections.abc.Sequence[int] = [],
             unencrypted_ports: collections.abc.Sequence[int] = [],
             proxy: typing.Optional[modal.proxy.Proxy] = None,
-            verbose: bool = False,
             _experimental_enable_snapshot: bool = False,
             _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
             client: typing.Optional[modal.client.Client] = None,
@@ -348,7 +342,6 @@ class Sandbox(modal.object.Object):
             _experimental_enable_snapshot: bool = False,
             _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
             client: typing.Optional[modal.client.Client] = None,
-            verbose: bool = False,
         ): ...
         async def aio(
             self,
@@ -383,7 +376,6 @@ class Sandbox(modal.object.Object):
             _experimental_enable_snapshot: bool = False,
             _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
             client: typing.Optional[modal.client.Client] = None,
-            verbose: bool = False,
         ): ...
 
     _create: ___create_spec

{modal-1.0.4 → modal-1.0.4.dev2}/modal/volume.py

@@ -403,10 +403,6 @@ class _Volume(_Object, type_prefix="vo"):
         """
         Read a file from the modal.Volume.
 
-        Note - this function is primarily intended to be used outside of a Modal App.
-        For more information on downloading files from a Modal Volume, see
-        [the guide](/docs/guide/volumes).
-
         **Example:**
 
         ```python notest
@@ -447,7 +443,6 @@ class _Volume(_Object, type_prefix="vo"):
         Read volume file into file-like IO object.
         """
         if progress_cb is None:
-
             def progress_cb(*_, **__):
                 pass
 

{modal-1.0.4 → modal-1.0.4.dev2}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.4
+Version: 1.0.4.dev2
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -22,7 +22,7 @@ Requires-Dist: click~=8.1.0
 Requires-Dist: grpclib==0.4.7
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
-Requires-Dist: synchronicity~=0.9.15
+Requires-Dist: synchronicity~=0.9.13
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-1.0.4 → modal-1.0.4.dev2}/modal.egg-info/requires.txt

@@ -4,7 +4,7 @@ click~=8.1.0
 grpclib==0.4.7
 protobuf!=4.24.0,<7.0,>=3.19
 rich>=12.0.0
-synchronicity~=0.9.15
+synchronicity~=0.9.13
 toml
 typer>=0.9
 types-certifi

{modal-1.0.4 → modal-1.0.4.dev2}/modal_proto/api.proto

@@ -2440,9 +2440,6 @@ message Sandbox {
 
   // If set, overrides the runtime used by the function, either "runc" or "gvisor".
   optional string runtime = 28;
-
-  // If set, the sandbox will be created with verbose logging enabled.
-  bool verbose = 29;
 }
 
 message SandboxCreateRequest {
@@ -2796,7 +2793,6 @@ message TaskInfo {
   modal.client.GenericResult result = 4;
   double enqueued_at = 5;
   string gpu_type = 6;
-  string sandbox_id = 7;
 }
 
 message TaskListRequest {