modal 1.6.2.dev12__tar.gz → 1.6.3.dev0__tar.gz

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/PKG-INFO

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

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/_utils/auth_token_manager.py

@@ -98,8 +98,9 @@ class _AuthTokenManager:
         caller goes away.
         """
         if self._refresh_task is None:
-            # Maybe another coroutine refreshed already, or we're cooling down after a failure.
-            if self._token and not self._should_refresh():
+            # Maybe another coroutine refreshed already, or we're cooling down after a failure. The cooldown
+            # only applies while the cached token is still usable.
+            if self._has_valid_token() and not self._should_refresh():
                 return
             # Note: the task is created in async code so it binds to the synchronicity event loop.
             self._refresh_task = asyncio.create_task(self._fetch_token())
@@ -121,12 +122,12 @@ class _AuthTokenManager:
     async def _fetch_token(self):
         """Fetch a new token and cache it, or arm the failure backoff."""
         try:
-            # No cached token to fall back on, so a failure is user-visible: retry transient errors.
+            # Retry transient errors if the cached token is missing or expired.
             # Otherwise one attempt, and _retry_after handles the cooldown.
             retry = Retry(
                 attempt_timeout=self.AUTH_TOKEN_TIMEOUT,
                 total_timeout=self.AUTH_TOKEN_RETRY_TOTAL_TIMEOUT,
-                max_retries=0 if self._token else DEFAULT_MAX_RETRIES,
+                max_retries=0 if self._has_valid_token() else DEFAULT_MAX_RETRIES,
             )
             token = await self._fetch(retry)
             if not token:
@@ -166,6 +167,9 @@ class _AuthTokenManager:
         except Exception as e:
             raise ValueError("Internal error: Cannot parse auth token. Please contact Modal support.") from e
 
+    def _has_valid_token(self):
+        return bool(self._token) and not self._is_expired()
+
     def _in_backoff(self):
         return time.time() < self._retry_after
 

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/cli/dict.py

@@ -8,7 +8,7 @@ from modal._load_context import LoadContext
 from modal._resolver import Resolver
 from modal._utils.async_utils import TaskContext, synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
-from modal.cli.utils import display_table, env_option, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, yes_option
 from modal.client import _Client
 from modal.dict import _Dict
 from modal.output import OutputManager
@@ -64,10 +64,8 @@ async def clear(name: str, *, yes: bool = False, env: str | None = None):
     """Clear the contents of a named Dict by deleting all of its data."""
     d = _Dict.from_name(name, environment_name=env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the contents of modal.Dict '{name}'?",
-            default=False,
-            abort=True,
         )
     await d.clear()
 
@@ -87,10 +85,8 @@ async def delete(
 ):
     """Delete a named Dict and all of its data."""
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.Dict '{name}'?",
-            default=False,
-            abort=True,
         )
     await _Dict.objects.delete(name, environment_name=env, allow_missing=allow_missing)
 

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/cli/network_file_system.py

@@ -14,7 +14,7 @@ from modal._location import display_location
 from modal._utils.async_utils import synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli._download import _volume_download
-from modal.cli.utils import display_table, env_option, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, yes_option
 from modal.client import _Client
 from modal.network_file_system import _NetworkFileSystem
 from modal.output import OutputManager
@@ -86,10 +86,8 @@ async def delete(
     # Lookup first to validate the name, even though delete is a staticmethod
     await _NetworkFileSystem.from_name(nfs_name, environment_name=env).hydrate()
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.NetworkFileSystem '{nfs_name}'?",
-            default=False,
-            abort=True,
         )
 
     await _NetworkFileSystem.delete(nfs_name, environment_name=env)

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/cli/queues.py

@@ -8,7 +8,7 @@ from modal._load_context import LoadContext
 from modal._resolver import Resolver
 from modal._utils.async_utils import TaskContext, synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
-from modal.cli.utils import display_table, env_option, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, yes_option
 from modal.client import _Client
 from modal.output import OutputManager
 from modal.queue import _Queue
@@ -127,10 +127,8 @@ async def clear(
     """Clear the contents of a Queue by removing all of its data."""
     q = _Queue.from_name(name, environment_name=env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the contents of modal.Queue '{name}'?",
-            default=False,
-            abort=True,
         )
     await q.clear(partition=partition, all=all)
 
@@ -151,10 +149,8 @@ async def delete(
     """Delete a named Queue and all of its data."""
     env = ensure_env(env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.Queue '{name}'?",
-            default=False,
-            abort=True,
         )
     await _Queue.objects.delete(name, environment_name=env, allow_missing=allow_missing)
 

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/cli/secret.py

@@ -13,7 +13,7 @@ from rich.syntax import Syntax
 from modal._environments import ensure_env
 from modal._utils.async_utils import synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
-from modal.cli.utils import display_table, env_option, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, yes_option
 from modal.client import _Client
 from modal.output import OutputManager
 from modal.secret import _Secret
@@ -194,10 +194,8 @@ async def delete(
 ):
     env = ensure_env(env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.Secret '{name}'?",
-            default=False,
-            abort=True,
         )
     await _Secret.objects.delete(name, environment_name=env, allow_missing=allow_missing)
 

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/cli/volume.py

@@ -13,7 +13,7 @@ from modal._utils.async_utils import synchronizer
 from modal._utils.browser_utils import open_url_and_display
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli._download import _volume_download
-from modal.cli.utils import display_table, env_option, humanize_filesize, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, humanize_filesize, yes_option
 from modal.output import OutputManager
 from modal.volume import _AbstractVolumeUploadContextManager, _Volume
 from modal_proto import api_pb2
@@ -81,10 +81,8 @@ async def rename(
     env: str | None = None,
 ):
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want rename the modal.Volume '{old_name}'? This may break any Apps currently using it.",
-            default=False,
-            abort=True,
         )
 
     await _Volume.rename(old_name, new_name, environment_name=env)
@@ -132,10 +130,8 @@ async def delete(
 ):
     env = ensure_env(env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.Volume '{name}'?",
-            default=False,
-            abort=True,
         )
 
     await _Volume.objects.delete(name, environment_name=env, allow_missing=allow_missing)

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/client.pyi

@@ -80,7 +80,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.2.dev12",
+        version: str = "1.6.3.dev0",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -290,7 +290,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.2.dev12",
+        version: str = "1.6.3.dev0",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/functions.pyi

@@ -619,7 +619,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.
 
@@ -644,7 +644,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]:
@@ -694,7 +694,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.
 
@@ -727,7 +727,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: ...
@@ -735,7 +735,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.
 
@@ -768,7 +768,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     @property
     def _raw_f_(self) -> collections.abc.Callable[..., typing.Any]: ...

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/sandbox/_sandbox.py

@@ -112,6 +112,11 @@ _EXIT_SNAPSHOT_LONG_POLL_TIMEOUT = 10.0
 # client-side deadline.
 _EXIT_SNAPSHOT_POLL_DEADLINE_MARGIN = 5.0
 
+# `Sandbox.wait` re-polls a server-side long poll of this many seconds. Each poll gets a network deadline
+# with a margin over the hold, so a poll the server never answers fails and is retried instead of hanging.
+_WAIT_LONG_POLL_TIMEOUT = 10.0
+_WAIT_POLL_DEADLINE_MARGIN = 5.0
+
 # How long `Sandbox.create` waits for capacity before giving up.
 _SANDBOX_SCHEDULING_TIMEOUT: float = 21 * 60
 
@@ -484,8 +489,8 @@ class _Sandbox(_Object, type_prefix="sb"):
                 wildcard prefixes (``*.``); a bare ``"*"`` allows all domains. The outbound policy
                 can be replaced later via `Sandbox._experimental_set_outbound_network_policy`.
             inbound_cidr_allowlist:
-                List of CIDRs allowed to connect inbound to the sandbox (tunnels and connection tokens). If None,
-                all CIDRs are allowed.
+                List of CIDRs allowed to connect inbound to the sandbox (encrypted tunnels and connection tokens).
+                If None, all CIDRs are allowed.
             _experimental_outbound_policy: Configuration for replacing headers in outbound HTTPS requests from
                 the Sandbox. Secrets referenced by the policy are resolved outside the Sandbox and are never
                 visible to the workload. See `modal.experimental.OutboundPolicy`. This API is experimental and
@@ -1682,14 +1687,15 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         """
 
