anyscale 0.5.153__tar.gz → 0.5.155__tar.gz

{anyscale-0.5.153 → anyscale-0.5.155}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.5.153
+Version: 0.5.155
 Summary: Command Line Interface for Anyscale
 Home-page: UNKNOWN
 Author: Anyscale Inc.

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale/client/openapi_client/api/default_api.py

@@ -13714,7 +13714,7 @@ class DefaultApi(object):
         body_params = None
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
+            ['text/plain'])  # noqa: E501
 
         # Authentication setting
         auth_settings = []  # noqa: E501

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale/controllers/cloud_controller.py

@@ -115,7 +115,7 @@ except ValueError:
 
 try:
     GCP_DEPLOYMENT_MANAGER_TIMEOUT_SECONDS = int(
-        getenv("GCP_DEPLOYMENT_MANAGER_TIMEOUT_SECONDS", 300)
+        getenv("GCP_DEPLOYMENT_MANAGER_TIMEOUT_SECONDS", 600)
     )
 except ValueError:
     raise Exception(
@@ -842,6 +842,8 @@ class CloudController(BaseController):
                 )
                 raise ClickException("Cloud setup failed!")
 
+            self.verify_aws_cloud_quotas(region=region)
+
             self.log.info(f"Successfully created cloud {name}, and it's ready to use.")
         elif provider == "gcp":
             if project_id is None:
@@ -1444,6 +1446,8 @@ class CloudController(BaseController):
 
         logger.info("\n".join(verification_result_summary))
 
+        self.verify_aws_cloud_quotas(region=region, boto3_session=boto3_session)
+
         return all(
             [
                 verify_anyscale_access_result,
@@ -1459,6 +1463,63 @@ class CloudController(BaseController):
             ]
         )
 
