feat: support --name option for bentoml build and bentoml code (#5297)

Signed-off-by: Frost Ming <me@frostming.com>

Author: frostming

src/bentoml/_internal/bento/build_config.py

@@ -17,8 +17,6 @@
 import psutil
 import yaml
 from pathspec import PathSpec
-from typing_extensions import NotRequired
-from typing_extensions import TypedDict
 
 from ...exceptions import BentoMLException
 from ...exceptions import InvalidArgument
@@ -48,11 +46,6 @@
 logger = logging.getLogger(__name__)
 
 
-class EnvironmentEntry(TypedDict):
-    name: str
-    value: NotRequired[str]
-
-
 # Docker defaults
 DEFAULT_CUDA_VERSION = "11.6.2"
 DEFAULT_CONTAINER_DISTRO = "debian"

src/bentoml/bentos.py

@@ -7,6 +7,7 @@
 import logging
 import typing as t
 
+import attr
 from simple_di import Provide
 from simple_di import inject
 
@@ -25,9 +26,9 @@
     from _bentoml_sdk import Service as NewService
 
     from ._internal.bento import BentoStore
+    from ._internal.bento.build_config import BentoEnvSchema
     from ._internal.bento.build_config import CondaOptions
     from ._internal.bento.build_config import DockerOptions
-    from ._internal.bento.build_config import EnvironmentEntry
     from ._internal.bento.build_config import ModelSpec
     from ._internal.bento.build_config import PythonOptions
     from ._internal.cloud import BentoCloudClient
@@ -279,7 +280,7 @@ def build(
     description: str | None = None,
     include: t.List[str] | None = None,
     exclude: t.List[str] | None = None,
-    envs: t.List[EnvironmentEntry] | None = None,
+    envs: t.List[BentoEnvSchema] | None = None,
     docker: DockerOptions | dict[str, t.Any] | None = None,
     python: PythonOptions | dict[str, t.Any] | None = None,
     conda: CondaOptions | dict[str, t.Any] | None = None,
@@ -378,6 +379,7 @@ def build_bentofile(
     bentofile: str | None = None,
     *,
     service: str | None = None,
+    name: str | None = None,
     version: str | None = None,
     labels: dict[str, str] | None = None,
     build_ctx: str | None = None,
@@ -421,10 +423,14 @@ def build_bentofile(
         else:
             build_config = BentoBuildConfig(service=service or "")
 
+    new_attrs = {}
+    if name is not None:
+        new_attrs["name"] = name
     if labels:
-        if not build_config.labels:
-            object.__setattr__(build_config, "labels", labels)
-        build_config.labels.update(labels)
+        new_attrs["labels"] = {**(build_config.labels or {}), **labels}
+
+    if new_attrs:
+        build_config = attr.evolve(build_config, **new_attrs)
 
     bento = Bento.create(
         build_config=build_config,

src/bentoml_cli/bentos.py

@@ -362,6 +362,7 @@ def push(
     @click.option(
         "-f", "--bentofile", help="Path to bentofile. Default to 'bentofile.yaml'"
     )
+    @click.option("--name", help="Bento name")
     @click.option(
         "--version",
         type=click.STRING,
@@ -412,6 +413,7 @@ def push(
     def build(  # type: ignore (not accessed)
         build_ctx: str,
         bentofile: str | None,
+        name: str | None,
         version: str | None,
         labels: tuple[str, ...],
         output: t.Literal["tag", "default"],
@@ -442,6 +444,7 @@ def build(  # type: ignore (not accessed)
         bento = build_bentofile(
             bentofile,
             service=service,
+            name=name,
             version=version,
             labels=labels_dict or None,
             build_ctx=build_ctx,

src/bentoml_cli/cli.py

@@ -10,9 +10,9 @@ def create_bentoml_cli() -> click.Command:
     from bentoml_cli.bentos import bento_command
     from bentoml_cli.cloud import cloud_command
     from bentoml_cli.containerize import containerize_command
+    from bentoml_cli.deployment import codespace
     from bentoml_cli.deployment import deploy_command
     from bentoml_cli.deployment import deployment_command
-    from bentoml_cli.deployment import develop_command
     from bentoml_cli.env import env_command
     from bentoml_cli.models import model_command
     from bentoml_cli.secret import secret_command
@@ -47,7 +47,7 @@ def bentoml_cli():
     bentoml_cli.add_subcommands(serve_command)
     bentoml_cli.add_command(containerize_command)
     bentoml_cli.add_command(deploy_command)
-    bentoml_cli.add_command(develop_command)
+    bentoml_cli.add_command(codespace)
     bentoml_cli.add_command(deployment_command)
     bentoml_cli.add_command(secret_command)
     # Load commands from extensions

src/bentoml_cli/deployment.py

@@ -240,7 +240,7 @@ def decorate(f: t.Callable[..., t.Any]) -> t.Callable[..., t.Any]:
 )
 @shared_decorator
 @inject
-def develop_command(
+def codespace(
     bento_dir: str,
     cluster: str | None,
     attach: str | None,
@@ -292,8 +292,12 @@ def develop_command(
         ).ask()
 
         if chosen == "new":
+            name = questionary.text(
+                "Enter a name for the new codespace, or leave it blank to get a random name derived from the service"
+            ).ask()
             deployment = create_deployment(
                 bento=bento_dir,
+                name=name or None,
                 cluster=cluster,
                 dev=True,
                 wait=False,