anyscale 0.26.52__py3-none-any.whl → 0.26.54__py3-none-any.whl

anyscale/commands/cloud_commands.py

@@ -244,8 +244,8 @@ def list_cloud(name: Optional[str], cloud_id: Optional[str], max_items: int,) ->
     )
 
 
-@cloud_cli.group("deployment", help="Manage the configuration for a cloud deployment.")
-def cloud_deployment_group() -> None:
+@cloud_cli.group("resource", help="Manage the configuration for a cloud resource.")
+def cloud_resource_group() -> None:
     pass
 
 
@@ -254,68 +254,68 @@ def cloud_config_group() -> None:
     pass
 
 
-@cloud_deployment_group.command(
+@cloud_resource_group.command(
     name="create",
-    help="Create a new cloud deployment in an existing cloud.",
+    help="Create a new cloud resource in an existing cloud.",
     cls=AnyscaleCommand,
-    example=command_examples.CLOUD_DEPLOYMENT_CREATE_EXAMPLE,
+    example=command_examples.CLOUD_RESOURCE_CREATE_EXAMPLE,
     is_alpha=True,
 )
 @click.option(
     "--cloud",
-    help="The name of the cloud to create the new deployment in.",
+    help="The name of the cloud to add the new resource to.",
     type=str,
     required=True,
 )
 @click.option(
     "--file",
     "-f",
-    help="Path to a YAML file defining the cloud deployment. Schema: https://docs.anyscale.com/reference/cloud/#clouddeployment.",
+    help="Path to a YAML file defining the cloud resource. Schema: https://docs.anyscale.com/reference/cloud/#cloudresource.",
     required=True,
 )
 @click.option(
     "--skip-verification",
     is_flag=True,
     default=False,
-    help="Skip cloud deployment verification.",
+    help="Skip cloud resource verification.",
 )
 @click.option(
     "--yes", "-y", is_flag=True, default=False, help="Skip asking for confirmation."
 )
-def cloud_deployment_create(
+def cloud_resource_create(
     cloud: str, file: str, skip_verification: bool, yes: bool,
 ) -> None:
     try:
-        CloudController().create_cloud_deployment(cloud, file, skip_verification, yes)
+        CloudController().create_cloud_resource(cloud, file, skip_verification, yes)
     except click.ClickException as e:
         print(e)
 
 
-@cloud_deployment_group.command(
+@cloud_resource_group.command(
     name="delete",
-    help="Remove a cloud deployment from an existing cloud.",
+    help="Remove a cloud resource from an existing cloud.",
     cls=AnyscaleCommand,
-    example=command_examples.CLOUD_DEPLOYMENT_DELETE_EXAMPLE,
+    example=command_examples.CLOUD_RESOURCE_DELETE_EXAMPLE,
     is_alpha=True,
 )
 @click.option(
     "--cloud",
-    help="The name of the cloud to remove the deployment from.",
+    help="The name of the cloud to remove the resource from.",
     type=str,
     required=True,
 )
 @click.option(
-    "--deployment",
-    help="The name of the deployment to remove.",
+    "--resource",
+    help="The name of the cloud resource to remove.",
     type=str,
     required=True,
 )
 @click.option(
     "--yes", "-y", is_flag=True, default=False, help="Skip asking for confirmation."
 )
-def cloud_deployment_delete(cloud: str, deployment: str, yes: bool,) -> None:
+def cloud_resource_delete(cloud: str, resource: str, yes: bool,) -> None:
     try:
-        CloudController().remove_cloud_deployment(cloud, deployment, yes)
+        CloudController().remove_cloud_resource(cloud, resource, yes)
     except click.ClickException as e:
         print(e)
 
@@ -361,7 +361,7 @@ def cloud_deployment_delete(cloud: str, deployment: 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/#clouddeployment.",
+    help="EXPERIMENTAL: Path to a YAML file defining a list of cloud resources. Schema: https://docs.anyscale.com/reference/cloud/#cloudresource.",
     required=False,
 )
 @click.option(
@@ -387,7 +387,7 @@ def cloud_update(  # noqa: PLR0913
             "were both provided. Please only provide one of these two arguments."
         )
     if resources_file:
-        CloudController().update_cloud_deployments(
+        CloudController().update_cloud_resources(
             cloud_name=cloud_name or name,
             cloud_id=cloud_id,
             resources_file=resources_file,
@@ -1337,14 +1337,16 @@ def get_cloud(
             log.error("Cloud not found.")
             return
 
-        # Include all cloud deployments for the cloud.
-        cloud_deployments = CloudController().get_cloud_deployments(cloud_id=cloud.id)
+        # Include all cloud resources for the cloud.
+        cloud_resources = CloudController().get_formatted_cloud_resources(
+            cloud_id=cloud.id
+        )
         result = {
             "name": cloud.name,
             "id": cloud.id,
             "created_at": cloud.created_at,
             "is_default": cloud.is_default,
-            "deployments": cloud_deployments.get("deployments", []),
+            "resources": cloud_resources,
         }
 
         if output:

anyscale/commands/command_examples.py

@@ -550,12 +550,12 @@ collaborators:
 """
 
 
-CLOUD_DEPLOYMENT_CREATE_EXAMPLE = """\
-$ anyscale cloud deployment create --cloud my-cloud --file new-cloud-deployment.yaml
-Successfully created cloud deployment my-new-deployment in cloud my-cloud.
+CLOUD_RESOURCE_CREATE_EXAMPLE = """\
+$ anyscale cloud resource create --cloud my-cloud --file new-cloud-resource.yaml
+Successfully created cloud resource my-new-resource in cloud my-cloud.
 
-$ cat new-cloud-deployment.yaml
-name: my-new-deployment
+$ cat new-cloud-resource.yaml
+name: my-new-resource
 provider: AWS
 compute_stack: VM
 region: us-west-2
@@ -575,11 +575,11 @@ aws_config:
   memorydb_cluster_name: my-memorydb-cluster
 """
 
-CLOUD_DEPLOYMENT_DELETE_EXAMPLE = """\
-$ anyscale cloud deployment delete --cloud my-cloud --deployment my-deployment
+CLOUD_RESOURCE_DELETE_EXAMPLE = """\
+$ anyscale cloud resource delete --cloud my-cloud --resource my-resource
 Output
-Please confirm that you would like to remove deployment my-deployment from cloud my-cloud. [y/N]: y
-(anyscale +3.5s) Successfully removed deployment my-deployment from cloud my-cloud!
+Please confirm that you would like to remove resource my-resource from cloud my-cloud. [y/N]: y
+(anyscale +3.5s) Successfully removed resource my-resource from cloud my-cloud!
 """
 
 CLOUD_GET_CLOUD_EXAMPLE = """\
@@ -589,7 +589,7 @@ name: my-cloud
 created_at: 2022-10-18 05:12:13.335803+00:00
 is_default: true
 deployments:
-- cloud_deployment_id: cldrsrc_123
+- cloud_resource_id: cldrsrc_123
   name: vm-aws-us-west-2
   provider: AWS
   compute_stack: VM

anyscale/commands/exec_commands.py

@@ -1,14 +1,25 @@
 import click
 
+from anyscale.commands.util import DeprecatedAnyscaleCommand
+
 
 @click.command(
     name="exec",
     hidden=True,
     help="[DEPRECATED] Execute shell commands in interactive cluster.",
     context_settings={"ignore_unknown_options": True, "allow_extra_args": True,},
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale exec` has been deprecated and no longer works on Anyscale",
+    alternative="use `anyscale job submit` to run your script as a job in a cluster",
 )
 def anyscale_exec() -> None:
+    """Execute shell commands in interactive cluster.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale job submit' to run your script as a job in a cluster.
+    """
     raise click.ClickException(
-        "Warning: `anyscale exec` has been deprecated and no longer works on Anyscale V2. "
+        "`anyscale exec` has been deprecated and no longer works on Anyscale. "
         "Please use `anyscale job submit` to run your script as a job in a cluster."
     )

anyscale/commands/list_commands.py

@@ -8,6 +8,7 @@ from typing import Any, Optional
 import click
 
 from anyscale.cli_logger import BlockLogger
+from anyscale.commands.util import DeprecatedAnyscaleCommand
 from anyscale.controllers.list_controller import ListController
 
 
@@ -25,26 +26,40 @@ def list_cli() -> None:
     name="clouds",
     help="[DEPRECATED] List the clouds currently available in your account.",
     hidden=True,
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale list clouds` has been deprecated",
+    alternative="use `anyscale cloud list` instead",
 )
 @click.option("--json", "show_json", help="Return the results in json", is_flag=True)
 def list_clouds(show_json: bool) -> None:
-    log.warning(
-        "`anyscale list clouds` has been deprecated. Please use `anyscale cloud list` instead."
-    )
+    """List the clouds currently available in your account.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale cloud list' instead.
+    """
     list_controller = ListController()
     output = list_controller.list_clouds(json_format=show_json)
     print(output)
 
 
 @list_cli.command(
-    name="projects", help="[DEPRECATED] List all accessible projects.", hidden=True
+    name="projects",
+    help="[DEPRECATED] List all accessible projects.",
+    hidden=True,
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale list projects` has been deprecated",
+    alternative="use `anyscale project list` instead",
 )
 @click.option("--json", "show_json", help="Return the results in json", is_flag=True)
 @click.pass_context
 def project_list(ctx: Any, show_json: bool) -> None:  # noqa: ARG001
-    log.warning(
-        "`anyscale list projects` has been deprecated. Please use `anyscale project list` instead."
-    )
+    """List all accessible projects.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale project list' instead.
+    """
     list_controller = ListController()
     output = list_controller.list_projects(json_format=show_json)
     print(output)
@@ -54,6 +69,10 @@ def project_list(ctx: Any, show_json: bool) -> None:  # noqa: ARG001
     name="sessions",
     help="[DEPRECATED] List all clusters within the current project.",
     hidden=True,
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale list sessions` has been deprecated",
+    alternative="use `anyscale cluster list` instead",
 )
 @click.option(
     "--name",
@@ -65,9 +84,11 @@ def project_list(ctx: Any, show_json: bool) -> None:  # noqa: ARG001
 @click.option("--all", help="List all clusters, including inactive ones.", is_flag=True)
 @click.option("--json", "show_json", help="Return the results in json", is_flag=True)
 def session_list(name: Optional[str], all: bool, show_json: bool) -> None:  # noqa: A002
-    log.warning(
-        "`anyscale list sessions` has been deprecated. Please use `anyscale cluster list` instead."
-    )
+    """List all clusters within the current project.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale cluster list' instead.
+    """
     list_controller = ListController()
     output = list_controller.list_sessions(
         name=name, show_all=all, json_format=show_json
@@ -79,7 +100,16 @@ def session_list(name: Optional[str], all: bool, show_json: bool) -> None:  # no
     name="ips",
     help="[DEPRECATED] List IP addresses of head and worker nodes.",
     context_settings={"ignore_unknown_options": True, "allow_extra_args": True,},
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="Listing IPs is not supported on Anyscale",
+    alternative="use the Anyscale console to view cluster node information",
 )
 def list_ips() -> None:
-    """List IP addresses of head and worker nodes."""
-    raise click.ClickException("Listing IPs is not supported on Anyscale V2")
+    """List IP addresses of head and worker nodes.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Listing IPs is not supported on Anyscale.
+    Use the Anyscale console to view cluster node information.
+    """
+    raise click.ClickException("Listing IPs is not supported on Anyscale")

anyscale/commands/project_commands.py

@@ -12,7 +12,11 @@ import anyscale
 from anyscale.cli_logger import BlockLogger
 from anyscale.commands import command_examples
 from anyscale.commands.list_util import display_list
-from anyscale.commands.util import AnyscaleCommand, NotRequiredIf
+from anyscale.commands.util import (
+    AnyscaleCommand,
+    DeprecatedAnyscaleCommand,
+    NotRequiredIf,
+)
 from anyscale.controllers.project_controller import ProjectController
 from anyscale.project.models import (
     CreateProjectCollaborator,
@@ -441,6 +445,10 @@ def _default_project_name() -> str:
         "[DEPRECATED] Create a new project or attach this directory to an existing project."
     ),
     hidden=True,
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale init` has been deprecated",
+    alternative="use `anyscale project create` to create a new project",
 )
 @click.option(
     "--project-id",
@@ -474,10 +482,11 @@ def anyscale_init(
     config: Optional[str],
     requirements: Optional[str],
 ) -> None:
-    log.warning(
-        "`anyscale init` has been deprecated. Please use `anyscale project init` "
-        "to create or attach to a project from this directory."
-    )
+    """Create a new project or attach this directory to an existing project.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale project create' to create a new project.
+    """
     if (project_id and name) or not (project_id or name):
         raise click.BadArgumentUsage(
             "Only one of project_id and name must be provided."
@@ -491,6 +500,10 @@ def anyscale_init(
     name="init",
     help="[DEPRECATED] Create a new project or attach this directory to an existing project.",
     hidden=True,
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale project init` has been deprecated",
+    alternative="use `anyscale project create` to create a new project and specify a project id or name for the other Anyscale CLI commands",
 )
 @click.option(
     "--project-id",
@@ -510,11 +523,11 @@ def anyscale_init(
     default=_default_project_name(),
 )
 def init(project_id: Optional[str], name: Optional[str],) -> None:
-    log.warning(
-        "`anyscale project init` has been deprecated and will be removed in "
-        "April 2022. Please use `anyscale project create` to create a new project "
-        "and specify a project id or name for the other Anyscale CLI commands."
-    )
+    """Create a new project or attach this directory to an existing project.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale project create' to create a new project.
+    """
     if (project_id and name) or not (project_id or name):
         raise click.BadArgumentUsage(
             "Only one of --project-id and --name must be provided."

anyscale/commands/schedule_commands.py

@@ -9,7 +9,10 @@ import yaml
 import anyscale
 from anyscale.cli_logger import BlockLogger
 from anyscale.commands import command_examples
-from anyscale.commands.util import AnyscaleCommand, LegacyAnyscaleCommand
+from anyscale.commands.util import (
+    AnyscaleCommand,
+    DeprecatedAnyscaleCommand,
+)
 from anyscale.controllers.schedule_controller import ScheduleController
 from anyscale.schedule.models import JobConfig, ScheduleConfig, ScheduleState
 
@@ -94,9 +97,11 @@ def apply(config_file: str, name: Optional[str],) -> None:
 
 @schedule_cli.command(
     name="create",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale schedule",
-    new_cli=apply,
+    help="[DEPRECATED - use 'apply' instead] Create a schedule.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale schedule create` has been deprecated",
+    alternative="use `anyscale schedule apply` instead",
 )
 @click.argument("schedule_config_file", required=True)
 @click.option(
@@ -108,13 +113,15 @@ def apply(config_file: str, name: Optional[str],) -> None:
 def create(
     schedule_config_file: str, name: Optional[str], description: Optional[str],
 ) -> None:
-    """ Create or Update a Schedule
+    """Create or Update a Schedule.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale schedule apply' instead.
 
     This function accepts 1 argument, a path to a YAML config file that defines this schedule.
 
     Note: if a schedule with the name exists in the specified project, it will be updated instead.
     """
-    log.warning("DEPRECATED: Use `anyscale schedule apply` instead.")
     job_controller = ScheduleController()
     job_controller.apply(
         schedule_config_file, name, description,
@@ -123,9 +130,11 @@ def create(
 
 @schedule_cli.command(
     name="update",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale schedule",
-    new_cli=apply,
+    help="[DEPRECATED - use 'apply' instead] Update a schedule.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale schedule update` has been deprecated",
+    alternative="use `anyscale schedule apply` instead",
 )
 @click.argument("schedule_config_file", required=True)
 @click.option(
@@ -137,11 +146,13 @@ def create(
 def update(
     schedule_config_file: str, name: Optional[str], description: Optional[str],
 ) -> None:
-    """ Create or Update a Schedule
+    """Create or Update a Schedule.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale schedule apply' instead.
 
     This function accepts 1 argument, a path to a YAML config file that defines this schedule.
     """
-    log.warning("DEPRECATED: Use `anyscale schedule apply` instead.")
     job_controller = ScheduleController()
     job_controller.apply(
         schedule_config_file, name, description,

anyscale/commands/service_commands.py

@@ -22,7 +22,7 @@ from anyscale.commands.list_util import (
 from anyscale.commands.util import (
     AnyscaleCommand,
     convert_kv_strings_to_dict,
-    LegacyAnyscaleCommand,
+    DeprecatedAnyscaleCommand,
     override_env_vars,
 )
 from anyscale.controllers.service_controller import ServiceController
@@ -565,10 +565,11 @@ def controller_logs(
 
 @service_cli.command(
     name="rollout",
-    help="Roll out a service.",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale service",
-    new_cli=deploy,
+    help="[DEPRECATED - use 'deploy' instead] Roll out a service.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="`anyscale service rollout` has been deprecated",
+    alternative="use `anyscale service deploy` instead",
 )
 @click.option(
     "-f",
@@ -626,7 +627,11 @@ def rollout(  # noqa: PLR0913
     in_place: bool,
     no_auto_complete_rollout: bool,
 ):
-    """Start or update a service rollout to a new version."""
+    """Start or update a service rollout to a new version.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale service deploy' instead.
+    """
     if in_place:
         if rollout_strategy is not None:
             raise click.ClickException(

anyscale/commands/util.py

@@ -1,9 +1,16 @@
 from copy import deepcopy
-from typing import Dict, Tuple, TypeVar
+from datetime import date, datetime
+import sys
+from typing import Dict, Optional, Tuple, TypeVar
 
 import click
+import colorama
 
 from anyscale._private.workload import WorkloadConfig
+from anyscale.cli_logger import BlockLogger
+
+
+logger = BlockLogger()
 
 
 class AnyscaleCommand(click.Command):
@@ -151,3 +158,89 @@ def override_env_vars(config: T, overrides: Dict[str, str]) -> T:
     final_env_vars = deepcopy(config.env_vars) if config.env_vars else {}
     final_env_vars.update(overrides)
     return config.options(env_vars=final_env_vars)
+
+
+class DeprecatedAnyscaleCommand(click.Command):
+    """
+    DeprecatedAnyscaleCommand is a subclass of click.Command that shows deprecation warnings.
+
+    Similar to LegacyAnyscaleCommand but focuses on deprecation with dates and alternatives.
+    """
+
+    def __init__(self, *args, **kwargs):
+        self.__removal_date__ = kwargs.pop("removal_date", None)
+        self.__deprecation_message__ = kwargs.pop("deprecation_message", None)
+        self.__alternative__ = kwargs.pop("alternative", None)
+        super().__init__(*args, **kwargs)
+
+    def get_help(self, ctx):
+        """Override get_help to show deprecation warning when help is displayed."""
+        self._show_deprecation_warning()
+        return super().get_help(ctx)
+
+    def invoke(self, ctx):
+        """Override invoke to show deprecation warning before executing."""
+        self._show_deprecation_warning()
+        return super().invoke(ctx)
+
+    def _show_deprecation_warning(self):
+        """Show the deprecation warning."""
+
+        # Visual separator for attention
+        print("\n" + "=" * 80, file=sys.stderr)
+        print(
+            f"{colorama.Style.BRIGHT}{colorama.Fore.YELLOW}⚠️  DEPRECATION WARNING ⚠️{colorama.Style.RESET_ALL}",
+            file=sys.stderr,
+        )
+        print("=" * 80, file=sys.stderr)
+
+        # Build deprecation message
+        base_msg = (
+            self.__deprecation_message__
+            if self.__deprecation_message__
+            else f"Command '{self.name}' is deprecated"
+        )
+
+        # Removal date information with grammar-aware connector
+        date_msg = None
+        if self.__removal_date__:
+            date_str = self._format_removal_date(self.__removal_date__)
+            if date_str:
+                ends_with_punct = base_msg.strip().endswith((".", "!", "?"))
+                if ends_with_punct:
+                    date_msg = f"It will be removed on {date_str}"
+                else:
+                    date_msg = f"and will be removed on {date_str}"
+
+        # Alternative suggestion
+        alternative_msg = None
+        if self.__alternative__:
+            alternative_msg = f"\n\n➡️  {colorama.Style.BRIGHT}Please {self.__alternative__}{colorama.Style.RESET_ALL}"
+
+        main_line_parts = [part for part in (base_msg, date_msg) if part]
+        deprecation_msg = " ".join(main_line_parts)
+        if alternative_msg:
+            deprecation_msg += alternative_msg
+
+        # Logger warning but also print directly for visibility
+        print(
+            f"\n{colorama.Fore.YELLOW}{deprecation_msg}{colorama.Style.RESET_ALL}",
+            file=sys.stderr,
+        )
+        print("=" * 80 + "\n", file=sys.stderr)
+
+    def _format_removal_date(self, removal_date) -> Optional[str]:
+        """Format the removal date for display."""
+        try:
+            if isinstance(removal_date, str):
+                parsed_date = datetime.strptime(removal_date, "%Y-%m-%d").date()
+            elif isinstance(removal_date, datetime):
+                parsed_date = removal_date.date()
+            elif isinstance(removal_date, date):
+                parsed_date = removal_date
+            else:
+                return None
+
+            return parsed_date.strftime("%Y-%m-%d")
+        except (ValueError, AttributeError):
+            return str(removal_date)