+    def verify_aws_cloud_quotas(
+        self, *, region: str, boto3_session: Optional[Any] = None
+    ):
+        """
+        Checks the AWS EC2 instance quotas and warns users if they are not good enough
+        to support LLM workloads
+        """
+        if boto3_session is None:
+            boto3_session = boto3.Session(region_name=region)
+
+        QUOTAS_CONFIG = {
+            "L-3819A6DF": {
+                "description": "All G and VT Spot Instance Requests",
+                "min": 512,
+            },
+            "L-34B43A08": {
+                "description": "All Standard (A, C, D, H, I, M, R, T, Z) Spot Instance Requests",
+                "min": 512,
+            },
+            "L-7212CCBC": {
+                "description": "All P4, P3 and P2 Spot Instance Requests",
+                "min": 224,
+            },
+            "L-DB2E81BA": {
+                "description": "Running On-Demand G and VT instances",
+                "min": 512,
+            },
+            "L-1216C47A": {
+                "description": "Running On-Demand Standard (A, C, D, H, I, M, R, T, Z) instances",
+                "min": 544,
+            },
+            "L-417A185B": {"description": "Running On-Demand P instances", "min": 224,},
+        }
+
+        quota_client = boto3_session.client("service-quotas")
+
+        self.log.info("Checking quota values...")
+        invalid_quotas = []
+        for quota_code, config in QUOTAS_CONFIG.items():
+            quota = quota_client.get_service_quota(
+                ServiceCode="ec2", QuotaCode=quota_code
+            )
+            if quota["Quota"]["Value"] < config["min"]:
+                invalid_quotas.append(quota_code)
+
+        if len(invalid_quotas):
+            quota_errors = [
+                f"- \"{QUOTAS_CONFIG[quota_code]['description']}\" should be at least {QUOTAS_CONFIG[quota_code]['min']} (curr: {quota['Quota']['Value']})"
+                for quota_code in invalid_quotas
+            ]
+            quota_error_str = "\n".join(quota_errors)
+            self.log.warning(
+                "Your AWS account does not have enough quota to support LLM workloads. "
+                "Please request quota increases for the following quotas:\n"
+                f"{quota_error_str}\n\nFor instructions on how to increase quotas, visit this link: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-resource-limits.html#request-increase"
+            )
+
     def register_aws_cloud(  # noqa: PLR0913, PLR0912, C901
         self,
         *,
@@ -2017,12 +2078,11 @@ class CloudController(BaseController):
                 self.delete_all_aws_resources(cloud, skip_confirmation)
 
             elif cloud_provider == CloudProviders.GCP:
-
-                with self.log.spinner("Deleting load balancing resources..."):
-                    wait_for_lb_resource_termination(
-                        api_client=self.api_client, cloud_id=cloud_id
-                    )
                 try:
+                    with self.log.spinner("Deleting load balancing resources..."):
+                        wait_for_lb_resource_termination(
+                            api_client=self.api_client, cloud_id=cloud_id
+                        )
                     self.delete_gcp_managed_cloud(cloud=cloud)
                 except ClickException as e:
                     confirm(
@@ -2048,11 +2108,20 @@ class CloudController(BaseController):
             and not cloud.is_k8s
             and not cloud.is_aioa
         ):
-            with self.log.spinner("Deleting load balancing resources..."):
-                wait_for_lb_resource_termination(
-                    api_client=self.api_client, cloud_id=cloud_id
-                )
             # GCP registered cloud
+            try:
+                with self.log.spinner("Deleting load balancing resources..."):
+                    wait_for_lb_resource_termination(
+                        api_client=self.api_client, cloud_id=cloud_id
+                    )
+            except ClickException as e:
+                confirm(
+                    f"Error while trying to clean up {cloud_provider} resources:\n{e}\n"
+                    "Do you want to force delete this cloud? You will need to clean up any associated resources on your own.\n"
+                    "Continue with force deletion?",
+                    skip_confirmation,
+                )
+
             credentials = json.loads(cloud.credentials)
             provider = credentials["gcp_workload_identity_pool_id"]
             service_account = credentials["service_account_email"]

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale/controllers/cloud_functional_verification_controller.py

@@ -282,7 +282,7 @@ class CloudFunctionalVerificationController(BaseController):
                 return False
             url = get_endpoint(f"/workspaces/{workspace.id}/{workspace.cluster_id}")
             create_workspace_task.update(
-                True, f"[bold green]Workspace created at [link={url}]{url}[/link]"
+                True, f"[bold green]Workspace created at {url}"
             )
 
         # Wait until workspace is active
@@ -445,9 +445,7 @@ class CloudFunctionalVerificationController(BaseController):
                 )
                 return False
             url = get_endpoint(f"/services/{service.id}")
-            deploy_service_task.update(
-                True, f"[bold green]Service deployed at [link={url}]{url}[/link]"
-            )
+            deploy_service_task.update(True, f"[bold green]Service deployed at {url}")
 
         # Wait until service is active
         def get_service_status(service_id):

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale/sdk/anyscale_client/sdk.py

@@ -10,25 +10,18 @@ from anyscale.api import configure_tcp_keepalive
 from anyscale.api_utils.job_logs_util import (
     _get_logs_from_running_production_job,
     _get_job_logs_from_storage_bucket,
-    _get_logs_from_active_job_run,
 )
 from anyscale.api_utils.exceptions.log_retrieval_errors import (
     ExpectedLogRetrievalError,
-    LogRetrievalTimeoutError,
-    UnsupportedLogRetrievalMethodError,
 )
-from anyscale.api_utils.logs_util import _remove_ansi_escape_sequences
 from anyscale.sdk.anyscale_client.models.cluster_compute_config import (
     ClusterComputeConfig,
 )
 from anyscale.sdk.anyscale_client.models.create_cluster_compute import (
     CreateClusterCompute,
 )
-from anyscale.sdk.anyscale_client.models.job import Job
-from anyscale.sdk.anyscale_client.models.job_status import JobStatus
 from anyscale.sdk.anyscale_client.models.production_job import ProductionJob
 from anyscale.sdk.anyscale_client.models.ha_job_states import HaJobStates
-from anyscale.shared_anyscale_utils.utils.ray_semver import ray_semver_compare
 from anyscale.utils.runtime_env import upload_and_rewrite_working_dir
 from anyscale.sdk import anyscale_client
 from anyscale.sdk.anyscale_client.api.default_api import DefaultApi
