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

anyscale/commands/util.py

@@ -1,10 +1,11 @@
 from copy import deepcopy
 from datetime import date, datetime
 import sys
-from typing import Dict, Optional, Tuple, TypeVar
+from typing import Dict, Iterable, List, Optional, Tuple, TypeVar
 
 import click
 import colorama
+from rich.table import Table
 
 from anyscale._private.workload import WorkloadConfig
 from anyscale.cli_logger import BlockLogger
@@ -160,6 +161,108 @@ def override_env_vars(config: T, overrides: Dict[str, str]) -> T:
     return config.options(env_vars=final_env_vars)
 
 
+def parse_repeatable_tags_to_dict(strings: Iterable[str]) -> Dict[str, List[str]]:
+    """Parse repeatable --tag args into dict[key] -> list[values].
+
+    Accepts both "key:value" and "key=value". Ignores malformed entries.
+    Values for the same key are ORed; different keys are ANDed by the backend.
+    """
+    result: Dict[str, List[str]] = {}
+    for raw in strings or []:
+        if ":" in raw:
+            key, value = raw.split(":", 1)
+        elif "=" in raw:
+            key, value = raw.split("=", 1)
+        else:
+            continue
+        key = key.strip()
+        value = value.strip()
+        if not key or not value:
+            continue
+        result.setdefault(key, []).append(value)
+    return result
+
+
+def normalize_tags_to_api_list(strings: Iterable[str]) -> List[str]:
+    """Normalize repeatable --tag args into API wire format list[str] "key:value".
+
+    Accepts both "key:value" and "key=value". Ignores malformed entries.
+    """
+    flattened: List[str] = []
+    for raw in strings or []:
+        if ":" in raw:
+            key, value = raw.split(":", 1)
+        elif "=" in raw:
+            key, value = raw.split("=", 1)
+        else:
+            continue
+        key = key.strip()
+        value = value.strip()
+        if not key or not value:
+            continue
+        flattened.append(f"{key}:{value}")
+    return flattened
+
+
+def flatten_tag_dict_to_api_list(
+    tags: Optional[Dict[str, List[str]]]
+) -> Optional[List[str]]:
+    """Flatten dict[key] -> list[values] into list[str] "key:value" for API.
+
+    Returns None if input is None or empty after normalization.
+    """
+    if not tags:
+        return None
+    out: List[str] = []
+    for key, values in tags.items():
+        if not key:
+            continue
+        for value in values or []:
+            if value:
+                out.append(f"{key}:{value}")
+    return out if out else None
+
+
+def parse_tags_kv_to_str_map(pairs: Iterable[str]) -> Dict[str, str]:
+    """Parse repeatable key=value (or key:value) into a simple {key: value} map.
+
+    Last occurrence wins for duplicate keys. Malformed entries are ignored.
+    """
+    result: Dict[str, str] = {}
+    for raw in pairs or []:
+        if ":" in raw:
+            key, value = raw.split(":", 1)
+        elif "=" in raw:
+            key, value = raw.split("=", 1)
+        else:
+            continue
+        key = key.strip()
+        value = value.strip()
+        if not key or not value:
+            continue
+        result[key] = value
+    return result
+
+
+def build_kv_table(
+    pairs: Iterable[Tuple[str, str]], *, title: Optional[str] = None
+) -> Table:
+    """Build a Rich table for key/value pairs.
+
+    - Sorts rows by key then value for stable output
+    - Columns wrap to fit smaller terminals
+    """
+    table = Table(show_header=True, header_style="bold", expand=False, title=title)
+    table.add_column("KEY", overflow="fold")
+    table.add_column("VALUE", overflow="fold")
+    sorted_pairs = sorted(
+        [(str(k), str(v)) for k, v in (pairs or [])], key=lambda kv: (kv[0], kv[1])
+    )
+    for key, value in sorted_pairs:
+        table.add_row(key, value)
+    return table
+
+
 class DeprecatedAnyscaleCommand(click.Command):
     """
     DeprecatedAnyscaleCommand is a subclass of click.Command that shows deprecation warnings.

anyscale/commands/workspace_commands.py

@@ -1,17 +1,28 @@
 import json
+from json import dumps as json_dumps
 import os
 import sys
-from typing import Any, Tuple
+from typing import Any, Optional, Tuple
 
 import click
 import requests
+from rich.console import Console
 
 from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.models.execute_interactive_command_options import (
     ExecuteInteractiveCommandOptions,
 )
-from anyscale.commands.util import DeprecatedAnyscaleCommand, LegacyAnyscaleCommand
+from anyscale.client.openapi_client.models.resource_tag_resource_type import (
+    ResourceTagResourceType,
+)
+from anyscale.commands.util import (
+    build_kv_table,
+    DeprecatedAnyscaleCommand,
+    LegacyAnyscaleCommand,
+    parse_repeatable_tags_to_dict,
+    parse_tags_kv_to_str_map,
+)
 from anyscale.controllers.cluster_controller import ClusterController
 from anyscale.controllers.workspace_controller import WorkspaceController
 from anyscale.project_utils import find_project_root
@@ -373,7 +384,9 @@ def run(command: str, web_terminal: bool, as_job: bool, no_push: bool,) -> None:
     dir_name = workspace_controller.get_workspace_dir_name()
     if web_terminal:
         cluster_id = workspace_controller.get_activated_workspace().cluster_id
-        _execute_shell_command(cluster_id, f"cd ~/{dir_name} && {command}")
+        if not cluster_id:
+            raise click.ClickException("Workspace is not running; no active cluster.")
+        _execute_shell_command(str(cluster_id), f"cd ~/{dir_name} && {command}")
         # TODO(ekl) show the workspace URL here and also block on completion.
         print()
         print(
@@ -412,9 +425,114 @@ def ssh(args: Tuple[str]) -> None:
 @workspace_cli.command(
     name="list", help="prints information about existing workspaces", hidden=True,
 )
-def list_command() -> None:
+@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."
+    ),
+)
+def list_command(tags: Tuple[str]) -> None:
     workspace_controller = WorkspaceController()
-    workspace_controller.list()
+    workspace_controller.list(
+        tags_filter=parse_repeatable_tags_to_dict(tags) if tags else None
+    )
+
+
+@workspace_cli.group("tags", help="Manage tags for workspaces.")
+def workspace_tags_cli() -> None:
+    pass
+
+
+@workspace_tags_cli.command(name="add", help="Add or update tags on a workspace.")
+@click.option(
+    "--id", "workspace_id", required=False, help="Unique ID of the workspace."
+)
+@click.option("--name", "-n", required=False, help="Name of the workspace.")
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    help="Tag in key=value (or key:value) format. Repeat to add multiple.",
+)
+def workspace_tags_add(
+    workspace_id: Optional[str], name: Optional[str], tags: Tuple[str]
+) -> None:
+    if not workspace_id and not name:
+        raise click.ClickException("Provide either --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.")
+    WorkspaceController().add_tags(workspace_id=workspace_id, name=name, tags=tag_map)
+    stderr = Console(stderr=True)
+    ident = workspace_id or name or "<unknown>"
+    stderr.print(f"Tags updated for workspace '{ident}'.")
+
+
+@workspace_tags_cli.command(name="remove", help="Remove tags by key from a workspace.")
+@click.option(
+    "--id", "workspace_id", required=False, help="Unique ID of the workspace."
+)
+@click.option("--name", "-n", required=False, help="Name of the workspace.")
+@click.option("--key", "keys", multiple=True, help="Tag key to remove. Repeatable.")
+def workspace_tags_remove(
+    workspace_id: Optional[str], name: Optional[str], keys: Tuple[str]
+) -> None:
+    if not workspace_id and not name:
+        raise click.ClickException("Provide either --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.")
+    WorkspaceController().remove_tags(
+        workspace_id=workspace_id, name=name, keys=key_list
+    )
+    stderr = Console(stderr=True)
+    ident = workspace_id or name or "<unknown>"
+    stderr.print(f"Removed tag keys {key_list} from workspace '{ident}'.")
+
+
+@workspace_tags_cli.command(name="list", help="List tags for a workspace.")
+@click.option(
+    "--id", "workspace_id", required=False, help="Unique ID of the workspace."
+)
+@click.option("--name", "-n", required=False, help="Name of the workspace.")
+@click.option("--json", "json_output", is_flag=True, default=False)
+def workspace_tags_list(
+    workspace_id: Optional[str], name: Optional[str], json_output: bool
+) -> None:
+    if not workspace_id and not name:
+        raise click.ClickException("Provide either --id or --name.")
+    if not workspace_id:
+        # Resolve via name
+        auth = get_auth_api_client()
+        results = auth.api_client.list_workspaces_api_v2_experimental_workspaces_get(
+            name=name
+        ).results
+        if len(results) == 0:
+            raise click.ClickException(f"No workspace with name '{name}' found.")
+        if len(results) > 1:
+            raise click.ClickException(
+                f"Multiple workspaces with name '{name}' found. Please use --id."
+            )
+        workspace_id = results[0].id
+    auth = get_auth_api_client()
+    resp = auth.api_client.get_tags_for_resource_api_v2_tags_resource_get(
+        ResourceTagResourceType.WORKSPACE, workspace_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(vigneshka): Migrate to v2 if there is usage, then deprecate

anyscale/commands/workspace_commands_v2.py

@@ -18,7 +18,11 @@ from anyscale._private.models.image_uri import ImageURI
 from anyscale._private.sdk import _LAZY_SDK_SINGLETONS
 from anyscale.cli_logger import BlockLogger
 from anyscale.commands import command_examples
-from anyscale.commands.util import AnyscaleCommand, convert_kv_strings_to_dict
+from anyscale.commands.util import (
+    AnyscaleCommand,
+    convert_kv_strings_to_dict,
+    parse_tags_kv_to_str_map,
+)
 import anyscale.workspace
 from anyscale.workspace._private.workspace_sdk import ANYSCALE_WORKSPACES_SSH_OPTIONS
 from anyscale.workspace.commands import _WORKSPACE_SDK_SINGLETON_KEY
@@ -491,6 +495,12 @@ def workspace_cli() -> None:
     type=str,
     help="Environment variables to set for the workspace. The format is 'key=value'. This argument can be specified multiple times. When the same key is also specified in the config file, the value from the command-line flag will overwrite the value from the config file.",
 )
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    help="Tag in key=value (or key:value) format. Repeat to add multiple.",
+)
 def create(  # noqa: PLR0913, PLR0912, C901
     config_file: Optional[str],
     name: Optional[str],
@@ -503,6 +513,7 @@ def create(  # noqa: PLR0913, PLR0912, C901
     project: Optional[str],
     requirements: Optional[str],
     env: Optional[Tuple[str]],
+    tags: Optional[Tuple[str]],
 ) -> None:
     """Creates a new workspace.
 
