modal 1.5.1.dev0__tar.gz → 1.5.1.dev1__tar.gz

{modal-1.5.1.dev0 → modal-1.5.1.dev1}/PKG-INFO

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

{modal-1.5.1.dev0 → modal-1.5.1.dev1}/modal/_server.py

@@ -72,6 +72,10 @@ class _Server:
     def _get_service_function(self) -> _Function:
         return self._service_function
 
+    @property
+    def object_id(self) -> str:
+        return self._service_function.object_id
+
     @staticmethod
     def _extract_user_cls(wrapped_user_cls: "type | _PartialFunction") -> type:
         if isinstance(wrapped_user_cls, _PartialFunction):
@@ -83,14 +87,12 @@ class _Server:
     # ============ Live Methods ============
 
     @live_method
-    async def get_urls(self) -> dict[str, str] | None:
-        def _extract_region_from_url(url: str) -> str:
-            return url.split(".")[-3].removeprefix("modal-")
-
-        return {
-            _extract_region_from_url(url): url
-            for url in await self._get_service_function()._experimental_get_flash_urls() or []
-        }
+    async def get_url(self) -> str | None:
+        urls = await self._get_service_function()._experimental_get_flash_urls()
+        # Return the first URL if it exists. Servers should only have one URL
+        # since they only have one region.
+        url = urls[0] if urls else None
+        return url
 
     @live_method
     async def update_autoscaler(

{modal-1.5.1.dev0 → modal-1.5.1.dev1}/modal/cli/shell.py

@@ -60,20 +60,13 @@ def _passed_forbidden_args(
     return passed_forbidden
 
 
-def _parse_experimental_options(options: Iterable[str]) -> dict[str, bool]:
-    parsed: dict[str, bool] = {}
+def _parse_experimental_options(options: Iterable[str]) -> dict[str, str]:
+    parsed: dict[str, str] = {}
     for option in options:
         key, sep, raw_value = option.partition("=")
         if not key or not sep:
             raise click.BadParameter("must use KEY=VALUE")
-
-        value = raw_value.lower()
-        if value in {"1", "true"}:
-            parsed[key] = True
-        elif value in {"0", "false"}:
-            parsed[key] = False
-        else:
-            raise click.BadParameter("BOOL must be one of true, false, 1, or 0")
+        parsed[key] = raw_value
     return parsed
 
 
@@ -200,7 +193,7 @@ def _start_shell_from_function_spec(
     timeout: int,
     function_spec: _FunctionSpec,
     pty: bool,
-    experimental_options: dict[str, bool],
+    experimental_options: dict[str, str],
 ) -> None:
     interactive_shell(
         app,
@@ -238,7 +231,7 @@ def _start_shell_from_image(
     cloud: str | None,
     region: str | None,
     pty: bool,
-    experimental_options: dict[str, bool],
+    experimental_options: dict[str, str],
 ) -> None:
     volumes = {f"/mnt/{vol}": Volume.from_name(vol) for vol in volume}
     secrets = [Secret.from_name(s) for s in secret]

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

{modal-1.5.1.dev0 → modal-1.5.1.dev1}/modal/functions.pyi

@@ -487,7 +487,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.
 
@@ -512,7 +512,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]:
@@ -562,7 +562,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.
 
@@ -595,7 +595,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: ...
@@ -603,7 +603,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.
 
@@ -636,7 +636,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.

{modal-1.5.1.dev0 → modal-1.5.1.dev1}/modal/sandbox.py

@@ -352,7 +352,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         unencrypted_ports: Sequence[int] = [],
         proxy: _Proxy | None = None,
         readiness_probe: Probe | None = None,
-        experimental_options: dict[str, bool] | None = None,
+        experimental_options: dict[str, Any] | None = None,
         tags: dict[str, str] | None = None,
         enable_snapshot: bool = False,
         verbose: bool = False,
@@ -470,7 +470,9 @@ class _Sandbox(_Object, type_prefix="sb"):
                 enable_snapshot=enable_snapshot,
                 verbose=verbose,
                 name=name,
-                experimental_options=experimental_options,
+                experimental_options_v2=(
+                    {k: str(v) for k, v in experimental_options.items()} if experimental_options else None
+                ),
                 custom_domain=custom_domain,
                 include_oidc_identity_token=include_oidc_identity_token,
                 inbound_cidr_allowlist=list(inbound_cidr_allowlist) if inbound_cidr_allowlist is not None else [],
@@ -525,7 +527,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         include_oidc_identity_token: bool = False,
         readiness_probe: Probe | None = None,
         verbose: bool = False,
-        experimental_options: dict[str, bool] | None = None,
+        experimental_options: dict[str, Any] | None = None,
         _experimental_enable_snapshot: bool = False,
         client: _Client | None = None,
         environment_name: str | None = None,  # *DEPRECATED*
@@ -696,7 +698,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         proxy: _Proxy | None = None,
         include_oidc_identity_token: bool = False,
         readiness_probe: Probe | None = None,
-        experimental_options: dict[str, bool] | None = None,
+        experimental_options: dict[str, Any] | None = None,
         _experimental_enable_snapshot: bool = False,
         client: _Client | None = None,
         verbose: bool = False,
@@ -1517,15 +1519,17 @@ class _Sandbox(_Object, type_prefix="sb"):
         return self._tunnels
 
     async def create_connect_token(
-        self, user_metadata: str | dict[str, Any] | None = None
+        self, user_metadata: str | dict[str, Any] | None = None, port: int = 8080
     ) -> SandboxConnectCredentials:
         """Create a token for making HTTP connections to the Sandbox.
 
-        Also accepts an optional user_metadata string or dict to associate with the token. This metadata
+        Accepts an optional user_metadata string or dict to associate with the token. This metadata
         will be added to the headers by the proxy when forwarding requests to the Sandbox.
+        Also accepts a port that requests will be routed to.
 
         Args:
             user_metadata: Optional JSON-serializable metadata or string stored with the connect token.
+            port: Optional container port that requests are routed to when using this token.
 
         Returns:
             URL and token credentials for connecting to the sandbox over HTTP.
@@ -1537,7 +1541,12 @@ class _Sandbox(_Object, type_prefix="sb"):
             except Exception as e:
                 raise InvalidError(f"Failed to serialize user_metadata: {e}")
 
-        req = api_pb2.SandboxCreateConnectTokenRequest(sandbox_id=self.object_id, user_metadata=user_metadata)
+        if not isinstance(port, int) or not (1 <= port <= 65535):
+            raise InvalidError("port must be between 1 and 65535")
+
+        req = api_pb2.SandboxCreateConnectTokenRequest(
+            sandbox_id=self.object_id, user_metadata=user_metadata, port=port
+        )
         resp = await self._client.stub.SandboxCreateConnectToken(req)
         return SandboxConnectCredentials(resp.url, resp.token)
 

{modal-1.5.1.dev0 → modal-1.5.1.dev1}/modal/sandbox.pyi

@@ -212,7 +212,7 @@ class _Sandbox(modal._object._Object):
         unencrypted_ports: collections.abc.Sequence[int] = [],
         proxy: typing.Optional[modal.proxy._Proxy] = None,
         readiness_probe: typing.Optional[Probe] = None,
-        experimental_options: typing.Optional[dict[str, bool]] = None,
+        experimental_options: typing.Optional[dict[str, typing.Any]] = None,
         tags: typing.Optional[dict[str, str]] = None,
         enable_snapshot: bool = False,
         verbose: bool = False,
@@ -257,7 +257,7 @@ class _Sandbox(modal._object._Object):
         include_oidc_identity_token: bool = False,
         readiness_probe: typing.Optional[Probe] = None,
         verbose: bool = False,
-        experimental_options: typing.Optional[dict[str, bool]] = None,
+        experimental_options: typing.Optional[dict[str, typing.Any]] = None,
         _experimental_enable_snapshot: bool = False,
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
@@ -368,7 +368,7 @@ class _Sandbox(modal._object._Object):
         proxy: typing.Optional[modal.proxy._Proxy] = None,
         include_oidc_identity_token: bool = False,
         readiness_probe: typing.Optional[Probe] = None,
-        experimental_options: typing.Optional[dict[str, bool]] = None,
+        experimental_options: typing.Optional[dict[str, typing.Any]] = None,
         _experimental_enable_snapshot: bool = False,
         client: typing.Optional[modal.client._Client] = None,
         verbose: bool = False,
@@ -662,15 +662,17 @@ class _Sandbox(modal._object._Object):
         ...
 
     async def create_connect_token(
-        self, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None
+        self, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None, port: int = 8080
     ) -> SandboxConnectCredentials:
         """Create a token for making HTTP connections to the Sandbox.
 
-        Also accepts an optional user_metadata string or dict to associate with the token. This metadata
+        Accepts an optional user_metadata string or dict to associate with the token. This metadata
         will be added to the headers by the proxy when forwarding requests to the Sandbox.
+        Also accepts a port that requests will be routed to.
 
         Args:
             user_metadata: Optional JSON-serializable metadata or string stored with the connect token.
+            port: Optional container port that requests are routed to when using this token.
 
         Returns:
             URL and token credentials for connecting to the sandbox over HTTP.
@@ -1230,7 +1232,7 @@ class Sandbox(modal.object.Object):
         unencrypted_ports: collections.abc.Sequence[int] = [],
         proxy: typing.Optional[modal.proxy.Proxy] = None,
         readiness_probe: typing.Optional[Probe] = None,
-        experimental_options: typing.Optional[dict[str, bool]] = None,
+        experimental_options: typing.Optional[dict[str, typing.Any]] = None,
         tags: typing.Optional[dict[str, str]] = None,
         enable_snapshot: bool = False,
         verbose: bool = False,
@@ -1279,7 +1281,7 @@ class Sandbox(modal.object.Object):
             include_oidc_identity_token: bool = False,
             readiness_probe: typing.Optional[Probe] = None,
             verbose: bool = False,
-            experimental_options: typing.Optional[dict[str, bool]] = None,
+            experimental_options: typing.Optional[dict[str, typing.Any]] = None,
             _experimental_enable_snapshot: bool = False,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -1394,7 +1396,7 @@ class Sandbox(modal.object.Object):
             include_oidc_identity_token: bool = False,
             readiness_probe: typing.Optional[Probe] = None,
             verbose: bool = False,
-            experimental_options: typing.Optional[dict[str, bool]] = None,
+            experimental_options: typing.Optional[dict[str, typing.Any]] = None,
             _experimental_enable_snapshot: bool = False,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -1511,7 +1513,7 @@ class Sandbox(modal.object.Object):
             proxy: typing.Optional[modal.proxy.Proxy] = None,
             include_oidc_identity_token: bool = False,
             readiness_probe: typing.Optional[Probe] = None,
-            experimental_options: typing.Optional[dict[str, bool]] = None,
+            experimental_options: typing.Optional[dict[str, typing.Any]] = None,
             _experimental_enable_snapshot: bool = False,
             client: typing.Optional[modal.client.Client] = None,
             verbose: bool = False,
@@ -1563,7 +1565,7 @@ class Sandbox(modal.object.Object):
             proxy: typing.Optional[modal.proxy.Proxy] = None,
             include_oidc_identity_token: bool = False,
             readiness_probe: typing.Optional[Probe] = None,
-            experimental_options: typing.Optional[dict[str, bool]] = None,
+            experimental_options: typing.Optional[dict[str, typing.Any]] = None,
             _experimental_enable_snapshot: bool = False,
             client: typing.Optional[modal.client.Client] = None,
             verbose: bool = False,
@@ -2170,15 +2172,17 @@ class Sandbox(modal.object.Object):
 
     class __create_connect_token_spec(typing_extensions.Protocol):
         def __call__(
-            self, /, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None
+            self, /, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None, port: int = 8080
         ) -> SandboxConnectCredentials:
             """Create a token for making HTTP connections to the Sandbox.
 
-            Also accepts an optional user_metadata string or dict to associate with the token. This metadata
+            Accepts an optional user_metadata string or dict to associate with the token. This metadata
             will be added to the headers by the proxy when forwarding requests to the Sandbox.
+            Also accepts a port that requests will be routed to.
 
             Args:
                 user_metadata: Optional JSON-serializable metadata or string stored with the connect token.
+                port: Optional container port that requests are routed to when using this token.
 
             Returns:
                 URL and token credentials for connecting to the sandbox over HTTP.
@@ -2186,15 +2190,17 @@ class Sandbox(modal.object.Object):
             ...
 
         async def aio(
-            self, /, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None
+            self, /, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None, port: int = 8080
         ) -> SandboxConnectCredentials:
             """Create a token for making HTTP connections to the Sandbox.
 
-            Also accepts an optional user_metadata string or dict to associate with the token. This metadata
+            Accepts an optional user_metadata string or dict to associate with the token. This metadata
             will be added to the headers by the proxy when forwarding requests to the Sandbox.
+            Also accepts a port that requests will be routed to.
 
             Args:
                 user_metadata: Optional JSON-serializable metadata or string stored with the connect token.
+                port: Optional container port that requests are routed to when using this token.
 
             Returns:
                 URL and token credentials for connecting to the sandbox over HTTP.

{modal-1.5.1.dev0 → modal-1.5.1.dev1}/modal/server.pyi

@@ -33,14 +33,16 @@ class Server:
     def _get_user_cls(self) -> type: ...
     def _get_app(self) -> modal.app.App: ...
     def _get_service_function(self) -> modal.functions.Function: ...
+    @property
+    def object_id(self) -> str: ...
     @staticmethod
     def _extract_user_cls(wrapped_user_cls: typing.Union[type, modal.partial_function.PartialFunction]) -> type: ...
 
-    class __get_urls_spec(typing_extensions.Protocol):
-        def __call__(self, /) -> typing.Optional[dict[str, str]]: ...
-        async def aio(self, /) -> typing.Optional[dict[str, str]]: ...
+    class __get_url_spec(typing_extensions.Protocol):
+        def __call__(self, /) -> typing.Optional[str]: ...
+        async def aio(self, /) -> typing.Optional[str]: ...
 
-    get_urls: __get_urls_spec
+    get_url: __get_url_spec
 
     class __update_autoscaler_spec(typing_extensions.Protocol):
         def __call__(

{modal-1.5.1.dev0 → modal-1.5.1.dev1}/modal.egg-info/PKG-INFO

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