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

anyscale/_private/anyscale_client/anyscale_client.py

@@ -1292,7 +1292,7 @@ class AnyscaleClient(AnyscaleClientInterface):
     def _upload_local_runtime_env(
         self,
         cloud_id: str,
-        cloud_deployment_id: Optional[str],
+        cloud_resource_id: Optional[str],
         zip_file_bytes: bytes,
         content_hash: str,
         overwrite_existing_file: bool,
@@ -1302,7 +1302,7 @@ class AnyscaleClient(AnyscaleClientInterface):
             file_type=CloudDataBucketFileType.RUNTIME_ENV_PACKAGES,
             file_name=file_name,
             access_mode=CloudDataBucketAccessMode.WRITE,
-            cloud_deployment_id=cloud_deployment_id,
+            cloud_resource_id=cloud_resource_id,
         )
         info: CloudDataBucketPresignedUrlResponse = self._internal_api_client.generate_cloud_data_bucket_presigned_url_api_v2_clouds_cloud_id_generate_cloud_data_bucket_presigned_url_post(
             cloud_id, request
@@ -1355,27 +1355,27 @@ class AnyscaleClient(AnyscaleClientInterface):
         cloud_id: str,
         excludes: Optional[List[str]] = None,
         overwrite_existing_file: bool = OVERWRITE_EXISTING_CLOUD_STORAGE_FILES,
-        cloud_deployment: Optional[str] = None,
+        cloud_resource_name: Optional[str] = None,
     ) -> str:
         if not pathlib.Path(local_dir).is_dir():
             raise RuntimeError(f"Path '{local_dir}' is not a valid directory.")
 