@@ -53,9 +46,8 @@ from anyscale.util import get_endpoint
 from anyscale.authenticate import AuthenticationBlock
 from anyscale_client.models import ClusterEnvironmentBuildStatus
 from anyscale.util import get_ray_and_py_version_for_default_cluster_env
-from anyscale.utils.deprecation_util import deprecated
 from anyscale.project import get_default_project
-from anyscale.utils.ray_version_utils import get_alias_for_base_image_name
+from anyscale.utils.ray_version_utils import get_correct_name_for_base_image_name
 
 logger = logging.getLogger(__file__)
 
@@ -202,8 +194,9 @@ class AnyscaleSDK(DefaultApi):  # type: ignore
                 ).result
             else:
                 base_image_name = create_cluster_environment.config_json['base_image']
-                if base_image_name != get_alias_for_base_image_name(base_image_name): # We need to make sure base_image_name after ray 2.7.0, before 2.8.0 have a optimized suffix 
-                    self.log.error(f"Starting from Ray version 2.7.0 and before version 2.8.0, you might be required to include the suffix 'optimized' in the base_image name for that specific Ray version. Try using {self.log.highlight(get_alias_for_base_image_name(base_image_name))}")
+                correct_base_image_name = get_correct_name_for_base_image_name(base_image_name)
+                if base_image_name != correct_base_image_name: # We need to make sure base_image_name after ray 2.7.0, before 2.8.0 have a optimized suffix
+                    self.log.error(f"Starting from Ray version 2.7.0 and before version 2.8.0, you might be required to include the suffix 'optimized' in the base_image name for that specific Ray version. Try using {self.log.highlight(correct_base_image_name)}")
                     return
                 cluster_environment = self.create_cluster_environment(
                     create_cluster_environment
@@ -226,8 +219,9 @@ class AnyscaleSDK(DefaultApi):  # type: ignore
                 ).result
             else:
                 base_image_name = create_cluster_environment.config_json['base_image']
