anyscale 0.26.61__py3-none-any.whl → 0.26.63__py3-none-any.whl

anyscale/client/openapi_client/models/revokeapikeysresponse_response.py

@@ -0,0 +1,121 @@
+# 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 RevokeapikeysresponseResponse(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 = {
+        'result': 'RevokeApiKeysResponse'
+    }
+
+    attribute_map = {
+        'result': 'result'
+    }
+
+    def __init__(self, result=None, local_vars_configuration=None):  # noqa: E501
+        """RevokeapikeysresponseResponse - 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._result = None
+        self.discriminator = None
+
+        self.result = result
+
+    @property
+    def result(self):
+        """Gets the result of this RevokeapikeysresponseResponse.  # noqa: E501
+
+
+        :return: The result of this RevokeapikeysresponseResponse.  # noqa: E501
+        :rtype: RevokeApiKeysResponse
+        """
+        return self._result
+
+    @result.setter
+    def result(self, result):
+        """Sets the result of this RevokeapikeysresponseResponse.
+
+
+        :param result: The result of this RevokeapikeysresponseResponse.  # noqa: E501
+        :type: RevokeApiKeysResponse
+        """
+        if self.local_vars_configuration.client_side_validation and result is None:  # noqa: E501
+            raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
+
+        self._result = result
+
+    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, RevokeapikeysresponseResponse):
+            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, RevokeapikeysresponseResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/client/openapi_client/models/{cloud_hosting_type.py → task_summary_config.py}

@@ -18,21 +18,13 @@ import six
 from openapi_client.configuration import Configuration
 
 
-class CloudHostingType(object):
+class TaskSummaryConfig(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
     Do not edit the class manually.
     """
 
-    """
-    allowed enum values
-    """
-    ANYSCALE_HOSTED = "anyscale_hosted"
-    CUSTOMER_HOSTED = "customer_hosted"
-
-    allowable_values = [ANYSCALE_HOSTED, CUSTOMER_HOSTED]  # noqa: E501
-
     """
     Attributes:
       openapi_types (dict): The key is attribute name
@@ -41,18 +33,46 @@ class CloudHostingType(object):
                             and the value is json key in definition.
     """
     openapi_types = {
+        'data_operator_id': 'str'
     }
 
     attribute_map = {
+        'data_operator_id': 'data_operator_id'
     }
 
-    def __init__(self, local_vars_configuration=None):  # noqa: E501
-        """CloudHostingType - a model defined in OpenAPI"""  # noqa: E501
+    def __init__(self, data_operator_id=None, local_vars_configuration=None):  # noqa: E501
+        """TaskSummaryConfig - 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._data_operator_id = None
         self.discriminator = None
 
+        if data_operator_id is not None:
+            self.data_operator_id = data_operator_id
+
+    @property
+    def data_operator_id(self):
+        """Gets the data_operator_id of this TaskSummaryConfig.  # noqa: E501
+
+
+        :return: The data_operator_id of this TaskSummaryConfig.  # noqa: E501
+        :rtype: str
+        """
+        return self._data_operator_id
+
+    @data_operator_id.setter
+    def data_operator_id(self, data_operator_id):
+        """Sets the data_operator_id of this TaskSummaryConfig.
+
+
+        :param data_operator_id: The data_operator_id of this TaskSummaryConfig.  # noqa: E501
+        :type: str
+        """
+
+        self._data_operator_id = data_operator_id
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -87,14 +107,14 @@ class CloudHostingType(object):
 
     def __eq__(self, other):
         """Returns true if both objects are equal"""
-        if not isinstance(other, CloudHostingType):
+        if not isinstance(other, TaskSummaryConfig):
             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, CloudHostingType):
+        if not isinstance(other, TaskSummaryConfig):
             return True
 
         return self.to_dict() != other.to_dict()

anyscale/client/openapi_client/models/task_table_config.py

@@ -39,7 +39,8 @@ class TaskTableConfig(object):
         'text': 'str',
         'job_id': 'str',
         'exception_type': 'str',
-        'attempts': 'TaskAttempts'
+        'attempts': 'TaskAttempts',
+        'data_operator_id': 'str'
     }
 
     attribute_map = {
@@ -49,10 +50,11 @@ class TaskTableConfig(object):
         'text': 'text',
         'job_id': 'job_id',
         'exception_type': 'exception_type',
-        'attempts': 'attempts'
+        'attempts': 'attempts',
+        'data_operator_id': 'data_operator_id'
     }
 
-    def __init__(self, task_id=None, function_name=None, current_state=None, text=None, job_id=None, exception_type=None, attempts=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, task_id=None, function_name=None, current_state=None, text=None, job_id=None, exception_type=None, attempts=None, data_operator_id=None, local_vars_configuration=None):  # noqa: E501
         """TaskTableConfig - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -65,6 +67,7 @@ class TaskTableConfig(object):
         self._job_id = None
         self._exception_type = None
         self._attempts = None
