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

anyscale/commands/cloud_commands.py

@@ -23,7 +23,10 @@ from anyscale.client.openapi_client.models import (
 from anyscale.client.openapi_client.models.compute_stack import ComputeStack
 from anyscale.cloud.models import CreateCloudCollaborator, CreateCloudCollaborators
 from anyscale.commands import command_examples
-from anyscale.commands.setup_k8s import setup_kubernetes_cloud
+from anyscale.commands.setup_k8s import (
+    setup_kubernetes_cloud,
+    setup_kubernetes_cloud_resource,
+)
 from anyscale.commands.util import AnyscaleCommand, OptionPromptNull
 from anyscale.controllers.cloud_controller import CloudController
 from anyscale.util import (
@@ -381,6 +384,134 @@ def cloud_resource_create(
         print(e)
 
 
+@cloud_resource_group.command(
+    name="setup",
+    help="Set up cloud resources for an existing cloud on a Kubernetes cluster.",
+    cls=AnyscaleCommand,
+    is_alpha=True,
+)
+@click.option(
+    "--provider",
+    help="The cloud provider type.",
+    required=True,
+    type=click.Choice(["aws", "gcp"], case_sensitive=False),
+)
+@click.option(
+    "--region", help="Region to set up the resources in.", required=True,
+)
+@click.option(
+    "--stack",
+    help="The compute stack to use (only k8s is supported for this command).",
+    required=False,
+    type=click.Choice(["k8s"], case_sensitive=False),
+    default="k8s",
+    show_default=True,
+)
+@click.option(
+    "--cloud",
+    help="The name of the existing cloud to add resources to. Either this or --cloud-id is required.",
+    type=str,
+    required=False,
+)
+@click.option(
+    "--cloud-id",
+    help="The ID of the existing cloud to add resources to. Either this or --cloud is required.",
+    type=str,
+    required=False,
+)
+@click.option(
+    "--cluster-name", help="Kubernetes cluster name.", required=True, type=str,
+)
+@click.option(
+    "--namespace",
+    help="Kubernetes namespace for Anyscale operator.",
+    required=False,
+    type=str,
+    default="anyscale-operator",
+)
+@click.option(
+    "--project-id",
+    help="Globally Unique project ID for GCP clouds (e.g., my-project-abc123)",
+    required=False,
+    type=str,
+)
+@click.option(
+    "--functional-verify",
+    help="Verify the cloud is functional. This will check that the cloud can launch workspace/service.",
+    required=False,
+    is_flag=False,
+    flag_value="workspace",
+)
+@click.option(
+    "--yes", "-y", is_flag=True, default=False, help="Skip asking for confirmation."
+)
+@click.option(
+    "--values-file",
+    help="Path to save the generated Helm values file (default: auto-generated with timestamp).",
+    required=False,
+    type=str,
+)
+@click.option(
+    "--debug", is_flag=True, default=False, help="Enable debug logging.",
+)
+@click.option(
+    "--operator-chart",
+    help="Path to operator chart (skips helm repo add/update).",
+    required=False,
+    type=str,
+    hidden=True,
+)
+@click.option(
+    "--resource-name",
+    help="Name for the cloud resource (optional, will be auto-generated if not provided)",
+    required=False,
+    type=str,
+    default=None,
+)
+def cloud_resource_setup(  # noqa: PLR0913
+    provider: str,
+    region: str,
+    stack: str,
+    cloud: Optional[str],
+    cloud_id: Optional[str],
+    cluster_name: str,
+    namespace: str,
+    project_id: Optional[str],
+    functional_verify: Optional[str],
+    yes: bool,
+    values_file: Optional[str],
+    debug: bool,
+    operator_chart: Optional[str],
+    resource_name: Optional[str],
+) -> None:
+    """
+    Set up cloud resources for an existing Anyscale cloud on a Kubernetes cluster.
+
+    This command sets up infrastructure (S3/GCS buckets, IAM roles, etc.) and installs
+    the Anyscale operator on your Kubernetes cluster, then creates a cloud resource in
+    an existing cloud instead of registering a new cloud.
+    """
+    # Validate stack
+    if stack != "k8s":
+        raise click.ClickException("Only --stack=k8s is supported for this command.")
+
+    setup_kubernetes_cloud_resource(
+        provider=provider,
+        region=region,
+        cloud_name=cloud,
+        cloud_id=cloud_id,
+        cluster_name=cluster_name,
+        namespace=namespace,
+        project_id=project_id,
+        functional_verify=bool(functional_verify),
+        yes=yes,
+        values_file=values_file,
+        debug=debug,
+        operator_chart=operator_chart,
+        resource_name=resource_name,
+    )
+
+
 @cloud_resource_group.command(
     name="delete",
     help="Remove a cloud resource from an existing cloud.",
@@ -451,7 +582,7 @@ def cloud_resource_delete(cloud: str, resource: str, yes: bool,) -> None:
 @click.option(
     "--resources-file",
     "-f",
-    help="EXPERIMENTAL: Path to a YAML file defining a list of cloud resources. Schema: https://docs.anyscale.com/reference/cloud/#cloudresource.",
+    help="EXPERIMENTAL: Path to a YAML file defining a single cloud resource or a list of cloud resources. Schema: https://docs.anyscale.com/reference/cloud/#cloudresource.",
     required=False,
 )
 @click.option(

anyscale/commands/job_commands.py

@@ -5,17 +5,31 @@ from subprocess import list2cmdline
 from typing import List, Optional, Tuple
 
 import click
+from rich.console import Console
 import yaml
 
 import anyscale
 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.delete_resource_tags_request import (
+    DeleteResourceTagsRequest,
+)
 from anyscale.client.openapi_client.models.ha_job_states import HaJobStates
+from anyscale.client.openapi_client.models.resource_tag_resource_type import (
+    ResourceTagResourceType,
+)
+from anyscale.client.openapi_client.models.upsert_resource_tags_request import (
+    UpsertResourceTagsRequest,
+)
 from anyscale.commands import command_examples
 from anyscale.commands.util import (
     AnyscaleCommand,
+    build_kv_table,
     convert_kv_strings_to_dict,
     override_env_vars,
+    parse_repeatable_tags_to_dict,
+    parse_tags_kv_to_str_map,
 )
 from anyscale.controllers.job_controller import JobController
 from anyscale.job.models import JobConfig, JobLogMode, JobState, JobStatus
@@ -129,6 +143,12 @@ def job_cli() -> None:
     type=str,
     help="Python modules to be available for import in the Ray workers. Each entry must be a path to a local directory.",
 )
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    help="Tag in key=value (or key:value) format. Repeat to add multiple.",
+)
 @click.option(
     "--cloud",
     required=False,
@@ -182,6 +202,7 @@ def submit(  # noqa: PLR0912 PLR0913 C901
     exclude: Tuple[str],
     requirements: Optional[str],
     py_module: Tuple[str],
+    tags: Tuple[str],
     cloud: Optional[str],
     project: Optional[str],
     max_retries: Optional[int],
@@ -336,6 +357,11 @@ and override the entrypoint with `python main.py`.
         if timeout_s is not None:
             config = config.options(timeout_s=timeout_s)
 
+        if tags:
+            tag_map = parse_tags_kv_to_str_map(tags)
+            if tag_map:
+                config = config.options(tags=tag_map)
+
         log.info(f"Submitting job with config {config}.")
         job_id = anyscale.job.submit(config)
 
@@ -347,7 +373,7 @@ and override the entrypoint with `python main.py`.
         log.info("Use `--wait` to wait for the job to run and stream logs.")
 
     if wait:
-        anyscale.job.wait(id=job_id)
+        anyscale.job.wait(id=job_id, follow=True)
 
 
 # TODO(mowen): Add cloud support for this when we refactor to new SDK method
@@ -379,6 +405,17 @@ and override the entrypoint with `python main.py`.
         "If not provided, defaults to listing only unarchived jobs."
     ),
 )
+@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(
     "--max-items",
     required=False,
@@ -404,6 +441,7 @@ def list(  # noqa: A001 PLR0913
     include_archived: bool,
     max_items: int,
     states: List[HaJobStates],
+    tags: List[str],
 ) -> None:
     job_controller = JobController()
     job_controller.list(
@@ -414,6 +452,7 @@ def list(  # noqa: A001 PLR0913
         include_archived=include_archived,
         max_items=max_items,
         states=states,
+        tags=parse_repeatable_tags_to_dict(tags) if tags else None,
     )
 
 
@@ -755,3 +794,84 @@ status will be returned.
         stream = StringIO()
         yaml.dump(status_dict, stream, sort_keys=False)
         print(stream.getvalue(), end="")
+
+
+@job_cli.group("tags", help="Manage tags for jobs.")
+def job_tags_cli() -> None:
+    pass
+
+
+@job_tags_cli.command(name="add", help="Add or update tags on a job.")
+@click.option("--id", "job_id", required=False, help="Unique ID of the job.")
+@click.option("--name", "-n", required=False, help="Name of the job.")
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    help="Tag in key=value (or key:value) format. Repeat to add multiple.",
+)
+def job_tags_add(job_id: Optional[str], name: Optional[str], tags: Tuple[str]) -> None:
+    if not job_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.")
+    req = UpsertResourceTagsRequest(
+        resource_type=ResourceTagResourceType.JOB,
+        resource_id=job_id or JobController().resolve_job_id(job_id, name),
+        tags=tag_map,
+    )
+    JobController().api_client.upsert_resource_tags_api_v2_tags_resource_put(req)
+    stderr = Console(stderr=True)
+    ident = job_id or name or "<unknown>"
+    stderr.print(f"Tags updated for job '{ident}'.")
+
+
+@job_tags_cli.command(name="remove", help="Remove tags by key from a job.")
+@click.option("--id", "job_id", required=False, help="Unique ID of the job.")
+@click.option("--name", "-n", required=False, help="Name of the job.")
+@click.option("--key", "keys", multiple=True, help="Tag key to remove. Repeatable.")
+def job_tags_remove(
+    job_id: Optional[str], name: Optional[str], keys: Tuple[str]
+) -> None:
+    if not job_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.")
+    req = DeleteResourceTagsRequest(
+        resource_type=ResourceTagResourceType.JOB,
+        resource_id=job_id or JobController().resolve_job_id(job_id, name),
+        keys=key_list,
+    )
+    JobController().api_client.delete_resource_tags_api_v2_tags_resource_delete(req)
+    stderr = Console(stderr=True)
+    ident = job_id or name or "<unknown>"
+    stderr.print(f"Removed tag keys {key_list} from job '{ident}'.")
+
+
+@job_tags_cli.command(name="list", help="List tags for a job.")
+@click.option("--id", "job_id", required=False, help="Unique ID of the job.")
+@click.option("--name", "-n", required=False, help="Name of the job.")
+@click.option("--json", "json_output", is_flag=True, default=False)
+def job_tags_list(
+    job_id: Optional[str], name: Optional[str], json_output: bool
+) -> None:
+    if not job_id and not name:
+        raise click.ClickException("Provide either --id or --name.")
+    if not job_id:
+        job_id = JobController().resolve_job_id(job_id, name)
+    auth = get_auth_api_client()
+    resp = auth.api_client.get_tags_for_resource_api_v2_tags_resource_get(
+        ResourceTagResourceType.JOB, job_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"))

anyscale/commands/job_queue_commands.py

@@ -5,16 +5,20 @@ from enum import Enum
 from functools import partial
 from json import dumps as json_dumps
 import sys
-from typing import Dict, get_type_hints, List, Optional
+from typing import Dict, get_type_hints, List, Optional, Tuple
 
 import click
 from rich.console import Console
 from rich.table import Table
 
+from anyscale.authenticate import get_auth_api_client
 from anyscale.client.openapi_client.models.job_queue_sort_directive import (
     JobQueueSortDirective,
 )
 from anyscale.client.openapi_client.models.job_queue_sort_field import JobQueueSortField
+from anyscale.client.openapi_client.models.resource_tag_resource_type import (
+    ResourceTagResourceType,
+)
 from anyscale.client.openapi_client.models.session_state import SessionState
 from anyscale.client.openapi_client.models.sort_order import SortOrder
 from anyscale.commands import command_examples
@@ -24,7 +28,12 @@ from anyscale.commands.list_util import (
     NON_INTERACTIVE_DEFAULT_MAX_ITEMS,
     validate_page_size,
 )
-from anyscale.commands.util import AnyscaleCommand
+from anyscale.commands.util import (
+    AnyscaleCommand,
+    build_kv_table,
+    parse_repeatable_tags_to_dict,
+    parse_tags_kv_to_str_map,
+)
 import anyscale.job_queue
 from anyscale.job_queue.models import JobQueueStatus, JobQueueStatusKeys
 from anyscale.util import get_endpoint, get_user_info, validate_non_negative_arg
@@ -94,6 +103,17 @@ VIEW_COLUMNS: Dict[ViewOption, List[JobQueueStatusKeys]] = {
     type=click.Choice(SessionState.allowable_values, case_sensitive=False),
     help="Filter by cluster status.",
 )
+@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(
     "--view",
     type=click.Choice([opt.value for opt in ViewOption], case_sensitive=False),
@@ -133,6 +153,7 @@ def list_job_queues(  # noqa: PLR0913
     cloud: Optional[str],
     project: Optional[str],
     cluster_status: Optional[str],
+    tags: List[str],
     include_all_users: bool,
     view: ViewOption,
     page_size: int,
@@ -172,6 +193,7 @@ def list_job_queues(  # noqa: PLR0913
             creator_id=None if include_all_users else (user.id if user else None),
             cloud=cloud,
             project=project,
+            tags_filter=parse_repeatable_tags_to_dict(tags) if tags else None,
             page_size=page_size,
             max_items=None if not no_interactive else effective_max,
             sorting_directives=sort_dirs,
@@ -240,6 +262,81 @@ def update_job_queue(
         sys.exit(1)
 
 
+@job_queue_cli.group("tags", help="Manage tags for job queues.")
+def job_queue_tags_cli() -> None:
+    pass
+
+
+@job_queue_tags_cli.command(name="add", help="Add or update tags on a job queue.")
+@click.option("--id", "job_queue_id", help="ID of a job queue.")
+@click.option("--name", type=str, help="Name of a job queue.")
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    help="Tag in key=value (or key:value) format. Repeat to add multiple.",
+)
+def job_queue_tags_add(
+    job_queue_id: Optional[str], name: Optional[str], tags: Tuple[str],
+) -> None:
+    if not job_queue_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.")
+    anyscale.job_queue.add_tags(job_queue_id=job_queue_id, name=name, tags=tag_map)
+    stderr = Console(stderr=True)
+    ident = job_queue_id or name or "<unknown>"
+    stderr.print(f"Tags updated for job queue '{ident}'.")
+
+
+@job_queue_tags_cli.command(name="remove", help="Remove tags by key from a job queue.")
+@click.option("--id", "job_queue_id", help="ID of a job queue.")
+@click.option("--name", type=str, help="Name of a job queue.")
+@click.option("--key", "keys", multiple=True, help="Tag key to remove. Repeatable.")
+def job_queue_tags_remove(
+    job_queue_id: Optional[str], name: Optional[str], keys: Tuple[str],
+) -> None:
+    if not job_queue_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.")
+    anyscale.job_queue.remove_tags(job_queue_id=job_queue_id, name=name, keys=key_list)
+    stderr = Console(stderr=True)
+    ident = job_queue_id or name or "<unknown>"
+    stderr.print(f"Removed tag keys {key_list} from job queue '{ident}'.")
+
+
+@job_queue_tags_cli.command(name="list", help="List tags for a job queue.")
+@click.option("--id", "job_queue_id", help="ID of a job queue.")
+@click.option("--name", type=str, help="Name of a job queue.")
+@click.option("--json", "json_output", is_flag=True, default=False)
+def job_queue_tags_list(
+    job_queue_id: Optional[str], name: Optional[str], json_output: bool,
+) -> None:
+    if not job_queue_id and not name:
+        raise click.ClickException("Provide either --id or --name.")
+    if not job_queue_id:
+        # Resolve ID via status (public SDK), which fetches by ID only; so instead list by name
+        jq = anyscale.job_queue.status(job_queue_id=anyscale.job_queue.list(name=name, max_items=1).__next__().id)  # type: ignore
+        job_queue_id = jq.id
+    auth = get_auth_api_client()
+    resp = auth.api_client.get_tags_for_resource_api_v2_tags_resource_get(
+        ResourceTagResourceType.JOB_QUEUE, job_queue_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"))
+
+
 @job_queue_cli.command(
     name="status",
     help="Show job queue details.",