modal 1.5.3.dev12__tar.gz → 1.5.4.dev0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.3.dev12
+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.dev12 → 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.dev12 → 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.dev12 → 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
@@ -591,4 +621,4 @@ def ensure_env(environment_name: str | None = None) -> str:
     if environment_name is not None:
         config.override_locally("environment", environment_name)
 
-    return config.get("environment")
+    return config.get("environment") or ""

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_grpc_client.py

@@ -54,7 +54,7 @@ class grpc_error_converter:
         with suppress_tb_frame():
             if isinstance(exc, GRPCError):
                 modal_exc = _STATUS_TO_EXCEPTION[exc.status](exc.message)
-                modal_exc._grpc_message = exc.message
+                modal_exc._grpc_message = exc.message or ""
                 modal_exc._grpc_status = exc.status
                 modal_exc._grpc_details = exc.details
                 if use_full_traceback:

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_object.py

@@ -23,19 +23,20 @@ EPHEMERAL_OBJECT_HEARTBEAT_SLEEP: int = 300
 
 def _get_environment_name(
     environment_name: str | None = None,
-) -> str | None:
+) -> str:
     """Get environment name from various sources.
 
     Args:
-        environment_name: Explicitly provided environment name (highest priority)
+        environment_name: Explicitly provided environment name (highest priority).
 
     Returns:
-        Environment name from first available source, or config default
+        Environment name from as passed in, from config, or as a null string
+        (which implies workspace-level default).
     """
     if environment_name:
         return environment_name
     else:
-        return config.get("environment")
+        return config.get("environment") or ""
 
 
 def live_method(method):

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_output/rich.py

@@ -81,11 +81,11 @@ class FunctionQueuingColumn(ProgressColumn):
         super().__init__()
 
     def render(self, task) -> Text:
-        self.lag = max(task.completed - task.elapsed, self.lag)
+        self.lag = max(task.completed - (task.elapsed or 0), self.lag)
         if task.finished:
-            elapsed = max(task.finished_time, task.completed)
+            elapsed = max(task.finished_time or 0, task.completed)
         else:
-            elapsed = task.elapsed + self.lag
+            elapsed = (task.elapsed or 0) + self.lag
         delta = timedelta(seconds=int(elapsed))
         return Text(str(delta), style="progress.elapsed")
 

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_resources.py