+        self._data_operator_id = None
         self.discriminator = None
 
         if task_id is not None:
@@ -81,6 +84,8 @@ class TaskTableConfig(object):
             self.exception_type = exception_type
         if attempts is not None:
             self.attempts = attempts
+        if data_operator_id is not None:
+            self.data_operator_id = data_operator_id
 
     @property
     def task_id(self):
@@ -229,6 +234,27 @@ class TaskTableConfig(object):
 
         self._attempts = attempts
 
+    @property
+    def data_operator_id(self):
+        """Gets the data_operator_id of this TaskTableConfig.  # noqa: E501
+
+
+        :return: The data_operator_id of this TaskTableConfig.  # noqa: E501
+        :rtype: str
+        """
+        return self._data_operator_id
+
+    @data_operator_id.setter
+    def data_operator_id(self, data_operator_id):
+        """Sets the data_operator_id of this TaskTableConfig.
+
+
+        :param data_operator_id: The data_operator_id of this TaskTableConfig.  # noqa: E501
+        :type: str
+        """
+
+        self._data_operator_id = data_operator_id
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale/client/openapi_client/models/task_table_row.py

@@ -51,7 +51,8 @@ class TaskTableRow(object):
         'worker_pid': 'str',
         'parent_task_id': 'str',
         'ray_session_name': 'str',
-        'exception_type': 'str'
+        'exception_type': 'str',
+        'data_operator_id': 'str'
     }
 
     attribute_map = {
@@ -73,10 +74,11 @@ class TaskTableRow(object):
         'worker_pid': 'worker_pid',
         'parent_task_id': 'parent_task_id',
         'ray_session_name': 'ray_session_name',
-        'exception_type': 'exception_type'
+        'exception_type': 'exception_type',
+        'data_operator_id': 'data_operator_id'
     }
 
