modal 1.4.4.dev9__tar.gz → 1.4.4.dev11__tar.gz

{modal-1.4.4.dev9 → modal-1.4.4.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.4.dev9
+Version: 1.4.4.dev11
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -23,7 +23,7 @@ Requires-Dist: grpclib<0.4.10,>=0.4.7; python_version < "3.14"
 Requires-Dist: grpclib<0.4.10,>=0.4.9; python_version >= "3.14"
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
-Requires-Dist: synchronicity~=0.12.1
+Requires-Dist: synchronicity~=0.12.3
 Requires-Dist: toml
 Requires-Dist: types-certifi
 Requires-Dist: types-toml

{modal-1.4.4.dev9 → modal-1.4.4.dev11}/modal/__init__.py

@@ -45,6 +45,7 @@ try:
     from .secret import Secret
     from .snapshot import SandboxSnapshot
     from .volume import Volume
+    from .workspace import Workspace
 except Exception:
     print()
     print("#" * 80)
@@ -81,6 +82,7 @@ __all__ = [
     "Secret",
     "Tunnel",
     "Volume",
+    "Workspace",
     "asgi_app",
     "batched",
     "billing",

{modal-1.4.4.dev9 → modal-1.4.4.dev11}/modal/_billing.py

@@ -1,7 +1,7 @@
 # Copyright Modal Labs 2025
 from datetime import datetime, timezone
 from decimal import Decimal
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 from modal_proto import api_pb2
 
@@ -21,10 +21,10 @@ class WorkspaceBillingReportItem(TypedDict):
 async def _workspace_billing_report(
     *,
     start: datetime,  # Start of the report, inclusive
-    end: Optional[datetime] = None,  # End of the report, exclusive
+    end: datetime | None = None,  # End of the report, exclusive
     resolution: str = "d",  # Resolution, e.g. "d" for daily or "h" for hourly
-    tag_names: Optional[list[str]] = None,  # Optional additional metadata to include
-    client: Optional[_Client] = None,
+    tag_names: list[str] | None = None,  # Optional additional metadata to include
+    client: _Client | None = None,
 ) -> list[WorkspaceBillingReportItem]:
     """Generate a tabular report of workspace usage by object and time.
 

{modal-1.4.4.dev9 → modal-1.4.4.dev11}/modal/_clustered_functions.py

@@ -2,7 +2,6 @@
 import os
 import socket
 from dataclasses import dataclass
-from typing import Optional
 
 from modal._utils.async_utils import synchronize_api
 from modal.client import _Client
@@ -18,7 +17,7 @@ class ClusterInfo:
     container_ipv4_ips: list[str]
 
 
-cluster_info: Optional[ClusterInfo] = None
+cluster_info: ClusterInfo | None = None
 
 
 def get_cluster_info() -> ClusterInfo:

{modal-1.4.4.dev9 → modal-1.4.4.dev11}/modal/_clustered_functions.pyi

@@ -1,5 +1,5 @@
 import modal.client
-import typing
+import types
 import typing_extensions
 
 class ClusterInfo:
@@ -31,4 +31,4 @@ class __initialize_clustered_function_spec(typing_extensions.Protocol):
 
 initialize_clustered_function: __initialize_clustered_function_spec
 
-cluster_info: typing.Optional[ClusterInfo]
+cluster_info: ClusterInfo | None

{modal-1.4.4.dev9 → modal-1.4.4.dev11}/modal/_container_entrypoint.py

@@ -21,7 +21,7 @@ import signal
 import threading
 import time
 import types
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from google.protobuf.message import Message
 
@@ -40,8 +40,8 @@ from ._runtime import execution_context
 from ._runtime.container_io_manager import (
     ContainerIOManager,
     IOContext,
-    UserException,
 )
+from ._runtime.task_lifecycle_manager import UserException
 
 if TYPE_CHECKING:
     import modal._runtime.container_io_manager
@@ -268,7 +268,7 @@ def call_function(
 
 def get_serialized_user_class_and_function(
     function_def: api_pb2.Function, client: _Client
-) -> tuple[Optional[type], Optional[types.FunctionType]]:
+) -> tuple[type | None, types.FunctionType | None]:
     if function_def.definition_type == api_pb2.Function.DEFINITION_TYPE_SERIALIZED:
         assert function_def.function_serialized or function_def.class_serialized
 
@@ -310,7 +310,7 @@ def main(container_args: api_pb2.ContainerArguments, client: Client):
         ser_usr_cls, ser_fun = get_serialized_user_class_and_function(function_def, _client)
 
         # Initialize the function, importing user code.
-        with container_io_manager.handle_user_exception():
+        with container_io_manager.get_task_lifecycle_manager().handle_task_lifecycle_exception():
             if container_args.serialized_params:
                 param_args, param_kwargs = deserialize_params(container_args.serialized_params, function_def, _client)
             else:
@@ -390,7 +390,7 @@ def main(container_args: api_pb2.ContainerArguments, client: Client):
                     "that evaluates differently in the local and remote environments."
                 )
             for object_id, obj in zip(dep_object_ids, service.service_deps):
-                metadata: Optional[Message] = container_app.object_handle_metadata[object_id]
+                metadata: Message | None = container_app.object_handle_metadata[object_id]
                 obj._hydrate(object_id, _client, metadata)
 
         # Initialize clustered functions.
@@ -401,7 +401,13 @@ def main(container_args: api_pb2.ContainerArguments, client: Client):
                 function_def._experimental_group_size,
             )
 
-        with service.execution_context(event_loop, container_io_manager) as finalized_functions:
+        with service.execution_context(
+            event_loop=event_loop,
+            snapshot=container_io_manager.memory_snapshot,
+            container_io_manager=container_io_manager,
+        ) as finalized_functions:
+            # This context managers handles pre/post snapshot lifecycle of the user code,
+            # finalized functions, ASGI/WSGI lifespan, and volume commit.
             if function_def.is_server:
                 call_server(event_loop)
             else:
@@ -412,7 +418,7 @@ if __name__ == "__main__":
     logger.debug("Container: starting")
 
     container_args = api_pb2.ContainerArguments()
-    container_arguments_path: Optional[str] = os.environ.get("MODAL_CONTAINER_ARGUMENTS_PATH")
+    container_arguments_path: str | None = os.environ.get("MODAL_CONTAINER_ARGUMENTS_PATH")
     if container_arguments_path is None:
         raise RuntimeError("No path to the container arguments file provided!")
     container_args.ParseFromString(open(container_arguments_path, "rb").read())

{modal-1.4.4.dev9 → modal-1.4.4.dev11}/modal/_environments.py

@@ -3,7 +3,7 @@ import asyncio
 import builtins
 from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
-from typing import Literal, Optional
+from typing import Literal
 
 from google.protobuf.empty_pb2 import Empty
 from google.protobuf.message import Message
@@ -35,7 +35,7 @@ class _EnvironmentManager:
         name: str,  # Name to use for the new Environment
         *,
         restricted: bool = False,  # If True, enable RBAC restrictions on the Environment
-        client: Optional[_Client] = None,  # Optional client with Modal credentials
+        client: _Client | None = None,  # Optional client with Modal credentials
     ) -> None:
         """Create a new Environment.
 
@@ -52,7 +52,7 @@ class _EnvironmentManager:
     async def list(
         self,
         *,
-        client: Optional[_Client] = None,  # Optional client with Modal credentials
+        client: _Client | None = None,  # Optional client with Modal credentials
     ) -> builtins.list["_Environment"]:
         """Return a list of hydrated Environment objects.
 
@@ -85,7 +85,7 @@ class _EnvironmentManager:
         self,
         name: str,  # Name of the Environment to delete
         *,
-        client: Optional[_Client] = None,  # Optional client with Modal credentials
+        client: _Client | None = None,  # Optional client with Modal credentials
     ) -> None:
         """Delete a named Environment.
 
@@ -116,9 +116,9 @@ def _role_to_proto(role: str) -> api_pb2.EnvironmentRole.ValueType:
 
 def _role_from_proto(proto_value: int) -> MemberRole:
     match proto_value:
-        case int(v) if v == api_pb2.ENVIRONMENT_ROLE_VIEWER:
+        case api_pb2.ENVIRONMENT_ROLE_VIEWER:
             return "viewer"
-        case int(v) if v == api_pb2.ENVIRONMENT_ROLE_CONTRIBUTOR:
+        case api_pb2.ENVIRONMENT_ROLE_CONTRIBUTOR:
             return "contributor"
         case _:
             raise ValueError(f"Unknown environment role: {proto_value}")
@@ -167,8 +167,8 @@ class _EnvironmentMembersManager:
     async def update(
         self,
         *,
-        users: Optional[Mapping[str, MemberRole]] = None,
-        service_users: Optional[Mapping[str, MemberRole]] = None,
+        users: Mapping[str, MemberRole] | None = None,
+        service_users: Mapping[str, MemberRole] | None = None,
     ) -> None:
         """Add or modify roles for members of a restricted Environment.
 
@@ -224,8 +224,8 @@ class _EnvironmentMembersManager:
     async def remove(
         self,
         *,
-        users: Optional[Iterable[str]] = None,
-        service_users: Optional[Iterable[str]] = None,
+        users: Iterable[str] | None = None,
+        service_users: Iterable[str] | None = None,
     ) -> None:
         """Remove members from a restricted Environment.
 
@@ -289,7 +289,7 @@ class _EnvironmentMembersManager:
 
 
 class _Environment(_Object, type_prefix="en"):
-    _name: Optional[str] = None
+    _name: str | None = None
     _settings: EnvironmentSettings
 
     def __init__(self):
@@ -300,7 +300,7 @@ class _Environment(_Object, type_prefix="en"):
         )
 
     @property
-    def name(self) -> Optional[str]:
+    def name(self) -> str | None:
         return self._name
 
     @classproperty
@@ -331,10 +331,10 @@ class _Environment(_Object, type_prefix="en"):
 
     @staticmethod
     def _get_or_create(
-        name: str, repr: str, create_if_missing: bool = False, client: Optional[_Client] = None
+        name: str, repr: str, create_if_missing: bool = False, client: _Client | None = None
     ) -> "_Environment":
         async def _load(
-            self: _Environment, resolver: Resolver, load_context: LoadContext, existing_object_id: Optional[str]
+            self: _Environment, resolver: Resolver, load_context: LoadContext, existing_object_id: str | None
         ):
             request = api_pb2.EnvironmentGetOrCreateRequest(
                 deployment_name=name,
@@ -358,7 +358,7 @@ class _Environment(_Object, type_prefix="en"):
         )
 
     @staticmethod
-    def from_context(*, client: Optional[_Client] = None) -> "_Environment":
+    def from_context(*, client: _Client | None = None) -> "_Environment":
         """Look up an Environment object using the current context.
 
         This method returns the Environment that is defined by the local configuration
@@ -381,7 +381,7 @@ class _Environment(_Object, type_prefix="en"):
         name: str,
         *,
         create_if_missing: bool = False,
-        client: Optional[_Client] = None,
+        client: _Client | None = None,
     ) -> "_Environment":
         """Look up an Environment object using its name."""
         check_environment_name(name)
@@ -412,7 +412,7 @@ async def _get_environment_cached(name: str, client: _Client) -> _Environment:
 # and migrate users to the new object-oriented API, but that should happen gracefully.
 
 
-async def _delete_environment(name: str, client: Optional[_Client] = None):
+async def _delete_environment(name: str, client: _Client | None = None):
     if client is None:
         client = await _Client.from_env()
     await client.stub.EnvironmentDelete(api_pb2.EnvironmentDeleteRequest(name=name))
@@ -421,9 +421,9 @@ async def _delete_environment(name: str, client: Optional[_Client] = None):
 async def _update_environment(
     current_name: str,
     *,
-    new_name: Optional[str] = None,
-    new_web_suffix: Optional[str] = None,
-    client: Optional[_Client] = None,
+    new_name: str | None = None,
+    new_web_suffix: str | None = None,
+    client: _Client | None = None,
 ):
     new_name_pb2 = None
     new_web_suffix_pb2 = None
@@ -444,20 +444,20 @@ async def _update_environment(
     await client.stub.EnvironmentUpdate(update_payload)
 
 
-async def _create_environment(name: str, client: Optional[_Client] = None):
+async def _create_environment(name: str, client: _Client | None = None):
     if client is None:
         client = await _Client.from_env()
     await client.stub.EnvironmentCreate(api_pb2.EnvironmentCreateRequest(name=name))
 
 
-async def _list_environments(client: Optional[_Client] = None) -> list[api_pb2.EnvironmentListItem]:
+async def _list_environments(client: _Client | None = None) -> list[api_pb2.EnvironmentListItem]:
     if client is None:
         client = await _Client.from_env()
     resp = await client.stub.EnvironmentList(Empty())
     return list(resp.items)
 
 
-def ensure_env(environment_name: Optional[str] = None) -> str:
+def ensure_env(environment_name: str | None = None) -> str:
     """Override config environment with environment from environment_name
 
     This is necessary since a cli command that runs Modal code, without explicit

{modal-1.4.4.dev9 → modal-1.4.4.dev11}/modal/_function_variants.py

@@ -2,7 +2,7 @@
 import dataclasses
 from collections.abc import Collection, Sequence, Sized
 from pathlib import PurePosixPath
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 from modal_proto import api_pb2
 
@@ -39,40 +39,40 @@ class _FunctionOptions:
     secrets: Collection[_Secret] = ()
     validated_volumes: Sequence[tuple[str, _Volume]] = ()
     cloud_bucket_mounts: Sequence[tuple[str, _CloudBucketMount]] = ()
-    resources: Optional[api_pb2.Resources] = None
-    retry_policy: Optional[api_pb2.FunctionRetryPolicy] = None
-    max_containers: Optional[int] = None
-    buffer_containers: Optional[int] = None
-    scaledown_window: Optional[int] = None
-    timeout_secs: Optional[int] = None
-    scheduler_placement: Optional[api_pb2.SchedulerPlacement] = None
-    cloud: Optional[str] = None
-    max_concurrent_inputs: Optional[int] = None
-    target_concurrent_inputs: Optional[int] = None
-    batch_max_size: Optional[int] = None
-    batch_wait_ms: Optional[int] = None
+    resources: api_pb2.Resources | None = None
+    retry_policy: api_pb2.FunctionRetryPolicy | None = None
+    max_containers: int | None = None
+    buffer_containers: int | None = None
+    scaledown_window: int | None = None
+    timeout_secs: int | None = None
+    scheduler_placement: api_pb2.SchedulerPlacement | None = None
+    cloud: str | None = None
+    max_concurrent_inputs: int | None = None
+    target_concurrent_inputs: int | None = None
+    batch_max_size: int | None = None
+    batch_wait_ms: int | None = None
 
     @classmethod
     def new(
         cls,
         *,
-        cpu: Optional[Union[float, tuple[float, float]]] = None,
-        memory: Optional[Union[int, tuple[int, int]]] = None,
-        gpu: Optional[str] = None,
-        env: Optional[dict[str, Optional[str]]] = None,
-        secrets: Optional[Collection[_Secret]] = None,
-        volumes: dict[Union[str, PurePosixPath], Union[_Volume, _CloudBucketMount]] = {},
-        retries: Optional[Union[int, Retries]] = None,
-        max_containers: Optional[int] = None,
-        buffer_containers: Optional[int] = None,
-        scaledown_window: Optional[int] = None,
-        timeout: Optional[int] = None,
-        region: Optional[Union[str, Sequence[str]]] = None,
-        cloud: Optional[str] = None,
-        max_concurrent_inputs: Optional[int] = None,
-        target_concurrent_inputs: Optional[int] = None,
-        batch_max_size: Optional[int] = None,
-        batch_wait_ms: Optional[int] = None,
+        cpu: float | tuple[float, float] | None = None,
+        memory: int | tuple[int, int] | None = None,
+        gpu: str | None = None,
+        env: dict[str, str | None] | None = None,
+        secrets: Collection[_Secret] | None = None,
+        volumes: dict[str | PurePosixPath, _Volume | _CloudBucketMount] = {},
+        retries: int | Retries | None = None,
+        max_containers: int | None = None,
+        buffer_containers: int | None = None,
+        scaledown_window: int | None = None,
+        timeout: int | None = None,
+        region: str | Sequence[str] | None = None,
+        cloud: str | None = None,
+        max_concurrent_inputs: int | None = None,
+        target_concurrent_inputs: int | None = None,
+        batch_max_size: int | None = None,
+        batch_wait_ms: int | None = None,
     ) -> "_FunctionOptions":
         """Internal constructor that validates and normalizes public parameters."""
         retry_policy = _parse_retries(retries)
@@ -89,7 +89,7 @@ class _FunctionOptions:
         if env:
             secrets = [*secrets, _Secret.from_dict(env)]
 
-        scheduler_placement: Optional[api_pb2.SchedulerPlacement] = None
+        scheduler_placement: api_pb2.SchedulerPlacement | None = None
         if region:
             regions = [region] if isinstance(region, str) else list(region)
             scheduler_placement = api_pb2.SchedulerPlacement(regions=regions)
@@ -187,8 +187,8 @@ class _FunctionOptions:
 
 def _make_function_variant(
     base_function: "_Function",
-    options: Optional[_FunctionOptions],
-    parameter_schema: Optional[Sequence[api_pb2.ClassParameterSpec]],
+    options: _FunctionOptions | None,
+    parameter_schema: Sequence[api_pb2.ClassParameterSpec] | None,
     args: Sized,
     kwargs: dict[str, Any],
 ) -> "_Function":
@@ -198,7 +198,7 @@ def _make_function_variant(
         function_variant: "_Function",
         resolver: "Resolver",
         load_context: "LoadContext",
-        existing_object_id: Optional[str],
+        existing_object_id: str | None,
     ):
         if not base_function.is_hydrated:
             await base_function.hydrate(load_context.client)