-                if base_image_name != get_alias_for_base_image_name(base_image_name): # We need to make sure base_image_name after ray 2.7.0, before 2.8.0 have a optimized suffix 
-                    self.log.error(f"Starting from Ray version 2.7.0 and before version 2.8.0, you might be required to include the suffix 'optimized' in the base_image name for that specific Ray version. Try using {self.log.highlight(get_alias_for_base_image_name(base_image_name))}")
+                correct_base_image_name = get_correct_name_for_base_image_name(base_image_name)
+                if base_image_name != correct_base_image_name: # We need to make sure base_image_name after ray 2.7.0, before 2.8.0 have a optimized suffix
+                    self.log.error(f"Starting from Ray version 2.7.0 and before version 2.8.0, you might be required to include the suffix 'optimized' in the base_image name for that specific Ray version. Try using {self.log.highlight(correct_base_image_name)}")
                     return
                 build = self.create_cluster_environment_build(
                     {

anyscale-0.5.155/anyscale/shared_anyscale_utils/tests/test_ray_semver.py

@@ -0,0 +1,63 @@
+# AUTOGENERATED - modify shared_anyscale_util in root directory to make changes
+import pytest
+
+from shared_anyscale_utils.utils.ray_semver import (
+    _number_prefix_split,
+    _number_suffix_split,
+    _number_value,
+    ray_semver_compare,
+)
+
+
+def test_number_value():
+    assert _number_value("1") == 1
+    assert _number_value("0") == 0
+    assert _number_value("11") == 11
+    assert _number_value("1.2") == 0
+    assert _number_value("1.2.3") == 0
+    assert _number_value("") == 0
+
+
+def test_number_suffix_split():
+    assert _number_suffix_split("") == ("", "")
+    assert _number_suffix_split("ray2") == ("ray", "2")
+    assert _number_suffix_split("ray11") == ("ray", "11")
+    assert _number_suffix_split("ray11a") == ("ray11a", "")
+
+
+def test_number_prefix_split():
+    assert _number_prefix_split("1") == ("1", "")
+    assert _number_prefix_split("2rc") == ("2", "rc")
+    assert _number_prefix_split("11opt") == ("11", "opt")
+    assert _number_prefix_split("x11") == ("", "x11")
+
+
+@pytest.mark.parametrize(
+    ("a", "b", "expected_result"),
+    [
+        ("2.7.0", "2.7.0", 0),
+        ("ray2.7.0", "ray2.7.0", 0),
+        ("2.7.0", "ray2.7.0", -1),
+        ("rayml2.7.0", "ray2.7.0", 1),
+        ("2.7.0optimized", "2.7.0", 1),
+        ("2.7.0", "2.7.0optimized", -1),
+        ("2.0.1rc1", "2.0.1rc2", -1),
+        ("2.7.0", "2.7.0oss", -1),
+        ("2.0.1rc", "2.0.1", 1),
+        ("3.5.1customsuffix", "3.5.1", 1),
+        ("1.2.3", "1.2.3.dev456", -1),
+        ("2.0.0.final", "2.0.0", 1),
+        ("2.0.0", "2.0.0.final", -1),
+        ("2.6.0", "2.7.0", -1),
+        ("2.6.0", "2.11.0", -1),
+        ("2.0.1rc", "2.0.2", -1),
+        ("2.7.0optimized", "2.7.0oss", -1),
+        ("nightly", "2.7.0", 1),
+    ],
+)
+def test_ray_semver_compare(a, b, expected_result):
+    if a != b:
+        assert expected_result != 0
+    assert ray_semver_compare(a, b) == expected_result
+    if expected_result != 0:
+        assert ray_semver_compare(b, a) == -expected_result

anyscale-0.5.155/anyscale/shared_anyscale_utils/utils/ray_semver.py

@@ -0,0 +1,81 @@
+# AUTOGENERATED - modify shared_anyscale_util in root directory to make changes
+from typing import Tuple
+
+
+def _number_value(s: str) -> int:
+    try:
+        return int(s)
+    except ValueError:
+        return 0
+
+
+def _number_suffix_split(s: str) -> Tuple[str, str]:
+    n = len(s)
+    for i in range(n):
+        if not s[n - 1 - i].isdigit():
+            return s[: n - i], s[n - i :]
+    return "", s  # all digits
+
+
+def _number_prefix_split(s: str) -> Tuple[str, str]:
+    n = len(s)
+    for i in range(n):
+        if not s[i].isdigit():
+            return s[:i], s[i:]
+    return s, ""  # all digits
+
+
+def ray_semver_compare(a: str, b: str) -> int:  # noqa: PLR0911 PLR0912
+    """
+    A dumb implementation of semver comparison because ray versions
+    don't actually follow the semver standard.
+
+
+    The standard for semver versions is
+    "{MAJOR}.{MINOR}.{PATCH}-{PRE_RELEASE_VERSION}," such as 2.7.0 or 2.7.0-oss
+    for Ray versions. However, since we use hyphens in the codebase to split
+    and extract information, our standard for Ray versions is
+    "{MAJOR}.{MINOR}.{PATCH}{PRE_RELEASE_VERSION}," like 2.7.0oss
+    without "-" between the patch and the pre-release version.
+
+    Two versions are equal if they are the same string.
+
+    Example:
+        ray_semver_compare("2.7.0", "2.7.0optimized") == -1
+        ray_semver_compare("2.0.1rc1", "2.0.1rc2") == -1
+    """
+    if a == b:
+        return 0
+    if a == "":
+        return -1
+    if b == "":
+        return 1
+
+    a_parts = a.split(".")
+    b_parts = b.split(".")
+
+    for i, a_part in enumerate(a_parts):
+        if i >= len(b_parts):
+            # No b has no part anymore, then a is greater.
+            return 1
+
+        b_part = b_parts[i]
+        if a_part == b_part:
+            continue
+
+        if i == 0:
+            # looks like ray2
+            a_str, a_num_str = _number_suffix_split(a_part)
+            b_str, b_num_str = _number_suffix_split(b_part)
+            a_tuples0 = (a_str, _number_value(a_num_str), a_num_str, a_part)
+            b_tuples0 = (b_str, _number_value(b_num_str), b_num_str, b_part)
+            return 1 if a_tuples0 > b_tuples0 else -1
+        a_num_str, a_str = _number_prefix_split(a_part)
+        b_num_str, b_str = _number_prefix_split(b_part)
+        a_tuples = (_number_value(a_num_str), a_num_str, a_str, a_part)
+        b_tuples = (_number_value(b_num_str), b_num_str, b_str, b_part)
+        return 1 if a_tuples > b_tuples else -1
+
+    if len(a_parts) < len(b_parts):
+        return -1
+    return 1 if a > b else -1

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale/snapshot_util.py

@@ -25,6 +25,7 @@ WORKING_DIR = os.environ.get("ANYSCALE_WORKING_DIR", "/home/ray")
 CONFIGS_TO_SAVE = [
     ".bash_history",
     ".zsh_history",
+    ".python_history",
 ]
 # These files are saved per user.
 CONFIGS_TO_REPLICATE = [

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale/utils/cloud_utils.py

@@ -122,8 +122,8 @@ def wait_for_lb_resource_termination(
             break
         time.sleep(poll_interval_s)
     else:
-        raise TimeoutError(
-            f"LB resources and namespace did not Terminate after {timeout_s} seconds."
+        raise ClickException(
+            f"LB resources and namespace termination timed out after {timeout_s} seconds."
         )
 
 

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale/utils/ray_version_utils.py

@@ -1,12 +1,14 @@
 from anyscale.shared_anyscale_utils.utils.ray_semver import ray_semver_compare
 
 
-def get_alias_for_base_image_name(base_image_name: str) -> str:
+def get_correct_name_for_base_image_name(base_image_name: str) -> str:
     """
-    Modify a base image name to comply with Ray version and naming conventions.
+    Modify base_image_name to be a correct base image name if it is not.
 
-    This function takes a base image name as input, extracts the Ray version, and checks if the version
-    is greater than or equal to '2.7.0', or falls back to the original name.
+    This function checks the base_image_name, if it looks correct, returns it.
+    If not, try to modify it to be a correct base image name. This can be used
+    as a hint for users on what they might want to use when the given name
+    is not a right one.
 
     Args:
         base_image_name (str): The name of the base image to be checked.
@@ -16,16 +18,22 @@ def get_alias_for_base_image_name(base_image_name: str) -> str:
 
     Example:
         To check a base image name, you can call this function like this:
-        >>> get_alias_for_base_image_name("anyscale/ray:2.7.0-py38-cuda121"), it should be modified to "anyscale/ray:2.7.0oss-py38-cuda121"
+        >>> get_correct_name_for_base_image_name("anyscale/ray:2.7.0-py38-cuda121"), it should be modified to "anyscale/ray:2.7.0optimized-py38-cuda121"
     """
     # to extract "2.7.0", "2.7.0oss", "2.7.0optimized", "2.0.1rc" as ray_version
     ray_version = get_ray_version(base_image_name)
 
+    # If it has an explicit suffix, respect it.
     if ray_version.endswith(("optimized", "oss")) or "rc" in ray_version:
         return base_image_name
 
-    if ray_semver_compare(ray_version, "2.7.0") >= 0:  # ray_version >= "2.7.0"
+    # Ray 2.7.x images do not exist on anyscale. Only "optimized" version exists.
+    if (
+        ray_semver_compare(ray_version, "2.7.0") >= 0
+        and ray_semver_compare(ray_version, "2.8.0") < 0
+    ):  # ray_version ~= 2.7.?
         return base_image_name.replace(ray_version, f"{ray_version}optimized")
+
     return base_image_name
 
 

anyscale-0.5.155/anyscale/version.py

@@ -0,0 +1 @@
+__version__ = "0.5.155"

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale/workspace.py

@@ -14,7 +14,9 @@ def write_workspace_id_to_disk(workspace_id: str, directory: str) -> None:
 def get_workspace_root_or_throw() -> str:
     root_dir = find_project_root(os.getcwd())
     if not root_dir:
-        raise ClickException("No directory with .anyscale.yaml file found")
+        raise ClickException(
+            "No directory with .anyscale.yaml file found. Please make sure you are running the command in a cloned workspace directory."
+        )
     return os.path.join(root_dir, "")
 
 
@@ -28,4 +30,6 @@ def load_workspace_id_or_throw() -> str:
             config = yaml.safe_load(f)
             return config["workspace_id"]
     else:
-        raise ClickException("No .anyscale.yaml file found")
+        raise ClickException(
+            "No .anyscale.yaml file found. Please make sure you are running the command in a cloned workspace directory."
+        )

{anyscale-0.5.153 → anyscale-0.5.155}/anyscale.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.5.153
+Version: 0.5.155
 Summary: Command Line Interface for Anyscale
 Home-page: UNKNOWN
 Author: Anyscale Inc.

{anyscale-0.5.153 → anyscale-0.5.155}/tests/controllers/test_cloud_controller.py

@@ -920,6 +920,7 @@ def test_verify_cloud(
     ) as verify_gcp_cloud_resources_mock:
         cloud_controller = CloudController()
         cloud_controller.log = Mock()
+        cloud_controller.verify_aws_cloud_quotas = Mock()  # type: ignore[assignment]
 
         cloud = Mock(
             result=Mock(
@@ -1015,6 +1016,7 @@ def test_setup_managed_cloud(
     ):
         cloud_controller = CloudController()
         cloud_controller.api_client = mock_api_client
+        cloud_controller.verify_aws_cloud_quotas = Mock()  # type: ignore[assignment]
         if cloud_setup_failure:
             with pytest.raises(ClickException):
                 cloud_controller.setup_managed_cloud(
@@ -2705,3 +2707,58 @@ def test_add_redis_cluster_aws(
             else:
                 mock_get_or_create_memorydb.assert_called_once()
                 mock_edit_cloud_resource.assert_called_once()
+
+
+def test_verify_aws_cloud_quotas_no_errors():
+    cloud_controller = CloudController()
+    # No errors
+    with patch(
+        "frontend.cli.anyscale.controllers.cloud_controller.boto3.Session"
+    ) as mock_session_class:
+
+        def get_service_quota_mock(ServiceCode: str, QuotaCode: str):
+            assert ServiceCode == "ec2"
+            return {"Quota": {"Value": 1000}}  # All above quota minimums
+
+        mock_quota_client = Mock(
+            get_service_quota=Mock(side_effect=get_service_quota_mock)
+        )
+        mock_session = Mock(client=Mock(return_value=mock_quota_client))
+        mock_session_class.return_value = mock_session
+
+        cloud_controller.verify_aws_cloud_quotas(region="us-west-2")
+
+        mock_session_class.assert_called_once_with(region_name="us-west-2")
+        mock_session.client.assert_called_once_with("service-quotas")
+        assert mock_quota_client.get_service_quota.call_count == 6
+
+    # G and VT On-Demand instances and P4 Spot instances quotas not met
+    with patch(
+        "frontend.cli.anyscale.controllers.cloud_controller.boto3.Session"
+    ) as mock_session_class:
+
+        def get_service_quota_mock(ServiceCode: str, QuotaCode: str):
+            assert ServiceCode == "ec2"
+            # On-Demand G and VT instances or P4 Spot Instances
+            if QuotaCode == "L-DB2E81BA" or QuotaCode == "L-7212CCBC":
+                return {"Quota": {"Value": 0}}  # Below quota min
+            else:
+                return {"Quota": {"Value": 1000}}  # Above quota minimums
+
+        mock_quota_client = Mock(
+            get_service_quota=Mock(side_effect=get_service_quota_mock)
+        )
+        mock_session = Mock(client=Mock(return_value=mock_quota_client))
+        mock_session_class.return_value = mock_session
+        cloud_controller.log = Mock()
+
+        cloud_controller.verify_aws_cloud_quotas(region="us-west-2")
+
+        mock_session_class.assert_called_once_with(region_name="us-west-2")
+        mock_session.client.assert_called_once_with("service-quotas")
+        assert mock_quota_client.get_service_quota.call_count == 6
+        cloud_controller.log.warning.assert_called_once()
+        warning_message = cloud_controller.log.warning.call_args[0][0]
+        # Error messages should include info about these quotas
+        assert "All P4, P3 and P2 Spot Instance Requests" in warning_message
+        assert "Running On-Demand G and VT instances" in warning_message

{anyscale-0.5.153 → anyscale-0.5.155}/tests/controllers/test_cluster_env_controller.py

@@ -14,7 +14,9 @@ from anyscale.sdk.anyscale_client import (
     CreateBYODClusterEnvironment,
     CreateClusterEnvironment,
 )
-from frontend.cli.anyscale.utils.ray_version_utils import get_alias_for_base_image_name
+from frontend.cli.anyscale.utils.ray_version_utils import (
+    get_correct_name_for_base_image_name,
+)
 
 
 def get_imported_function_name(func: Callable[..., Any]) -> str:
@@ -186,6 +188,7 @@ def test_disambiguate_byod_builds(mock_auth_api_client):
 @pytest.mark.parametrize(
     ("base_image_name", "expected_result"),
     [
+        ("anyscale/ray:2.8.0-py38-cuda121", "anyscale/ray:2.8.0-py38-cuda121"),
         ("anyscale/ray:2.7.1oss-py38-cuda121", "anyscale/ray:2.7.1oss-py38-cuda121"),
         (
             "anyscale/ray:2.7.1optimized-py38-cuda121",
@@ -199,6 +202,6 @@ def test_disambiguate_byod_builds(mock_auth_api_client):
         ("anyscale/ray:2.0.1rc-py38-cuda121", "anyscale/ray:2.0.1rc-py38-cuda121"),
     ],
 )
-def test_get_alias_for_base_image_name(base_image_name, expected_result):
-    result = get_alias_for_base_image_name(base_image_name)
+def test_get_correct_name_for_base_image_name(base_image_name, expected_result):
+    result = get_correct_name_for_base_image_name(base_image_name)
     assert result == expected_result

anyscale-0.5.153/anyscale/shared_anyscale_utils/tests/test_ray_semver.py

@@ -1,40 +0,0 @@
-# AUTOGENERATED - modify shared_anyscale_util in root directory to make changes
-import pytest
-
-from shared_anyscale_utils.utils.ray_semver import (
-    get_byod_ray_version_alias,
-    ray_semver_compare,
-)
-
-
-@pytest.mark.parametrize(
-    ("a", "b", "expected_result"),
-    [
-        ("ray2.7.0", "ray2.7.0", 0),
-        ("ray2.7.0optimized", "ray2.7.0", 0),
-        ("ray2.7.0oss", "ray2.7.0", 0),
-        ("ray2.0.1rc", "ray2.0.1", 0),
-        ("ray3.5.1customsuffix", "ray3.5.1", 0),
-        ("ray1.2.3.dev456", "ray1.2.3", 0),
-        ("ray2.0.0.final", "ray2.0.0", 0),
-        ("ray2.7.0", "ray2.6.0", 1),
-        ("ray2.0.1rc", "ray2.0.2", -1),
-        ("ray2.7.0optimized", "ray2.7.0oss", 0),
-    ],
-)
-def test_ray_semver_compare(a, b, expected_result):
-    assert ray_semver_compare(a, b) == expected_result
-
-
-@pytest.mark.parametrize(
-    ("ray_version", "expected_alias"),
-    [
-        ("2.7.0rc1", "2.7.0rc1"),
-        ("2.6.0", "2.6.0"),
-        ("2.7.1", "2.7.1optimized"),
-        ("2.7.0", "2.7.0optimized"),
-        ("nightly", "nightly"),
-    ],
-)
-def test_get_byod_ray_version_alias(ray_version, expected_alias):
-    assert get_byod_ray_version_alias(ray_version) == expected_alias