anyscale 0.26.69__py3-none-any.whl → 0.26.71__py3-none-any.whl

anyscale/commands/service_commands.py

@@ -11,7 +11,11 @@ from typing_extensions import Literal
 import yaml
 
 from anyscale._private.models.image_uri import ImageURI
+from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
+from anyscale.client.openapi_client.models.resource_tag_resource_type import (
+    ResourceTagResourceType,
+)
 from anyscale.commands import command_examples
 from anyscale.commands.list_util import (
     display_list,
@@ -21,9 +25,12 @@ from anyscale.commands.list_util import (
 )
 from anyscale.commands.util import (
     AnyscaleCommand,
+    build_kv_table,
     convert_kv_strings_to_dict,
     DeprecatedAnyscaleCommand,
     override_env_vars,
+    parse_repeatable_tags_to_dict,
+    parse_tags_kv_to_str_map,
 )
 from anyscale.controllers.service_controller import ServiceController
 import anyscale.service
@@ -79,8 +86,9 @@ def _read_name_from_config_file(path: str):
     "-f",
     "--config-file",
     required=False,
-    default=None,
+    default=[],
     type=str,
+    multiple=True,
     help="Path to a YAML config file to deploy. When deploying from a file, import path and arguments cannot be provided. Command-line flags will overwrite values read from the file.",
 )
 @click.option(
@@ -202,8 +210,21 @@ def _read_name_from_config_file(path: str):
     type=str,
     help="Named project to use for the service. If not provided, the default project for the cloud will be used (or, if running in a workspace, the project of the workspace).",
 )
