modal 1.5.3.dev13__tar.gz → 1.5.4.dev0__tar.gz

{modal-1.5.3.dev13 → modal-1.5.4.dev0}/PKG-INFO

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

{modal-1.5.3.dev13 → modal-1.5.4.dev0}/modal/_clustered_functions.py

@@ -15,6 +15,7 @@ class ClusterInfo:
     cluster_id: str
     container_ips: list[str]
     container_ipv4_ips: list[str]
+    fabric_ids: list[str]
 
 
 cluster_info: ClusterInfo | None = None
@@ -29,6 +30,14 @@ def get_cluster_info() -> ClusterInfo:
     return cluster_info
 
 
+def get_fabric_peers() -> list[int]:
+    info = get_cluster_info()
+    if info.rank >= len(info.fabric_ids) or not info.fabric_ids[info.rank]:
+        return [info.rank]
+    own_fabric_id = info.fabric_ids[info.rank]
+    return [rank for rank, fabric_id in enumerate(info.fabric_ids) if fabric_id == own_fabric_id]
+
+
 async def _initialize_clustered_function(client: _Client, task_id: str, world_size: int):
     global cluster_info
 
@@ -70,6 +79,7 @@ async def _initialize_clustered_function(client: _Client, task_id: str, world_si
             cluster_id=resp.cluster_id,
             container_ips=resp.container_ips,
             container_ipv4_ips=resp.container_ipv4_ips,
+            fabric_ids=resp.fabric_ids,
         )
     else:
         cluster_info = ClusterInfo(
@@ -77,6 +87,7 @@ async def _initialize_clustered_function(client: _Client, task_id: str, world_si
             cluster_id="",  # No cluster ID for single-node  # TODO(irfansharif): Is this right?
             container_ips=[container_ip],
             container_ipv4_ips=[],  # No IPv4 IPs for single-node
+            fabric_ids=[],
         )
 
 

{modal-1.5.3.dev13 → modal-1.5.4.dev0}/modal/_clustered_functions.pyi

@@ -3,14 +3,17 @@ import types
 import typing_extensions
 
 class ClusterInfo:
-    """ClusterInfo(rank: int, cluster_id: str, container_ips: list[str], container_ipv4_ips: list[str])"""
+    """ClusterInfo(rank: int, cluster_id: str, container_ips: list[str], container_ipv4_ips: list[str], fabric_ids: list[str])"""
 
     rank: int
     cluster_id: str
     container_ips: list[str]
     container_ipv4_ips: list[str]
+    fabric_ids: list[str]
 
-    def __init__(self, rank: int, cluster_id: str, container_ips: list[str], container_ipv4_ips: list[str]) -> None:
+    def __init__(
+        self, rank: int, cluster_id: str, container_ips: list[str], container_ipv4_ips: list[str], fabric_ids: list[str]
+    ) -> None:
         """Initialize self.  See help(type(self)) for accurate signature."""
         ...
 
@@ -23,6 +26,7 @@ class ClusterInfo:
         ...
 
 def get_cluster_info() -> ClusterInfo: ...
+def get_fabric_peers() -> list[int]: ...
 async def _initialize_clustered_function(client: modal.client._Client, task_id: str, world_size: int): ...
 
 class __initialize_clustered_function_spec(typing_extensions.Protocol):

{modal-1.5.3.dev13 → modal-1.5.4.dev0}/modal/_environments.py

@@ -16,6 +16,7 @@ from modal_proto import api_pb2
 from ._load_context import LoadContext
 from ._object import _Object
 from ._resolver import Resolver
+from ._utils.deprecation import deprecation_warning
 from ._utils.name_utils import check_environment_name
 from ._utils.time_utils import is_utc_month_aligned, parse_billing_cycle
 from .client import _Client
@@ -104,7 +105,7 @@ class _EnvironmentManager:
         await client.stub.EnvironmentDelete(api_pb2.EnvironmentDeleteRequest(name=name))
 
 
-class _EnvironmentMembersManager:
+class _EnvironmentRolesManager:
     """mdmd:namespace"""
 
     def __init__(self, environment: "_Environment"):
@@ -112,13 +113,13 @@ class _EnvironmentMembersManager:
         self._environment = environment
 
     async def list(self) -> dict[Literal["users", "service_users"], dict[str, str]]:
-        """Enumerate the environment roles for each user and service user in the workspace.
+        """Enumerate the Environment Role for each user and service user in the workspace.
 
         **Examples:**
 
         ```python notest
-        members = modal.Environment.from_name("my-env").members.list()
-        print(members)
+        roles = modal.Environment.from_name("my-env").roles.list()
+        print(roles)
         # {
         #     "users": {"alice": "contributor", "bob": "viewer", "carol": "contributor"},
         #     "service_users": {"alice-bot": "contributor", "ops-bot": "viewer", "ci-bot": "no-access"},
@@ -145,16 +146,17 @@ class _EnvironmentMembersManager:
         users: Mapping[str, str] | None = None,
         service_users: Mapping[str, str] | None = None,
     ) -> None:
-        """Add or modify roles for members of a restricted Environment.
+        """Update the Environment Role of users and service users.
 
-        Each user or service user will be added to the Environment if not currently a member;
-        if already a member, the user or service user's role will be updated.
+        Each role is one of 'contributor', 'viewer', or 'no-access'. Service users can be
+        assigned a role on any Environment, while workspace members can only be assigned a
+        role on restricted Environments.
 
         **Examples:**
 
         ```python notest
         env = modal.Environment.from_name("my-restricted-env")
-        env.members.update(
+        env.roles.update(
             users={"alice": "contributor", "bob": "viewer"},
             service_users={"alice-bot": "contributor"},
         )
@@ -196,24 +198,59 @@ class _EnvironmentMembersManager:
 
         await self._dispatch_role_updates(requests)
 
+    async def _dispatch_role_updates(self, requests: dict[str, api_pb2.EnvironmentRoleSetRequest]) -> None:
+        """Send batched EnvironmentRoleSet RPCs and report all errors encountered."""
+        results = await asyncio.gather(
+            *(self._environment.client.stub.EnvironmentRoleSet(req) for req in requests.values()),
+            return_exceptions=True,
+        )
+        errors = [(label, result) for label, result in zip(requests.keys(), results) if isinstance(result, Exception)]
+        if errors:
+            n = len(errors)
+            header = f"{n} error{'s' if n != 1 else ''} occurred while updating Environment roles:"
+            details = "\n".join(f"  - {label}: {e}" for label, e in errors)
+            raise WorkspaceManagementError(f"{header}\n{details}")
+
+
+# Deprecated alias for `_EnvironmentRolesManager`; each method warns and delegates.
+class _EnvironmentMembersManager:
+    """mdmd:hidden"""
+
+    def __init__(self, environment: "_Environment"):
+        """mdmd:hidden"""
+        self._environment = environment
+
+    async def list(self) -> dict[Literal["users", "service_users"], dict[str, str]]:
+        deprecation_warning(
+            (2026, 7, 23),
+            "`Environment.members.list()` is deprecated; use `Environment.roles.list()` instead.",
+        )
+        return await _EnvironmentRolesManager(self._environment).list()
+
+    async def update(
+        self,
+        *,
+        users: Mapping[str, str] | None = None,
+        service_users: Mapping[str, str] | None = None,
+    ) -> None:
+        deprecation_warning(
+            (2026, 7, 23),
+            "`Environment.members.update()` is deprecated; use `Environment.roles.update()` instead.",
+        )
+        await _EnvironmentRolesManager(self._environment).update(users=users, service_users=service_users)
+
     async def remove(
         self,
         *,
         users: Iterable[str] | None = None,
         service_users: Iterable[str] | None = None,
     ) -> None:
-        """Remove members from a restricted Environment.
-
-        **Examples:**
-
-        ```python notest
-        env = modal.Environment.from_name("my-restricted-env")
-        env.members.remove(
-            users=["alice"],
-            service_users=["alice-bot"],
+        """Remove the Environment Role of users and service users, reverting them to the default."""
+        deprecation_warning(
+            (2026, 7, 23),
+            "`Environment.members.remove()` is deprecated. Environment Roles are now explicit; "
+            "set a role (e.g. 'no-access') with `Environment.roles.update()` instead.",
         )
-        ```
-        """
         await self._environment.hydrate()
         users = users or []
         service_users = service_users or []
@@ -247,20 +284,7 @@ class _EnvironmentMembersManager:
                 role=api_pb2.ENVIRONMENT_ROLE_UNSPECIFIED,
             )
 
-        await self._dispatch_role_updates(requests)
-
-    async def _dispatch_role_updates(self, requests: dict[str, api_pb2.EnvironmentRoleSetRequest]) -> None:
-        """Send batched EnvironmentRoleSet RPCs and report all errors encountered."""
-        results = await asyncio.gather(
-            *(self._environment.client.stub.EnvironmentRoleSet(req) for req in requests.values()),
-            return_exceptions=True,
-        )
-        errors = [(label, result) for label, result in zip(requests.keys(), results) if isinstance(result, Exception)]
-        if errors:
-            n = len(errors)
-            header = f"{n} error{'s' if n != 1 else ''} occurred while updating Environment members:"
-            details = "\n".join(f"  - {label}: {e}" for label, e in errors)
-            raise WorkspaceManagementError(f"{header}\n{details}")
+        await _EnvironmentRolesManager(self._environment)._dispatch_role_updates(requests)
 
 
 class _Environment(_Object, type_prefix="en"):
@@ -284,11 +308,17 @@ class _Environment(_Object, type_prefix="en"):
         return _EnvironmentManager()
 
     @property
-    def members(self) -> "_EnvironmentMembersManager":
-        """Namespace with methods for managing the membership of a restricted Environment.
+    def roles(self) -> "_EnvironmentRolesManager":
+        """Namespace with methods for managing the Environment Roles of users and service users.
 
-        See https://modal.com/docs/guide/rbac for more information on restricted Environments.
+        See https://modal.com/docs/guide/rbac for more information on Environment Roles.
         """
+        return _EnvironmentRolesManager(self)
+
+    @property
+    def members(self) -> "_EnvironmentMembersManager":
+        """mdmd:hidden"""
+        # Deprecated alias for `Environment.roles`.
         return _EnvironmentMembersManager(self)
 
     # TODO(michael) Keeping this private for now until we decide what else should be in it

{modal-1.5.3.dev13 → modal-1.5.4.dev0}/modal/cli/environment.py

@@ -1,5 +1,6 @@
 # Copyright Modal Labs 2023
 import json as json_mod
+import warnings
 
 import click
 import rich
@@ -11,6 +12,7 @@ from rich.text import Text
 from modal import environments
 from modal._environments import _Environment
 from modal._utils.async_utils import synchronizer
+from modal._utils.deprecation import deprecation_warning
 from modal._utils.display_utils import pretty_decimal
 from modal._utils.name_utils import check_environment_name
 from modal._utils.time_utils import format_interval
@@ -18,7 +20,7 @@ from modal.cli.billing import DATE_HELP, _validate_and_parse_interval
 from modal.cli.utils import _col_name_to_json_key, confirm_or_suggest_yes, display_table, yes_option
 from modal.config import config
 from modal.environments import Environment
-from modal.exception import InvalidError
+from modal.exception import DeprecationError, InvalidError
 from modal.output import OutputManager
 
 from ._help import ModalGroup
@@ -55,7 +57,7 @@ def list_(json: bool = False):
     # over the server default
     active_env = config.get("environment") or ""
     for env in envs:
-        if env.default is True and active_env is None:
+        if env.default is True and not active_env:
             active_env = env.name
 
     table_data = []
@@ -123,67 +125,127 @@ def update(
     rich.print("[green]✓[/green] Environment updated")
 
 
-MEMBERS_HELP_TEXT = """Manage members and their roles in a restricted Environment.
-
-Restricted Environments use RBAC to limit the actions that can be performed by
-users (and service users) based on roles: https://modal.com/docs/guide/rbac.
-"""
-
-members_cli = ModalGroup(name="members", help=MEMBERS_HELP_TEXT)
-environment_cli.add_command(members_cli)
-
 service_user_option = click.option(
-    "--service-user", is_flag=True, default=False, help="Treat MEMBER as the name of a service user"
+    "--service-user", is_flag=True, default=False, help="Treat PRINCIPAL as the name of a service user"
 )
 
 
-@members_cli.command("list", help="List the members of a restricted Environment", no_args_is_help=True)
-@click.argument("environment")
-@click.option("--json", is_flag=True, default=False)
-def members_list(environment: str, json: bool = False):
-    members = Environment.from_name(environment).members.list()
+def _render_roles_list(environment: str, json: bool) -> None:
+    roles = Environment.from_name(environment).roles.list()
     if json:
         # Mirror the API output shape: a nested dict keyed by users / service_users.
-        OutputManager.get().print_json(json_mod.dumps(members))
+        OutputManager.get().print_json(json_mod.dumps(roles))
         return
     rows = []
-    for name, role in members.get("users", {}).items():
+    for name, role in roles.get("users", {}).items():
         rows.append([name, role])
-    for name, role in members.get("service_users", {}).items():
+    for name, role in roles.get("service_users", {}).items():
         rows.append([f"{name} (service user)", role])
     rows = sorted(rows, key=lambda x: x[0])
     display_table(["name", "role"], rows)
 
 
-@members_cli.command("update", help="Add or update a member's role in a restricted Environment", no_args_is_help=True)
-@click.argument("environment")
-@click.argument("member")
-@click.option(
-    "--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: str, service_user: bool = False):
+def _apply_role_update(environment: str, principal: str, role: str, service_user: bool) -> None:
     env = Environment.from_name(environment)
     if service_user:
-        env.members.update(service_users={member: role})
+        env.roles.update(service_users={principal: role})
     else:
-        env.members.update(users={member: role})
+        env.roles.update(users={principal: role})
     kind = "service user" if service_user else "user"
-    rich.print(f"[green]✓[/green] Set {kind} {member!r} to role {role!r} in environment {environment!r}")
+    rich.print(f"[green]✓[/green] Set {kind} {principal!r} to role {role!r} in environment {environment!r}")
 
 
-@members_cli.command("remove", help="Remove a member from a restricted Environment", no_args_is_help=True)
-@click.argument("environment")
-@click.argument("member")
-@service_user_option
-def members_remove(environment: str, member: str, service_user: bool = False):
+def _apply_role_remove(environment: str, principal: str, service_user: bool) -> None:
     env = Environment.from_name(environment)
-    if service_user:
-        env.members.remove(service_users=[member])
-    else:
-        env.members.remove(users=[member])
+    # `remove` only lives on the deprecated `members` manager, which warns. The caller (a
+    # deprecated `members` command) has already warned, so suppress the redundant SDK warning.
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", DeprecationError)
+        if service_user:
+            env.members.remove(service_users=[principal])
+        else:
+            env.members.remove(users=[principal])
     kind = "service user" if service_user else "user"
-    rich.print(f"[green]✓[/green] Removed {kind} {member!r} from environment {environment!r}")
+    rich.print(f"[green]✓[/green] Removed {kind} {principal!r} from environment {environment!r}")
+
+
+ROLES_HELP_TEXT = """Manage the Environment Roles of users and service users.
+
+An Environment Role is one of 'contributor' (read-write), 'viewer' (read-only), or
+'no-access', and dictates access to Environments. See
+https://modal.com/docs/guide/rbac for details on which principals can be assigned
+which roles.
+"""
+
+roles_cli = ModalGroup(name="roles", help=ROLES_HELP_TEXT)
+environment_cli.add_command(roles_cli)
+
+
+@roles_cli.command("list", help="List the roles of each user and service user in an Environment", no_args_is_help=True)
+@click.argument("environment")
+@click.option("--json", is_flag=True, default=False)
+def roles_list(environment: str, json: bool = False):
+    _render_roles_list(environment, json)
+
+
+@roles_cli.command("update", help="Update a user's or service user's role in an Environment", no_args_is_help=True)
+@click.argument("environment")
+@click.argument("principal")
+@click.option("--role", type=click.Choice(["contributor", "viewer", "no-access"]), required=True, help="Role to assign")
+@service_user_option
+def roles_update(environment: str, principal: str, role: str, service_user: bool = False):
+    _apply_role_update(environment, principal, role, service_user)
+
+
+# The deprecated `members` command group keeps working for existing automation, but is hidden
+# from `--help` so it is not discoverable. Each subcommand warns with its own guidance.
+members_cli = ModalGroup(name="members", help="[Deprecated] Use `modal environment roles`.", hidden=True)
+environment_cli.add_command(members_cli)
+
+
+@members_cli.command("list", help="[Deprecated] Use `modal environment roles list`", no_args_is_help=True)
+@click.argument("environment")
+@click.option("--json", is_flag=True, default=False)
+def members_list(environment: str, json: bool = False):
+    deprecation_warning(
+        (2026, 7, 23),
+        "`modal environment members list` is deprecated; use `modal environment roles list`.",
+        show_source=False,
+    )
+    _render_roles_list(environment, json)
+
+
+@members_cli.command("update", help="[Deprecated] Use `modal environment roles update`", no_args_is_help=True)
+@click.argument("environment")
+@click.argument("principal")
+@click.option(
+    "--role",
+    type=click.Choice(["contributor", "viewer", "no-access"]),
+    required=True,
+    help="Role to assign to the principal",
+)
+@service_user_option
+def members_update(environment: str, principal: str, role: str, service_user: bool = False):
+    deprecation_warning(
+        (2026, 7, 23),
+        "`modal environment members update` is deprecated; use `modal environment roles update`.",
+        show_source=False,
+    )
+    _apply_role_update(environment, principal, role, service_user)
+
+
+@members_cli.command("remove", help="[Deprecated] Use `modal environment roles update`", no_args_is_help=True)
+@click.argument("environment")
+@click.argument("principal")
+@service_user_option
+def members_remove(environment: str, principal: str, service_user: bool = False):
+    deprecation_warning(
+        (2026, 7, 23),
+        "`modal environment members remove` is deprecated; roles are now explicit — set a role "
+        "(e.g. `--role no-access`) with `modal environment roles update` instead.",
+        show_source=False,
+    )
+    _apply_role_remove(environment, principal, service_user)
 
 
 billing_cli = ModalGroup(name="billing", help="View billing and usage info for the given Environment.")

{modal-1.5.3.dev13 → modal-1.5.4.dev0}/modal/client.pyi

@@ -37,7 +37,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev13",
+        version: str = "1.5.4.dev0",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -207,7 +207,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.3.dev13",
+        version: str = "1.5.4.dev0",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.3.dev13 → modal-1.5.4.dev0}/modal/environments.py

@@ -6,12 +6,15 @@ from ._environments import (
     _EnvironmentBillingManager,
     _EnvironmentManager,
     _EnvironmentMembersManager,
+    _EnvironmentRolesManager,
     _list_environments,
     _update_environment,
 )
 from ._utils.async_utils import synchronize_api, synchronizer
 
 EnvironmentManager = synchronize_api(_EnvironmentManager, target_module=__name__)
+EnvironmentRolesManager = synchronize_api(_EnvironmentRolesManager, target_module=__name__)
+# Deprecated alias for `EnvironmentRolesManager`, retired with `Environment.members`.
 EnvironmentMembersManager = synchronize_api(_EnvironmentMembersManager, target_module=__name__)
 EnvironmentBillingManager = synchronize_api(_EnvironmentBillingManager, target_module=__name__)
 Environment = synchronize_api(_Environment, target_module=__name__)