@@ -576,6 +587,11 @@ def create(  # noqa: PLR0913, PLR0912, C901
         if env_dict:
             config = config.options(env_vars=env_dict)
 
+    if tags:
+        tag_map = parse_tags_kv_to_str_map(tags)
+        if tag_map:
+            config = config.options(tags=tag_map)
+
     anyscale.workspace.create(config,)
 
 

anyscale/compute_config/_private/compute_config_sdk.py

@@ -53,12 +53,21 @@ class PrivateComputeConfigSDK(BaseSDK):
         config: Union[None, Dict, HeadNodeConfig],
         *,
         cloud: Cloud,
+        cloud_resource_name: Optional[str] = None,
         schedulable_by_default: bool,
     ) -> ComputeNodeType:
         if config is None:
-            # If no head node config is provided, use the cloud default.
+            cloud_resource_id = None
+            if cloud_resource_name:
+                cloud_resource = self._client.get_cloud_resource_by_name(
+                    cloud_id=cloud.id, cloud_resource_name=cloud_resource_name
+                )
+                if cloud_resource:
+                    cloud_resource_id = cloud_resource.cloud_resource_id
+
+            # If no head node config is provided, use the cloud/cloud resource default.
             default: ClusterComputeConfig = self._client.get_default_compute_config(
-                cloud_id=cloud.id
+                cloud_id=cloud.id, cloud_resource_id=cloud_resource_id,
             ).config
 
             api_model = ComputeNodeType(
@@ -125,7 +134,7 @@ class PrivateComputeConfigSDK(BaseSDK):
         return api_models
 
     def _convert_single_deployment_compute_config_to_api_model(
-        self, compute_config: ComputeConfig
+        self, compute_config: ComputeConfig, base_flags: Optional[Dict[str, Any]] = None
     ) -> CloudDeploymentComputeConfig:
         # We should only make the head node schedulable when it's the *only* node in the cluster.
         # `worker_nodes=None` uses the default serverless config, so this only happens if `worker_nodes`
@@ -139,9 +148,10 @@ class PrivateComputeConfigSDK(BaseSDK):
                 "This should never happen; please reach out to Anyscale support."
             )
 