+@click.option(
+    "--versions",
+    required=False,
+    default=None,
+    type=str,
+    help="Defines the traffic and capacity percents per version. Capacity defaults to traffic.",
+)
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    help="Tag in key=value (or key:value) format. Repeat to add multiple.",
+)
 def deploy(  # noqa: PLR0912, PLR0913 C901
-    config_file: Optional[str],
+    config_file: List[str],
     import_path: Optional[str],
     arguments: Tuple[str],
     name: Optional[str],
@@ -222,6 +243,8 @@ def deploy(  # noqa: PLR0912, PLR0913 C901
     py_module: Tuple[str],
     cloud: Optional[str],
     project: Optional[str],
+    versions: Optional[str],
+    tags: Optional[Tuple[str]],
 ):
     """Deploy or update a service.
 
@@ -238,102 +261,165 @@ def deploy(  # noqa: PLR0912, PLR0913 C901
     Command-line flags override values in the config file.
     """
 
-    if config_file is not None:
-        if import_path is not None or len(arguments) > 0:
+    if versions is None:
+        if len(config_file) == 1:
+            if import_path is not None or len(arguments) > 0:
+                raise click.ClickException(
+                    "When a config file is provided, import path and application arguments can't be."
+                )
+
+            if not pathlib.Path(config_file[0]).is_file():
+                raise click.ClickException(f"Config file '{config_file[0]}' not found.")
+
+            config = ServiceConfig.from_yaml(config_file[0])
+        elif len(config_file) > 1:
             raise click.ClickException(
-                "When a config file is provided, import path and application arguments can't be."
+                "Multiple config files can be provided only when deploying multiple versions with --versions."
             )
+        else:
+            # when config_file is not provided.
+            if import_path is None:
+                raise click.ClickException(
+                    "Either config file or import path must be provided."
+                )
 
-        if not pathlib.Path(config_file).is_file():
-            raise click.ClickException(f"Config file '{config_file}' not found.")
+            if (
+                import_path.endswith((".yaml", ".yml"))
+                or pathlib.Path(import_path).is_file()
+            ):
+                log.warning(
+                    f"The provided import path '{import_path}' looks like a config file. Did you mean to use '-f config.yaml'?"
+                )
 
-        config = ServiceConfig.from_yaml(config_file)
-    else:
-        if import_path is None:
+            app: Dict[str, Any] = {"import_path": import_path}
+            arguments_dict = convert_kv_strings_to_dict(arguments)
+            if arguments_dict:
+                app["args"] = arguments_dict
+
+            config = ServiceConfig(applications=[app])
+
+        if containerfile and image_uri:
             raise click.ClickException(
-                "Either config file or import path must be provided."
+                "Only one of '--containerfile' and '--image-uri' can be provided."
             )
 
-        if (
-            import_path.endswith((".yaml", ".yml"))
-            or pathlib.Path(import_path).is_file()
+        if ray_version and (not image_uri and not containerfile):
+            raise click.ClickException(
+                "Ray version can only be used with an image or containerfile.",
+            )
+
+        if registry_login_secret and (
+            not image_uri or ImageURI.from_str(image_uri).is_cluster_env_image()
         ):
-            log.warning(
-                f"The provided import path '{import_path}' looks like a config file. Did you mean to use '-f config.yaml'?"
+            raise click.ClickException(
+                "Registry login secret can only be used with an image that is not hosted on Anyscale."
             )
 
-        app: Dict[str, Any] = {"import_path": import_path}
-        arguments_dict = convert_kv_strings_to_dict(arguments)
-        if arguments_dict:
-            app["args"] = arguments_dict
+        if name is not None:
+            config = config.options(name=name)
 
-        config = ServiceConfig(applications=[app])
+        if image_uri is not None:
+            config = config.options(image_uri=image_uri)
 
-    if containerfile and image_uri:
-        raise click.ClickException(
-            "Only one of '--containerfile' and '--image-uri' can be provided."
-        )
+        if registry_login_secret is not None:
+            config = config.options(registry_login_secret=registry_login_secret)
 
-    if ray_version and (not image_uri and not containerfile):
-        raise click.ClickException(
-            "Ray version can only be used with an image or containerfile.",
-        )
+        if ray_version is not None:
+            config = config.options(ray_version=ray_version)
 
-    if registry_login_secret and (
-        not image_uri or ImageURI.from_str(image_uri).is_cluster_env_image()
-    ):
-        raise click.ClickException(
-            "Registry login secret can only be used with an image that is not hosted on Anyscale."
-        )
+        if containerfile is not None:
+            config = config.options(containerfile=containerfile)
 
-    if name is not None:
-        config = config.options(name=name)
+        if compute_config is not None:
+            config = config.options(compute_config=compute_config)
 
-    if image_uri is not None:
-        config = config.options(image_uri=image_uri)
+        if working_dir is not None:
+            config = config.options(working_dir=working_dir)
 
-    if registry_login_secret is not None:
-        config = config.options(registry_login_secret=registry_login_secret)
+        if exclude:
+            config = config.options(excludes=[e for e in exclude])
 
-    if ray_version is not None:
-        config = config.options(ray_version=ray_version)
+        if requirements is not None:
+            config = config.options(requirements=requirements)
 
-    if containerfile is not None:
-        config = config.options(containerfile=containerfile)
+        if env:
+            config = override_env_vars(config, convert_kv_strings_to_dict(env))
 
-    if compute_config is not None:
-        config = config.options(compute_config=compute_config)
+        if py_module:
+            for module in py_module:
+                if not pathlib.Path(module).is_dir():
+                    raise click.ClickException(
+                        f"Python module path '{module}' does not exist or is not a directory."
+                    )
+            config = config.options(py_modules=[*py_module])
 
-    if working_dir is not None:
-        config = config.options(working_dir=working_dir)
+        if cloud is not None:
+            config = config.options(cloud=cloud)
+        if project is not None:
+            config = config.options(project=project)
 
-    if exclude:
-        config = config.options(excludes=[e for e in exclude])
+        configs = config
+    else:
+        # When multiple versions are being deployed.
+        # configs = [ServiceConfig.from_yaml(config) for config in config_file]
+        configs = []
+        for config in config_file:
+            config = ServiceConfig.from_yaml(config)
+            if name is not None:
+                config = config.options(name=name)
 
-    if requirements is not None:
-        config = config.options(requirements=requirements)
+            if cloud is not None:
+                config = config.options(cloud=cloud)
 
-    if env:
-        config = override_env_vars(config, convert_kv_strings_to_dict(env))
+            if project is not None:
+                config = config.options(project=project)
 
-    if py_module:
-        for module in py_module:
-            if not pathlib.Path(module).is_dir():
-                raise click.ClickException(
-                    f"Python module path '{module}' does not exist or is not a directory."
-                )
-        config = config.options(py_modules=[*py_module])
+            if image_uri is not None:
+                log.warning("--image-uri is ignored.")
+
+            if registry_login_secret is not None:
+                log.warning("--registry-login-secret is ignored.")
+
+            if ray_version is not None:
+                log.warning("--ray-version is ignored.")
+
+            if containerfile is not None:
+                log.warning("--containerfile is ignored.")
+
+            if compute_config is not None:
+                log.warning("--compute-config is ignored.")
+
+            if working_dir is not None:
+                log.warning("--working-dir is ignored.")
+
+            if exclude:
+                log.warning("--exclude is ignored.")
+
+            if requirements is not None:
+                log.warning("--requirements is ignored.")
+
+            if env:
+                log.warning("--env is ignored.")
 
-    if cloud is not None:
-        config = config.options(cloud=cloud)
-    if project is not None:
-        config = config.options(project=project)
+            if py_module:
+                log.warning("--py-module is ignored.")
+
+            configs.append(config)
+
+    if tags:
+        tag_map = parse_tags_kv_to_str_map(tags)
+        if tag_map:
+            config = config.options(tags=tag_map)
 
     anyscale.service.deploy(
-        config,
+        configs,
         in_place=in_place,
         canary_percent=canary_percent,
         max_surge_percent=max_surge_percent,
+        versions=versions,
+        name=name,
+        cloud=cloud,
+        project=project,
     )
 
 
@@ -409,6 +495,10 @@ def status(
         # becomes a common pattern.
         status_dict.get("primary_version", {}).pop("config", None)
         status_dict.get("canary_version", {}).pop("config", None)
+        # Remove config from all versions in multi-version services
+        if status_dict.get("versions"):
+            for version in status_dict.get("versions", []):
+                version.pop("config", None)
 
     console = Console()
     if json:
@@ -743,6 +833,17 @@ def _format_service_output_data(svc: ServiceStatus) -> Dict[str, str]:
     type=str,
     help="Named project to use; defaults to your org/workspace project.",
 )
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    help=(
+        "This option can be repeated to filter by multiple tags. "
+        "Tags with the same key are ORed, whereas tags with different keys are ANDed. "
+        "Example: --tag team:mlops --tag team:infra --tag env:prod. "
+        "Filters with team: (mlops OR infra) AND env:prod."
+    ),
+)
 @click.option(
     "--created-by-me",
     is_flag=True,
@@ -811,6 +912,7 @@ def _format_service_output_data(svc: ServiceStatus) -> Dict[str, str]:
 def list(  # noqa: PLR0913, A001
     service_id: Optional[str],
     name: Optional[str],
+    tags: List[str],
     created_by_me: bool,
     cloud: Optional[str],
     project: Optional[str],
@@ -847,6 +949,7 @@ def list(  # noqa: PLR0913, A001
     stderr.print("[bold]Listing services with:[/]")
     stderr.print(f"• name            = {name or '<any>'}")
     stderr.print(f"• states          = {', '.join(state_filter) or '<all>'}")
+    stderr.print(f"• tags            = {', '.join(tags) or '<none>'}")
     stderr.print(f"• created_by_me   = {created_by_me}")
     stderr.print(f"• include_archived= {include_archived}")
     stderr.print(f"• sort            = {sort or '<none>'}")
@@ -879,6 +982,7 @@ def list(  # noqa: PLR0913, A001
             service_id=service_id,
             name=name,
             state_filter=state_filter,
+            tags_filter=parse_repeatable_tags_to_dict(tags) if tags else None,
             creator_id=creator_id,
             cloud=cloud,
             project=project,
@@ -909,6 +1013,102 @@ def list(  # noqa: PLR0913, A001
         sys.exit(1)
 
 
+@service_cli.group("tags", help="Manage tags for services.")
+def service_tags_cli() -> None:
+    pass
+
+
+@service_tags_cli.command(name="add", help="Add or update tags on a service.")
+@click.option("--service-id", "--id", help="ID of the service.")
+@click.option("--name", "-n", help="Name of the service.")
+@click.option("--cloud", type=str, help="Cloud name (for name resolution).")
+@click.option("--project", type=str, help="Project name (for name resolution).")
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    help="Tag in key=value (or key:value) format. Repeat to add multiple.",
+)
+def tags_add(
+    service_id: Optional[str],
+    name: Optional[str],
+    cloud: Optional[str],
+    project: Optional[str],
+    tags: Tuple[str],
+) -> None:
+    if not service_id and not name:
+        raise click.ClickException("Provide either --service-id/--id or --name.")
+    tag_map = parse_tags_kv_to_str_map(tags)
+    if not tag_map:
+        raise click.ClickException("Provide at least one --tag key=value.")
+    anyscale.service.add_tags(
+        id=service_id, name=name, cloud=cloud, project=project, tags=tag_map
+    )
+    stderr = Console(stderr=True)
+    ident = service_id or name or "<unknown>"
+    stderr.print(f"Tags updated for service '{ident}'.")
+
+
+@service_tags_cli.command(name="remove", help="Remove tags by key from a service.")
+@click.option("--service-id", "--id", help="ID of the service.")
+@click.option("--name", "-n", help="Name of the service.")
+@click.option("--cloud", type=str, help="Cloud name (for name resolution).")
+@click.option("--project", type=str, help="Project name (for name resolution).")
+@click.option("--key", "keys", multiple=True, help="Tag key to remove. Repeatable.")
+def tags_remove(
+    service_id: Optional[str],
+    name: Optional[str],
+    cloud: Optional[str],
+    project: Optional[str],
+    keys: Tuple[str],
+) -> None:
+    if not service_id and not name:
+        raise click.ClickException("Provide either --service-id/--id or --name.")
+    key_list = [k for k in keys if k and k.strip()]
+    if not key_list:
+        raise click.ClickException("Provide at least one --key to remove.")
+    anyscale.service.remove_tags(
+        id=service_id, name=name, cloud=cloud, project=project, keys=key_list
+    )
+    stderr = Console(stderr=True)
+    ident = service_id or name or "<unknown>"
+    stderr.print(f"Removed tag keys {key_list} from service '{ident}'.")
+
+
+@service_tags_cli.command(name="list", help="List tags for a service.")
+@click.option("--service-id", "--id", help="ID of the service.")
+@click.option("--name", "-n", help="Name of the service.")
+@click.option("--cloud", type=str, help="Cloud name (for name resolution).")
+@click.option("--project", type=str, help="Project name (for name resolution).")
+@click.option("--json", "json_output", is_flag=True, default=False)
+def tags_list(
+    service_id: Optional[str],
+    name: Optional[str],
+    cloud: Optional[str],
+    project: Optional[str],
+    json_output: bool,
+) -> None:
+    if not service_id and not name:
+        raise click.ClickException("Provide either --service-id/--id or --name.")
+    if not service_id:
+        svc: ServiceStatus = anyscale.service.status(name=name, cloud=cloud, project=project)  # type: ignore
+        service_id = svc.id
+    auth = get_auth_api_client()
+    resp = auth.api_client.get_tags_for_resource_api_v2_tags_resource_get(
+        ResourceTagResourceType.SERVICE, service_id
+    )
+    tags = getattr(resp.result, "tags", [])
+    if json_output:
+        Console().print_json(json=json_dumps([t.to_dict() for t in tags], indent=2))
+    else:
+        stderr = Console(stderr=True)
+        if not tags:
+            stderr.print("No tags found.")
+            return
+        pairs = [(t.key, t.value) for t in tags]
+        stderr.print(build_kv_table(pairs, title="Tags"))
+
+
 # TODO(mowen): Add cloud support for this when we refactor to new SDK method
 @service_cli.command(name="rollback", help="Roll back a service.")
 @click.option(