anyscale 0.26.51__py3-none-any.whl → 0.26.53__py3-none-any.whl

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)

anyscale/commands/workspace_commands.py

@@ -11,8 +11,7 @@ from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.models.execute_interactive_command_options import (
     ExecuteInteractiveCommandOptions,
 )
-from anyscale.commands import workspace_commands_v2
-from anyscale.commands.util import LegacyAnyscaleCommand
+from anyscale.commands.util import DeprecatedAnyscaleCommand, LegacyAnyscaleCommand
 from anyscale.controllers.cluster_controller import ClusterController
 from anyscale.controllers.workspace_controller import WorkspaceController
 from anyscale.project_utils import find_project_root
@@ -34,10 +33,11 @@ def workspace_cli() -> None:
 
 @workspace_cli.command(
     name="create",
-    help="Create a workspace on Anyscale.",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale workspace_v2",
-    new_cli=workspace_commands_v2.create,
+    help="[DEPRECATED - use 'workspace_v2 create' instead] Create a workspace on Anyscale.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 CLI is being replaced",
+    alternative="use 'anyscale workspace_v2 create' instead",
 )
 @click.option(
     "--name", "-n", required=True, help="Name of the workspace to create.",
@@ -85,6 +85,11 @@ def create(  # noqa: PLR0913
     ray_version: str,
     compute_config_id: str,
 ) -> None:
+    """Create a workspace on Anyscale.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale workspace_v2 create' instead.
+    """
     if cluster_env_build_id is None and docker is None:
         raise click.ClickException(
             "Please specify one of `--docker` or `--cluster-env-build-id`."
@@ -121,15 +126,21 @@ def create(  # noqa: PLR0913
 
 @workspace_cli.command(
     name="start",
-    help="Start an existing workspace on Anyscale.",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale workspace_v2",
-    new_cli=workspace_commands_v2.start,
+    help="[DEPRECATED - use 'workspace_v2 start' instead] Start an existing workspace on Anyscale.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 CLI is being replaced",
+    alternative="use 'anyscale workspace_v2 start' instead",
 )
 @click.option(
     "--name", "-n", required=True, help="Name of existing workspace to start.",
 )
 def start(name: str) -> None:
+    """Start an existing workspace on Anyscale.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale workspace_v2 start' instead.
+    """
     cluster_controller = ClusterController()
 
     workspace = get_workspace_from_name(name)
@@ -154,15 +165,21 @@ def start(name: str) -> None:
 
 @workspace_cli.command(
     name="terminate",
-    help="Terminate a workspace on Anyscale.",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale workspace_v2",
-    new_cli=workspace_commands_v2.terminate,
+    help="[DEPRECATED - use 'workspace_v2 terminate' instead] Terminate a workspace on Anyscale.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 CLI is being replaced",
+    alternative="use 'anyscale workspace_v2 terminate' instead",
 )
 @click.option(
     "--name", "-n", required=True, help="Name of existing workspace to terminate.",
 )
 def terminate(name: str) -> None:
+    """Terminate a workspace on Anyscale.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale workspace_v2 terminate' instead.
+    """
     cluster_controller = ClusterController()
     workspace = get_workspace_from_name(name)
     cluster_id = workspace.cluster_id
@@ -179,9 +196,11 @@ def terminate(name: str) -> None:
 
 @workspace_cli.command(
     name="clone",
-    help="Clone a workspace on Anyscale.",
-    cls=LegacyAnyscaleCommand,
-    is_limited_support=True,
+    help="[DEPRECATED - use workspace_v2 clone functionality instead] Clone a workspace on Anyscale.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 CLI is being replaced",
+    alternative="use workspace_v2 clone functionality instead",
 )
 @click.option(
     "--name", "-n", required=True, help="Name of existing workspace to clone.",
@@ -190,8 +209,10 @@ def terminate(name: str) -> None:
     "--verbose", "-v", required=False, is_flag=True, default=False, help="Verbose mode"
 )
 def clone(name: str, verbose: bool) -> None:
-    """
-    Clone the workspace to a local dir whose name is the name of the workspace.
+    """Clone the workspace to a local dir whose name is the name of the workspace.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use workspace_v2 clone functionality instead.
     """
     _check_local()
 
@@ -207,13 +228,24 @@ def clone(name: str, verbose: bool) -> None:
     _do_pull(pull_git_state=True, verbose=verbose)
 
 
-@workspace_cli.command(name="activate")
+@workspace_cli.command(
+    name="activate",
+    help="[DEPRECATED - no longer needed] Activate a workspace.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 activate command is no longer needed",
+    alternative="use workspace_v2 commands which don't require activation",
+)
 @click.argument(
     "name", required=True, default=None,
 )
 def activate(name: str) -> None:
     """Activate a workspace.
 
+    DEPRECATED: This command will be removed on 2025-10-01.
+    The workspace v1 activate command is no longer needed.
+    Use workspace_v2 commands which don't require activation.
+
     If the current directory is already a part of a workspace, change the workspace.
     Else, setup a new workspace rooted at the current directory
 
@@ -239,10 +271,11 @@ def activate(name: str) -> None:
 
 @workspace_cli.command(
     name="pull",
-    help="Pull files from a workspace on Anyscale.",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale workspace_v2",
-    new_cli=workspace_commands_v2.pull,
+    help="[DEPRECATED - use 'workspace_v2 pull' instead] Pull files from a workspace on Anyscale.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 CLI is being replaced",
+    alternative="use 'anyscale workspace_v2 pull' instead",
 )
 @click.option(
     "--pull-git-state",
@@ -252,6 +285,11 @@ def activate(name: str) -> None:
     help="Also pull git state. This will add additional overhead.",
 )
 def pull(pull_git_state) -> None:
+    """Pull files from a workspace on Anyscale.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale workspace_v2 pull' instead.
+    """
     _check_local()
     _check_workspace()
     _do_pull(pull_git_state)
@@ -259,10 +297,11 @@ def pull(pull_git_state) -> None:
 
 @workspace_cli.command(
     name="push",
-    help="Push files to a workspace on Anyscale.",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale workspace_v2",
-    new_cli=workspace_commands_v2.push,
+    help="[DEPRECATED - use 'workspace_v2 push' instead] Push files to a workspace on Anyscale.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 CLI is being replaced",
+    alternative="use 'anyscale workspace_v2 push' instead",
 )
 @click.option(
     "--push-git-state",
@@ -272,6 +311,11 @@ def pull(pull_git_state) -> None:
     help="Also push git state. This is currently unoptimized and will be very slow.",
 )
 def push(push_git_state) -> None:
+    """Push files to a workspace on Anyscale.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale workspace_v2 push' instead.
+    """
     _check_local()
     _check_workspace()
     _do_push(push_git_state)
@@ -279,10 +323,11 @@ def push(push_git_state) -> None:
 
 @workspace_cli.command(
     name="run",
-    help="Run a command in a workspace, syncing files first if needed.",
-    cls=LegacyAnyscaleCommand,
-    new_prefix="anyscale workspace_v2",
-    new_cli=workspace_commands_v2.run_command,
+    help="[DEPRECATED - use 'workspace_v2 run_command' instead] Run a command in a workspace, syncing files first if needed.",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 CLI is being replaced",
+    alternative="use 'anyscale workspace_v2 run_command' instead",
 )
 @click.argument("command", required=True)
 @click.option(
@@ -310,6 +355,11 @@ def push(push_git_state) -> None:
     help="Whether to skip pushing files prior to running the command.",
 )
 def run(command: str, web_terminal: bool, as_job: bool, no_push: bool,) -> None:
+    """Run a command in a workspace, syncing files first if needed.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale workspace_v2 run_command' instead.
+    """
     _check_local()
     _check_workspace()
     if as_job:
@@ -337,17 +387,20 @@ def run(command: str, web_terminal: bool, as_job: bool, no_push: bool,) -> None:
 
 @workspace_cli.command(
     name="ssh",
-    help="ssh into a workspace, you can also pass args to the ssh command. E.g. 'anyscale workspace ssh -- -L 8888:localhost:8888",
-    cls=LegacyAnyscaleCommand,
-    new_cli=workspace_commands_v2.ssh,
-    new_prefix="anyscale workspace_v2",
+    help="[DEPRECATED - use 'workspace_v2 ssh' instead] ssh into a workspace, you can also pass args to the ssh command. E.g. 'anyscale workspace ssh -- -L 8888:localhost:8888",
+    cls=DeprecatedAnyscaleCommand,
+    removal_date="2025-10-01",
+    deprecation_message="The workspace v1 CLI is being replaced",
+    alternative="use 'anyscale workspace_v2 ssh' instead",
 )
 @click.argument(
     "args", nargs=-1, required=False, type=click.UNPROCESSED,
 )
 def ssh(args: Tuple[str]) -> None:
-    """
-    ssh into a running workspace.
+    """ssh into a running workspace.
+
+    DEPRECATED: This command will be removed on 2025-10-01.
+    Use 'anyscale workspace_v2 ssh' instead.
     """
     _check_local()
 
@@ -364,6 +417,7 @@ def list_command() -> None:
     workspace_controller.list()
 
 
+# TODO(vigneshka): Migrate to v2 if there is usage, then deprecate
 @workspace_cli.command(name="cp", cls=LegacyAnyscaleCommand, is_limited_support=True)
 @click.argument(
     "remote_path",

anyscale/compute_config/__init__.py

@@ -21,7 +21,7 @@ from anyscale.compute_config.models import (
     ComputeConfigType,
     ComputeConfigVersion,
     HeadNodeConfig,
-    MultiDeploymentComputeConfig,
+    MultiResourceComputeConfig,
     WorkerNodeGroupConfig,
 )
 

anyscale/compute_config/_private/compute_config_sdk.py

@@ -20,7 +20,7 @@ from anyscale.compute_config.models import (
     ComputeConfigVersion,
     HeadNodeConfig,
     MarketType,
-    MultiDeploymentComputeConfig,
+    MultiResourceComputeConfig,
     WorkerNodeGroupConfig,
 )
 from anyscale.sdk.anyscale_client.models import ClusterComputeConfig
@@ -148,7 +148,7 @@ class PrivateComputeConfigSDK(BaseSDK):
             flags["max_resources"] = compute_config.max_resources
 
         return CloudDeploymentComputeConfig(
-            cloud_deployment=compute_config.cloud_deployment,
+            cloud_deployment=compute_config.cloud_resource,
             allowed_azs=compute_config.zones,
             head_node_type=self._convert_head_node_config_to_api_model(
                 compute_config.head_node,
@@ -180,7 +180,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                     "The latest version tag will be generated and returned."
                 )
 
-        if isinstance(compute_config, MultiDeploymentComputeConfig):
+        if isinstance(compute_config, MultiResourceComputeConfig):
             return self.create_multi_deployment_compute_config(
                 compute_config, name=name
             )
@@ -226,10 +226,7 @@ class PrivateComputeConfigSDK(BaseSDK):
         return full_name, compute_config_id
 
     def create_multi_deployment_compute_config(
-        self,
-        compute_config: MultiDeploymentComputeConfig,
-        *,
-        name: Optional[str] = None,
+        self, compute_config: MultiResourceComputeConfig, *, name: Optional[str] = None,
     ) -> Tuple[str, str]:
         """Register the provided multi-deployment compute config and return its internal ID."""
         # Returns the default cloud if user-provided cloud is not specified (`None`).
@@ -381,7 +378,7 @@ class PrivateComputeConfigSDK(BaseSDK):
 
         return configs
 
-    def _convert_cloud_deployment_compute_config_api_model_to_single_deployment_compute_config(
+    def _convert_cloud_deployment_compute_config_api_model_to_single_resource_compute_config(
         self, cloud_name: str, api_model: CloudDeploymentComputeConfig,
     ) -> ComputeConfig:
         worker_nodes = None
@@ -416,7 +413,7 @@ class PrivateComputeConfigSDK(BaseSDK):
 
         return ComputeConfig(
             cloud=cloud_name,
-            cloud_deployment=api_model.cloud_deployment,
+            cloud_resource=api_model.cloud_deployment,
             zones=zones,
             advanced_instance_config=api_model.advanced_configurations_json or None,
             enable_cross_zone_scaling=enable_cross_zone_scaling,
@@ -443,7 +440,7 @@ class PrivateComputeConfigSDK(BaseSDK):
         configs = None
         if api_model_config.deployment_configs:
             configs = [
-                self._convert_cloud_deployment_compute_config_api_model_to_single_deployment_compute_config(
+                self._convert_cloud_deployment_compute_config_api_model_to_single_resource_compute_config(
                     cloud.name, config
                 )
                 for config in api_model_config.deployment_configs
@@ -458,7 +455,7 @@ class PrivateComputeConfigSDK(BaseSDK):
             return ComputeConfigVersion(
                 name=f"{api_model.name}:{api_model.version}",
                 id=api_model.id,
-                config=MultiDeploymentComputeConfig(cloud=cloud.name, configs=configs),
+                config=MultiResourceComputeConfig(cloud=cloud.name, configs=configs),
             )
 
         # If there are no deployment configs, this is a compute config for a single cloud deployment - parse the top-level fields.

anyscale/compute_config/commands.py

@@ -34,10 +34,10 @@ single_deployment_compute_config = ComputeConfig(
 )
 full_name: str = anyscale.compute_config.create(single_deployment_compute_config, name="my-single-deployment-compute-config")
 
-multi_deployment_compute_config = MultiDeploymentComputeConfig(
+multi_deployment_compute_config = MultiResourceComputeConfig(
     configs=[
         ComputeConfig(
-            cloud_deployment="vm-aws-us-west-1",
+            cloud_resource="vm-aws-us-west-1",
             head_node=HeadNodeConfig(
                 instance_type="m5.2xlarge",
             ),
@@ -50,7 +50,7 @@ multi_deployment_compute_config = MultiDeploymentComputeConfig(
             ],
         ),
         ComputeConfig(
-            cloud_deployment="vm-aws-us-west-2",
+            cloud_resource="vm-aws-us-west-2",
             head_node=HeadNodeConfig(
                 instance_type="m5.2xlarge",
             ),