anyscale 0.26.14__py3-none-any.whl → 0.26.16__py3-none-any.whl

anyscale/client/openapi_client/models/task_table_row.py

@@ -42,12 +42,12 @@ class TaskTableRow(object):
         'error_message': 'str',
         'start_time_ns': 'int',
         'end_time_ns': 'int',
-        'required_resources': 'dict(str, float)',
+        'required_resources': 'str',
         'node_id': 'str',
         'worker_id': 'str',
         'worker_pid': 'str',
         'parent_task_id': 'str',
-        'session_name': 'str'
+        'ray_session_name': 'str'
     }
 
     attribute_map = {
@@ -65,10 +65,10 @@ class TaskTableRow(object):
         'worker_id': 'worker_id',
         'worker_pid': 'worker_pid',
         'parent_task_id': 'parent_task_id',
-        'session_name': 'session_name'
+        'ray_session_name': 'ray_session_name'
     }
 
-    def __init__(self, id=None, attempt_number=None, job_id=None, function_name=None, task_type=None, current_state=None, error_message=None, start_time_ns=None, end_time_ns=None, required_resources=None, node_id=None, worker_id=None, worker_pid=None, parent_task_id=None, session_name=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, id=None, attempt_number=None, job_id=None, function_name=None, task_type=None, current_state=None, error_message=None, start_time_ns=None, end_time_ns=None, required_resources=None, node_id=None, worker_id=None, worker_pid=None, parent_task_id=None, ray_session_name=None, local_vars_configuration=None):  # noqa: E501
         """TaskTableRow - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -88,7 +88,7 @@ class TaskTableRow(object):
         self._worker_id = None
         self._worker_pid = None
         self._parent_task_id = None
-        self._session_name = None
+        self._ray_session_name = None
         self.discriminator = None
 
         self.id = id
@@ -113,7 +113,7 @@ class TaskTableRow(object):
             self.worker_pid = worker_pid
         if parent_task_id is not None:
             self.parent_task_id = parent_task_id
-        self.session_name = session_name
+        self.ray_session_name = ray_session_name
 
     @property
     def id(self):
@@ -322,7 +322,7 @@ class TaskTableRow(object):
 
 
         :return: The required_resources of this TaskTableRow.  # noqa: E501
-        :rtype: dict(str, float)
+        :rtype: str
         """
         return self._required_resources
 
@@ -332,7 +332,7 @@ class TaskTableRow(object):
 
 
         :param required_resources: The required_resources of this TaskTableRow.  # noqa: E501
-        :type: dict(str, float)
+        :type: str
         """
 
         self._required_resources = required_resources
@@ -422,27 +422,27 @@ class TaskTableRow(object):
         self._parent_task_id = parent_task_id
 
     @property
-    def session_name(self):
-        """Gets the session_name of this TaskTableRow.  # noqa: E501
+    def ray_session_name(self):
+        """Gets the ray_session_name of this TaskTableRow.  # noqa: E501
 
 
-        :return: The session_name of this TaskTableRow.  # noqa: E501
+        :return: The ray_session_name of this TaskTableRow.  # noqa: E501
         :rtype: str
         """
-        return self._session_name
+        return self._ray_session_name
 
-    @session_name.setter
-    def session_name(self, session_name):
-        """Sets the session_name of this TaskTableRow.
+    @ray_session_name.setter
+    def ray_session_name(self, ray_session_name):
+        """Sets the ray_session_name of this TaskTableRow.
 
 
-        :param session_name: The session_name of this TaskTableRow.  # noqa: E501
+        :param ray_session_name: The ray_session_name of this TaskTableRow.  # noqa: E501
         :type: str
         """
-        if self.local_vars_configuration.client_side_validation and session_name is None:  # noqa: E501
-            raise ValueError("Invalid value for `session_name`, must not be `None`")  # noqa: E501
+        if self.local_vars_configuration.client_side_validation and ray_session_name is None:  # noqa: E501
+            raise ValueError("Invalid value for `ray_session_name`, must not be `None`")  # noqa: E501
 
-        self._session_name = session_name
+        self._ray_session_name = ray_session_name
 
     def to_dict(self):
         """Returns the model properties as a dict"""

anyscale/cloud/__init__.py

@@ -38,14 +38,14 @@ class CloudSDK:
     )
     def add_collaborators(
         self, cloud: str, collaborators: List[CreateCloudCollaborator],
-    ) -> str:
+    ) -> None:
         """
         Batch add collaborators to a cloud.
 
         :param cloud: The cloud to add users to.
         :param collaborators: The list of collaborators to add to the cloud.
         """
-        return self._private_sdk.add_collaborators(cloud, collaborators)
+        self._private_sdk.add_collaborators(cloud, collaborators)
 
     @sdk_docs(
         doc_py_example=_GET_EXAMPLE, arg_docstrings=_GET_ARG_DOCSTRINGS,

anyscale/cloud/_private/cloud_sdk.py

@@ -16,10 +16,10 @@ from anyscale.cloud.models import (
 class PrivateCloudSDK(BaseSDK):
     def add_collaborators(
         self, cloud: str, collaborators: List[CreateCloudCollaborator]
-    ) -> str:
+    ) -> None:
         cloud_id = self.client.get_cloud_id(cloud_name=cloud, compute_config_id=None)
 
-        return self.client.add_cloud_collaborators(
+        self.client.add_cloud_collaborators(
             cloud_id=cloud_id,
             collaborators=[
                 CreateCloudCollaboratorModel(

anyscale/cloud/commands.py

@@ -39,7 +39,10 @@ _ADD_COLLABORATORS_ARG_DOCSTRINGS = {
     arg_docstrings=_ADD_COLLABORATORS_ARG_DOCSTRINGS,
 )
 def add_collaborators(
-    cloud: str, collaborators: List[CreateCloudCollaborator], *, _sdk: PrivateCloudSDK,
+    cloud: str,
+    collaborators: List[CreateCloudCollaborator],
+    *,
+    _private_sdk: Optional[PrivateCloudSDK] = None,
 ) -> str:
     """
     Batch add collaborators to a cloud.
@@ -47,7 +50,7 @@ def add_collaborators(
     :param cloud: The cloud to add users to.
     :param collaborators: The list of collaborators to add to the cloud.
     """
-    return _sdk.add_collaborators(cloud, collaborators)
+    return _private_sdk.add_collaborators(cloud, collaborators)  # type: ignore
 
 
 _GET_EXAMPLE = """
@@ -76,7 +79,7 @@ def get(
     id: Optional[str] = None,  # noqa: A002
     name: Optional[str] = None,
     *,
-    _sdk: PrivateCloudSDK,
+    _private_sdk: Optional[PrivateCloudSDK] = None,
 ) -> Optional[Cloud]:
     """
     Get the cloud model for the provided cloud ID or name.
@@ -87,7 +90,7 @@ def get(
     :param name: The name of the cloud to retrieve.
     :return: A `Cloud` object if found, otherwise `None`.
     """
-    return _sdk.get(id=id, name=name)
+    return _private_sdk.get(id=id, name=name)  # type: ignore
 
 
 _GET_DEFAULT_EXAMPLE = """
@@ -104,10 +107,10 @@ default_cloud = anyscale.cloud.get_default()
     doc_py_example=_GET_DEFAULT_EXAMPLE,
     arg_docstrings={},
 )
-def get_default(*, _sdk: PrivateCloudSDK,) -> Optional[Cloud]:
+def get_default(*, _private_sdk: Optional[PrivateCloudSDK] = None) -> Optional[Cloud]:
     """
     Get the user's default cloud.
 
     :return: The default `Cloud` object if it exists, otherwise `None`.
     """
-    return _sdk.get_default()
+    return _private_sdk.get_default()  # type: ignore

anyscale/cloud_resource.py

@@ -71,7 +71,7 @@ def compare_dicts_diff(d1: Dict[Any, Any], d2: Dict[Any, Any]) -> str:
     )
 
 
-AWS_RESOURCE_DICT: Dict[str, CloudAnalyticsEventCloudResource] = {
+AWS_RESOURCE_DICT: Dict[str, str] = {
     "VPC": CloudAnalyticsEventCloudResource.AWS_VPC,
     "Subnet": CloudAnalyticsEventCloudResource.AWS_SUBNET,
     "Security group": CloudAnalyticsEventCloudResource.AWS_SECURITY_GROUP,

anyscale/cloud_utils.py

@@ -11,6 +11,7 @@ from anyscale.client.openapi_client.models import (
     CreateCloudResource,
     CreateCloudResourceGCP,
 )
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.sdk.anyscale_client.models.cloud import Cloud
 
 
@@ -99,6 +100,7 @@ def get_cloud_resource_by_cloud_id(
 ) -> Union[CreateCloudResource, CreateCloudResourceGCP]:
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
+    assert anyscale_api_client is not None
     cloud_resource = None
     if cloud_provider == "AWS":
         cloud = anyscale_api_client.get_cloud_with_cloud_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get(
@@ -114,7 +116,8 @@ def get_cloud_resource_by_cloud_id(
 
 
 def get_last_used_cloud(
-    project_id: Optional[str], anyscale_api_client: Optional[DefaultApi] = None
+    project_id: Optional[str],
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> str:
     """Return the name of the cloud last used in the project.
 
@@ -131,12 +134,12 @@ def get_last_used_cloud(
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
     if project_id:
-        cloud_id = anyscale_api_client.get_project(project_id).result.last_used_cloud_id
+        cloud_id = anyscale_api_client.get_project(project_id).result.last_used_cloud_id  # type: ignore
     else:
         cloud_id = None
     if cloud_id:
         try:
-            cloud = anyscale_api_client.get_cloud(cloud_id).result
+            cloud = anyscale_api_client.get_cloud(cloud_id).result  # type: ignore
         except Exception:  # noqa: BLE001
             raise click.ClickException(
                 f"Failed to fetch Cloud with id: {cloud_id}. Please specify `cloud` in the command."
@@ -161,7 +164,9 @@ def get_last_used_cloud(
     return cast(str, cloud_name)
 
 
-def get_all_clouds(anyscale_api_client: Optional[DefaultApi] = None) -> List[Cloud]:
+def get_all_clouds(
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
+) -> List[Cloud]:
     """Fetches all Clouds the user has access to.
     Returns:
         List of all Clouds the user has access to.
@@ -171,12 +176,12 @@ def get_all_clouds(anyscale_api_client: Optional[DefaultApi] = None) -> List[Clo
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
 
-    cloud_list_response = anyscale_api_client.search_clouds({"paging": {"count": 50}})
+    cloud_list_response = anyscale_api_client.search_clouds({"paging": {"count": 50}})  # type: ignore
     all_clouds = cloud_list_response.results
     next_paging_token = cloud_list_response.metadata.next_paging_token
 
     while next_paging_token:
-        cloud_list_response = anyscale_api_client.search_clouds(
+        cloud_list_response = anyscale_api_client.search_clouds(  # type: ignore
             {"paging": {"count": 50, "paging_token": next_paging_token}}
         )
         next_paging_token = cloud_list_response.metadata.next_paging_token

anyscale/cluster_compute.py

@@ -1,5 +1,5 @@
 import re
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Union
 
 from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
@@ -10,6 +10,7 @@ from anyscale.sdk.anyscale_client import (
     ComputeTemplateConfig,
     CreateComputeTemplate,
 )
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.sdk.anyscale_client.models.cluster_compute_config import (
     ClusterComputeConfig,
 )
@@ -27,7 +28,7 @@ def get_default_cluster_compute(
     cloud_name: Optional[str],
     project_id: Optional[str],
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ComputeTemplate:
     if api_client is None:
         api_client = get_auth_api_client().api_client
@@ -42,7 +43,7 @@ def get_default_cluster_compute(
             cloud_name = get_last_used_cloud(project_id, anyscale_api_client)
 
     cloud_id, _ = get_cloud_id_and_name(api_client, cloud_name=cloud_name)
-    config_object = anyscale_api_client.get_default_compute_config(cloud_id).result
+    config_object = anyscale_api_client.get_default_compute_config(cloud_id).result  # type: ignore
     compute_template = register_compute_template(config_object, api_client=api_client)
     return compute_template
 
@@ -134,7 +135,7 @@ def register_compute_template(
 
 def get_selected_cloud_id_or_default(
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
     cluster_compute_id: Optional[str] = None,
     cluster_compute_config: Optional[ClusterComputeConfig] = None,
     cloud_id: Optional[str] = None,
@@ -155,7 +156,7 @@ def get_selected_cloud_id_or_default(
             api_client=api_client, cloud_id=cloud_id, cloud_name=cloud_name,
         )
     elif cluster_compute_id:
-        parent_cloud_id = anyscale_api_client.get_cluster_compute(
+        parent_cloud_id = anyscale_api_client.get_cluster_compute(  # type: ignore
             cluster_compute_id
         ).result.config.cloud_id
     elif cluster_compute_config:

anyscale/cluster_env.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Optional, Union
 
 import click
 
@@ -6,6 +6,7 @@ from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.api.default_api import DefaultApi
 from anyscale.sdk.anyscale_client import ClusterEnvironmentBuild
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.shared_anyscale_utils.utils.byod import is_byod_id
 from anyscale.util import get_endpoint, get_ray_and_py_version_for_default_cluster_env
 
@@ -15,7 +16,7 @@ log = BlockLogger()
 
 def get_default_cluster_env_build(
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     ray_version, py_version = get_ray_and_py_version_for_default_cluster_env()
 
@@ -38,7 +39,8 @@ def get_default_cluster_env_build(
 
 
 def get_build_from_cluster_env_identifier(
-    cluster_env_identifier: str, anyscale_api_client: Optional[DefaultApi] = None,
+    cluster_env_identifier: str,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     """
     Get a build id from a cluster environment identifier of form `my_cluster_env:1` or
@@ -103,7 +105,8 @@ def get_build_from_cluster_env_identifier(
 
 
 def get_cluster_env_from_name(
-    cluster_env_name: str, anyscale_api_client: Optional[DefaultApi] = None,
+    cluster_env_name: str,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     """
     Get id of the cluster env (not build) given the name.
@@ -111,6 +114,7 @@ def get_cluster_env_from_name(
 
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
+    assert anyscale_api_client is not None
     cluster_envs = anyscale_api_client.search_cluster_environments(
         {"name": {"equals": cluster_env_name}, "paging": {"count": 1}}
     ).results
@@ -123,7 +127,7 @@ def get_cluster_env_from_name(
 
 def list_builds(
     cluster_env_id: str,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
     max_items: Optional[int] = None,
 ) -> List[ClusterEnvironmentBuild]:
     """
@@ -161,6 +165,7 @@ def validate_successful_build(
 
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
+    assert anyscale_api_client is not None
     build = anyscale_api_client.get_cluster_environment_build(build_id).result
     if build.status != "succeeded":
         cluster_env = anyscale_api_client.get_cluster_environment(

anyscale/commands/login_commands.py

@@ -32,7 +32,10 @@ def get_unauthenticated_openapi_client():
     default=7,
     help="Expire the token after this many days.",
 )
-def anyscale_login(no_expire: bool, expire_in_days: int) -> None:
+@click.option(
+    "--no-browser", is_flag=True, default=False, help="Do not open the browser.",
+)
+def anyscale_login(no_expire: bool, expire_in_days: int, no_browser: bool) -> None:
     """Log in to Anyscale using a URL
     This is the only unauthenticated API usage in the CLI."""
     if expire_in_days < 0 or no_expire:
@@ -52,8 +55,26 @@ def anyscale_login(no_expire: bool, expire_in_days: int) -> None:
 
     # Open the URL in the browser. This will work on most platforms.
     # OK to suppress any uncaught exceptions, because the URL will be printed out anyway.
-    with contextlib.suppress(Exception):
-        webbrowser.open(r.url)
+    if not no_browser:
+        with contextlib.suppress(Exception):
+            try:
+                # Only attempt to open browser if it's not a CLI browser (which doesn't support JavaScript)
+                if webbrowser.get().basename not in [
+                    "www-browser",
+                    "elinks",
+                    "links",
+                    "lynx",
+                    "w3m",
+                ]:
+                    webbrowser.open_new_tab(r.url)
+                else:
+                    log.info(
+                        "Could not open a JavaScript-capable web browser. Open the above URL in your browser manually."
+                    )
+            except webbrowser.Error:
+                log.info(
+                    "Could not open a web browser. Open the above URL in your browser manually."
+                )
 
     # give user 3 minutes to log in (3 seconds per attempt)
     for _i in range(60):

anyscale/commands/schedule_commands.py

@@ -11,7 +11,7 @@ from anyscale.cli_logger import BlockLogger
 from anyscale.commands import command_examples
 from anyscale.commands.util import AnyscaleCommand, LegacyAnyscaleCommand
 from anyscale.controllers.schedule_controller import ScheduleController
-from anyscale.schedule.models import ScheduleConfig, ScheduleState
+from anyscale.schedule.models import JobConfig, ScheduleConfig, ScheduleState
 
 
 log = BlockLogger()  # CLI Logger
@@ -85,6 +85,7 @@ def apply(config_file: str, name: Optional[str],) -> None:
     config = ScheduleConfig.from_yaml(config_file)
 
     if name is not None:
+        assert isinstance(config.job_config, JobConfig)
         config = config.options(job_config=config.job_config.options(name=name),)
 
     log.info(f"Applying schedule with config {config}.")

anyscale/compute_config/_private/compute_config_sdk.py

@@ -154,7 +154,7 @@ class PrivateComputeConfigSDK(BaseSDK):
         # `worker_nodes=None` uses the default serverless config, so this only happens if `worker_nodes`
         # is explicitly set to an empty list.
         # Returns the default cloud if user-provided cloud is not specified (`None`).
-        cloud_id = self.client.get_cloud_id(cloud_name=compute_config.cloud)
+        cloud_id = self.client.get_cloud_id(cloud_name=compute_config.cloud)  # type: ignore
         cloud = self.client.get_cloud(cloud_id=cloud_id)
         if cloud is None:
             raise RuntimeError(

anyscale/compute_config/commands.py

@@ -45,13 +45,16 @@ _CREATE_ARG_DOCSTRINGS = {
     arg_docstrings=_CREATE_ARG_DOCSTRINGS,
 )
 def create(
-    config: ComputeConfig, *, name: Optional[str], _sdk: PrivateComputeConfigSDK,
+    config: ComputeConfig,
+    *,
+    name: Optional[str],
+    _private_sdk: Optional[PrivateComputeConfigSDK] = None,
 ) -> str:
     """Create a new version of a compute config.
 
     Returns the full name of the registered compute config, including the version.
     """
-    full_name, _ = _sdk.create_compute_config(config, name=name)
+    full_name, _ = _private_sdk.create_compute_config(config, name=name)  # type: ignore
     return full_name
 
 
@@ -74,11 +77,11 @@ _GET_ARG_DOCSTRINGS = {
     arg_docstrings=_GET_ARG_DOCSTRINGS,
 )
 def get(
-    name: str,
+    name: Optional[str],
     *,
     include_archived: bool = False,
     _id: Optional[str] = None,
-    _sdk: PrivateComputeConfigSDK,
+    _private_sdk: Optional[PrivateComputeConfigSDK] = None,
 ) -> ComputeConfigVersion:
     """Get the compute config with the specified name.
 
@@ -88,7 +91,7 @@ def get(
     # NOTE(edoakes): I want to avoid exposing fetching by ID in the public API,
     # but it's needed for parity with the existing CLI. Therefore I am adding it
     # as a hidden private API that can be used like: (`name="", _id=id`).
-    return _sdk.get_compute_config(
+    return _private_sdk.get_compute_config(  # type: ignore
         name=name or None, id=_id, include_archived=include_archived
     )
 
@@ -108,7 +111,12 @@ _ARCHIVE_ARG_DOCSTRINGS = {"name": "Name of the compute config."}
     doc_py_example=_ARCHIVE_EXAMPLE,
     arg_docstrings=_ARCHIVE_ARG_DOCSTRINGS,
 )
-def archive(name: str, *, _id: Optional[str] = None, _sdk: PrivateComputeConfigSDK):
+def archive(
+    name: Optional[str],
+    *,
+    _id: Optional[str] = None,
+    _private_sdk: Optional[PrivateComputeConfigSDK] = None,
+):
     """Archive a compute config and all of its versions.
 
     The name can contain an optional version, e.g., 'name:version'.
@@ -119,4 +127,4 @@ def archive(name: str, *, _id: Optional[str] = None, _sdk: PrivateComputeConfigS
     # NOTE(edoakes): I want to avoid exposing fetching by ID in the public API,
     # but it's needed for parity with the existing CLI. Therefore I am adding it
     # as a hidden private API that can be used like: (`name="", _id=id`).
-    return _sdk.archive_compute_config(name=name or None, id=_id)
+    return _private_sdk.archive_compute_config(name=name or None, id=_id)  # type: ignore

anyscale/connect_utils/prepare_cluster.py

@@ -275,11 +275,21 @@ class PrepareClusterBlock:
             # Try to generate an auto-incrementing cluster name from the first 100 clusters.
             # If there are more than 40 clusters with, we will generate a random name.
             # If the name is already taken, we will re-try with a different random name.
-            results = list_entities(
-                self.anyscale_api_client.list_sessions, project_id, max=100
-            )
+            used_names: List[str] = []
+            has_more = True
+            paging_token = None
+            while has_more:
+                resp = self.anyscale_api_client.search_clusters(
+                    clusters_query={
+                        "project_id": project_id,
+                        "paging": {"count": 50, "paging_token": paging_token},
+                    }
+                )
+                used_names.extend([c.name for c in resp.results])
+                paging_token = resp.metadata.next_paging_token
+                has_more = paging_token is not None
+
             self.log.debug("-> Starting a new cluster")
-            used_names = [s.name for s in results]
             for i in range(MAX_CLUSTERS):
                 name = f"cluster-{i}"
                 if name not in used_names:

anyscale/controllers/cloud_controller.py

@@ -1411,7 +1411,7 @@ class CloudController(BaseController):
         )
         if enable_log_ingestion is not None:
             self._update_customer_aggregated_logs_config(
-                cloud_id=cloud_id, is_enabled=enable_log_ingestion,
+                cloud_id=cloud_id, is_enabled=enable_log_ingestion,  # type: ignore
             )
             self.log.info(
                 f"Successfully updated log ingestion configuration for cloud, "
@@ -1552,7 +1552,7 @@ class CloudController(BaseController):
                 cloud_resource=cloud_resource,
                 boto3_session=boto3_session,
                 region=cloud.region,
-                cloud_id=cloud_id,
+                cloud_id=cloud_id,  # type: ignore
                 is_bring_your_own_resource=cloud.is_bring_your_own_resource,
                 is_private_network=cloud.is_private_cloud
                 if cloud.is_private_cloud
@@ -1575,7 +1575,7 @@ class CloudController(BaseController):
                 project_id=project_id,
                 host_project_id=host_project_id,
                 region=cloud.region,
-                cloud_id=cloud_id,
+                cloud_id=cloud_id,  # type: ignore
                 yes=False,
                 strict=strict,
                 is_private_service_cloud=cloud.is_private_service_cloud,
@@ -3243,7 +3243,7 @@ class CloudController(BaseController):
         *,
         cloud_resource: Any,
         edit_details: Dict[str, Optional[str]],
-        gcp_filestore_config: GCPFileStoreConfig,
+        gcp_filestore_config: Optional[GCPFileStoreConfig],
         gcp_filestore_instance_id: Optional[str],
         gcp_filestore_location: Optional[str],
         gcp_utils,
@@ -3276,7 +3276,7 @@ class CloudController(BaseController):
         cloud_id: str,
         cloud_resource: Any,
         edit_details: Dict[str, Optional[str]],
-        gcp_filestore_config: GCPFileStoreConfig,
+        gcp_filestore_config: Optional[GCPFileStoreConfig],
         gcp_utils,
     ):
         rollback_cmd = self._generate_rollback_command(
@@ -3539,8 +3539,8 @@ class CloudController(BaseController):
                     )
                 try:
                     self._edit_aws_cloud(
-                        cloud_id=cloud_id,
-                        cloud_name=cloud_name,
+                        cloud_id=cloud_id,  # type: ignore
+                        cloud_name=cloud_name,  # type: ignore
                         cloud=cloud,
                         cloud_resource=cloud_resource,
                         aws_s3_id=aws_s3_id,
@@ -3593,8 +3593,8 @@ class CloudController(BaseController):
                     )
                 try:
                     self._edit_gcp_cloud(
-                        cloud_id=cloud_id,
-                        cloud_name=cloud_name,
+                        cloud_id=cloud_id,  # type: ignore
+                        cloud_name=cloud_name,  # type: ignore
                         cloud=cloud,
                         cloud_resource=cloud_resource,
                         gcp_filestore_instance_id=gcp_filestore_instance_id,

anyscale/controllers/cloud_functional_verification_controller.py

@@ -820,11 +820,13 @@ class CloudFunctionalVerificationController(BaseController):
             )
 
         confirmation_message.append(
-            "The instances will be terminated after verification. Do you want to continue?"
+            "The instances will be terminated after verification."
         )
 
+        self.log.info("\n".join(confirmation_message))
+
         confirm(
-            "\n".join(confirmation_message), yes,
+            "Continue?", yes,
         )
 
         verification_results: List[bool] = []

anyscale/controllers/cluster_controller.py

@@ -522,6 +522,7 @@ class ClusterController(BaseController):
                 api_client=self.api_client,
                 anyscale_api_client=self.anyscale_api_client,
             )
+            assert project_id is not None
             cluster_name = self._get_or_generate_cluster_name(project_id, cluster_name)
         return project_id, cluster_name
 

anyscale/controllers/job_controller.py

@@ -80,7 +80,7 @@ class JobController(BaseController):
         log: Optional[LogsLogger] = None,
         initialize_auth_api_client: bool = True,
         raise_structured_exception: bool = False,
-        auth_token: str = None,
+        auth_token: Optional[str] = None,
     ):
         if log is None:
             log = LogsLogger()

anyscale/controllers/service_controller.py

@@ -342,7 +342,7 @@ class ServiceController(BaseController):
     def _overwrite_runtime_env_in_v2_ray_serve_config(self, config: ServiceConfig):
         """Modifies config in place."""
         ray_serve_config = config.ray_serve_config
-        if "applications" in ray_serve_config:
+        if ray_serve_config is not None and "applications" in ray_serve_config:
             for ray_serve_app_config in ray_serve_config["applications"]:
                 ray_serve_app_config["runtime_env"] = override_runtime_env_config(
                     runtime_env=ray_serve_app_config.get("runtime_env"),
@@ -354,6 +354,7 @@ class ServiceController(BaseController):
                 )
 
         else:
+            assert ray_serve_config is not None
             ray_serve_config["runtime_env"] = override_runtime_env_config(
                 runtime_env=ray_serve_config.get("runtime_env"),
                 anyscale_api_client=self.sdk,