-        flags: Dict[str, Any] = deepcopy(
-            compute_config.flags
-        ) if compute_config.flags else {}
+        # Merge the MultiResourceComputeConfig flags (which apply to all cloud resources) with the individual compute config flags.
+        # The individual compute config flags will override the base flags.
+        flags = deepcopy(base_flags) if base_flags else {}
+        flags.update(compute_config.flags or {})
         flags["allow-cross-zone-autoscaling"] = compute_config.enable_cross_zone_scaling
 
         if compute_config.min_resources:
@@ -155,6 +165,7 @@ class PrivateComputeConfigSDK(BaseSDK):
             head_node_type=self._convert_head_node_config_to_api_model(
                 compute_config.head_node,
                 cloud=cloud,
+                cloud_resource_name=compute_config.cloud_resource,
                 schedulable_by_default=(
                     not compute_config.worker_nodes
                     and not compute_config.auto_select_worker_config
@@ -240,7 +251,9 @@ class PrivateComputeConfigSDK(BaseSDK):
         for config in compute_config.configs:
             assert isinstance(config, ComputeConfig)
             deployment_configs.append(
-                self._convert_single_deployment_compute_config_to_api_model(config)
+                self._convert_single_deployment_compute_config_to_api_model(
+                    config, compute_config.flags
+                )
             )
         default_config = deployment_configs[0]
 
@@ -261,11 +274,10 @@ class PrivateComputeConfigSDK(BaseSDK):
         )
         self.logger.info(f"Created compute config: '{full_name}'")
 
-        # TODO(janet): add this back after the UI has been updated to support multi-deployment compute configs.
-        # ui_url = self.client.get_compute_config_ui_url(
-        #     compute_config_id, cloud_id=cloud_id
-        # )
-        # self.logger.info(f"View the compute config in the UI: '{ui_url}'")
+        ui_url = self.client.get_compute_config_ui_url(
+            compute_config_id, cloud_id=cloud_id
+        )
+        self.logger.info(f"View the compute config in the UI: '{ui_url}'")
 
         return full_name, compute_config_id
 
@@ -428,6 +440,7 @@ class PrivateComputeConfigSDK(BaseSDK):
             min_resources=min_resources,
             max_resources=max_resources or None,
             flags=flags,
+            auto_select_worker_config=api_model.auto_select_worker_config or False,
         )
 
     def _convert_api_model_to_compute_config_version(

anyscale/compute_config/models.py

@@ -742,6 +742,21 @@ configs:
 
         return config_models
 
+    flags: Optional[Dict[str, Any]] = field(
+        default=None,
+        repr=False,
+        metadata={
+            "docstring": "Flags specifying advanced or experimental options that should be applied to all cloud resources. Flags specified in the individual compute configurations will override these flags.",
+        },
+    )
+
+    def _validate_flags(self, flags: Optional[Dict[str, Any]]):
+        if flags is None:
+            return
+
+        if not isinstance(flags, dict):
+            raise TypeError("'flags' must be a dict")
+
 
 ComputeConfigType = Union[ComputeConfig, MultiResourceComputeConfig]
 

anyscale/controllers/cloud_controller.py

@@ -1746,7 +1746,7 @@ class CloudController(BaseController):
         spec_file: str,
         skip_verification: bool = False,
         yes: bool = False,
-    ):
+    ) -> str:
         cloud_id, _ = get_cloud_id_and_name(
             self.api_client, cloud_id=cloud_id, cloud_name=cloud
         )
