modal 1.5.2.dev18__tar.gz → 1.5.2.dev20__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.2.dev18
+Version: 1.5.2.dev20
 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.dev20}/modal/_environments.py

@@ -103,9 +103,6 @@ class _EnvironmentManager:
         await client.stub.EnvironmentDelete(api_pb2.EnvironmentDeleteRequest(name=name))
 
 
-MemberRole = Literal["viewer", "contributor"]
-
-
 def _role_to_proto(role: str) -> "api_pb2.EnvironmentRole.ValueType":
     match role:
         case "viewer":
@@ -116,7 +113,7 @@ def _role_to_proto(role: str) -> "api_pb2.EnvironmentRole.ValueType":
             raise InvalidError(f"Invalid Environment role: {role!r} (expected 'viewer' or 'contributor')")
 
 
-def _role_from_proto(proto_value: int) -> MemberRole:
+def _role_from_proto(proto_value: int) -> str:
     match proto_value:
         case api_pb2.ENVIRONMENT_ROLE_VIEWER:
             return "viewer"
@@ -137,7 +134,7 @@ class _EnvironmentMembersManager:
         """mdmd:hidden"""
         self._environment = environment
 
-    async def list(self) -> dict[Literal["users", "service_users"], dict[str, MemberRole]]:
+    async def list(self) -> dict[Literal["users", "service_users"], dict[str, str]]:
         """Return the members of a restricted Environment with their roles.
 
         **Examples:**
@@ -155,8 +152,8 @@ class _EnvironmentMembersManager:
         req = api_pb2.EnvironmentGetManagedRequest(environment_id=self._environment.object_id)
         resp = await self._environment.client.stub.EnvironmentGetManaged(req)
 
-        users: dict[str, MemberRole] = {}
-        service_users: dict[str, MemberRole] = {}
+        users: dict[str, str] = {}
+        service_users: dict[str, str] = {}
         for principal in resp.principal_roles:
             role = _role_from_proto(principal.role)
             if principal.user_id:
@@ -169,8 +166,8 @@ class _EnvironmentMembersManager:
     async def update(
         self,
         *,
-        users: Mapping[str, MemberRole] | None = None,
-        service_users: Mapping[str, MemberRole] | None = None,
+        users: Mapping[str, str] | None = None,
+        service_users: Mapping[str, str] | None = None,
     ) -> None:
         """Add or modify roles for members of a restricted Environment.
 

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/modal/_image.py

@@ -117,13 +117,34 @@ def _validate_image_tag(tag: str) -> None:
     check_object_name(tag, "Image tag")
 
 
-def _parse_named_image_ref(name: str) -> str:
+def _parse_named_image_ref(name: str) -> tuple[str, str]:
+    """Parse an image reference, returning (namespace_prefix, name_tag).
+
+    If the name contains a '/', the part before the last '/' is extracted as
+    a namespace prefix (intended for environment/name or workspace/env/name
+    syntax). The actual image name (after the last '/') is validated as a
+    standard object name.
+
+    Returns a tuple of (prefix, "full_name:tag") where prefix is empty string
+    if no '/' is present.
+    """
     image_name, sep, tag = name.partition(":")
     if not sep:
         tag = "latest"
+
+    prefix = ""
+    if "/" in image_name:
+        prefix, image_name = image_name.rsplit("/", 1)
+        if not prefix:
+            raise InvalidError("Invalid Image name: '/' prefix must be non-empty.")
+        if not image_name:
+            raise InvalidError("Invalid Image name: name after '/' must be non-empty.")
+
     _validate_image_name(image_name)
     _validate_image_tag(tag)