-        cloud_deployment_id = None
-        if cloud_deployment is not None:
-            cloud_deployments = self._internal_api_client.get_cloud_deployments_api_v2_clouds_cloud_id_deployments_get(
+        cloud_resource_id = None
+        if cloud_resource_name is not None:
+            cloud_resources = self._internal_api_client.get_cloud_resources_api_v2_clouds_cloud_id_resources_get(
                 cloud_id=cloud_id,
             ).results
-            cloud_deployment_id = next(
+            cloud_resource_id = next(
                 (
-                    deployment.cloud_deployment_id
-                    for deployment in cloud_deployments
-                    if deployment.name == cloud_deployment
+                    cloud_resource.cloud_resource_id
+                    for cloud_resource in cloud_resources
+                    if cloud_resource.name == cloud_resource_name
                 ),
                 None,
             )
-            if cloud_deployment_id is None:
+            if cloud_resource_id is None:
                 raise ValueError(
-                    f"Cloud deployment '{cloud_deployment}' not found in cloud '{cloud_id}'"
+                    f"Cloud resource '{cloud_resource_name}' not found in cloud '{cloud_id}'"
                 )
 
         with zip_local_dir(local_dir, excludes=excludes) as (
@@ -1385,31 +1385,31 @@ class AnyscaleClient(AnyscaleClientInterface):
         ):
             info = self._upload_local_runtime_env(
                 cloud_id=cloud_id,
-                cloud_deployment_id=cloud_deployment_id,
+                cloud_resource_id=cloud_resource_id,
                 zip_file_bytes=zip_file_bytes,
                 content_hash=content_hash,
                 overwrite_existing_file=overwrite_existing_file,
             )
             return info.file_uri
 
-    def upload_local_dir_to_cloud_storage_multi_deployment(
+    def upload_local_dir_to_cloud_storage_multi_cloud_resource(
         self,
         local_dir: str,
         *,
         cloud_id: str,
-        cloud_deployments: List[Optional[str]],
+        cloud_resource_names: List[Optional[str]],
         excludes: Optional[List[str]] = None,
         overwrite_existing_file: bool = False,
     ) -> str:
         if not pathlib.Path(local_dir).is_dir():
             raise RuntimeError(f"Path '{local_dir}' is not a valid directory.")
 
-        all_cloud_deployments = self._internal_api_client.get_cloud_deployments_api_v2_clouds_cloud_id_deployments_get(
+        all_cloud_resources = self._internal_api_client.get_cloud_resources_api_v2_clouds_cloud_id_resources_get(
             cloud_id=cloud_id,
         ).results
-        cloud_deployment_ids = {
-            deployment.name: deployment.cloud_deployment_id
-            for deployment in all_cloud_deployments
+        cloud_resource_names_to_ids = {
+            cloud_resource.name: cloud_resource.cloud_resource_id
+            for cloud_resource in all_cloud_resources
         }
 
         bucket_paths = set()
@@ -1419,19 +1419,19 @@ class AnyscaleClient(AnyscaleClientInterface):
             zip_file_bytes,
             content_hash,
         ):
-            for cloud_deployment in cloud_deployments:
-                if cloud_deployment is not None:
-                    if cloud_deployment not in cloud_deployment_ids:
+            for cloud_resource_name in cloud_resource_names:
+                if cloud_resource_name is not None:
+                    if cloud_resource_name not in cloud_resource_names_to_ids:
                         raise ValueError(
-                            f"Cloud deployment '{cloud_deployment}' not found in cloud '{cloud_id}'"
+                            f"Cloud resource '{cloud_resource_name}' not found in cloud '{cloud_id}'"
                         )
-                    cloud_deployment_id = cloud_deployment_ids[cloud_deployment]
+                    cloud_resource_id = cloud_resource_names_to_ids[cloud_resource_name]
                 else:
-                    cloud_deployment_id = None
+                    cloud_resource_id = None
 
                 info = self._upload_local_runtime_env(
                     cloud_id=cloud_id,
-                    cloud_deployment_id=cloud_deployment_id,
+                    cloud_resource_id=cloud_resource_id,
                     zip_file_bytes=zip_file_bytes,
                     content_hash=content_hash,
                     overwrite_existing_file=overwrite_existing_file,

anyscale/_private/anyscale_client/common.py

@@ -57,7 +57,7 @@ from anyscale.utils.workspace_notification import WorkspaceNotification
 # Maybe just make it part of the release process to update it, or fetch the
 # default builds and get the latest one. The best thing to do is probably
 # to populate this in the backend.
-DEFAULT_RAY_VERSION = "2.49.0"  # RAY_RELEASE_UPDATE: update to latest version.
+DEFAULT_RAY_VERSION = "2.49.1"  # RAY_RELEASE_UPDATE: update to latest version.
 DEFAULT_PYTHON_VERSION = "py311"
 RUNTIME_ENV_PACKAGE_FORMAT = "pkg_{content_hash}.zip"
 
@@ -520,7 +520,7 @@ class AnyscaleClientInterface(ABC):
         cloud_id: str,
         excludes: Optional[List[str]] = None,
         overwrite_existing_file: bool = False,
-        cloud_deployment: Optional[str] = None,
+        cloud_resource_name: Optional[str] = None,
     ) -> str:
         """Upload the provided directory to cloud storage and return a URI for it.
 
@@ -535,17 +535,17 @@ class AnyscaleClientInterface(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def upload_local_dir_to_cloud_storage_multi_deployment(
+    def upload_local_dir_to_cloud_storage_multi_cloud_resource(
         self,
         local_dir: str,
         *,
         cloud_id: str,
-        cloud_deployments: List[Optional[str]],
+        cloud_resource_names: List[Optional[str]],
         excludes: Optional[List[str]] = None,
         overwrite_existing_file: bool = False,
     ) -> str:
         """Upload the provided directory to the object storage for each of the provided
-        cloud deployments and return the bucket path of the uploaded file.
+        cloud resources and return the bucket path of the uploaded file.
 
         The directory will be zipped and the resulting bucket path will later be converted
         to a URI that can be used in a Ray runtime_env.

anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -1019,12 +1019,12 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         cloud_id: str,
         excludes: Optional[List[str]] = None,  # noqa: ARG002
         overwrite_existing_file: bool = False,  # noqa: ARG002
-        cloud_deployment: Optional[str] = None,
+        cloud_resource_name: Optional[str] = None,
     ) -> str:
         # Ensure that URIs are consistent for the same passed directory.
         bucket = self.CLOUD_BUCKET.format(cloud_id=cloud_id)
-        if cloud_deployment is not None:
-            bucket += f"_{cloud_deployment}"
+        if cloud_resource_name is not None:
+            bucket += f"_{cloud_resource_name}"
         if local_dir not in self._upload_uri_mapping:
             self._upload_uri_mapping[
                 local_dir
@@ -1032,19 +1032,19 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
 
         return self._upload_uri_mapping[local_dir]
 
-    def upload_local_dir_to_cloud_storage_multi_deployment(
+    def upload_local_dir_to_cloud_storage_multi_cloud_resource(
         self,
         local_dir: str,
         *,
         cloud_id: str,
-        cloud_deployments: List[Optional[str]],
+        cloud_resource_names: List[Optional[str]],
         excludes: Optional[List[str]] = None,  # noqa: ARG002
         overwrite_existing_file: bool = False,  # noqa: ARG002
     ) -> str:
         bucket = self.CLOUD_BUCKET.format(cloud_id=cloud_id)
         if local_dir not in self._upload_bucket_path_mapping:
             self._upload_bucket_path_mapping[local_dir] = (
-                cloud_deployments,
+                cloud_resource_names,
                 f"{bucket}/fake_pkg_{str(uuid.uuid4())}.zip",
             )
         return self._upload_bucket_path_mapping[local_dir][1]

anyscale/_private/docgen/__main__.py

@@ -13,9 +13,9 @@ from anyscale.aggregated_instance_usage.models import DownloadCSVFilters
 from anyscale.cloud.models import (
     AWSConfig,
     Cloud,
-    CloudDeployment,
     CloudPermissionLevel,
     CloudProvider,
+    CloudResource,
     ComputeStack,
     CreateCloudCollaborator,
     FileStorage,
@@ -53,7 +53,7 @@ from anyscale.compute_config.models import (
     ComputeConfigVersion,
     HeadNodeConfig,
     MarketType,
-    MultiDeploymentComputeConfig,
+    MultiResourceComputeConfig,
     WorkerNodeGroupConfig,
 )
 from anyscale.image.models import ImageBuild, ImageBuildStatus
@@ -330,7 +330,7 @@ ALL_MODULES = [
         ],
         models=[
             ComputeConfig,
-            MultiDeploymentComputeConfig,
+            MultiResourceComputeConfig,
             HeadNodeConfig,
             WorkerNodeGroupConfig,
             MarketType,
@@ -448,8 +448,8 @@ ALL_MODULES = [
             cloud_commands.cloud_delete,
             cloud_commands.cloud_verify,
             cloud_commands.list_cloud,
-            cloud_commands.cloud_deployment_create,
-            cloud_commands.cloud_deployment_delete,
+            cloud_commands.cloud_resource_create,
+            cloud_commands.cloud_resource_delete,
             cloud_commands.cloud_config_get,
             cloud_commands.cloud_config_update,
             cloud_commands.cloud_set_default,
@@ -469,7 +469,7 @@ ALL_MODULES = [
             Cloud,
             CloudPermissionLevel,
             CreateCloudCollaborator,
-            CloudDeployment,
+            CloudResource,
             ComputeStack,
             CloudProvider,
             NetworkingMode,
@@ -481,8 +481,8 @@ ALL_MODULES = [
             KubernetesConfig,
         ],
         cli_command_group_prefix={
-            cloud_commands.cloud_deployment_create: "deployment",
-            cloud_commands.cloud_deployment_delete: "deployment",
+            cloud_commands.cloud_resource_create: "resource",
+            cloud_commands.cloud_resource_delete: "resource",
             cloud_commands.cloud_config_get: "config",
             cloud_commands.cloud_config_update: "config",
         },

anyscale/_private/docgen/generator.py

@@ -20,7 +20,11 @@ from anyscale._private.models.model_base import (
     ModelEnumType,
     ResultIterator,
 )
-from anyscale.commands.util import AnyscaleCommand, LegacyAnyscaleCommand
+from anyscale.commands.util import (
+    AnyscaleCommand,
+    DeprecatedAnyscaleCommand,
+    LegacyAnyscaleCommand,
+)
 
 
 ModelType = Union[ModelBaseType, ModelEnumType]
@@ -301,13 +305,20 @@ class MarkdownGenerator:
                 raise ValueError(
                     f"Config model '{t.__name__}' is missing a '__doc_yaml_example__'."
                 )
-        if isinstance(t, AnyscaleCommand) and not cli_example:
+        if (
+            isinstance(
+                t, (AnyscaleCommand, DeprecatedAnyscaleCommand, LegacyAnyscaleCommand)
+            )
+            and not cli_example
+        ):
             raise ValueError(
                 f"CLI command '{t.name}' is missing a '__doc_cli_example__'."
             )
         if (
             not isinstance(t, ModelBaseType)
-            and not isinstance(t, AnyscaleCommand)
+            and not isinstance(
+                t, (AnyscaleCommand, DeprecatedAnyscaleCommand, LegacyAnyscaleCommand)
+            )
             and not py_example
         ):
             raise ValueError(
@@ -321,8 +332,10 @@ class MarkdownGenerator:
             try:
                 yaml.safe_load(yaml_example)
             except Exception as e:  # noqa: BLE001
+                # For CLI commands, use t.name; for SDK functions/models, use t.__name__
+                name = getattr(t, "name", getattr(t, "__name__", str(t)))
                 raise ValueError(
-                    f"'{t.__name__}.__doc_yaml_example__' is not valid YAML syntax"
+                    f"'{name}.__doc_yaml_example__' is not valid YAML syntax"
                 ) from e
 
             yaml_example = yaml_example.strip("\n")
@@ -334,8 +347,10 @@ class MarkdownGenerator:
             try:
                 ast.parse(py_example)
             except Exception as e:  # noqa: BLE001
+                # For CLI commands, use t.name; for SDK functions/models, use t.__name__
+                name = getattr(t, "name", getattr(t, "__name__", str(t)))
                 raise ValueError(
-                    f"'{t.__name__}.__doc_py_example__' is not valid Python syntax"
+                    f"'{name}.__doc_py_example__' is not valid Python syntax"
                 ) from e
 
             py_example = py_example.strip("\n")
@@ -413,7 +428,7 @@ class MarkdownGenerator:
 
         return md
 
-    def _gen_markdown_for_cli_command(
+    def _gen_markdown_for_cli_command(  # noqa: PLR0912
         self, c: click.Command, *, cli_prefix: str
     ) -> str:
         """Generate a markdown section for a CLI command.
@@ -438,9 +453,31 @@ class MarkdownGenerator:
             else:
                 new_c = c.get_new_cli()
                 new_cli_prefix = c.get_new_prefix()
-                md += ":::warning\n"
-                md += f"This command is deprecated. Upgrade to [{new_cli_prefix} {new_c.name}]({self._get_cli_anchor(new_c, new_cli_prefix)}). \n"
-                md += ":::\n"
+                if new_c and new_cli_prefix:
+                    md += ":::warning\n"
+                    md += f"This command is deprecated. Upgrade to [{new_cli_prefix} {new_c.name}]({self._get_cli_anchor(new_c, new_cli_prefix)}). \n"
+                    md += ":::\n"
+        elif isinstance(c, DeprecatedAnyscaleCommand):
+            md = f'### `{cli_prefix} {c.name}` <span class="label-h3 label-deprecated">Deprecated</span>\n'
+            md += ":::warning[Deprecated]\n"
+            # Build deprecation message similar to the command itself
+            parts = []
+            if hasattr(c, "__deprecation_message__") and c.__deprecation_message__:
+                parts.append(c.__deprecation_message__)
+            else:
+                parts.append(f"Command '{c.name}' is deprecated")
+
+            if hasattr(c, "__removal_date__") and c.__removal_date__:
+                date_str = c._format_removal_date(c.__removal_date__)  # noqa: SLF001
+                if date_str:
+                    parts.append(f"and will be removed on {date_str}")
+
+            if hasattr(c, "__alternative__") and c.__alternative__:
+                parts.append(f"Please {c.__alternative__}")
+
+            deprecation_msg = ". ".join(parts) + "."
+            md += deprecation_msg + "\n"
+            md += ":::\n"
         elif isinstance(c, AnyscaleCommand) and c.is_alpha:
             md = f'### `{cli_prefix} {c.name}` <span class="label-h3 label-alpha">Alpha</span>\n'
             md += ":::warning\n"
@@ -478,7 +515,8 @@ class MarkdownGenerator:
             md += "\n"
 
         should_have_example = not (
-            isinstance(c, LegacyAnyscaleCommand) or cli_prefix in CLI_NO_EXAMPLES
+            isinstance(c, (LegacyAnyscaleCommand, DeprecatedAnyscaleCommand))
+            or cli_prefix in CLI_NO_EXAMPLES
         )
         has_cli_example = hasattr(c, "__doc_cli_example__")
         if should_have_example or has_cli_example: