modal 1.5.3.dev2__tar.gz → 1.5.3.dev3__tar.gz

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/PKG-INFO

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

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal/_functions.py

@@ -627,6 +627,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     _metadata: api_pb2.FunctionHandleMetadata | None = None
     _options: _FunctionOptions
     _base_function: "_Function | None" = None
+    _app_id: str | None = None
 
     @staticmethod
     def from_local(
@@ -1403,6 +1404,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             metadata.max_object_size_bytes if metadata.HasField("max_object_size_bytes") else MAX_OBJECT_SIZE_BYTES
         )
         self._experimental_flash_urls = metadata._experimental_flash_urls
+        self._app_id = metadata.app_id or None
 
         # Invalidate the Function variant cache when we load new metadata, since the base Function handle
         # is now in sync with the server but any previously-cached variants may be stale.
@@ -1412,6 +1414,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         # Overridden concrete implementation of base class method
         assert self._function_name, f"Function name must be set before metadata can be retrieved for {self}"
         return api_pb2.FunctionHandleMetadata(
+            app_id=self._app_id or "",
             function_name=self._function_name,
             function_type=get_function_type(self._is_generator),
             web_url=self._web_url or "",
@@ -1673,6 +1676,8 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         )
         fc: _FunctionCall[ReturnType] = _FunctionCall._new_hydrated(function_call_id, self.client, None)
         fc._num_inputs = num_inputs  # set the cached value of num_inputs
+        fc._app_id = self._app_id
+        fc._function_id = self.object_id
         return fc
 
     async def _call_function(self, args, kwargs) -> ReturnType:
@@ -1884,6 +1889,8 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             invocation.function_call_id, invocation.client, None
         )
         fc._is_generator = self._is_generator if self._is_generator else False
+        fc._app_id = self._app_id
+        fc._function_id = self.object_id
         return fc
 
     @synchronizer.no_input_translation
@@ -1920,6 +1927,8 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         fc: _FunctionCall[ReturnType] = _FunctionCall._new_hydrated(
             invocation.function_call_id, invocation.client, None
         )
+        fc._app_id = self._app_id
+        fc._function_id = self.object_id
         return fc
 
     def get_raw_f(self) -> Callable[..., Any]:
@@ -1979,10 +1988,18 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
 
     _is_generator: bool = False
     _num_inputs: int | None = None
+    _app_id: str | None = None
+    _function_id: str | None = None
 
     def _invocation(self):
         return _Invocation(self.client.stub, self.object_id, self.client)
 
+    async def _hydrate_from_id_metadata(self) -> None:
+        """Hydrate metadata only when needed for FunctionCall fields."""
+        request = api_pb2.FunctionCallFromIdRequest(function_call_id=self.object_id)
+        resp = await self.client.stub.FunctionCallFromId(request)
+        self._hydrate_metadata(resp)
+
     @live_method
     async def num_inputs(self) -> int:
         """Get the number of inputs in the function call.
@@ -1991,9 +2008,8 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
             How many inputs this function call includes (e.g. `1` for `.spawn()`, more for `.spawn_map()`).
         """
         if self._num_inputs is None:
-            request = api_pb2.FunctionCallFromIdRequest(function_call_id=self.object_id)
-            resp = await self.client.stub.FunctionCallFromId(request)
-            self._num_inputs = resp.num_inputs  # cached
+            await self._hydrate_from_id_metadata()
+        assert self._num_inputs is not None
         return self._num_inputs
 
     @live_method
@@ -2135,6 +2151,13 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         )
         return typing.cast("modal.functions.FunctionCall[Any]", synchronizer._translate_out(impl_instance))
 
+    def _hydrate_metadata(self, metadata: Message | None):
+        # Overridden concrete implementation of base class method
+        if isinstance(metadata, api_pb2.FunctionCallFromIdResponse):
+            self._num_inputs = metadata.num_inputs
+            self._app_id = metadata.metadata.app_id or None
+            self._function_id = metadata.metadata.function_id or None
+
     @staticmethod
     async def gather(*function_calls: "_FunctionCall[T]") -> typing.Sequence[T]:
         """Wait until all Modal FunctionCall objects have results before returning.

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal/_utils/grpc_utils.py

@@ -325,7 +325,7 @@ def create_channel(
 async def create_channel_with_fallbacks(
     server_url: str,
     metadata: dict[str, str] = {},
-    stagger_delay: float = 1.0,
+    stagger_delay: float = 3.0,
 ) -> grpclib.client.Channel:
     """Create a connected channel, supporting comma-separated fallback URLs.
 

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/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.3.dev2",
+        version: str = "1.5.3.dev3",
     ):
         """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.3.dev2",
+        version: str = "1.5.3.dev3",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal/cls.py

@@ -86,6 +86,8 @@ def _bind_instance_method(cls: "_Cls", service_function: _Function, method_name:
 
         method_metadata = service_function._method_handle_metadata[method_name]
         new_function._hydrate(service_function.object_id, service_function.client, method_metadata)
+        if not new_function._app_id:
+            new_function._app_id = service_function._app_id
 
     async def _load(fun: "_Function", resolver: Resolver, load_context: LoadContext, existing_object_id: str | None):
         # there is currently no actual loading logic executed to create each method on
@@ -426,6 +428,7 @@ class _Obj:
                 )
             await resolver.load(method_function, load_context)  # get the appropriate method handle (lazy)
             fun._hydrate_from_other(method_function)
+            fun._app_id = method_function._app_id
 
         # The reason we don't *always* use this lazy loader is because it precludes attribute access
         # on local classes.

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal/config.py

@@ -106,7 +106,8 @@ from modal_proto import api_pb2
 from ._utils.logger import configure_logger
 from .exception import InvalidError, NotFoundError
 
-DEFAULT_SERVER_URL = "https://api.modal.com"  # TODO(erikbern): add modal2.com
+# By default, try api.modal.com and fail over to api.modal2.com
+DEFAULT_SERVER_URL = "https://api.modal.com,https://api.modal2.com"
 
 
 # Locate config file and read it

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal/functions.pyi

@@ -58,6 +58,7 @@ class Function(
     _metadata: typing.Optional[modal_proto.api_pb2.FunctionHandleMetadata]
     _options: modal._function_variants._FunctionOptions
     _base_function: typing.Optional[Function]
+    _app_id: typing.Optional[str]
 
     def __init__(self, *args, **kwargs):
         """mdmd:hidden"""
@@ -492,7 +493,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -517,7 +518,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -567,7 +568,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -600,7 +601,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -608,7 +609,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -641,7 +642,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function.
@@ -892,6 +893,8 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     _is_generator: bool
     _num_inputs: typing.Optional[int]
+    _app_id: typing.Optional[str]
+    _function_id: typing.Optional[str]
 
     def __init__(self, *args, **kwargs):
         """mdmd:hidden"""
@@ -899,6 +902,17 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     def _invocation(self): ...
 
+    class ___hydrate_from_id_metadata_spec(typing_extensions.Protocol):
+        def __call__(self, /) -> None:
+            """Hydrate metadata only when needed for FunctionCall fields."""
+            ...
+
+        async def aio(self, /) -> None:
+            """Hydrate metadata only when needed for FunctionCall fields."""
+            ...
+
+    _hydrate_from_id_metadata: ___hydrate_from_id_metadata_spec
+
     class __num_inputs_spec(typing_extensions.Protocol):
         def __call__(self, /) -> int:
             """Get the number of inputs in the function call.
@@ -1115,6 +1129,8 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     from_id: typing.ClassVar[__from_id_spec]
 