-    return f"{image_name}:{tag}"
+
+    full_name = f"{prefix}/{image_name}" if prefix else image_name
+    return prefix, f"{full_name}:{tag}"
 
 
 def _validate_python_version(
@@ -2923,12 +2944,15 @@ class _Image(_Object, type_prefix="im"):
             ...
         ```
         """
-        tag = _parse_named_image_ref(name)
+        namespace_prefix, tag = _parse_named_image_ref(name)
+
+        if namespace_prefix and environment_name:
+            raise InvalidError("Cannot specify 'environment_name' when the image name contains a '/'.")
 
         async def _load(self: _Image, resolver: Resolver, load_context: LoadContext, existing_object_id: str | None):
             req = api_pb2.ImageGetByTagRequest(
                 tag=tag,
-                environment_name=load_context.environment_name,
+                environment_name="" if namespace_prefix else load_context.environment_name,
             )
             response = await load_context.client.stub.ImageGetByTag(req)
             self._hydrate(response.image_id, load_context.client, None)
@@ -2963,15 +2987,20 @@ class _Image(_Object, type_prefix="im"):
         image.publish("my-image-with-numpy:v1")
         ```
         """
-        tag = _parse_named_image_ref(name)
+        namespace_prefix, tag = _parse_named_image_ref(name)
+
+        if namespace_prefix:
+            if environment_name:
+                raise InvalidError("Cannot specify 'environment_name' when the image name contains a '/'.")
+            resolved_env = ""
+        else:
+            resolved_env = environment_name or config.get("environment") or ""
 
         if self._object_id is None:
             raise InvalidError("Cannot publish an image that has not been created yet. Call `.build()` first.")
 
         _client = client or await _Client.from_env()
 
-        resolved_env = environment_name or config.get("environment") or ""
-
         await _client.stub.ImagePublish(
             api_pb2.ImagePublishRequest(
                 image_id=self._object_id,

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/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.dev20}/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.dev20}/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.dev20}/modal/_workspace.py

@@ -13,13 +13,19 @@ from ._object import _Object
 from ._resolver import Resolver
 from ._utils.time_utils import timestamp_to_localized_dt
 from .client import _Client
-from .types import BillingReportItem, MemberRole, ProxyTokenInfo, TokenData, WorkspaceMemberInfo, WorkspaceSettings
+from .types import (
+    BillingReportItem,
+    ProxyTokenInfo,
+    TokenData,
+    WorkspaceMemberInfo,
+    WorkspaceSettings,
+)
 
 
-def _member_role_from_proto(proto_value: int) -> MemberRole:
+def _member_role_from_proto(proto_value: int) -> str:
     match proto_value:
         case api_pb2.MEMBER_ROLE_USER:
-            return "user"
+            return "member"
         case api_pb2.MEMBER_ROLE_MANAGER:
             return "manager"
         case api_pb2.MEMBER_ROLE_OWNER:

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/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.dev20}/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.dev20}/modal/cli/container.py

@@ -202,20 +202,20 @@ async def logs(
         task_info_resp = await client.stub.TaskGetInfo(api_pb2.TaskGetInfoRequest(task_id=task_id))
         app_id = task_info_resp.app_id
 
-        if not task_info_resp.info.started_at:
-            # Unlikely race or Modal backend issue, don't treat as a usage exception
+        if not task_info_resp.info.enqueued_at:
             return
-        container_started_dt = datetime.fromtimestamp(task_info_resp.info.started_at, timezone.utc)
+
+        container_enqueued_dt = datetime.fromtimestamp(task_info_resp.info.enqueued_at, timezone.utc)
 
         now = datetime.now(timezone.utc)
         if all_logs:
-            since_dt = container_started_dt
+            since_dt = container_enqueued_dt
             if task_info_resp.info.finished_at:
                 until_dt = datetime.fromtimestamp(task_info_resp.info.finished_at, timezone.utc)
             else:
                 until_dt = now
         else:
-            since_dt = _parse_time_arg(since, default=container_started_dt)
+            since_dt = _parse_time_arg(since, default=container_enqueued_dt)
             if task_info_resp.info.finished_at:
                 default_until_dt = datetime.fromtimestamp(task_info_resp.info.finished_at, timezone.utc)
             else:

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/modal/cli/environment.py

@@ -7,7 +7,7 @@ from click import UsageError
 from rich.text import Text
 
 from modal import environments
-from modal._environments import MemberRole, _Environment
+from modal._environments import _Environment
 from modal._utils.async_utils import synchronizer
 from modal._utils.name_utils import check_environment_name
 from modal._utils.time_utils import format_interval
@@ -158,7 +158,7 @@ def members_list(environment: str, json: bool = False):
     "--role", type=click.Choice(["contributor", "viewer"]), required=True, help="Role to assign to the member"
 )
 @service_user_option
-def members_update(environment: str, member: str, role: MemberRole, service_user: bool = False):
+def members_update(environment: str, member: str, role: str, service_user: bool = False):
     env = Environment.from_name(environment)
     if service_user:
         env.members.update(service_users={member: role})

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/modal/cli/image.py

@@ -168,11 +168,18 @@ async def history(
     env: Optional[str] = None,
     json: bool = False,
 ):
+    explicit_env = env  # None when --env is not passed by the user
     env = ensure_env(env)
     try:
-        name_tag = _parse_named_image_ref(name)
+        namespace_prefix, name_tag = _parse_named_image_ref(name)
     except InvalidError as exc:
         raise click.UsageError(str(exc)) from exc
+
+    if namespace_prefix:
+        if explicit_env is not None:
+            raise click.UsageError("Cannot specify '--env' when the image name contains a '/'.")
+        env = ""
+
     client = await _Client.from_env()
 
     first_page = await _fetch_history_page(client, env, name_tag, "")

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/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.dev20",
     ):
         """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.dev20",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/modal/environments.pyi

@@ -112,9 +112,7 @@ class EnvironmentMembersManager:
         ...
 
     class __list_spec(typing_extensions.Protocol):
-        def __call__(
-            self, /
-        ) -> dict[typing.Literal["users", "service_users"], dict[str, typing.Literal["viewer", "contributor"]]]:
+        def __call__(self, /) -> dict[typing.Literal["users", "service_users"], dict[str, str]]:
             """Return the members of a restricted Environment with their roles.
 
             **Examples:**
@@ -130,9 +128,7 @@ class EnvironmentMembersManager:
             """
             ...
 
-        async def aio(
-            self, /
-        ) -> dict[typing.Literal["users", "service_users"], dict[str, typing.Literal["viewer", "contributor"]]]:
+        async def aio(self, /) -> dict[typing.Literal["users", "service_users"], dict[str, str]]:
             """Return the members of a restricted Environment with their roles.
 
             **Examples:**
@@ -155,10 +151,8 @@ class EnvironmentMembersManager:
             self,
             /,
             *,
-            users: typing.Optional[collections.abc.Mapping[str, typing.Literal["viewer", "contributor"]]] = None,
-            service_users: typing.Optional[
-                collections.abc.Mapping[str, typing.Literal["viewer", "contributor"]]
-            ] = None,
+            users: typing.Optional[collections.abc.Mapping[str, str]] = None,
+            service_users: typing.Optional[collections.abc.Mapping[str, str]] = None,
         ) -> None:
             """Add or modify roles for members of a restricted Environment.
 
@@ -181,10 +175,8 @@ class EnvironmentMembersManager:
             self,
             /,
             *,
-            users: typing.Optional[collections.abc.Mapping[str, typing.Literal["viewer", "contributor"]]] = None,
-            service_users: typing.Optional[
-                collections.abc.Mapping[str, typing.Literal["viewer", "contributor"]]
-            ] = None,
+            users: typing.Optional[collections.abc.Mapping[str, str]] = None,
+            service_users: typing.Optional[collections.abc.Mapping[str, str]] = None,
         ) -> None:
             """Add or modify roles for members of a restricted Environment.
 

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/modal/types.py

@@ -5,7 +5,7 @@ import enum
 from dataclasses import FrozenInstanceError, dataclass
 from datetime import datetime, timezone
 from decimal import Decimal
-from typing import Any, Iterable, Literal, Optional
+from typing import Any, Iterable, Optional
 
 from modal_proto import api_pb2
 
@@ -54,9 +54,6 @@ class FileWatchEventType(enum.Enum):
     Remove = "Remove"
 
 
-MemberRole = Literal["user", "manager", "owner"]
-
-
 @dataclass
 class DictInfo:
     """Information about a Dict object."""
@@ -206,7 +203,7 @@ class WorkspaceMemberInfo:
     name: str
     email: str
     user_id: str
-    role: MemberRole
+    role: str
     joined_at: datetime
     last_active_at: Optional[datetime]  # None if the member has never been active
 

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/modal/workspace.pyi

@@ -72,7 +72,7 @@ class WorkspaceMemberInfo:
     name: str
     email: str
     user_id: str
-    role: typing.Literal["user", "manager", "owner"]
+    role: str
     joined_at: datetime.datetime
     last_active_at: typing.Optional[datetime.datetime]
 
@@ -81,7 +81,7 @@ class WorkspaceMemberInfo:
         name: str,
         email: str,
         user_id: str,
-        role: typing.Literal["user", "manager", "owner"],
+        role: str,
         joined_at: datetime.datetime,
         last_active_at: typing.Optional[datetime.datetime],
     ) -> None:

{modal-1.5.2.dev18 → modal-1.5.2.dev20}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.2.dev18
+Version: 1.5.2.dev20
 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.dev20}/modal_proto/api_grpc.py

@@ -483,6 +483,10 @@ class ModalClientBase(abc.ABC):
     async def MapStartOrContinue(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.MapStartOrContinueRequest, modal_proto.api_pb2.MapStartOrContinueResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def MountBatchedCheckExistence(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.MountBatchedCheckExistenceRequest, modal_proto.api_pb2.MountBatchedCheckExistenceResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def MountGetOrCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.MountGetOrCreateRequest, modal_proto.api_pb2.MountGetOrCreateResponse]') -> None:
         pass
@@ -1609,6 +1613,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.MapStartOrContinueRequest,
                 modal_proto.api_pb2.MapStartOrContinueResponse,
             ),
+            '/modal.client.ModalClient/MountBatchedCheckExistence': grpclib.const.Handler(
+                self.MountBatchedCheckExistence,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.MountBatchedCheckExistenceRequest,
+                modal_proto.api_pb2.MountBatchedCheckExistenceResponse,
+            ),
             '/modal.client.ModalClient/MountGetOrCreate': grpclib.const.Handler(
                 self.MountGetOrCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2953,6 +2963,12 @@ class ModalClientStub:
             modal_proto.api_pb2.MapStartOrContinueRequest,
             modal_proto.api_pb2.MapStartOrContinueResponse,
         )
+        self.MountBatchedCheckExistence = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/MountBatchedCheckExistence',
+            modal_proto.api_pb2.MountBatchedCheckExistenceRequest,
+            modal_proto.api_pb2.MountBatchedCheckExistenceResponse,
+        )
         self.MountGetOrCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/MountGetOrCreate',