modal 1.6.2.dev2__tar.gz → 1.6.2.dev3__tar.gz

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

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

{modal-1.6.2.dev2 → modal-1.6.2.dev3}/modal/_environments.py

@@ -54,7 +54,7 @@ class _EnvironmentManager:
         modal.Environment.objects.create("my-environment")
         ```
         """
-        check_environment_name(name)
+        check_environment_name(name, allow_periods=False)
 
         client = await _Client.from_env() if client is None else client
         request = api_pb2.EnvironmentCreateRequest(name=name, is_managed=restricted)
@@ -464,7 +464,7 @@ class _Environment(_Object, type_prefix="en"):
         client: _Client | None = None,
     ) -> "_Environment":
         """Look up an Environment object using its name."""
-        check_environment_name(name)
+        check_environment_name(name, allow_periods=True)
         return _Environment._get_or_create(
             name=name,
             repr=f"Environment.from_name({name!r})",

{modal-1.6.2.dev2 → modal-1.6.2.dev3}/modal/_utils/name_utils.py

@@ -27,13 +27,15 @@ def is_valid_object_name(name: str) -> bool:
     )
 
 
-def is_valid_environment_name(name: str) -> bool:
+def is_valid_environment_name(name: str, *, allow_periods: bool) -> bool:
     # first char is alnum, the rest allows other chars
     # The "en-" prefix is reserved for environment IDs, so that references
     # to environments can be resolved by either name or ID unambiguously.
+    # New names cannot contain periods, but some existing Environments have them and must stay resolvable.
+    rest_chars = r"a-zA-Z0-9-_." if allow_periods else r"a-zA-Z0-9-_"
     return (
         len(name) <= 64
-        and re.match(r"^[a-zA-Z0-9][a-zA-Z0-9-_.]+$", name) is not None
+        and re.match(rf"^[a-zA-Z0-9][{rest_chars}]*$", name) is not None
         and not name.lower().startswith("en-")
     )
 
@@ -67,12 +69,12 @@ def check_object_name(name: str, object_type: str) -> None:
         raise InvalidError(message)
 
 
-def check_environment_name(name: str) -> None:
+def check_environment_name(name: str, *, allow_periods: bool) -> None:
     message = (
         f"Invalid Environment name: '{name}'."
-        "\n\nEnvironment names can only start with alphanumeric characters,"
-        " may contain only alphanumeric characters, dashes, periods, and underscores,"
-        " must be shorter than 64 characters, and cannot start with 'en-'."
+        "\n\nEnvironment names must be 1-64 characters, can only start with alphanumeric characters,"
+        " may contain only alphanumeric characters, dashes, and underscores,"
+        " and cannot start with 'en-'."
     )
-    if not is_valid_environment_name(name):
+    if not is_valid_environment_name(name, allow_periods=allow_periods):
         raise InvalidError(message)

{modal-1.6.2.dev2 → modal-1.6.2.dev3}/modal/cli/endpoint.py

@@ -260,7 +260,7 @@ async def list_(*, json: bool = False, env: Optional[str] = None):
 @click.option(
     "--name",
     default=None,
-    help="Endpoint name. If not provided, a default will be derived from the model name.",
+    help="Endpoint name. Defaults to inference-{number} if not provided.",
 )
 @click.option(
     "--model",
@@ -410,6 +410,8 @@ async def create(
 
     output = OutputManager.get()
     output.print(f"[green]✓[/green] Endpoint '{resp.name}' ({resp.endpoint_id}) was created and started provisioning.")
+    if resp.model_name:
+        output.print(f'  → Send [cyan]"model": "{resp.model_name}"[/cyan] in requests to the Endpoint.')
     if resp.endpoint_page_url:
         output.print(f"  → View progress at [magenta]{resp.endpoint_page_url}[/magenta].")
         output.print("  → The Endpoint will also appear in [cyan]modal endpoint list[/cyan].")
@@ -517,6 +519,7 @@ async def info(
                 {
                     "name": endpoint_info.name,
                     "endpoint_id": endpoint_id,
+                    "model_name": endpoint_info.model_name or None,
                     "repo_id": endpoint_info.repo_id,
                     "revision": endpoint_info.revision or None,
                     "volume_id": endpoint_info.volume_id or None,
@@ -547,6 +550,8 @@ async def info(
     header.add_row(Text("Endpoint:"), endpoint_text)
     header.add_row(Text("Endpoint ID:"), Text(endpoint_id))
     header.add_row(Text("State:"), Text(status))
+    if endpoint_info.model_name:
+        header.add_row(Text("Model name:"), Text(endpoint_info.model_name))
     model_text = Text(endpoint_info.repo_id)
     if endpoint_info.revision:
         model_text.append(f"@{endpoint_info.revision[:7]}")

{modal-1.6.2.dev2 → modal-1.6.2.dev3}/modal/cli/environment.py

@@ -87,7 +87,7 @@ def create(
     default_role: str | None = None,
     public: bool = False,
 ):
-    check_environment_name(name)
+    check_environment_name(name, allow_periods=False)
     Environment.objects.create(
         name,
         restricted=restricted,
@@ -116,8 +116,8 @@ def update(
     if set_name is None and set_web_suffix is None:
         raise UsageError("You need to at least one new property (using --set-name or --set-web-suffix)")
 
-    if set_name:
-        check_environment_name(set_name)
+    if set_name and set_name != current_name:
+        check_environment_name(set_name, allow_periods=False)
 
     environments.update_environment(current_name, new_name=set_name, new_web_suffix=set_web_suffix)
     rich.print("[green]✓[/green] Environment updated")

{modal-1.6.2.dev2 → modal-1.6.2.dev3}/modal/client.pyi

@@ -80,7 +80,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.2.dev2",
+        version: str = "1.6.2.dev3",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -290,7 +290,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.2.dev2",
+        version: str = "1.6.2.dev3",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

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

@@ -613,7 +613,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -638,7 +638,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -688,7 +688,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -721,7 +721,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -729,7 +729,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -762,7 +762,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     @property
     def _raw_f_(self) -> collections.abc.Callable[..., typing.Any]: ...

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

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