+    def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
+
     class __gather_spec(typing_extensions.Protocol):
         def __call__(self, /, *function_calls: FunctionCall[modal._functions.T]) -> typing.Sequence[modal._functions.T]:
             """Wait until all Modal FunctionCall objects have results before returning.

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal/sandbox.py

@@ -349,7 +349,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         gpu: str | None = None,
         cloud: str | None = None,
         region: str | Sequence[str] | None = None,
-        cpu: float | None = None,
+        cpu: float | tuple[float, float] | None = None,
         memory: int | tuple[int, int] | None = None,
         mounts: Sequence[_Mount] = (),
         network_file_systems: dict[str | os.PathLike, _NetworkFileSystem] = {},
@@ -823,8 +823,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         timeout: int = 300,
         idle_timeout: int | None = None,
         workdir: str | None = None,
-        cpu: float | None = None,
-        memory: int | None = None,
+        cpu: float | tuple[float, float] | None = None,
+        memory: int | tuple[int, int] | None = None,
         cloud: str | None = None,
         region: str | Sequence[str] | None = None,
         block_network: bool = False,
@@ -852,6 +852,10 @@ class _Sandbox(_Object, type_prefix="sb"):
         `secret=...` or `oidc_auth_role_arn`), OIDC identity tokens, proxies, and
         filesystem snapshots.
 
+        `cpu` and `memory` accept either a scalar request or a `(request, limit)`
+        tuple that additionally sets a hard limit (fractional CPU cores; memory
+        in MiB), matching `Sandbox.create()`.
+
         Features like memory snapshots, network file systems, GPUs, and custom
         domains are not supported.
 

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal/sandbox.pyi

@@ -165,7 +165,7 @@ class _Sandbox(modal._object._Object):
         gpu: typing.Optional[str] = None,
         cloud: typing.Optional[str] = None,
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
-        cpu: typing.Optional[float] = None,
+        cpu: typing.Union[float, tuple[float, float], None] = None,
         memory: typing.Union[int, tuple[int, int], None] = None,
         mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem] = {},
@@ -368,8 +368,8 @@ class _Sandbox(modal._object._Object):
         timeout: int = 300,
         idle_timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
-        cpu: typing.Optional[float] = None,
-        memory: typing.Optional[int] = None,
+        cpu: typing.Union[float, tuple[float, float], None] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
         cloud: typing.Optional[str] = None,
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
         block_network: bool = False,
@@ -400,6 +400,10 @@ class _Sandbox(modal._object._Object):
         `secret=...` or `oidc_auth_role_arn`), OIDC identity tokens, proxies, and
         filesystem snapshots.
 
+        `cpu` and `memory` accept either a scalar request or a `(request, limit)`
+        tuple that additionally sets a hard limit (fractional CPU cores; memory
+        in MiB), matching `Sandbox.create()`.
+
         Features like memory snapshots, network file systems, GPUs, and custom
         domains are not supported.
 
@@ -1337,7 +1341,7 @@ class Sandbox(modal.object.Object):
         gpu: typing.Optional[str] = None,
         cloud: typing.Optional[str] = None,
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
-        cpu: typing.Optional[float] = None,
+        cpu: typing.Union[float, tuple[float, float], None] = None,
         memory: typing.Union[int, tuple[int, int], None] = None,
         mounts: collections.abc.Sequence[modal.mount.Mount] = (),
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem] = {},
@@ -1721,8 +1725,8 @@ class Sandbox(modal.object.Object):
             timeout: int = 300,
             idle_timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
-            cpu: typing.Optional[float] = None,
-            memory: typing.Optional[int] = None,
+            cpu: typing.Union[float, tuple[float, float], None] = None,
+            memory: typing.Union[int, tuple[int, int], None] = None,
             cloud: typing.Optional[str] = None,
             region: typing.Union[str, collections.abc.Sequence[str], None] = None,
             block_network: bool = False,
@@ -1753,6 +1757,10 @@ class Sandbox(modal.object.Object):
             `secret=...` or `oidc_auth_role_arn`), OIDC identity tokens, proxies, and
             filesystem snapshots.
 
+            `cpu` and `memory` accept either a scalar request or a `(request, limit)`
+            tuple that additionally sets a hard limit (fractional CPU cores; memory
+            in MiB), matching `Sandbox.create()`.
+
             Features like memory snapshots, network file systems, GPUs, and custom
             domains are not supported.
 
@@ -1783,8 +1791,8 @@ class Sandbox(modal.object.Object):
             timeout: int = 300,
             idle_timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
-            cpu: typing.Optional[float] = None,
-            memory: typing.Optional[int] = None,
+            cpu: typing.Union[float, tuple[float, float], None] = None,
+            memory: typing.Union[int, tuple[int, int], None] = None,
             cloud: typing.Optional[str] = None,
             region: typing.Union[str, collections.abc.Sequence[str], None] = None,
             block_network: bool = False,
@@ -1815,6 +1823,10 @@ class Sandbox(modal.object.Object):
             `secret=...` or `oidc_auth_role_arn`), OIDC identity tokens, proxies, and
             filesystem snapshots.
 
+            `cpu` and `memory` accept either a scalar request or a `(request, limit)`
+            tuple that additionally sets a hard limit (fractional CPU cores; memory
+            in MiB), matching `Sandbox.create()`.
+
             Features like memory snapshots, network file systems, GPUs, and custom
             domains are not supported.
 

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal.egg-info/PKG-INFO

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

{modal-1.5.3.dev2 → modal-1.5.3.dev3}/modal_proto/api_grpc.py

@@ -639,6 +639,10 @@ class ModalClientBase(abc.ABC):
     async def SandboxRestore(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxRestoreRequest, modal_proto.api_pb2.SandboxRestoreResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxSetName(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxSetNameRequest, modal_proto.api_pb2.SandboxSetNameResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxSnapshot(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxSnapshotRequest, modal_proto.api_pb2.SandboxSnapshotResponse]') -> None:
         pass
@@ -1871,6 +1875,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxRestoreRequest,
                 modal_proto.api_pb2.SandboxRestoreResponse,
             ),
+            '/modal.client.ModalClient/SandboxSetName': grpclib.const.Handler(
+                self.SandboxSetName,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxSetNameRequest,
+                modal_proto.api_pb2.SandboxSetNameResponse,
+            ),
             '/modal.client.ModalClient/SandboxSnapshot': grpclib.const.Handler(
                 self.SandboxSnapshot,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -3257,6 +3267,12 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxRestoreRequest,
             modal_proto.api_pb2.SandboxRestoreResponse,
         )
+        self.SandboxSetName = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxSetName',
+            modal_proto.api_pb2.SandboxSetNameRequest,
+            modal_proto.api_pb2.SandboxSetNameResponse,
+        )
         self.SandboxSnapshot = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxSnapshot',