anyscale 0.24.15__tar.gz → 0.24.16__tar.gz

{anyscale-0.24.15 → anyscale-0.24.16}/BUILD.bazel

@@ -56,7 +56,6 @@ py_library(
         requirement("tqdm"),
         requirement("humanize"),
         requirement("tzlocal"),
-        requirement("argon2-cffi"),
         requirement("google-cloud-compute"),
         requirement("google-cloud-resource-manager"),
         requirement("google-api-python-client"),

{anyscale-0.24.15 → anyscale-0.24.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.24.15
+Version: 0.24.16
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/__init__.py

@@ -4,7 +4,7 @@ import os
 from sys import path
 from typing import Any, Dict, List
 
-from anyscale import snapshot_util, version
+from anyscale import version
 
 
 logger = logging.getLogger(__name__)
@@ -15,14 +15,11 @@ anyscale_dir = os.path.dirname(os.path.abspath(__file__))
 path.append(os.path.join(anyscale_dir, "client"))
 path.append(os.path.join(anyscale_dir, "sdk"))
 
-from anyscale import integrations
+from anyscale import compute_config, integrations, job, service
 from anyscale.cluster import get_job_submission_client_cluster_info
 from anyscale.cluster_compute import get_cluster_compute_from_name
-import anyscale.compute_config
 from anyscale.connect import ClientBuilder
-import anyscale.job
 from anyscale.sdk.anyscale_client.sdk import AnyscaleSDK
-import anyscale.service
 
 
 # Note: indentation here matches that of connect.py::ClientBuilder.

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -194,7 +194,7 @@ class AnyscaleClient(AnyscaleClientInterface):
 
     def get_build_ui_url(self, cluster_env_id, build_id: str) -> str:
         return get_endpoint(
-            f"/container-images/{cluster_env_id}/versions/{build_id}", host=self.host
+            f"v2/container-images/{cluster_env_id}/versions/{build_id}", host=self.host
         )
 
     def get_current_workspace_id(self) -> Optional[str]:

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/_private/docgen/generator.py

@@ -15,6 +15,17 @@ ModelType = Union[ModelBaseType, ModelEnumType]
 CLI_OPTIONS_TO_SKIP = {"help", "service_id", "project_id"}
 FILE_EXTENSION = ".md"
 
+CUSTOMER_HOSTED_ANCHOR = "#customer-hosted-only"
+CUSTOMER_HOSTED_HEADER = """\
+#### Customer-hosted cloud features {#customer-hosted-only}
+:::note
+Some features are only available on customer-hosted clouds. Reach out to preview-help@anyscale.com for info.
+:::"""
+
+CUSTOMER_HOSTED_QUALIFIER = (
+    "Only available on [customer-hosted clouds](#customer-hosted-only)."
+)
+
 
 @dataclass
 class Module:
@@ -66,6 +77,7 @@ class MarkdownGenerator:
             output = "import Tabs from '@theme/Tabs';\n"
             output += "import TabItem from '@theme/TabItem';\n\n"
             output += f"# {m.title} API Reference\n\n"
+            output += CUSTOMER_HOSTED_HEADER + "\n\n"
             index += f"- [{m.title} API Reference]({filename_no_extension})\n"
             index += f"  - [{m.title} Models]({filename_no_extension}#{title_anchor}-models)\n"
 
@@ -240,15 +252,17 @@ class MarkdownGenerator:
                     # Skip private fields.
                     continue
 
-                md += f"- **`{field.name}` ({self._model_type_to_string(field.type)})**"
-                if "docstring" not in field.metadata:
+                docstring = field.metadata.get("docstring", None)
+                if not docstring:
                     raise ValueError(
                         f"Model '{t.__name__}' is missing a docstring for field '{field.name}'"
                     )
-                docstring = field.metadata.get("docstring", None)
-                if docstring:
-                    md += f": {docstring}"
-                md += "\n"
+
+                md += f"- **`{field.name}` ({self._model_type_to_string(field.type)})**: {docstring}\n"
+
+                customer_hosted_only = field.metadata.get("customer_hosted_only", False)
+                if customer_hosted_only:
+                    md += f"  - {CUSTOMER_HOSTED_QUALIFIER}\n"
             md += "\n\n"
 
             md += "#### Python Methods\n\n"

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/_private/models/image_uri.py

@@ -6,8 +6,9 @@ IMAGE_URI_PATTERN_RE = re.compile(
     r"^"
     # Optional registry host: hostname with optional port
     r"((?P<host>[a-zA-Z0-9.-]+)(?::(?P<port>[0-9]+))?/)?"
-    # Repository name: user_name/repository
-    r"(?P<repository>[a-zA-Z0-9-_]+/([a-zA-Z0-9-/_.])+)"
+    # Repository: user_name/repository
+    r"(?P<user>[a-zA-Z0-9-_]+/)?"  # user is optional.
+    r"(?P<repository>[a-zA-Z0-9-/_.]+)"
     # Optional Tag: version or string after ':'
     r"(:(?P<tag>[a-zA-Z0-9_.-]+))?"
     # Optional Digest: string after '@'

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/_private/sdk/__init__.py

@@ -1,5 +1,11 @@
 from functools import wraps
-from typing import Any, Callable, Dict, List, Optional, Type, Union
+from typing import Callable, cast, Dict, Type, TypeVar
+
+from typing_extensions import ParamSpec
+
+
+P = ParamSpec("P")
+T = TypeVar("T")
 
 
 _LAZY_SDK_SINGLETONS: Dict[str, Callable] = {}
@@ -7,14 +13,17 @@ _LAZY_SDK_SINGLETONS: Dict[str, Callable] = {}
 
 def sdk_command(
     key: str, sdk_cls: Type, *, doc_py_example: str, arg_docstrings: Dict[str, str],
-) -> Callable[[Callable], Callable]:
+) -> Callable[[Callable[P, T]], Callable[P, T]]:
     """Decorator to automatically inject an `_sdk` arg into the wrapped function.
 
     The arguments to this class are a unique key for the singleton and its type
     (the constructor will be called with no arguments).
     """
 
-    def _inject_typed_sdk_singleton(f: Callable) -> Callable:
+    # The P and T type hints allow f's type hints to pass through this decorator.
+    # Without them, f's type hints would not be visible to the developer.
+    # See https://github.com/anyscale/product/pull/27738.
+    def _inject_typed_sdk_singleton(f: Callable[P, T]) -> Callable[P, T]:
         if not doc_py_example:
             raise ValueError(
                 f"SDK command '{f.__name__}' must provide a non-empty 'doc_py_example'."
@@ -23,11 +32,15 @@ def sdk_command(
         # TODO: validate docstrings.
 
         @wraps(f)
-        def wrapper(*args, **kwargs):
+        def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
             if key not in _LAZY_SDK_SINGLETONS:
                 _LAZY_SDK_SINGLETONS[key] = sdk_cls()
 
-            return f(*args, _sdk=_LAZY_SDK_SINGLETONS[key], **kwargs)
+            # We disable the mypy linter here because it treats kwargs as a
+            # P.kwargs object. mypy wrongly thinks kwargs can't be indexed.
+            kwargs["_sdk"] = _LAZY_SDK_SINGLETONS[key]  # type: ignore
+
+            return f(*args, **kwargs)
 
         # TODO(edoakes): move to parsing docstrings instead.
         wrapper.__doc_py_example__ = doc_py_example  # type: ignore

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/anyscale-cloud-setup-oa.yaml

@@ -116,8 +116,6 @@ $EFSMountTargets
     Type: 'AWS::IAM::Role'
     Properties:
       RoleName: !Ref ClusterNodeIAMRoleName
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly
       AssumeRolePolicyDocument:
         Statement:
           - Action: 'sts:AssumeRole'

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/client/README.md

@@ -243,6 +243,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**get_socket_types_type_api_v2_userinfo_socket_types_type_get**](docs/DefaultApi.md#get_socket_types_type_api_v2_userinfo_socket_types_type_get) | **GET** /api/v2/userinfo/socket_types_type | Get Socket Types Type
 *DefaultApi* | [**get_startup_logs_api_v2_sessions_session_id_startup_logs_get**](docs/DefaultApi.md#get_startup_logs_api_v2_sessions_session_id_startup_logs_get) | **GET** /api/v2/sessions/{session_id}/startup_logs | Get Startup Logs
 *DefaultApi* | [**get_startup_logs_archived_api_v2_sessions_session_id_startup_logs_archived_get**](docs/DefaultApi.md#get_startup_logs_archived_api_v2_sessions_session_id_startup_logs_archived_get) | **GET** /api/v2/sessions/{session_id}/startup_logs_archived | Get Startup Logs Archived
+*DefaultApi* | [**get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get**](docs/DefaultApi.md#get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get) | **GET** /api/v2/experimental_workspaces/template/readme/{template_id} | Get Template Readme
 *DefaultApi* | [**get_templatized_cluster_environments_api_v2_application_templates_templatized_get**](docs/DefaultApi.md#get_templatized_cluster_environments_api_v2_application_templates_templatized_get) | **GET** /api/v2/application_templates/templatized/ | Get Templatized Cluster Environments
 *DefaultApi* | [**get_templatized_compute_configs_api_v2_compute_templates_templatized_cloud_id_get**](docs/DefaultApi.md#get_templatized_compute_configs_api_v2_compute_templates_templatized_cloud_id_get) | **GET** /api/v2/compute_templates/templatized/{cloud_id} | Get Templatized Compute Configs
 *DefaultApi* | [**get_user_info_api_v2_userinfo_get**](docs/DefaultApi.md#get_user_info_api_v2_userinfo_get) | **GET** /api/v2/userinfo/ | Get User Info
@@ -313,7 +314,6 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**register_autosync_session_api_v2_autosync_sessions_post**](docs/DefaultApi.md#register_autosync_session_api_v2_autosync_sessions_post) | **POST** /api/v2/autosync_sessions/ | Register Autosync Session
 *DefaultApi* | [**register_buffer_api_v2_anyscaled_register_buffer_post**](docs/DefaultApi.md#register_buffer_api_v2_anyscaled_register_buffer_post) | **POST** /api/v2/anyscaled/register_buffer | Register Buffer
 *DefaultApi* | [**register_build_api_v2_anyscaled_register_build_post**](docs/DefaultApi.md#register_build_api_v2_anyscaled_register_build_post) | **POST** /api/v2/anyscaled/register_build | Register Build
-*DefaultApi* | [**register_endpoints_user_api_v2_users_internal_register_endpoints_users_post**](docs/DefaultApi.md#register_endpoints_user_api_v2_users_internal_register_endpoints_users_post) | **POST** /api/v2/users/internal/register_endpoints_users | Register Endpoints User
 *DefaultApi* | [**register_user_api_v2_users_post**](docs/DefaultApi.md#register_user_api_v2_users_post) | **POST** /api/v2/users/ | Register User
 *DefaultApi* | [**register_user_from_stripe_api_v2_users_user_from_stripe_post**](docs/DefaultApi.md#register_user_from_stripe_api_v2_users_user_from_stripe_post) | **POST** /api/v2/users/user_from_stripe | Register User From Stripe
 *DefaultApi* | [**register_v2_api_v2_anyscaled_register_v2_post**](docs/DefaultApi.md#register_v2_api_v2_anyscaled_register_v2_post) | **POST** /api/v2/anyscaled/register_v2 | Register V2
@@ -695,8 +695,6 @@ Class | Method | HTTP request | Description
  - [MachineInfo](docs/MachineInfo.md)
  - [MachinePool](docs/MachinePool.md)
  - [MetronomeDashboardType](docs/MetronomeDashboardType.md)
- - [MigrationResult](docs/MigrationResult.md)
- - [MigrationresultListResponse](docs/MigrationresultListResponse.md)
  - [MiniBuild](docs/MiniBuild.md)
  - [MiniCloud](docs/MiniCloud.md)
  - [MiniCluster](docs/MiniCluster.md)

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/client/openapi_client/__init__.py

@@ -353,8 +353,6 @@ from openapi_client.models.machine_connection_state import MachineConnectionStat
 from openapi_client.models.machine_info import MachineInfo
 from openapi_client.models.machine_pool import MachinePool
 from openapi_client.models.metronome_dashboard_type import MetronomeDashboardType
-from openapi_client.models.migration_result import MigrationResult
-from openapi_client.models.migrationresult_list_response import MigrationresultListResponse
 from openapi_client.models.mini_build import MiniBuild
 from openapi_client.models.mini_cloud import MiniCloud
 from openapi_client.models.mini_cluster import MiniCluster

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/client/openapi_client/api/default_api.py

@@ -19616,6 +19616,120 @@ class DefaultApi(object):
             _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get(self, template_id, **kwargs):  # noqa: E501
+        """Get Template Readme  # noqa: E501
+
+        Retrieves a template's README.md file.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get(template_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str template_id: ID of the template. (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: WorkspacereadmeResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        return self.get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get_with_http_info(template_id, **kwargs)  # noqa: E501
+
+    def get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get_with_http_info(self, template_id, **kwargs):  # noqa: E501
+        """Get Template Readme  # noqa: E501
+
+        Retrieves a template's README.md file.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get_with_http_info(template_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str template_id: ID of the template. (required)
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(WorkspacereadmeResponse, status_code(int), headers(HTTPHeaderDict))
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        local_var_params = locals()
+
+        all_params = [
+            'template_id'
+        ]
+        all_params.extend(
+            [
+                'async_req',
+                '_return_http_data_only',
+                '_preload_content',
+                '_request_timeout'
+            ]
+        )
+
+        for key, val in six.iteritems(local_var_params['kwargs']):
+            if key not in all_params:
+                raise ApiTypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get" % key
+                )
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+        # verify the required parameter 'template_id' is set
+        if self.api_client.client_side_validation and ('template_id' not in local_var_params or  # noqa: E501
+                                                        local_var_params['template_id'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `template_id` when calling `get_template_readme_api_v2_experimental_workspaces_template_readme_template_id_get`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'template_id' in local_var_params:
+            path_params['template_id'] = local_var_params['template_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/experimental_workspaces/template/readme/{template_id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='WorkspacereadmeResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_templatized_cluster_environments_api_v2_application_templates_templatized_get(self, **kwargs):  # noqa: E501
         """Get Templatized Cluster Environments  # noqa: E501
 
@@ -28410,123 +28524,6 @@ class DefaultApi(object):
             _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def register_endpoints_user_api_v2_users_internal_register_endpoints_users_post(self, concurrent_migrations, **kwargs):  # noqa: E501
-        """Register Endpoints User  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.register_endpoints_user_api_v2_users_internal_register_endpoints_users_post(concurrent_migrations, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool: execute request asynchronously
-        :param int concurrent_migrations: (required)
-        :param int limit:
-        :param _preload_content: if False, the urllib3.HTTPResponse object will
-                                 be returned without reading/decoding response
-                                 data. Default is True.
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :return: MigrationresultListResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        return self.register_endpoints_user_api_v2_users_internal_register_endpoints_users_post_with_http_info(concurrent_migrations, **kwargs)  # noqa: E501
-
-    def register_endpoints_user_api_v2_users_internal_register_endpoints_users_post_with_http_info(self, concurrent_migrations, **kwargs):  # noqa: E501
-        """Register Endpoints User  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.register_endpoints_user_api_v2_users_internal_register_endpoints_users_post_with_http_info(concurrent_migrations, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool: execute request asynchronously
-        :param int concurrent_migrations: (required)
-        :param int limit:
-        :param _return_http_data_only: response data without head status code
-                                       and headers
-        :param _preload_content: if False, the urllib3.HTTPResponse object will
-                                 be returned without reading/decoding response
-                                 data. Default is True.
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :return: tuple(MigrationresultListResponse, status_code(int), headers(HTTPHeaderDict))
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        local_var_params = locals()
-
-        all_params = [
-            'concurrent_migrations',
-            'limit'
-        ]
-        all_params.extend(
-            [
-                'async_req',
-                '_return_http_data_only',
-                '_preload_content',
-                '_request_timeout'
-            ]
-        )
-
-        for key, val in six.iteritems(local_var_params['kwargs']):
-            if key not in all_params:
-                raise ApiTypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method register_endpoints_user_api_v2_users_internal_register_endpoints_users_post" % key
-                )
-            local_var_params[key] = val
-        del local_var_params['kwargs']
-        # verify the required parameter 'concurrent_migrations' is set
-        if self.api_client.client_side_validation and ('concurrent_migrations' not in local_var_params or  # noqa: E501
-                                                        local_var_params['concurrent_migrations'] is None):  # noqa: E501
-            raise ApiValueError("Missing the required parameter `concurrent_migrations` when calling `register_endpoints_user_api_v2_users_internal_register_endpoints_users_post`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-        if 'concurrent_migrations' in local_var_params and local_var_params['concurrent_migrations'] is not None:  # noqa: E501
-            query_params.append(('concurrent_migrations', local_var_params['concurrent_migrations']))  # noqa: E501
-        if 'limit' in local_var_params and local_var_params['limit'] is not None:  # noqa: E501
-            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = []  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/users/internal/register_endpoints_users', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='MigrationresultListResponse',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=local_var_params.get('async_req'),
-            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
-            _preload_content=local_var_params.get('_preload_content', True),
-            _request_timeout=local_var_params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def register_user_api_v2_users_post(self, create_user, **kwargs):  # noqa: E501
         """Register User  # noqa: E501
 

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/client/openapi_client/models/__init__.py

@@ -339,8 +339,6 @@ from openapi_client.models.machine_connection_state import MachineConnectionStat
 from openapi_client.models.machine_info import MachineInfo
 from openapi_client.models.machine_pool import MachinePool
 from openapi_client.models.metronome_dashboard_type import MetronomeDashboardType
-from openapi_client.models.migration_result import MigrationResult
-from openapi_client.models.migrationresult_list_response import MigrationresultListResponse
 from openapi_client.models.mini_build import MiniBuild
 from openapi_client.models.mini_cloud import MiniCloud
 from openapi_client.models.mini_cluster import MiniCluster

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/client/openapi_client/models/aica_endpoint_event_level.py

@@ -30,8 +30,11 @@ class AicaEndpointEventLevel(object):
     """
     ERROR = "ERROR"
     INFO = "INFO"
+    WARNING = "WARNING"
+    TRACE = "TRACE"
+    DEBUG = "DEBUG"
 
-    allowable_values = [ERROR, INFO]  # noqa: E501
+    allowable_values = [ERROR, INFO, WARNING, TRACE, DEBUG]  # noqa: E501
 
     """
     Attributes:

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/compute_config/models.py

@@ -65,7 +65,8 @@ class _NodeConfig(ModelBase):
         default=None,
         repr=False,
         metadata={
-            "docstring": "Advanced instance configurations that will be passed through to the cloud provider."
+            "docstring": "Advanced instance configurations that will be passed through to the cloud provider.",
+            "customer_hosted_only": True,
         },
     )
 
@@ -203,7 +204,8 @@ compute_config:
     market_type: Union[str, MarketType] = field(
         default=MarketType.ON_DEMAND,
         metadata={
-            "docstring": "The type of instances to use (see `MarketType` enum values for details)."
+            "docstring": "The type of instances to use (see `MarketType` enum values for details).",
+            "customer_hosted_only": True,
         },
     )
 
@@ -273,60 +275,6 @@ compute_config:
         if cloud is not None and not isinstance(cloud, str):
             raise TypeError("'cloud' must be a string")
 
-    zones: Optional[List[str]] = field(
-        default=None,
-        repr=False,
-        metadata={
-            "docstring": "Availability zones to consider for this cluster. Defaults to all zones in the cloud's region. By default all instances will run in the same zone to save cost, unless `enable_cross_zone_scaling` is set."
-        },
-    )
-
-    def _validate_zones(self, zones: Optional[List[str]]):
-        if zones is None:
-            return
-        if not isinstance(zones, list) or not all(isinstance(z, str) for z in zones):
-            raise TypeError("'zones' must be a List[str]")
-        if len(zones) == 0:
-            raise ValueError(
-                "'zones' must not be an empty list. Set `None` to default to all zones."
-            )
-
-    enable_cross_zone_scaling: bool = field(
-        default=False,
-        repr=False,
-        metadata={
-            "docstring": "Allow instances in the cluster to be run across multiple zones. This is recommended when running production services (for fault-tolerance in a zone failure scenario). It is not recommended for workloads that have a large amount of inter-zone communication due to the possibility of higher costs and degraded performance."
-        },
-    )
-
-    def _validate_enable_cross_zone_scaling(self, enable_cross_zone_scaling: bool):
-        if not isinstance(enable_cross_zone_scaling, bool):
-            raise TypeError("'enable_cross_zone_scaling' must be a boolean")
-
-    max_resources: Optional[ResourceDict] = field(
-        default=None,
-        repr=False,
-        metadata={
-            "docstring": "Total maximum logical resources across all nodes in the cluster. Resources omitted from this field have no maximum."
-        },
-    )
-
-    def _validate_max_resources(self, max_resources: Optional[ResourceDict]):
-        _validate_resource_dict(max_resources, field_name="max_resources")
-
-    advanced_instance_config: Optional[AdvancedInstanceConfigDict] = field(
-        default=None,
-        repr=False,
-        metadata={
-            "docstring": "Advanced instance configurations that will be passed through to the cloud provider."
-        },
-    )
-
-    def _validate_advanced_instance_config(
-        self, advanced_instance_config: Optional[AdvancedInstanceConfigDict],
-    ):
-        _validate_advanced_instance_config_dict(advanced_instance_config)
-
     head_node: Union[HeadNodeConfig, Dict, None] = field(
         default=None,
         repr=False,
@@ -392,3 +340,60 @@ compute_config:
             )
 
         return worker_node_models
+
+    max_resources: Optional[ResourceDict] = field(
+        default=None,
+        repr=False,
+        metadata={
+            "docstring": "Total maximum logical resources across all nodes in the cluster. Resources omitted from this field have no maximum."
+        },
+    )
+
+    def _validate_max_resources(self, max_resources: Optional[ResourceDict]):
+        _validate_resource_dict(max_resources, field_name="max_resources")
+
+    zones: Optional[List[str]] = field(
+        default=None,
+        repr=False,
+        metadata={
+            "docstring": "Availability zones to consider for this cluster. Defaults to all zones in the cloud's region. By default all instances will run in the same zone to save cost, unless `enable_cross_zone_scaling` is set.",
+            "customer_hosted_only": True,
+        },
+    )
+
+    def _validate_zones(self, zones: Optional[List[str]]):
+        if zones is None:
+            return
+        if not isinstance(zones, list) or not all(isinstance(z, str) for z in zones):
+            raise TypeError("'zones' must be a List[str]")
+        if len(zones) == 0:
+            raise ValueError(
+                "'zones' must not be an empty list. Set `None` to default to all zones."
+            )
+
+    enable_cross_zone_scaling: bool = field(
+        default=False,
+        repr=False,
+        metadata={
+            "docstring": "Allow instances in the cluster to be run across multiple zones. This is recommended when running production services (for fault-tolerance in a zone failure scenario). It is not recommended for workloads that have a large amount of inter-zone communication due to the possibility of higher costs and degraded performance.",
+            "customer_hosted_only": True,
+        },
+    )
+
+    def _validate_enable_cross_zone_scaling(self, enable_cross_zone_scaling: bool):
+        if not isinstance(enable_cross_zone_scaling, bool):
+            raise TypeError("'enable_cross_zone_scaling' must be a boolean")
+
+    advanced_instance_config: Optional[AdvancedInstanceConfigDict] = field(
+        default=None,
+        repr=False,
+        metadata={
+            "docstring": "Advanced instance configurations that will be passed through to the cloud provider.",
+            "customer_hosted_only": True,
+        },
+    )
+
+    def _validate_advanced_instance_config(
+        self, advanced_instance_config: Optional[AdvancedInstanceConfigDict],
+    ):
+        _validate_advanced_instance_config_dict(advanced_instance_config)

{anyscale-0.24.15 → anyscale-0.24.16}/anyscale/controllers/cloud_controller.py

@@ -554,10 +554,8 @@ class CloudController(BaseController):
 
         aws_efs_id = cfn_resources["EFS"]
         aws_efs_mount_target_ip = cfn_resources["EFSMountTargetIP"]
-        anyscale_iam_role_arn = (
-            anyscale_control_plane_role_arn
-            if anyscale_control_plane_role_arn
-            else cfn_resources.get("AnyscaleIAMRole", "")
+        anyscale_iam_role_arn = cfn_resources.get(
+            "AnyscaleIAMRole", anyscale_control_plane_role_arn
         )
         cluster_node_iam_role_arn = cfn_resources["NodeIamRole"]
 
@@ -1030,7 +1028,9 @@ class CloudController(BaseController):
                         self.api_client.get_anyscale_aws_account_api_v2_clouds_anyscale_aws_account_get().result.anyscale_aws_account
                     )
                     # Enable APIs in the given GCP project
-                    setup_utils.enable_project_apis(factory, project_id, self.log)
+                    setup_utils.enable_project_apis(
+                        factory, project_id, self.log, enable_head_node_fault_tolerance
+                    )
                     # We need the Google APIs Service Agent to have security admin permissions on the project
                     # so that we can set IAM policy on Anyscale access service account
                     project_number = setup_utils.get_project_number(