@@ -1797,16 +1797,21 @@ class CloudController(BaseController):
 
         # Add the resource.
         try:
-            self.api_client.add_cloud_resource_api_v2_clouds_cloud_id_add_resource_put(
+            response = self.api_client.add_cloud_resource_api_v2_clouds_cloud_id_add_resource_put(
                 cloud_id=cloud_id, cloud_deployment=new_deployment,
             )
         except Exception as e:  # noqa: BLE001
             raise ClickException(f"Failed to add cloud resource: {e}")
 
+        # Extract cloud_resource_id from the response
+        cloud_resource_id = response.result.cloud_resource_id
+
         self.log.info(
             f"Successfully created cloud resource{' ' + (new_deployment.name or '')} in cloud {cloud or cloud_id}!"
         )
 
+        return cloud_resource_id
+
     def update_cloud_resources(  # noqa: PLR0912, C901
         self,
         cloud_name: Optional[str],
@@ -1828,6 +1833,14 @@ class CloudController(BaseController):
 
         spec = yaml.safe_load(path.read_text())
 
+        # Normalize spec to a list
+        if isinstance(spec, dict):
+            spec = [spec]
+        elif not isinstance(spec, list):
+            raise ClickException(
+                "Invalid cloud resources file format. Must contain either a single CloudResource or a list of CloudResources."
+            )
+
         # Get the existing spec.
         existing_resources = self.get_cloud_resources(cloud_id=cloud_id)
 

anyscale/controllers/job_controller.py

@@ -29,6 +29,7 @@ from anyscale.client.openapi_client.models.decorated_production_job import (
     DecoratedProductionJob,
 )
 from anyscale.client.openapi_client.models.ha_job_states import HaJobStates
+from anyscale.commands.util import flatten_tag_dict_to_api_list
 from anyscale.controllers.base_controller import BaseController
 from anyscale.models.job_model import JobConfig
 from anyscale.project_utils import infer_project_id
@@ -213,6 +214,7 @@ class JobController(BaseController):
                 workspace_id=job_config.workspace_id,
                 config=config_object,
                 job_queue_config=job_queue_config,
+                tags=getattr(job_config, "tags", None),
             )
         ).result
         self.log.info(
@@ -288,6 +290,13 @@ class JobController(BaseController):
         ).result
         return job.state.current_state
 