-    def __init__(self, id=None, attempt_number=None, total_attempts=None, job_id=None, function_name=None, task_type=None, current_state=None, error_message=None, start_time_ns=None, start_running_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
+    def __init__(self, id=None, attempt_number=None, total_attempts=None, job_id=None, function_name=None, task_type=None, current_state=None, error_message=None, start_time_ns=None, start_running_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, data_operator_id=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()
@@ -101,6 +103,7 @@ class TaskTableRow(object):
         self._parent_task_id = None
         self._ray_session_name = None
         self._exception_type = None
+        self._data_operator_id = None
         self.discriminator = None
 
         self.id = id
@@ -133,6 +136,8 @@ class TaskTableRow(object):
         self.ray_session_name = ray_session_name
         if exception_type is not None:
             self.exception_type = exception_type
+        if data_operator_id is not None:
+            self.data_operator_id = data_operator_id
 
     @property
     def id(self):
@@ -549,6 +554,27 @@ class TaskTableRow(object):
 
         self._exception_type = exception_type
 
+    @property
+    def data_operator_id(self):
+        """Gets the data_operator_id of this TaskTableRow.  # noqa: E501
+
+
+        :return: The data_operator_id of this TaskTableRow.  # noqa: E501
+        :rtype: str
+        """
+        return self._data_operator_id
+
+    @data_operator_id.setter
+    def data_operator_id(self, data_operator_id):
+        """Sets the data_operator_id of this TaskTableRow.
+
+
+        :param data_operator_id: The data_operator_id of this TaskTableRow.  # noqa: E501
+        :type: str
+        """
+
+        self._data_operator_id = data_operator_id
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale/client/openapi_client/models/worker_node_type.py

@@ -36,6 +36,7 @@ class WorkerNodeType(object):
         'name': 'str',
         'instance_type': 'str',
         'resources': 'Resources',
+        'labels': 'dict(str, str)',
         'aws_advanced_configurations_json': 'object',
         'gcp_advanced_configurations_json': 'object',
         'advanced_configurations_json': 'object',
@@ -50,6 +51,7 @@ class WorkerNodeType(object):
         'name': 'name',
         'instance_type': 'instance_type',
         'resources': 'resources',
+        'labels': 'labels',
         'aws_advanced_configurations_json': 'aws_advanced_configurations_json',
         'gcp_advanced_configurations_json': 'gcp_advanced_configurations_json',
         'advanced_configurations_json': 'advanced_configurations_json',
@@ -60,7 +62,7 @@ class WorkerNodeType(object):
         'fallback_to_ondemand': 'fallback_to_ondemand'
     }
 
-    def __init__(self, name=None, instance_type=None, resources=None, aws_advanced_configurations_json=None, gcp_advanced_configurations_json=None, advanced_configurations_json=None, flags=None, min_workers=None, max_workers=None, use_spot=False, fallback_to_ondemand=False, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, name=None, instance_type=None, resources=None, labels=None, aws_advanced_configurations_json=None, gcp_advanced_configurations_json=None, advanced_configurations_json=None, flags=None, min_workers=None, max_workers=None, use_spot=False, fallback_to_ondemand=False, local_vars_configuration=None):  # noqa: E501
         """WorkerNodeType - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -69,6 +71,7 @@ class WorkerNodeType(object):
         self._name = None
         self._instance_type = None
         self._resources = None
+        self._labels = None
         self._aws_advanced_configurations_json = None
         self._gcp_advanced_configurations_json = None
         self._advanced_configurations_json = None
@@ -83,6 +86,8 @@ class WorkerNodeType(object):
         self.instance_type = instance_type
         if resources is not None:
             self.resources = resources
+        if labels is not None:
+            self.labels = labels
         if aws_advanced_configurations_json is not None:
             self.aws_advanced_configurations_json = aws_advanced_configurations_json
         if gcp_advanced_configurations_json is not None:
@@ -173,6 +178,29 @@ class WorkerNodeType(object):
 
         self._resources = resources
 
+    @property
+    def labels(self):
+        """Gets the labels of this WorkerNodeType.  # noqa: E501
+
+        Labels to associate the node with for scheduling purposes. Defaults to the list of Ray & Anyscale default labels.  # noqa: E501
+
+        :return: The labels of this WorkerNodeType.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._labels
+
+    @labels.setter
+    def labels(self, labels):
+        """Sets the labels of this WorkerNodeType.
+
+        Labels to associate the node with for scheduling purposes. Defaults to the list of Ray & Anyscale default labels.  # noqa: E501
+
+        :param labels: The labels of this WorkerNodeType.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._labels = labels
+
     @property
     def aws_advanced_configurations_json(self):
         """Gets the aws_advanced_configurations_json of this WorkerNodeType.  # noqa: E501

anyscale/commands/cloud_commands.py

@@ -433,22 +433,130 @@ def cloud_update(  # noqa: PLR0913
     help="Cloud id to get details about. Alternative to cloud name.",
     required=False,
 )
+@click.option(
+    "--resource",
+    help="Name of the cloud resource to get details for. If not provided, defaults to the primary resource for the cloud.",
+    type=str,
+    required=False,
+)
+@click.option(
+    "--resource-id",
+    "cloud_resource_id",
+    help="Cloud resource ID to get details for. Alternative to cloud resource name.",
+    type=str,
+    required=False,
+)
 def cloud_config_get(
-    cloud_name: Optional[str], name: Optional[str], cloud_id: Optional[str]
+    cloud_name: Optional[str],
+    name: Optional[str],
+    cloud_id: Optional[str],
+    resource: Optional[str],
+    cloud_resource_id: Optional[str],
 ) -> None:
     if cloud_name and name and cloud_name != name:
         raise click.ClickException(
             "The positional argument CLOUD_NAME and the keyword argument --name "
             "were both provided. Please only provide one of these two arguments."
         )
+
+    # Validate resource selection options
+    if resource and cloud_resource_id:
+        raise click.ClickException(
+            "Cannot specify both --resource and --resource-id. Please provide only one."
+        )
+
     config = CloudController().get_cloud_config(
-        cloud_name=cloud_name or name, cloud_id=cloud_id,
+        cloud_name=cloud_name or name,
+        cloud_id=cloud_id,
+        resource=resource,
+        cloud_resource_id=cloud_resource_id,
     )
     stream = StringIO()
     yaml.dump(config.spec, stream)
     print(stream.getvalue())
 
 
+def _validate_cloud_config_update_args(
+    cloud_name: Optional[str],
+    name: Optional[str],
+    resource: Optional[str],
+    cloud_resource_id: Optional[str],
+    passed_enable_disable_flags: bool,
+    spec_file: Optional[str],
+) -> None:
+    """Validate arguments for cloud config update command."""
+    if cloud_name and name and cloud_name != name:
+        raise click.ClickException(
+            "The positional argument CLOUD_NAME and the keyword argument --name "
+            "were both provided. Please only provide one of these two arguments."
+        )
+
+    if resource and cloud_resource_id:
+        raise click.ClickException(
+            "Cannot specify both --resource and --resource-id. Please provide only one."
+        )
+
+    if passed_enable_disable_flags and spec_file:
+        raise click.ClickException(
+            "Invalid combination of arguments: --spec-file should not be provided with any other enable/disable flags."
+        )
+
+    if (resource or cloud_resource_id) and not spec_file:
+        raise click.ClickException(
+            "--resource and --resource-id can only be used with --spec-file."
+        )
+
+
+def _handle_log_ingestion_config(enable_log_ingestion: Optional[bool]) -> None:
+    """Handle log ingestion configuration with user prompts."""
+    if enable_log_ingestion is True:
+        consent_message = click.prompt(
+            "--enable-log-ingestion is specified. Please note the logs produced by "
+            "your cluster will be ingested into Anyscale's service in region "
+            "us-west-2. Your clusters may incur extra data transfer cost from the "
+            "cloud provider. If you are sure you want to enable this feature, "
+            'please type "consent"',
+            type=str,
+        )
+        if consent_message != "consent":
+            raise click.ClickException(
+                'You must type "consent" to enable log ingestion.'
+            )
+    elif enable_log_ingestion is False:
+        confirm_response = click.confirm(
+            "--disable-log-ingestion is specified. Please note the logs that's "
+            "already ingested will not be deleted. Existing clusters will not stop"
+            "the log ingestion until you restart them. Logs are automatically "
+            "deleted after 30 days from the time of ingestion. Are you sure you "
+            "want to disable log ingestion?"
+        )
+        if not confirm_response:
+            raise click.ClickException("You must confirm to disable log ingestion.")
+
+
+def _handle_system_cluster_config(enable_system_cluster: Optional[bool]) -> None:
+    """Handle system cluster configuration with user prompts."""
+    confirm_response = True
+    if enable_system_cluster is True:
+        confirm_response = click.confirm(
+            "--enable-system-cluster is specified. Please note that this will enable "
+            "system cluster functionality for the cloud and will incur extra cost. "
+            "Are you sure you want to enable system cluster?"
+        )
+    elif enable_system_cluster is False:
+        confirm_response = click.confirm(
+            "--disable-system-cluster is specified. This will disable system cluster "
+            "functionality for the cloud. Please note that this will not terminate "
+            "the system cluster if it is currently running. "
+            "Are you sure you want to disable system cluster?"
+        )
+
+    if enable_system_cluster is not None and not confirm_response:
+        raise click.ClickException(
+            f"You must confirm to {'enable' if enable_system_cluster else 'disable'} system cluster."
+        )
+
+
 @cloud_config_group.command(
     "update",
     help="Update the current configuration for a cloud.",
@@ -490,88 +598,65 @@ def cloud_config_get(
     required=False,
     help="Provide a path to a specification file.",
 )
-def cloud_config_update(
+@click.option(
+    "--resource",
+    help="Name of the cloud resource to get details for. If not provided, defaults to the primary resource for the cloud.",
+    type=str,
+    required=False,
+)
+@click.option(
+    "--resource-id",
+    "cloud_resource_id",
+    help="Cloud resource ID to get details for. Alternative to cloud resource name.",
+    type=str,
+    required=False,
+)
+def cloud_config_update(  # noqa: PLR0913
     cloud_name: Optional[str],
     name: Optional[str],
     cloud_id: Optional[str],
     enable_log_ingestion: Optional[bool],
     enable_system_cluster: Optional[bool],
     spec_file: Optional[str],
+    resource: Optional[str],
+    cloud_resource_id: Optional[str],
 ) -> None:
-    if cloud_name and name and cloud_name != name:
-        raise click.ClickException(
-            "The positional argument CLOUD_NAME and the keyword argument --name "
-            "were both provided. Please only provide one of these two arguments."
-        )
-
     passed_enable_disable_flags = any(
         [enable_log_ingestion is not None, enable_system_cluster is not None]
     )
-    if passed_enable_disable_flags and spec_file:
-        raise click.ClickException(
-            "Invalid combination of arguments: --spec-file should not be provided with any other enable/disable flags."
-        )
 
-    if passed_enable_disable_flags:
-        # Handle log ingestion configuration
-        # TODO: enable_log_ingestion should be unified into cloud deployment config.
-        if enable_log_ingestion is True:
-            consent_message = click.prompt(
-                "--enable-log-ingestion is specified. Please note the logs produced by "
-                "your cluster will be ingested into Anyscale's service in region "
-                "us-west-2. Your clusters may incur extra data transfer cost from the "
-                "cloud provider. If you are sure you want to enable this feature, "
-                'please type "consent"',
-                type=str,
-            )
-            if consent_message != "consent":
-                raise click.ClickException(
-                    'You must type "consent" to enable log ingestion.'
-                )
-        elif enable_log_ingestion is False:
-            confirm_response = click.confirm(
-                "--disable-log-ingestion is specified. Please note the logs that's "
-                "already ingested will not be deleted. Existing clusters will not stop"
-                "the log ingestion until you restart them. Logs are automatically "
-                "deleted after 30 days from the time of ingestion. Are you sure you "
-                "want to disable log ingestion?"
-            )
-            if not confirm_response:
-                raise click.ClickException("You must confirm to disable log ingestion.")
+    _validate_cloud_config_update_args(
+        cloud_name,
+        name,
+        resource,
+        cloud_resource_id,
+        passed_enable_disable_flags,
+        spec_file,
+    )
 
+    cloud_name_resolved = cloud_name or name
+
+    if passed_enable_disable_flags:
+        _handle_log_ingestion_config(enable_log_ingestion)
         CloudController().update_cloud_config(
-            cloud_name=cloud_name or name,
+            cloud_name=cloud_name_resolved,
             cloud_id=cloud_id,
             enable_log_ingestion=enable_log_ingestion,
         )
 
-        # Handle system cluster configuration
-        if enable_system_cluster is True:
-            confirm_response = click.confirm(
-                "--enable-system-cluster is specified. Please note that this will enable "
-                "system cluster functionality for the cloud and will incur extra cost. "
-                "Are you sure you want to enable system cluster?"
-            )
-        elif enable_system_cluster is False:
-            confirm_response = click.confirm(
-                "--disable-system-cluster is specified. This will disable system cluster "
-                "functionality for the cloud. Please note that this will not terminate "
-                "the system cluster if it is currently running. "
-                "Are you sure you want to disable system cluster?"
-            )
-        if enable_system_cluster is not None and not confirm_response:
-            raise click.ClickException(
-                f"You must confirm to {'enable' if enable_system_cluster else 'disable'} system cluster."
-            )
-
+        _handle_system_cluster_config(enable_system_cluster)
         CloudController().update_system_cluster_config(
-            cloud_name=cloud_name or name,
+            cloud_name=cloud_name_resolved,
             cloud_id=cloud_id,
             system_cluster_enabled=enable_system_cluster,
         )
     elif spec_file:
         CloudController().update_cloud_config(
-            cloud_name=cloud_name or name, cloud_id=cloud_id, spec_file=spec_file,
+            cloud_name=cloud_name_resolved,
+            cloud_id=cloud_id,
+            spec_file=spec_file,
+            resource=resource,
+            cloud_resource_id=cloud_resource_id,
         )
     else:
         raise click.ClickException(