modal 1.5.2.dev18__tar.gz → 1.5.2.dev19__tar.gz

{modal-1.5.2.dev18 → modal-1.5.2.dev19}/PKG-INFO

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

{modal-1.5.2.dev18 → modal-1.5.2.dev19}/modal/_utils/grpc_utils.py

@@ -163,7 +163,6 @@ RETRYABLE_GRPC_STATUS_CODES = [
     Status.UNKNOWN,
 ]
 SERVER_RETRY_WARNING_TIME_INTERVAL = 30.0
-# Initial per-attempt timeout for TCP/TLS handshake in connect_channel.
 DEFAULT_MAX_RETRIES = 3
 
 
@@ -308,11 +307,6 @@ def create_channel(
 
 # With 18 attempts, the max delays between calls is: 0.1 + 0.2 + 0.4 + 0.8 + 1.6 + 3.2 + 5*11 ~ 62
 @retry(n_attempts=18, base_delay=0.1, attempt_timeout=10.0, max_delay=5.0, total_timeout=63.0)
-async def connect_channel(channel: grpclib.client.Channel):
-    """Connect to socket and raise exceptions when there is a connection issue."""
-    await channel.__connect__()
-
-
 async def create_channel_with_fallbacks(
     server_url: str,
     metadata: dict[str, str] = {},
@@ -323,21 +317,35 @@ async def create_channel_with_fallbacks(
     `server_url` may be a single URL or a comma-separated list of URLs. The connection attempts
     are raced against each other and the first one to connect wins, which lets the client fail
     over to a secondary endpoint when the primary is unreachable (e.g. a DNS outage on the
-    primary's domain). Attempts are staggered: the candidate at index `i` waits `i * stagger_delay`
-    seconds before starting, so earlier URLs (e.g. the primary) get a head start and are preferred
-    when reachable. Losing attempts are cancelled and their channels closed.
+    primary's domain).
+
+    Attempts are staggered so earlier URLs (e.g. the primary) get a head start and are preferred
+    when reachable: the candidate at index `i` waits up to `i * stagger_delay` seconds before
+    starting. That wait is cut short as soon as the previous candidate *fails*, so a fast failure
+    falls over to the next URL immediately instead of waiting out the full stagger. Losing attempts
+    are cancelled and their channels closed.
     """
     urls = [url.strip() for url in server_url.split(",")]
 
+    # Set when a candidate's connection attempt fails, letting the next candidate start immediately
+    # instead of waiting out its stagger delay.
+    failed = [asyncio.Event() for _ in urls]
+
     async def connect(index: int, url: str) -> grpclib.client.Channel:
-        # Stagger the start so earlier URLs are preferred; once started, all attempts race.
-        await asyncio.sleep(index * stagger_delay)
+        if index > 0:
+            # Stagger the start so earlier URLs are preferred, but start early if the previous
+            # candidate has already failed.
+            try:
+                await asyncio.wait_for(failed[index - 1].wait(), timeout=index * stagger_delay)
+            except asyncio.TimeoutError:
+                pass
         channel = create_channel(url, metadata)
         try:
-            await connect_channel(channel)
+            await channel.__connect__()
         except BaseException:
             # Close the channel of a losing/cancelled attempt so its socket doesn't leak.
             channel.close()
+            failed[index].set()
             raise
         return channel
 

{modal-1.5.2.dev18 → modal-1.5.2.dev19}/modal/_utils/name_utils.py

@@ -29,7 +29,13 @@ def is_valid_object_name(name: str) -> bool:
 
 def is_valid_environment_name(name: str) -> bool:
     # first char is alnum, the rest allows other chars
-    return len(name) <= 64 and re.match(r"^[a-zA-Z0-9][a-zA-Z0-9-_.]+$", name) is not None
+    # The "en-" prefix is reserved for environment IDs, so that references
+    # to environments can be resolved by either name or ID unambiguously.
+    return (
+        len(name) <= 64
+        and re.match(r"^[a-zA-Z0-9][a-zA-Z0-9-_.]+$", name) is not None
+        and not name.lower().startswith("en-")
+    )
 
 
 def is_valid_tag(tag: str, max_length: int = 50) -> bool:
@@ -66,7 +72,7 @@ def check_environment_name(name: str) -> None:
         f"Invalid Environment name: '{name}'."
         "\n\nEnvironment names can only start with alphanumeric characters,"
         " may contain only alphanumeric characters, dashes, periods, and underscores,"
-        " and must be shorter than 64 characters."
+        " must be shorter than 64 characters, and cannot start with 'en-'."
     )
     if not is_valid_environment_name(name):
         raise InvalidError(message)

{modal-1.5.2.dev18 → modal-1.5.2.dev19}/modal/_utils/task_command_router_client.py

@@ -32,8 +32,8 @@ from .grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 async def _connect_channel(channel: grpclib.client.Channel):
     """Connect to the command router channel.
 
-    Uses a longer retry budget than grpc_utils.connect_channel. In rare cases the sandbox
-    may take a long time to start on the worker after scheduling.
+    Uses a longer retry budget than grpc_utils.create_channel_with_fallbacks. In rare cases the
+    sandbox may take a long time to start on the worker after scheduling.
 
     Retries with exponential backoff (1, 2, 4, 8, 10, 10, ...) capped at 10s per delay.
     Total sleep between attempts: 1 + 2 + 4 + 8 + 10*29 = 305s (~5 min).

{modal-1.5.2.dev18 → modal-1.5.2.dev19}/modal/app.py

@@ -1266,9 +1266,6 @@ class _App:
 
         return wrapper
 
-    def _experimental_server(self, **kwargs):
-        return self.server(**kwargs)
-
     def server(
         self,
         _warn_parentheses_missing=None,  # mdmd:line-hidden

{modal-1.5.2.dev18 → modal-1.5.2.dev19}/modal/app.pyi

@@ -728,7 +728,6 @@ class _App:
         """
         ...
 
-    def _experimental_server(self, **kwargs): ...
     def server(
         self,
         _warn_parentheses_missing=None,
@@ -1733,7 +1732,6 @@ class App:
         """
         ...
 
-    def _experimental_server(self, **kwargs): ...
     def server(
         self,
         _warn_parentheses_missing=None,

{modal-1.5.2.dev18 → modal-1.5.2.dev19}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.2.dev18",
+        version: str = "1.5.2.dev19",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -205,7 +205,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.2.dev18",
+        version: str = "1.5.2.dev19",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.2.dev18 → modal-1.5.2.dev19}/modal/functions.pyi

@@ -491,7 +491,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.
 
@@ -516,7 +516,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]:
@@ -566,7 +566,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.
 
@@ -599,7 +599,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: ...
@@ -607,7 +607,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.
 
@@ -640,7 +640,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-1.5.2.dev18 → modal-1.5.2.dev19}/modal.egg-info/PKG-INFO

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