modal 1.6.2.dev2__py3-none-any.whl → 1.6.2.dev3__py3-none-any.whl

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/_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/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/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/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/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.dist-info → modal-1.6.2.dev3.dist-info}/METADATA

@@ -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.dist-info → modal-1.6.2.dev3.dist-info}/RECORD

@@ -4,7 +4,7 @@ modal/_billing.py,sha256=VEa-YKFsuKmRfWW1SPiXGiY84RzTTRvo8ILi0V10R28,3483
 modal/_cluster.py,sha256=aJJU4bIeosuSBDHoUpz6ckxLMqU8TbkS--h9LE2DMcY,7377
 modal/_cluster.pyi,sha256=ZEZ_ovUvhcE7F_BOwevwcHhc-sr68_2HKpxaqzZNeAA,3648
 modal/_container_entrypoint.py,sha256=mvKu0PceNUqCFgMk7eIx8_2lycMfRGPQJIgjQZbaOE8,22622
-modal/_environments.py,sha256=YOl2oSxvKmLrfc9DDT6KY4aLfIZ9gCOrssz07fXS7cg,27561
+modal/_environments.py,sha256=O7YagqEUhmxEG5Q10Ch6FDSIsAKFbKXULLaeRw0uCio,27602
 modal/_function_variants.py,sha256=xF34OxGaZbmxe0chAJCQb9Uyc8TP78VG8MO55deBWLs,24398
 modal/_functions.py,sha256=hIP3RbIzk_njzVE1miC2hzObTbIa9-LQ1DHm3Whvpgw,112480
 modal/_grpc_client.py,sha256=ajCxTqhDk-rpWuYmUScRXwYMPVmvujo8ckvvv4l0czk,7088
@@ -37,7 +37,7 @@ modal/billing.py,sha256=E1-P_P8bJFLp-bTaggYd4BaaViImPB5UdtXiY8VeAZQ,390
 modal/billing.pyi,sha256=4m7VLYNS8IiJ2I3CJx0awvrOM6BILWRVLfdeqtAYr8M,7189
 modal/call_graph.py,sha256=XGALIDn1bLchWo_goyX23bcPjzCZcfqKUo8INIfDapo,1775
 modal/client.py,sha256=cstrL0wpXCZmcvRs7Sy3QRw9Vz8zkZy8NNk0tPe38sk,22852
-modal/client.pyi,sha256=08PWLhNyJyKvXkR-1C79kW5sO5AIb6KUOSS2yFRi0nw,23488
+modal/client.pyi,sha256=-xShSANf8DRBMSBxDYj_3oWs90QMaQNrpvBkHhBf0Ic,23488
 modal/cloud_bucket_mount.py,sha256=ZOg69dhIFcJcwim4JP-6s1tqwOYAfgS9806jRpspifw,7511
 modal/cloud_bucket_mount.pyi,sha256=HoPe_NG5jYdVfmTNY-ZJ3-C8Eo_FzJovl9orJRjkGbE,10252
 modal/cls.py,sha256=sxKiVm8GQUuEnPx1KJfTHVdSqSmqnNj6U5CQbW37QsA,41771
@@ -54,7 +54,7 @@ modal/environments.pyi,sha256=drmg6yVLjpPhGJ4byOrdBEp2KRLburPrKT-FYtgNPoM,23628
 modal/exception.py,sha256=L-dUKust6feZzn5qhTVusSAr0IBa4Wa3qIA225IT_lY,12334
 modal/file_pattern_matcher.py,sha256=CpaNNj7oBlOSewX-AAUZCF8KDxH0_DmgwzfpVGbPYJ4,8138
 modal/functions.py,sha256=EZRcHFfnoYbvawUJnAHF5nIvoo9GX2Djy7mUmOCXmXc,258
-modal/functions.pyi,sha256=fT7lbQJT7vOuBj73ee7JPB0k06AyLitJIZgixlAWYd0,56311
+modal/functions.pyi,sha256=RPXVlUgs9XxdjzBhgVvD_vBl6GQ4FjWxJxZqha6GITU,56311
 modal/image.py,sha256=c0lUSAoU-Ip3g5DGZ0uhdCzoWSQWh1g0i-7Rxo-Sz-I,160
 modal/image.pyi,sha256=R5rdY4P30IEm-F7A2S9CdXa6QYNk-pQwsEun9BKTyLw,61094
 modal/io_streams.py,sha256=fL1mJw3uvAtKtoKiAP-uB-cAG3JM8fnKV32r0SnhgcQ,32990
@@ -139,7 +139,7 @@ modal/_utils/idle_countdown.py,sha256=oh653Syrjvv--RzJCf4nPaS-U2FK0snmuG_lRJ5KB9
 modal/_utils/jwt_utils.py,sha256=KUoqGHMM4ewDyTsTKXPm1wrMu8Z6lp0l8VILHufm484,1354
 modal/_utils/logger.py,sha256=NgbMKFT9chYYt_TU01DdIior5ByYr2gZtrWIk1SFRLc,1782
 modal/_utils/mount_utils.py,sha256=-jXLNauPLLdj-7-PU280h8emA3ycqedYUEO-1tWk2Kw,4974
-modal/_utils/name_utils.py,sha256=k3BHNWjO1-zcUsUV_hF6U1s9yz0EhT4y20bJwiTb4OA,2762
+modal/_utils/name_utils.py,sha256=FQJa4GL5ie1VCvByEv7AUx_LqKm8y3pL72xGHd8EQ4Q,2997
 modal/_utils/package_utils.py,sha256=jYE7WFVzYWIfO0ZJhno_BYHb6Skp48uupOiw1a3yWzw,2056
 modal/_utils/pattern_utils.py,sha256=Dtqh0jL07-RJYK2FMBKgkUzAXnN1CUtDAiKdpeJFGro,6736
 modal/_utils/proxy_support.py,sha256=hLA_XojYxzPysOiLqyUbB-SgMLmn_X8WtXTk92xh7g4,3162
@@ -175,9 +175,9 @@ modal/cli/container.py,sha256=NAOP7YonB8NfOLQX2IHTze7ApEE7S9I1N8Eb1Y2Xwjk,12386
 modal/cli/curl.py,sha256=FIT0wCwmpOt1AgGfKsSqWOnei-eDv-KMnt5hdg9_DUY,4524
 modal/cli/dashboard.py,sha256=6V8BLYIooToNRM83PRAWaw1imxED3AzmApYNNti-pJk,917
 modal/cli/dict.py,sha256=m6JL4QCcPjCidK-qonYvq97qzRRb-F5spUI5PvVCa3Y,5152
-modal/cli/endpoint.py,sha256=dVJHfrXhAxhmuQyZPD7BI4CiREArjYe2xQLNPozyniE,28350
+modal/cli/endpoint.py,sha256=grS3cQCNw2qhnczirDoYCiBEnUXp3paPK_4MVSZk7gA,28642
 modal/cli/entry_point.py,sha256=Sy9w9C2RHG9XDalJ0Fjwr4yQc4dTEL9gVNQuDrj3woI,5050
-modal/cli/environment.py,sha256=cmASvzqkSofHQ7wKhVdKYKxrAFIKUvyc88rTpCE8AIc,18306
+modal/cli/environment.py,sha256=rKnKQFsbcLXjBtYWLFRqhP1NeCjMnqvSPci7Md4ZjIM,18377
 modal/cli/function.py,sha256=kb_Q5wrlYp4vCftwT0OxlREKkEI_-yJg12npz11-EKA,42297
 modal/cli/image.py,sha256=Ve-PDT4XTH9KEQrZxvUc2ocAW4mLI5QfwQssaajK4MI,8073
 modal/cli/import_refs.py,sha256=gxoogHVixec1-qj_FUwhWQXqjy9yvqYCNuAYWCCFEWk,15994
