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

anyscale/client/README.md

@@ -234,6 +234,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**get_resource_notification_api_v2_resource_notifications_resource_notification_id_get**](docs/DefaultApi.md#get_resource_notification_api_v2_resource_notifications_resource_notification_id_get) | **GET** /api/v2/resource_notifications/{resource_notification_id} | Get Resource Notification
 *DefaultApi* | [**get_resource_quota_api_v2_resource_quotas_resource_quota_id_get**](docs/DefaultApi.md#get_resource_quota_api_v2_resource_quotas_resource_quota_id_get) | **GET** /api/v2/resource_quotas/{resource_quota_id} | Get Resource Quota
 *DefaultApi* | [**get_root_cause_for_job_api_v2_iknow_get**](docs/DefaultApi.md#get_root_cause_for_job_api_v2_iknow_get) | **GET** /api/v2/iknow/ | Get Root Cause For Job
+*DefaultApi* | [**get_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get**](docs/DefaultApi.md#get_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get) | **GET** /api/v2/decorated_ha_jobs/{production_job_id}/events/{ha_job_event_id}/sensitive_message_presigned_url | Get Sensitive Message Presigned Url
 *DefaultApi* | [**get_serve_logs_download_api_v2_logs_serve_logs_download_cluster_id_get**](docs/DefaultApi.md#get_serve_logs_download_api_v2_logs_serve_logs_download_cluster_id_get) | **GET** /api/v2/logs/serve_logs_download/{cluster_id} | Get Serve Logs Download
 *DefaultApi* | [**get_service_api_v2_services_v2_service_id_get**](docs/DefaultApi.md#get_service_api_v2_services_v2_service_id_get) | **GET** /api/v2/services-v2/{service_id} | Get Service
 *DefaultApi* | [**get_service_event_verbose_message_api_v2_services_v2_events_event_id_verbose_message_get**](docs/DefaultApi.md#get_service_event_verbose_message_api_v2_services_v2_events_event_id_verbose_message_get) | **GET** /api/v2/services-v2/events/{event_id}/verbose_message | Get Service Event Verbose Message
@@ -818,6 +819,7 @@ Class | Method | HTTP request | Description
  - [PauseSchedule](docs/PauseSchedule.md)
  - [PermissionLevel](docs/PermissionLevel.md)
  - [PlanStatus](docs/PlanStatus.md)
+ - [PresignedUrlResponse](docs/PresignedUrlResponse.md)
  - [ProductionJob](docs/ProductionJob.md)
  - [ProductionJobConfig](docs/ProductionJobConfig.md)
  - [ProductionJobEvent](docs/ProductionJobEvent.md)

anyscale/client/openapi_client/__init__.py

@@ -458,6 +458,7 @@ from openapi_client.models.partition_info import PartitionInfo
 from openapi_client.models.pause_schedule import PauseSchedule
 from openapi_client.models.permission_level import PermissionLevel
 from openapi_client.models.plan_status import PlanStatus
+from openapi_client.models.presigned_url_response import PresignedUrlResponse
 from openapi_client.models.production_job import ProductionJob
 from openapi_client.models.production_job_config import ProductionJobConfig
 from openapi_client.models.production_job_event import ProductionJobEvent

anyscale/client/openapi_client/api/default_api.py

@@ -18764,6 +18764,129 @@ class DefaultApi(object):
             _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get(self, production_job_id, ha_job_event_id, **kwargs):  # noqa: E501
+        """Get Sensitive Message Presigned Url  # noqa: E501
+
+        Get the presigned url for the sensitive message details  # 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_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get(production_job_id, ha_job_event_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str production_job_id: (required)
+        :param str ha_job_event_id: (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: PresignedUrlResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        return self.get_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get_with_http_info(production_job_id, ha_job_event_id, **kwargs)  # noqa: E501
+
+    def get_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get_with_http_info(self, production_job_id, ha_job_event_id, **kwargs):  # noqa: E501
+        """Get Sensitive Message Presigned Url  # noqa: E501
+
+        Get the presigned url for the sensitive message details  # 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_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get_with_http_info(production_job_id, ha_job_event_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str production_job_id: (required)
+        :param str ha_job_event_id: (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(PresignedUrlResponse, status_code(int), headers(HTTPHeaderDict))
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        local_var_params = locals()
+
+        all_params = [
+            'production_job_id',
+            'ha_job_event_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_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get" % key
+                )
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+        # verify the required parameter 'production_job_id' is set
+        if self.api_client.client_side_validation and ('production_job_id' not in local_var_params or  # noqa: E501
+                                                        local_var_params['production_job_id'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `production_job_id` when calling `get_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get`")  # noqa: E501
+        # verify the required parameter 'ha_job_event_id' is set
+        if self.api_client.client_side_validation and ('ha_job_event_id' not in local_var_params or  # noqa: E501
+                                                        local_var_params['ha_job_event_id'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `ha_job_event_id` when calling `get_sensitive_message_presigned_url_api_v2_decorated_ha_jobs_production_job_id_events_ha_job_event_id_sensitive_message_presigned_url_get`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'production_job_id' in local_var_params:
+            path_params['production_job_id'] = local_var_params['production_job_id']  # noqa: E501
+        if 'ha_job_event_id' in local_var_params:
+            path_params['ha_job_event_id'] = local_var_params['ha_job_event_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/decorated_ha_jobs/{production_job_id}/events/{ha_job_event_id}/sensitive_message_presigned_url', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='PresignedUrlResponse',  # 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_serve_logs_download_api_v2_logs_serve_logs_download_cluster_id_get(self, cluster_id, **kwargs):  # noqa: E501
         """Get Serve Logs Download  # noqa: E501
 

anyscale/client/openapi_client/models/__init__.py

@@ -444,6 +444,7 @@ from openapi_client.models.partition_info import PartitionInfo
 from openapi_client.models.pause_schedule import PauseSchedule
 from openapi_client.models.permission_level import PermissionLevel
 from openapi_client.models.plan_status import PlanStatus
+from openapi_client.models.presigned_url_response import PresignedUrlResponse
 from openapi_client.models.production_job import ProductionJob
 from openapi_client.models.production_job_config import ProductionJobConfig
 from openapi_client.models.production_job_event import ProductionJobEvent

anyscale/client/openapi_client/models/cloud_data_bucket_file_type.py

@@ -33,8 +33,9 @@ class CloudDataBucketFileType(object):
     AUDIT_LOGS = "audit_logs"
     SYSTEM_STORAGE_WORKSPACE_TRACKING_DEPENDENCIES = "system_storage/workspace_tracking_dependencies"
     SYSTEM_STORAGE_WORKSPACES = "system_storage/workspaces"
+    JOB_MESSAGES = "job_messages"
 
-    allowable_values = [RUNTIME_ENV_PACKAGES, DATASETS, AUDIT_LOGS, SYSTEM_STORAGE_WORKSPACE_TRACKING_DEPENDENCIES, SYSTEM_STORAGE_WORKSPACES]  # noqa: E501
+    allowable_values = [RUNTIME_ENV_PACKAGES, DATASETS, AUDIT_LOGS, SYSTEM_STORAGE_WORKSPACE_TRACKING_DEPENDENCIES, SYSTEM_STORAGE_WORKSPACES, JOB_MESSAGES]  # noqa: E501
 
     """
     Attributes:

anyscale/client/openapi_client/models/presigned_url_response.py

@@ -0,0 +1,123 @@
+# coding: utf-8
+
+"""
+    Managed Ray API
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from openapi_client.configuration import Configuration
+
+
+class PresignedUrlResponse(object):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      openapi_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    openapi_types = {
+        'url': 'str'
+    }
+
+    attribute_map = {
+        'url': 'url'
+    }
+
+    def __init__(self, url=None, local_vars_configuration=None):  # noqa: E501
+        """PresignedUrlResponse - a model defined in OpenAPI"""  # noqa: E501
+        if local_vars_configuration is None:
+            local_vars_configuration = Configuration()
+        self.local_vars_configuration = local_vars_configuration
+
+        self._url = None
+        self.discriminator = None
+
+        self.url = url
+
+    @property
+    def url(self):
+        """Gets the url of this PresignedUrlResponse.  # noqa: E501
+
+        The presigned url  # noqa: E501
+
+        :return: The url of this PresignedUrlResponse.  # noqa: E501
+        :rtype: str
+        """
+        return self._url
+
+    @url.setter
+    def url(self, url):
+        """Sets the url of this PresignedUrlResponse.
+
+        The presigned url  # noqa: E501
+
+        :param url: The url of this PresignedUrlResponse.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and url is None:  # noqa: E501
+            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
+
+        self._url = url
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PresignedUrlResponse):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PresignedUrlResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/client/openapi_client/models/production_job_event.py

@@ -42,7 +42,8 @@ class ProductionJobEvent(object):
         'origin': 'HaJobEventOrigin',
         'ha_job_id': 'str',
         'cluster_id': 'str',
-        'metadata': 'object'
+        'metadata': 'object',
+        'has_additional_sensitive_message': 'bool'
     }
 
     attribute_map = {
@@ -55,10 +56,11 @@ class ProductionJobEvent(object):
         'origin': 'origin',
         'ha_job_id': 'ha_job_id',
         'cluster_id': 'cluster_id',
-        'metadata': 'metadata'
+        'metadata': 'metadata',
+        'has_additional_sensitive_message': 'has_additional_sensitive_message'
     }
 
-    def __init__(self, id=None, created_at=None, event_type=None, error_type=None, level=None, message=None, origin=None, ha_job_id=None, cluster_id=None, metadata=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, id=None, created_at=None, event_type=None, error_type=None, level=None, message=None, origin=None, ha_job_id=None, cluster_id=None, metadata=None, has_additional_sensitive_message=False, local_vars_configuration=None):  # noqa: E501
         """ProductionJobEvent - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -74,6 +76,7 @@ class ProductionJobEvent(object):
         self._ha_job_id = None
         self._cluster_id = None
         self._metadata = None
+        self._has_additional_sensitive_message = None
         self.discriminator = None
 
         self.id = id
@@ -92,6 +95,8 @@ class ProductionJobEvent(object):
             self.cluster_id = cluster_id
         if metadata is not None:
             self.metadata = metadata
+        if has_additional_sensitive_message is not None:
+            self.has_additional_sensitive_message = has_additional_sensitive_message
 
     @property
     def id(self):
@@ -331,6 +336,29 @@ class ProductionJobEvent(object):
 
         self._metadata = metadata
 
+    @property
+    def has_additional_sensitive_message(self):
+        """Gets the has_additional_sensitive_message of this ProductionJobEvent.  # noqa: E501
+
+        Whether we have additional sensitive message details stored that can be subsequently fetched.  # noqa: E501
+
+        :return: The has_additional_sensitive_message of this ProductionJobEvent.  # noqa: E501
+        :rtype: bool
+        """
+        return self._has_additional_sensitive_message
+
+    @has_additional_sensitive_message.setter
+    def has_additional_sensitive_message(self, has_additional_sensitive_message):
+        """Sets the has_additional_sensitive_message of this ProductionJobEvent.
+
+        Whether we have additional sensitive message details stored that can be subsequently fetched.  # noqa: E501
+
+        :param has_additional_sensitive_message: The has_additional_sensitive_message of this ProductionJobEvent.  # noqa: E501
+        :type: bool
+        """
+
+        self._has_additional_sensitive_message = has_additional_sensitive_message
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale/client/openapi_client/models/task_table_row.py

@@ -43,6 +43,7 @@ class TaskTableRow(object):
         'start_time_ns': 'int',
         'end_time_ns': 'int',
         'required_resources': 'str',
+        'runtime_env': 'str',
         'node_id': 'str',
         'worker_id': 'str',
         'worker_pid': 'str',
@@ -62,6 +63,7 @@ class TaskTableRow(object):
         'start_time_ns': 'start_time_ns',
         'end_time_ns': 'end_time_ns',
         'required_resources': 'required_resources',
+        'runtime_env': 'runtime_env',
         'node_id': 'node_id',
         'worker_id': 'worker_id',
         'worker_pid': 'worker_pid',
@@ -70,7 +72,7 @@ class TaskTableRow(object):
         'exception_type': 'exception_type'
     }
 
-    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, exception_type=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, runtime_env=None, node_id=None, worker_id=None, worker_pid=None, parent_task_id=None, ray_session_name=None, exception_type=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()
@@ -86,6 +88,7 @@ class TaskTableRow(object):
         self._start_time_ns = None
         self._end_time_ns = None
         self._required_resources = None
+        self._runtime_env = None
         self._node_id = None
         self._worker_id = None
         self._worker_pid = None
@@ -108,6 +111,8 @@ class TaskTableRow(object):
             self.end_time_ns = end_time_ns
         if required_resources is not None:
             self.required_resources = required_resources
+        if runtime_env is not None:
+            self.runtime_env = runtime_env
         if node_id is not None:
             self.node_id = node_id
         if worker_id is not None:
@@ -342,6 +347,27 @@ class TaskTableRow(object):
 
         self._required_resources = required_resources
 
+    @property
+    def runtime_env(self):
+        """Gets the runtime_env of this TaskTableRow.  # noqa: E501
+
+
+        :return: The runtime_env of this TaskTableRow.  # noqa: E501
+        :rtype: str
+        """
+        return self._runtime_env
+
+    @runtime_env.setter
+    def runtime_env(self, runtime_env):
+        """Sets the runtime_env of this TaskTableRow.
+
+
+        :param runtime_env: The runtime_env of this TaskTableRow.  # noqa: E501
+        :type: str
+        """
+
+        self._runtime_env = runtime_env
+
     @property
     def node_id(self):
         """Gets the node_id of this TaskTableRow.  # noqa: E501

anyscale/cloud/models.py

@@ -109,12 +109,14 @@ class CloudProvider(ModelEnum):
     AWS = "AWS"
     GCP = "GCP"
     AZURE = "AZURE"
+    GENERIC = "GENERIC"
 
     __docstrings__ = {
         UNKNOWN: "Unknown cloud provider.",
         AWS: "Amazon Web Services.",
         GCP: "Google Cloud Platform.",
         AZURE: "Microsoft Azure.",
+        GENERIC: "Generic cloud provider.",
     }  # type: ignore
 
 
@@ -141,7 +143,7 @@ cloud = Cloud(
     id: str = field(metadata={"docstring": "Unique identifier for this Cloud."})
     provider: Union[CloudProvider, str] = field(
         metadata={
-            "docstring": "Cloud provider (AWS, GCP, AZURE) or UNKNOWN if not recognized."
+            "docstring": "Cloud provider (AWS, GCP, AZURE, GENERIC) or UNKNOWN if not recognized."
         },
     )
     compute_stack: Union[ComputeStack, str] = field(
@@ -499,15 +501,15 @@ bucket_name: s3://my-bucket
 file_storage:
 file_storage_id: fs-12345678901234567
 aws_config:
-vpc_id: vpc-12345678901234567
-subnet_ids:
-    - subnet-11111111111111111
-    - subnet-22222222222222222
-security_group_ids:
-    - sg-12345678901234567
-anyscale_iam_role_id: arn:aws:iam::123456789012:role/anyscale-iam-role
-cluster_iam_role_id: arn:aws:iam::123456789012:role/cluster-node-role
-memorydb_cluster_name: my-memorydb-cluster
+  vpc_id: vpc-12345678901234567
+  subnet_ids:
+  - subnet-11111111111111111
+  - subnet-22222222222222222
+  security_group_ids:
+  - sg-12345678901234567
+  anyscale_iam_role_id: arn:aws:iam::123456789012:role/anyscale-iam-role
+  cluster_iam_role_id: arn:aws:iam::123456789012:role/cluster-node-role
+  memorydb_cluster_name: my-memorydb-cluster
 """
 
     cloud_resource_id: Optional[str] = field(
@@ -519,7 +521,9 @@ memorydb_cluster_name: my-memorydb-cluster
     )
     provider: Union[CloudProvider, str] = field(
         default=CloudProvider.UNKNOWN,
-        metadata={"docstring": "The cloud provider type (e.g., AWS, GCP, or AZURE)."},
+        metadata={
+            "docstring": "The cloud provider type (e.g., AWS, GCP, AZURE, or GENERIC)."
+        },
     )
     compute_stack: Union[ComputeStack, str] = field(
         default=ComputeStack.VM,

anyscale/controllers/cloud_controller.py

@@ -1471,18 +1471,26 @@ class CloudController(BaseController):
             d.pop("cloud_deployment_id", None)
         return formatted_cloud_resources
 
-    def get_cloud_resources(self, cloud_id: str) -> List[CloudDeployment]:
-        decorated_cloud_resources = self.get_decorated_cloud_resources(cloud_id)
-
+    def _convert_decorated_cloud_resource_to_cloud_deployment(
+        self, decorated_cloud_resource: DecoratedCloudResource
+    ) -> CloudDeployment:
         # DecoratedCloudResource has extra fields that are not in CloudDeployment.
         allowed_keys = set(CloudDeployment.attribute_map.keys())
         allowed_keys.remove(
             "cloud_deployment_id"
         )  # Remove deprecated cloud_deployment_id field.
+        return CloudDeployment(
+            **{
+                k: v
+                for k, v in decorated_cloud_resource.to_dict().items()
+                if k in allowed_keys
+            }
+        )
+
+    def get_cloud_resources(self, cloud_id: str) -> List[CloudDeployment]:
+        decorated_cloud_resources = self.get_decorated_cloud_resources(cloud_id)
         return [
-            CloudDeployment(
-                **{k: v for k, v in resource.to_dict().items() if k in allowed_keys}
-            )
+            self._convert_decorated_cloud_resource_to_cloud_deployment(resource)
             for resource in decorated_cloud_resources
         ]
 
@@ -1815,24 +1823,25 @@ class CloudController(BaseController):
                 "Please use `anyscale cloud resource create` to add cloud resources."
             )
 
-        # Diff the existing and new specs
-        diff = self._generate_diff(
-            [self._remove_empty_values(r.to_dict()) for r in existing_resources], spec
-        )
-        if not diff:
-            self.log.info("No changes detected.")
-            return
-
         existing_resources_dict = {
             resource.cloud_resource_id: resource for resource in existing_resources
         }
 
+        all_deployments: List[CloudDeployment] = []
         updated_deployments: List[CloudDeployment] = []
         for d in spec:
             try:
                 deployment = CloudDeployment(**d)
             except Exception as e:  # noqa: BLE001
-                raise ClickException(f"Failed to parse cloud resource: {e}")
+                try:
+                    # Try to parse the cloud deployment as a DecoratedCloudResource as well,
+                    # which has extra fields that are not in CloudDeployment.
+                    deployment = self._convert_decorated_cloud_resource_to_cloud_deployment(
+                        DecoratedCloudResource(**d)
+                    )
+                except:  # noqa: E722
+                    # Raise original error from parsing as CloudDeployment.
+                    raise ClickException(f"Failed to parse cloud resource: {e}")
 
             if not deployment.cloud_resource_id:
                 raise ClickException(
@@ -1846,10 +1855,20 @@ class CloudController(BaseController):
                 raise ClickException(
                     "Please use the `anyscale machine-pool` CLI to update machine pools."
                 )
+
+            all_deployments.append(deployment)
             if deployment != existing_resources_dict[deployment.cloud_resource_id]:
                 updated_deployments.append(deployment)
 
-        # Log the diff and confirm.
+        # Diff the existing and new specs and confirm.
+        diff = self._generate_diff(
+            [self._remove_empty_values(r.to_dict()) for r in existing_resources],
+            [self._remove_empty_values(r.to_dict()) for r in all_deployments],
+        )
+        if not diff:
+            self.log.info("No changes detected.")
+            return
+
         self.log.info(f"Detected the following changes:\n{diff}")
 
         confirm("Would you like to proceed with updating this cloud?", yes)

anyscale/version.py

@@ -1 +1 @@
-__version__ = "0.26.53"
+__version__ = "0.26.55"

{anyscale-0.26.53.dist-info → anyscale-0.26.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anyscale
-Version: 0.26.53
+Version: 0.26.55
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License

{anyscale-0.26.53.dist-info → anyscale-0.26.55.dist-info}/RECORD

@@ -28,7 +28,7 @@ anyscale/snapshot.py,sha256=UGJT5C1s_4xmQxjWODK5DFpGxHRBX5jOCdSCqXESH8E,1685
 anyscale/tables.py,sha256=TV4F2uLnwehvbkAfaP7iuLlT2wLIo6ORH2LVdRGXW5g,2840
 anyscale/telemetry.py,sha256=U90C2Vgx48z9PMTI6EbzHFbP3jWnDUutbIfMPBb8-SI,14711
 anyscale/util.py,sha256=7YPUcm1KCWnmwQpgO0iy0Ly3kSKEAdsCI2jmFridKH0,42881
-anyscale/version.py,sha256=KYK87Ie_qnRuNorZIFSLv1eb5nf6iI6UXZPyQ1ZgBmI,24
+anyscale/version.py,sha256=Q91RXdcQACvk1n5hluPOYNf8C1ugDnw4_PqOP-z1lsI,24
 anyscale/workspace_utils.py,sha256=OViE88CnIF5ruVxd3kazQ0Mf2BxqtMq6wx-XQ5A2cp8,1204
 anyscale/_private/anyscale_client/README.md,sha256=kSfI2Jfw5RHZWYtu0di3XtdSCx0d2pSwKMfjmDvw7Tg,3770
 anyscale/_private/anyscale_client/__init__.py,sha256=807Blx3RHQeS8BmKZcsOQQ4dYoKlCnpm6Bdsif2CrHg,337
@@ -106,7 +106,7 @@ anyscale/background/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 anyscale/background/job_runner.py,sha256=LTuv9JOahyv6C9i7DLQAONgQF6--FfYZEmJrKy-sUG8,2687
 anyscale/client/.gitignore,sha256=JZyvYEtT2DCSK9V5Joi6lQofhMik4PXiJRCWsg7SvqI,807
 anyscale/client/.openapi-generator-ignore,sha256=pu2PTide7pJtJ-DFLzDy0cTYQJRlrB-8RRH3zGLeUds,1040
-anyscale/client/README.md,sha256=-MkkZDPYB6pjZLFUVpZrU6bNfJBiQypWC1-NQ0VNoJ8,116558
+anyscale/client/README.md,sha256=drReIpsz3aOF68F7ZdDWi-tdexu2HtkkAFIqHzpZPYs,117082
 anyscale/client/git_push.sh,sha256=EDCZOTTiLxbtPHmiU63qC99rGH67B7dhdPZdNUKivF0,1827
 anyscale/client/requirements.txt,sha256=dkVKYUStC5h_g_87SH7pRdhXCj7ySozAJMGAFEzGgFc,126
 anyscale/client/setup.cfg,sha256=l7bdKSIedeBhhoDtupsBwx1xPrlBf2yYeTH7a8kMga4,28
@@ -114,14 +114,14 @@ anyscale/client/setup.py,sha256=tSxqw1kAL1B9adnrnOarjnQfSbwGmnTr_kg8ZXhlm5A,1109
 anyscale/client/test-requirements.txt,sha256=sTjmDTj5W9fh1ZAeo8UT2EBdeGDBNttj_PHiPBXg1D4,111
 anyscale/client/tox.ini,sha256=M6L3UmvAdvU65LsoAF-Oi7oRjwZlCJZn8I7ofdXn5Ok,156
 anyscale/client/.openapi-generator/VERSION,sha256=J0RzX-4u4jfin1kviKtmncjUePyjHm2kyvmkobOrt_E,5
-anyscale/client/openapi_client/__init__.py,sha256=n_BVjUXeEZ9s5SsMy29_JiEfq11b9HCnckrt7u7GuXQ,52076
+anyscale/client/openapi_client/__init__.py,sha256=KOoXXkErPM_UsuBVuf8Qi3gvLAseOrCukFI6EAx49Sc,52154
 anyscale/client/openapi_client/api_client.py,sha256=d8Un6j2Ny2vlS2qBXPVFj6_ql0k36DFahpWt_28TfCk,25563
 anyscale/client/openapi_client/configuration.py,sha256=Dd5XrlHwv-wxnf0C35PG_-HBQoY3Yaz6hKrmkZz-m0E,12363
 anyscale/client/openapi_client/exceptions.py,sha256=3egwsXQG2j_vARbqgBxUO1xSltAhpfiHTYVP7VXTvU0,3792
 anyscale/client/openapi_client/rest.py,sha256=Ehj37v7GHW6SXV067Hze5HE42ayKaGi6a6ZlkR7u3Lg,12501
 anyscale/client/openapi_client/api/__init__.py,sha256=i8u7BI2xX1GrXTL3hN0pKpYIlnT-D_uDxH2ElOfYG1I,141
-anyscale/client/openapi_client/api/default_api.py,sha256=o_JD8Os3cfTCa1kjBVWbEuas_iw7RDLW4Nvc4Af_RPU,1888525
-anyscale/client/openapi_client/models/__init__.py,sha256=TfxKCPxJlILOTC6TLICbTHEPTnI-EzW1ijB1GuvFBU8,51586
+anyscale/client/openapi_client/api/default_api.py,sha256=ZE4su4Qoq_SDdJt6yFfoCe11NwnugVy_2GltALBXuHY,1895564
+anyscale/client/openapi_client/models/__init__.py,sha256=xveymwyO79TG-b3lfrZWJWV3sp9tDwB0pMYrQpbqmc8,51664
 anyscale/client/openapi_client/models/access_config.py,sha256=b2mA0qtuTA5PFbp6C61Jc_T2zUMaojM1v32IhZo0MfY,3648
 anyscale/client/openapi_client/models/actor_status.py,sha256=6xyX_aIqURj2raBdY9DmBxsdDACFrqqYvElGiM6YG2E,2813
 anyscale/client/openapi_client/models/admin_create_user.py,sha256=9DPr8D0lKgoEZ3Z2kGsAd8L7ocFCiP6woOGLVs8SRb8,7251
@@ -188,7 +188,7 @@ anyscale/client/openapi_client/models/cloud_collaborator_value.py,sha256=67xXXXl
 anyscale/client/openapi_client/models/cloud_collaborators_query.py,sha256=G2pjjNQZ6lvktbjsbl-M9JV2Pwer8LiNPRB-4Xa68qI,3853
 anyscale/client/openapi_client/models/cloud_config.py,sha256=cAn8jOFF9lX1Uy2Z1noDvXZ40s6aqqC9ZrUGU3A-R4M,7507
 anyscale/client/openapi_client/models/cloud_data_bucket_access_mode.py,sha256=RpskZfLKeCtLrM-DKtpW9W6Xo9lKKrTq1HIOFGHUzaQ,2869
-anyscale/client/openapi_client/models/cloud_data_bucket_file_type.py,sha256=3-qbvSLTkchZoQ0T_mzi53qL6aZFDnU0FXFijUMoXxI,3197
+anyscale/client/openapi_client/models/cloud_data_bucket_file_type.py,sha256=Oz3rb36kt479cUWz-7s9lA42i7V9owda_q1QUfm2YJ8,3245
 anyscale/client/openapi_client/models/cloud_data_bucket_presigned_upload_info.py,sha256=oDuxszeCGe8_mMBx84yIE9uQypMRNDvUoN8CR84QaDQ,10068
 anyscale/client/openapi_client/models/cloud_data_bucket_presigned_upload_request.py,sha256=1a5lhtKDaXO46Mrdm6s5HMGFuoj5o_4kkEc7gFTadiI,5268
 anyscale/client/openapi_client/models/cloud_data_bucket_presigned_upload_scheme.py,sha256=5si79TIn1yIdm52omXlmNmyrfHgbCykKPmVXtOIlWXQ,2943
@@ -552,9 +552,10 @@ anyscale/client/openapi_client/models/partition_info.py,sha256=XaAsTffyjTxdCZN3w
 anyscale/client/openapi_client/models/pause_schedule.py,sha256=ru7_OzH7oDw5y2h1o5QNfKW8TXbkF1h-NDwccbUDRd0,3661
 anyscale/client/openapi_client/models/permission_level.py,sha256=fGnBgKrcZkGLYl7RpQQm0_gaGzkTehnJjOnIX8G4jAw,2868
 anyscale/client/openapi_client/models/plan_status.py,sha256=4Gl0dZDiPeP4ar87viHvggfjZwQeqWuMZ78i8bRWV9k,3855
+anyscale/client/openapi_client/models/presigned_url_response.py,sha256=2f2D4FGpCCzaP2fRUBMGiMeG94JKu9OPQ0E3HOGhcQ4,3540
 anyscale/client/openapi_client/models/production_job.py,sha256=fVDrDRonEiH6OVfKl3Xwc1RPaPs0S4EKLqBEzvRIraY,13672
 anyscale/client/openapi_client/models/production_job_config.py,sha256=cW2TxSTUw-dDm3kGWa_tNet7dmJM3VVPJ75pWumosiA,12527
-anyscale/client/openapi_client/models/production_job_event.py,sha256=VljH0Qm09GbEHsb9je3LDcENu9MwD3pRISRJipwrV_s,11432
+anyscale/client/openapi_client/models/production_job_event.py,sha256=TbXg3vxM8FKkctaYg8BQKbjFjiXCbivQa362t_afz54,12829
 anyscale/client/openapi_client/models/production_job_event_scope_filter.py,sha256=12DobzeEMTXhjDgELgR4noOLLodf-7lkwHcER2IED7s,2910
 anyscale/client/openapi_client/models/production_job_state_transition.py,sha256=yj6OVCo_bmJYNSa3t7RquX98KPdyaL3M-qlDcSwPUPU,9692
 anyscale/client/openapi_client/models/productionjob_response.py,sha256=5ft3ywRCus84N9g1FUt85PPe2FVRHyQBFBaPThG0TAA,3561
@@ -666,7 +667,7 @@ anyscale/client/openapi_client/models/task_state.py,sha256=KpRA6VImK3r0qNeaiHh4a
 anyscale/client/openapi_client/models/task_summary.py,sha256=8GIpf9xxmPDV8LJgIsGmSQex2R6CDKx0oJ9_VrL7oPw,9102
 anyscale/client/openapi_client/models/task_table_config.py,sha256=sy9cStVRjjT6KFU_47ibBbSRPf7fXjXe9YW2hwtPFhM,6928
 anyscale/client/openapi_client/models/task_table_response.py,sha256=T8VDBMlOzD1c2hY_Q1JdOF8ZF1MqA5JUMbnRjCKZmcg,5074
-anyscale/client/openapi_client/models/task_table_row.py,sha256=neF3ZAb_A12MsZkm_5tc8QV_PaItUirrVugGLTP27eE,15434
+anyscale/client/openapi_client/models/task_table_row.py,sha256=7fXOimaIWXfTd7SLMsktKVUH6Mg7P4IOshBCL3bm9rs,16151
 anyscale/client/openapi_client/models/task_type.py,sha256=BwGeFgSgxL8aazGdhr58L7KyPHK5EqRrE_rVWuWyWCE,2807
 anyscale/client/openapi_client/models/tasksummary_response.py,sha256=sgOV63ZyYroVvcLbISXz0LU44tW8tLCefcqYB1WFsQ0,3539
 anyscale/client/openapi_client/models/text_query.py,sha256=aMcKF6nRme1J1jYKhvqUIG8VzlcDN72znSFF9kKCc2Y,5107
@@ -747,7 +748,7 @@ anyscale/client/openapi_client/models/write_project.py,sha256=48Jym8VDE57cZXTnVH
 anyscale/client/openapi_client/models/write_support_request.py,sha256=pFOalGDQi9FCDjeJV7ccBpq6iRq1Sub4NBfcUVfCglE,3614
 anyscale/cloud/__init__.py,sha256=cpMh-fHKh-LaK2VKF7uDtUN4gnFXhgWnVrtaIEZPPuU,4508
 anyscale/cloud/commands.py,sha256=2tGXjhL4QinVUE2ayGhUNRnsRPgHdSust1flWBi7QIw,4159
-anyscale/cloud/models.py,sha256=HMGzcQr0xnHTO0FvdOuFvO57RpNRLFiPMNCRv71U5p0,18945
+anyscale/cloud/models.py,sha256=cy2NPzBmyg614QXqDe69Lx627XcMSSTXe20jPFY6C14,19059
 anyscale/cloud/_private/cloud_sdk.py,sha256=5TBGyGSjMI4jLOnSle1WWC6za0psP9xgTGWU2LgwemA,4099
 anyscale/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anyscale/commands/aggregated_instance_usage_commands.py,sha256=TRP1X3hdIWbKg9V20VtazlDXsYAeV--M0DH3-Z5tnj4,2293
@@ -797,7 +798,7 @@ anyscale/connect_utils/start_interactive_session.py,sha256=DbuIK2wuWofmbwJ9MLbsb
 anyscale/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anyscale/controllers/auth_controller.py,sha256=hDY2sPvUP8pvh8PnlDYH5rCHjQes2v3b_KBVjMbrzeE,5127
 anyscale/controllers/base_controller.py,sha256=1QFJoScFUV7YTzpKarhwPOc1SvI-xqX3TZmwxKonW6I,1998
-anyscale/controllers/cloud_controller.py,sha256=WslkGFtv0YE4VIvNiPA-F9kRfqfeQvGgapunBb5OjAU,201395
+anyscale/controllers/cloud_controller.py,sha256=Yjrqmy-gcUXD0mmTyVON0fRc2ok0bReGbNKn2qixsOY,202329
 anyscale/controllers/cloud_file_storage_utils.py,sha256=ifaqClEybTgxhqGWHYoH1vrlbxwjRuO-De_3666R2O4,6987
 anyscale/controllers/cloud_functional_verification_controller.py,sha256=YsEfdHT9hPtxy_3a5Q62UlRXW0iFJ1lVS4IZ_NHoemE,33399
 anyscale/controllers/cluster_controller.py,sha256=Sb5wVjrjpycg5iqmENAVtZ4iy9Kr6kM97_ck-KH85LM,28745
@@ -1091,10 +1092,10 @@ anyscale/workspace/__init__.py,sha256=Innbm5ZhCyADEVBiYSo_vbpKwUNcMzVSAfxIGKOYe6
 anyscale/workspace/commands.py,sha256=GBwZenhxe4LFAOCoW8y8KLSgm2HxMxozJ3njEcx53QE,18555
 anyscale/workspace/models.py,sha256=uiMqoJRQNRgTcOIIsysSrtlHMtnI7paUWS34EN626Cg,10016
 anyscale/workspace/_private/workspace_sdk.py,sha256=2CMeYfJt0UtIFCocDn1ukw1iI5esKHdopLe6duEs-qE,27599
-anyscale-0.26.53.dist-info/licenses/LICENSE,sha256=UOPu974Wzsna6frFv1mu4VrZgNdZT7lbcNPzo5ue3qs,3494
-anyscale-0.26.53.dist-info/licenses/NOTICE,sha256=gHqDhSnUYlRXX-mDOL5FtE7774oiKyV_HO80qM3r9Xo,196
-anyscale-0.26.53.dist-info/METADATA,sha256=l2ZT1nqe0TSKHx4MQ8LIldjR5b6MfYSDj6YaDA4tXNs,3231
-anyscale-0.26.53.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-anyscale-0.26.53.dist-info/entry_points.txt,sha256=NqO18sCZn6zG6J0S38itjcN00s7aE3C3v3k5lMAfCLk,51
-anyscale-0.26.53.dist-info/top_level.txt,sha256=g3NVNS8Oh0NZwbFFgeX696C5MZZkS5dqV2NqcsbDRJE,9
-anyscale-0.26.53.dist-info/RECORD,,
+anyscale-0.26.55.dist-info/licenses/LICENSE,sha256=UOPu974Wzsna6frFv1mu4VrZgNdZT7lbcNPzo5ue3qs,3494
+anyscale-0.26.55.dist-info/licenses/NOTICE,sha256=gHqDhSnUYlRXX-mDOL5FtE7774oiKyV_HO80qM3r9Xo,196
+anyscale-0.26.55.dist-info/METADATA,sha256=Eckny4k8rW5-VXvfnrA2lu9Mx6GXNWP_aPUMFeMksLo,3231
+anyscale-0.26.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+anyscale-0.26.55.dist-info/entry_points.txt,sha256=NqO18sCZn6zG6J0S38itjcN00s7aE3C3v3k5lMAfCLk,51
+anyscale-0.26.55.dist-info/top_level.txt,sha256=g3NVNS8Oh0NZwbFFgeX696C5MZZkS5dqV2NqcsbDRJE,9
+anyscale-0.26.55.dist-info/RECORD,,