+        poll_retry = Retry(attempt_timeout=_WAIT_LONG_POLL_TIMEOUT + _WAIT_POLL_DEADLINE_MARGIN)
         while True:
-            req = api_pb2.SandboxWaitRequest(sandbox_id=self.object_id, timeout=10)
+            req = api_pb2.SandboxWaitRequest(sandbox_id=self.object_id, timeout=_WAIT_LONG_POLL_TIMEOUT)
             # Use the private __client to allow `wait` to work with a detached sandbox
             stub = self.__client._stub
             if self._is_v2:
-                resp = await stub.SandboxWaitV2(req, metadata=await self._v2_metadata(self.__client))
+                resp = await stub.SandboxWaitV2(req, retry=poll_retry, metadata=await self._v2_metadata(self.__client))
             else:
-                resp = await stub.SandboxWait(req)
+                resp = await stub.SandboxWait(req, retry=poll_retry)
             if resp.result.status:
                 logger.debug(f"Sandbox {self.object_id} wait completed with status {resp.result.status}")
                 self._result = resp.result

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal/sandbox/sandbox.pyi

@@ -1474,8 +1474,8 @@ class Sandbox(modal.object.Object):
                     wildcard prefixes (``*.``); a bare ``"*"`` allows all domains. The outbound policy
                     can be replaced later via `Sandbox._experimental_set_outbound_network_policy`.
                 inbound_cidr_allowlist:
-                    List of CIDRs allowed to connect inbound to the sandbox (tunnels and connection tokens). If None,
-                    all CIDRs are allowed.
+                    List of CIDRs allowed to connect inbound to the sandbox (encrypted tunnels and connection tokens).
+                    If None, all CIDRs are allowed.
                 _experimental_outbound_policy: Configuration for replacing headers in outbound HTTPS requests from
                     the Sandbox. Secrets referenced by the policy are resolved outside the Sandbox and are never
                     visible to the workload. See `modal.experimental.OutboundPolicy`. This API is experimental and
@@ -1598,8 +1598,8 @@ class Sandbox(modal.object.Object):
                     wildcard prefixes (``*.``); a bare ``"*"`` allows all domains. The outbound policy
                     can be replaced later via `Sandbox._experimental_set_outbound_network_policy`.
                 inbound_cidr_allowlist:
-                    List of CIDRs allowed to connect inbound to the sandbox (tunnels and connection tokens). If None,
-                    all CIDRs are allowed.
+                    List of CIDRs allowed to connect inbound to the sandbox (encrypted tunnels and connection tokens).
+                    If None, all CIDRs are allowed.
                 _experimental_outbound_policy: Configuration for replacing headers in outbound HTTPS requests from
                     the Sandbox. Secrets referenced by the policy are resolved outside the Sandbox and are never
                     visible to the workload. See `modal.experimental.OutboundPolicy`. This API is experimental and

{modal-1.6.2.dev12 → modal-1.6.3.dev0}/modal.egg-info/PKG-INFO

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