@@ -26,10 +26,10 @@ def convert_fn_config_to_resources_config(
             raise InvalidError(f"Cannot specify a CPU limit lower than request: {milli_cpu_max} < {milli_cpu}")
     elif cpu and isinstance(cpu, (float, int)):
         milli_cpu = int(1000 * cpu)
-        milli_cpu_max = None
+        milli_cpu_max = 0
     else:
-        milli_cpu = None
-        milli_cpu_max = None
+        milli_cpu = 0
+        milli_cpu_max = 0
 
     if memory and isinstance(memory, int):
         memory_mb = memory
@@ -47,6 +47,6 @@ def convert_fn_config_to_resources_config(
         gpu_config=parse_gpu_config(gpu),
         memory_mb=memory_mb,
         memory_mb_max=memory_mb_max,
-        ephemeral_disk_mb=ephemeral_disk,
+        ephemeral_disk_mb=ephemeral_disk or 0,
         rdma=rdma or False,
     )

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_runtime/user_code_imports.py

@@ -549,7 +549,8 @@ def _get_cls_or_user_cls(
     else:
         # Load the module dynamically for non-serialized class.
         module = importlib.import_module(function_def.module_name)
-        qual_name: str = function_def.function_name
+        # Always use implementation_name to find the class, default to function_name if implementation_name not set.
+        qual_name: str = function_def.implementation_name or function_def.function_name
 
         if not is_global_object(qual_name):
             raise LocalFunctionError("Attempted to load a class defined in a function scope")

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_traceback.py

@@ -75,7 +75,7 @@ def append_modal_tb(exc: BaseException, tb_dict: TBDictType, line_cache: LineCac
     setattr(exc, "__line_cache__", line_cache)
 
 
-def reduce_traceback_to_user_code(tb: TracebackType | None, user_source: str) -> TracebackType:
+def reduce_traceback_to_user_code(tb: TracebackType | None, user_source: str) -> TracebackType | None:
     """Return a traceback that does not contain modal entrypoint or synchronicity frames."""
 
     # Step forward all the way through the traceback and drop any "Modal support" frames

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_utils/async_utils.py

@@ -1266,3 +1266,8 @@ def deprecate_aio_usage(deprecation_date: tuple[int, int, int], readable_sync_ca
         return MethodWithAio(sync_implementation, _async_proxy, synchronizer, is_classmethod=is_classmethod)
 
     return deco
+
+
+async def async_generator_from_sync(lst: Iterable[T]) -> AsyncGenerator[T, None]:
+    for item in lst:
+        yield item

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_utils/blob_utils.py

@@ -444,6 +444,7 @@ class FileUploadSpec:
     mode: int  # file permission bits (last 12 bits of st_mode)
     size: int
     content: bytes | None = None  # Set for very small files to avoid double-read
+    exists_in_store: bool | None = None  # set after existence check
 
     def read_content(self) -> bytes:
         """Read content from source."""

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_utils/bytes_io_segment_payload.py

@@ -45,7 +45,8 @@ class BytesIOSegmentPayload(Payload):
         self.segment_length = segment_length
         # seek to start of file segment we are interested in, in order to make .size() evaluate correctly
         self._value.seek(self.initial_seek_pos + segment_start)
-        assert self.segment_length <= super().size
+        base_size = super().size
+        assert base_size is not None and self.segment_length <= base_size
         self.chunk_size = chunk_size
         self.progress_report_cb = progress_report_cb or (lambda *_, **__: None)
         self.reset_state()

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_utils/pattern_utils.py

@@ -143,12 +143,12 @@ class Pattern:
             else:
                 return False
         elif self.match_type == MatchType.REGEXP:
-            return self.regexp.match(path) is not None
+            return self.regexp is not None and self.regexp.match(path) is not None
         else:
             return False
 
 
-def read_ignorefile(reader: TextIO) -> list[str]:
+def read_ignorefile(reader: TextIO | None) -> list[str]:
     """Read an ignore file from a reader and return the list of file patterns to
     ignore, applying the following rules:
 

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/_utils/time_utils.py

@@ -294,7 +294,9 @@ def relative_timestamp(dt: datetime) -> str:
 
 
 def locale_tz() -> tzinfo:
-    return datetime.now().astimezone().tzinfo
+    tz = datetime.now().astimezone().tzinfo
+    assert tz is not None
+    return tz
 
 
 def as_timestamp(arg: datetime | str | None) -> float:

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/app.py

@@ -1295,6 +1295,7 @@ class _App:
         scaleup_window: int | None = None,  # Stabilization window (seconds) of sustained demand before scaling up
         scaledown_window: int | None = None,  # Max idle time before scaling down (seconds)
         startup_timeout: int = 30,  # Maximum container startup time in seconds
+        name: str | None = None,  # Name of the server
         port: int = 8000,  # Port the HTTP server listens on
         unauthenticated: bool = False,  # Whether the endpoint requires proxy authentication, required by default.
         h2_enabled: bool = False,  # Enable HTTP/2
@@ -1341,6 +1342,7 @@ class _App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.
@@ -1423,7 +1425,7 @@ class _App:
             local_state = self._local_state
 
             # Create the FunctionInfo for the server, note we treat FunctionInfo as a class for servers
-            info = FunctionInfo(None, serialized=serialized, user_cls=user_cls, name_override=user_cls.__name__)
+            info = FunctionInfo(None, serialized=serialized, user_cls=user_cls, name_override=name or user_cls.__name__)
             # Create the service function
             service_function = _Function.from_local(
                 info,

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/app.pyi

@@ -751,6 +751,7 @@ class _App:
         scaleup_window: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         startup_timeout: int = 30,
+        name: typing.Optional[str] = None,
         port: int = 8000,
         unauthenticated: bool = False,
         h2_enabled: bool = False,
@@ -797,6 +798,7 @@ class _App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.
@@ -1755,6 +1757,7 @@ class App:
         scaleup_window: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         startup_timeout: int = 30,
+        name: typing.Optional[str] = None,
         port: int = 8000,
         unauthenticated: bool = False,
         h2_enabled: bool = False,
@@ -1799,6 +1802,7 @@ class App:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
             startup_timeout: Maximum container startup time in seconds.
+            name: Sets the Modal name of the function within the app, defaults to class name.
             port: Port the HTTP server listens on.
             unauthenticated: Whether the endpoint requires proxy authentication; required by default.
             h2_enabled: Enable HTTP/2.

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/cli/cluster.py

@@ -51,7 +51,7 @@ async def list_(env: str | None = None, json: bool = False):
             [
                 c.cluster_id,
                 c.app_id,
-                timestamp_to_localized_str(c.started_at, json) if c.started_at else "Pending",
+                timestamp_to_localized_str(c.started_at, json) or "Pending",
                 str(len(c.task_ids)),
             ]
         )

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/cli/dashboard.py

@@ -21,7 +21,7 @@ async def dashboard(
     if object_id:
         url = f"https://modal.com/id/{object_id}"
     else:
-        env = config.get("environment")
+        env = config.get("environment") or ""
         request = api_pb2.WorkspaceDashboardUrlRequest(environment_name=env)
         client = await _Client.from_env()
         response = await client.stub.WorkspaceDashboardUrlGet(request)

{modal-1.5.3.dev12 → modal-1.5.4.dev0}/modal/cli/endpoint.py

@@ -207,7 +207,7 @@ async def create(
         raise click.UsageError("--custom-volume-path requires --custom-volume-name.")
 
     env_name = ensure_env(env)
-    environment_name = _get_environment_name(env_name) or ""
+    environment_name = _get_environment_name(env_name)
     client = await _Client.from_env()
 
     compute_region_spec = api_pb2.EndpointComputeRegionSpec()
@@ -271,7 +271,7 @@ async def create(
 async def list_(*, json: bool = False, env: Optional[str] = None):
     """List Endpoints that are provisioning or running in an environment."""
     env_name = ensure_env(env)
-    environment_name = _get_environment_name(env_name) or ""
+    environment_name = _get_environment_name(env_name)
     client = await _Client.from_env()
 
     items: list[api_pb2.EndpointListItem] = []