+    def resolve_job_id(self, job_id: Optional[str], job_name: Optional[str]) -> str:
+        """Resolve and return a job's ID from either an explicit ID or a name.
+
+        Raises click.ClickException if neither is provided or if the name is ambiguous.
+        """
+        return self._resolve_job_object(job_id, job_name).id
+
     def list(  # noqa: PLR0913
         self,
         include_all_users: bool,
@@ -297,6 +306,7 @@ class JobController(BaseController):
         include_archived: bool,
         max_items: int,
         states: List[HaJobStates],
+        tags: Optional[Dict[str, List[str]]] = None,
     ) -> None:
         """
         This function will list jobs.
@@ -349,6 +359,7 @@ class JobController(BaseController):
                 archive_status="ALL" if include_archived else "NOT_ARCHIVED",
                 count=DEFAULT_PAGE_LIMIT,
                 state_filter=states,
+                tag_filter=flatten_tag_dict_to_api_list(tags),
             )
             jobs_list.extend(resp.results)
             paging_token = resp.metadata.next_paging_token
@@ -363,6 +374,7 @@ class JobController(BaseController):
                     count=DEFAULT_PAGE_LIMIT,
                     paging_token=paging_token,
                     state_filter=states,
+                    tag_filter=flatten_tag_dict_to_api_list(tags),
                 )
                 jobs_list.extend(resp.results)
                 paging_token = resp.metadata.next_paging_token