@@ -203,7 +203,7 @@ modal/experimental/flash_server.py,sha256=iqxVoQij6aM58_h0la6Y_Vy3CCQj8iYmjzt79r
 modal/experimental/flash_server.pyi,sha256=LuIBqeOJ1NAapKWnJMRzzrwIHlIK2GcOLOI2r-z_QN0,1025
 modal/experimental/ipython.py,sha256=kJ6o9wkAY_MiSb7paewI7f1MJAeqdi8TX5pBdhr_mUI,2925
 modal/skills/modal/SKILL.md,sha256=Bm-0BPTYppJoeQzA-N-Re8L6-nKnV6gspJXMl4cD0P0,5490
-modal-1.6.2.dev2.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.6.2.dev3.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=9-b8vl2EsLWD9zJqpCK8IUi5h44Bjn3i3rSdedZV4bA,6415
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -216,8 +216,8 @@ modal_docs/mdmd/signatures.py,sha256=OASroKle763Kfumn4Ek4PABJXEGP56JMCTug44QoBx4
 modal_docs/mdmd/types.py,sha256=tv7fvziPr-MeDzOp4e2pK5h3d1DXTUOO74rPqDoBn6g,736
 modal_proto/__init__.py,sha256=Hkou4lcD5tArEkW_9v9KZhLY7fl0fA9-O28beKU55pg,396
 modal_proto/api_grpc.py,sha256=KxLECZV7ZaGXW49yYYW0TooRkgJ3KyijbtnRXlVfhB0,199086
-modal_proto/api_pb2.py,sha256=sAzmEm53sIm962aEXo06FOzd4DCS8sG720wwsOUE4AI,568956
-modal_proto/api_pb2.pyi,sha256=10brUOSW09-UoxKhvcVi_dZq15vn4UgHEH8Gk8WTWRc,786226
+modal_proto/api_pb2.py,sha256=Cb7l4tkiaPwl6fMNcBVz2f4k0XwlDMnMQCr-rIN73yQ,569124
+modal_proto/api_pb2.pyi,sha256=P5mqeNDHocrZr8QRAuwFJ0Y1_u3CK5vMrt_CMxJMv3E,787096
 modal_proto/api_pb2_grpc.py,sha256=Wf2QuVkC3XfKvH5aQKhwiqoEzAALTBV5KI9L77o7k08,426312
 modal_proto/api_pb2_grpc.pyi,sha256=b2tPpDPRLEu7ubhqS7pyHRjGh3ngeQhN1HUInJ6HMDA,100139
 modal_proto/modal_api_grpc.py,sha256=tHIPTopW9zSuAe_ECj4iOKob8Ce1YUihm00YJW5OYwE,31361
@@ -227,10 +227,10 @@ modal_proto/task_command_router_pb2.py,sha256=e_YIBjfDP2nDMZIvBYlHG49wosIGj3ruHh
 modal_proto/task_command_router_pb2.pyi,sha256=I8olEX3B6NqupcmIXB4Evq_Am1YScqHoIoB0xYnkAhA,50428
 modal_proto/task_command_router_pb2_grpc.py,sha256=XvHEJvi-Dd6gco-Wo8UtP1SiEEF8wOHvsWgZQ4VyXFc,44447
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=3sNk2lY6EMk_GaYds-RwZ_tY6KbMCP-yimKAm2qDKVc,14837
-modal_version/__init__.py,sha256=79VB29W9wYlizhylLiwKty4Js4f0Qk5cKmymrPeQkEM,120
+modal_version/__init__.py,sha256=ex8RYHAd7mw7X0AfdnO8IeO71ieP98r8v38rlsJBrr8,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.6.2.dev2.dist-info/METADATA,sha256=B9hx-I84zcORTn2yjIlL0xmmz70ScH3Czb1jMA8Rx3w,2512
-modal-1.6.2.dev2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-modal-1.6.2.dev2.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.6.2.dev2.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.6.2.dev2.dist-info/RECORD,,
+modal-1.6.2.dev3.dist-info/METADATA,sha256=l-0_uc2JoohUL45NgIR-b6FB1pIXMscLxSy08OQbwKc,2512
+modal-1.6.2.dev3.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+modal-1.6.2.dev3.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.6.2.dev3.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.6.2.dev3.dist-info/RECORD,,