modal 1.0.4.dev4__tar.gz → 1.0.4.dev7__tar.gz

{modal-1.0.4.dev4 → modal-1.0.4.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.4.dev4
+Version: 1.0.4.dev7
 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.13
+Requires-Dist: synchronicity~=0.9.14
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-1.0.4.dev4 → modal-1.0.4.dev7}/modal/_utils/async_utils.py

@@ -647,7 +647,9 @@ class StopSentinelType: ...
 STOP_SENTINEL = StopSentinelType()
 
 
-async def async_merge(*generators: AsyncGenerator[T, None]) -> AsyncGenerator[T, None]:
+async def async_merge(
+    *generators: AsyncGenerator[T, None], cancellation_timeout: float = 10.0
+) -> AsyncGenerator[T, None]:
     """
     Asynchronously merges multiple async generators into a single async generator.
 
@@ -692,8 +694,9 @@ async def async_merge(*generators: AsyncGenerator[T, None]) -> AsyncGenerator[T,
 
     async def producer(generator: AsyncGenerator[T, None]):
         try:
-            async for item in generator:
-                await queue.put(ValueWrapper(item))
+            async with aclosing(generator) as stream:
+                async for item in stream:
+                    await queue.put(ValueWrapper(item))
         except Exception as e:
             await queue.put(ExceptionWrapper(e))
 
@@ -735,15 +738,20 @@ async def async_merge(*generators: AsyncGenerator[T, None]) -> AsyncGenerator[T,
             new_output_task = asyncio.create_task(queue.get())
 
     finally:
-        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
+        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")
 
 
 async def callable_to_agen(awaitable: Callable[[], Awaitable[T]]) -> AsyncGenerator[T, None]:
@@ -761,16 +769,34 @@ 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 for item in input_generator:
-            await queue.put(ValueWrapper(item))
+        async with aclosing(input_generator) as stream:
+            async for item in stream:
+                await queue.put(ValueWrapper(item))
 
         for _ in range(concurrency):
             await queue.put(STOP_SENTINEL)
@@ -784,14 +810,17 @@ async def async_map(
         while True:
             item = await queue.get()
             if isinstance(item, ValueWrapper):
-                yield await async_mapper_func(item.value)
+                res = await prevent_cancellation_abortion(async_mapper_func(item.value))
+                yield res
             elif isinstance(item, ExceptionWrapper):
                 raise item.value
             else:
                 assert_type(item, StopSentinelType)
                 break
 
-    async with aclosing(async_merge(*[worker() for _ in range(concurrency)], producer())) as stream:
+    async with aclosing(
+        async_merge(*[worker() for i in range(concurrency)], producer(), cancellation_timeout=cancellation_timeout)
+    ) as stream:
         async for item in stream:
             yield item
 

{modal-1.0.4.dev4 → modal-1.0.4.dev7}/modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.4.dev4",
+        version: str = "1.0.4.dev7",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -94,7 +94,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.4.dev4",
+        version: str = "1.0.4.dev7",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.4.dev4 → modal-1.0.4.dev7}/modal/sandbox.py

@@ -105,6 +105,7 @@ 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"""
 
@@ -205,6 +206,7 @@ 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
@@ -253,6 +255,8 @@ 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[
@@ -298,6 +302,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             _experimental_enable_snapshot=_experimental_enable_snapshot,
             _experimental_scheduler_placement=_experimental_scheduler_placement,
             client=client,
+            verbose=verbose,
         )
 
     @staticmethod
@@ -342,6 +347,7 @@ 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
@@ -376,6 +382,7 @@ 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.dev4 → modal-1.0.4.dev7}/modal/sandbox.pyi

@@ -63,6 +63,7 @@ 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(
@@ -90,6 +91,7 @@ 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,
@@ -124,6 +126,7 @@ 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
@@ -236,6 +239,7 @@ 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):
@@ -268,6 +272,7 @@ 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,
@@ -301,6 +306,7 @@ 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,
@@ -342,6 +348,7 @@ 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,
@@ -376,6 +383,7 @@ 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.dev4 → modal-1.0.4.dev7}/modal/volume.py

@@ -403,6 +403,10 @@ 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
@@ -443,6 +447,7 @@ 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.dev4 → modal-1.0.4.dev7}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.4.dev4
+Version: 1.0.4.dev7
 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.13
+Requires-Dist: synchronicity~=0.9.14
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-1.0.4.dev4 → modal-1.0.4.dev7}/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.13
+synchronicity~=0.9.14
 toml
 typer>=0.9
 types-certifi

{modal-1.0.4.dev4 → modal-1.0.4.dev7}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.4.dev4"
+__version__ = "1.0.4.dev7"

{modal-1.0.4.dev4 → modal-1.0.4.dev7}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "grpclib==0.4.7",
     "protobuf>=3.19,<7.0,!=4.24.0",
     "rich>=12.0.0",
-    "synchronicity~=0.9.13",
+    "synchronicity~=0.9.14",
     "toml",
     "typer>=0.9",
     "types-certifi",