anyscale 0.25.2__py3-none-any.whl → 0.25.4__py3-none-any.whl

anyscale/client/openapi_client/models/clusterevent_list_response.py

@@ -0,0 +1,147 @@
+# 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 ClustereventListResponse(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 = {
+        'results': 'list[ClusterEvent]',
+        'metadata': 'ListResponseMetadata'
+    }
+
+    attribute_map = {
+        'results': 'results',
+        'metadata': 'metadata'
+    }
+
+    def __init__(self, results=None, metadata=None, local_vars_configuration=None):  # noqa: E501
+        """ClustereventListResponse - 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._results = None
+        self._metadata = None
+        self.discriminator = None
+
+        self.results = results
+        if metadata is not None:
+            self.metadata = metadata
+
+    @property
+    def results(self):
+        """Gets the results of this ClustereventListResponse.  # noqa: E501
+
+
+        :return: The results of this ClustereventListResponse.  # noqa: E501
+        :rtype: list[ClusterEvent]
+        """
+        return self._results
+
+    @results.setter
+    def results(self, results):
+        """Sets the results of this ClustereventListResponse.
+
+
+        :param results: The results of this ClustereventListResponse.  # noqa: E501
+        :type: list[ClusterEvent]
+        """
+        if self.local_vars_configuration.client_side_validation and results is None:  # noqa: E501
+            raise ValueError("Invalid value for `results`, must not be `None`")  # noqa: E501
+
+        self._results = results
+
+    @property
+    def metadata(self):
+        """Gets the metadata of this ClustereventListResponse.  # noqa: E501
+
+
+        :return: The metadata of this ClustereventListResponse.  # noqa: E501
+        :rtype: ListResponseMetadata
+        """
+        return self._metadata
+
+    @metadata.setter
+    def metadata(self, metadata):
+        """Sets the metadata of this ClustereventListResponse.
+
+
+        :param metadata: The metadata of this ClustereventListResponse.  # noqa: E501
+        :type: ListResponseMetadata
+        """
+
+        self._metadata = metadata
+
+    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, ClustereventListResponse):
+            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, ClustereventListResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/client/openapi_client/models/create_notification_channel_record.py

@@ -34,15 +34,17 @@ class CreateNotificationChannelRecord(object):
     """
     openapi_types = {
         'email_config': 'NotificationChannelEmailConfig',
-        'webhook_config': 'NotificationChannelWebhookConfig'
+        'webhook_config': 'NotificationChannelWebhookConfig',
+        'slack_config': 'NotificationChannelSlackConfig'
     }
 
     attribute_map = {
         'email_config': 'email_config',
-        'webhook_config': 'webhook_config'
+        'webhook_config': 'webhook_config',
+        'slack_config': 'slack_config'
     }
 
-    def __init__(self, email_config=None, webhook_config=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, email_config=None, webhook_config=None, slack_config=None, local_vars_configuration=None):  # noqa: E501
         """CreateNotificationChannelRecord - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -50,12 +52,15 @@ class CreateNotificationChannelRecord(object):
 
         self._email_config = None
         self._webhook_config = None
+        self._slack_config = None
         self.discriminator = None
 
         if email_config is not None:
             self.email_config = email_config
         if webhook_config is not None:
             self.webhook_config = webhook_config
+        if slack_config is not None:
+            self.slack_config = slack_config
 
     @property
     def email_config(self):
@@ -99,6 +104,27 @@ class CreateNotificationChannelRecord(object):
 
         self._webhook_config = webhook_config
 
+    @property
+    def slack_config(self):
+        """Gets the slack_config of this CreateNotificationChannelRecord.  # noqa: E501
+
+
+        :return: The slack_config of this CreateNotificationChannelRecord.  # noqa: E501
+        :rtype: NotificationChannelSlackConfig
+        """
+        return self._slack_config
+
+    @slack_config.setter
+    def slack_config(self, slack_config):
+        """Sets the slack_config of this CreateNotificationChannelRecord.
+
+
+        :param slack_config: The slack_config of this CreateNotificationChannelRecord.  # noqa: E501
+        :type: NotificationChannelSlackConfig
+        """
+
+        self._slack_config = slack_config
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale/client/openapi_client/models/notification_channel_slack_config.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 NotificationChannelSlackConfig(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 = {
+        'slack_urls': 'list[str]'
+    }
+
+    attribute_map = {
+        'slack_urls': 'slack_urls'
+    }
+
+    def __init__(self, slack_urls=None, local_vars_configuration=None):  # noqa: E501
+        """NotificationChannelSlackConfig - 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._slack_urls = None
+        self.discriminator = None
+
+        self.slack_urls = slack_urls
+
+    @property
+    def slack_urls(self):
+        """Gets the slack_urls of this NotificationChannelSlackConfig.  # noqa: E501
+
+
+        :return: The slack_urls of this NotificationChannelSlackConfig.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._slack_urls
+
+    @slack_urls.setter
+    def slack_urls(self, slack_urls):
+        """Sets the slack_urls of this NotificationChannelSlackConfig.
+
+
+        :param slack_urls: The slack_urls of this NotificationChannelSlackConfig.  # noqa: E501
+        :type: list[str]
+        """
+        if self.local_vars_configuration.client_side_validation and slack_urls is None:  # noqa: E501
+            raise ValueError("Invalid value for `slack_urls`, must not be `None`")  # noqa: E501
+
+        self._slack_urls = slack_urls
+
+    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, NotificationChannelSlackConfig):
+            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, NotificationChannelSlackConfig):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/client/openapi_client/models/update_cloud_collaborator.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 UpdateCloudCollaborator(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 = {
+        'permission_level': 'PermissionLevel'
+    }
+
+    attribute_map = {
+        'permission_level': 'permission_level'
+    }
+
+    def __init__(self, permission_level=None, local_vars_configuration=None):  # noqa: E501
+        """UpdateCloudCollaborator - 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._permission_level = None
+        self.discriminator = None
+
+        self.permission_level = permission_level
+
+    @property
+    def permission_level(self):
+        """Gets the permission_level of this UpdateCloudCollaborator.  # noqa: E501
+
+
+        :return: The permission_level of this UpdateCloudCollaborator.  # noqa: E501
+        :rtype: PermissionLevel
+        """
+        return self._permission_level
+
+    @permission_level.setter
+    def permission_level(self, permission_level):
+        """Sets the permission_level of this UpdateCloudCollaborator.
+
+
+        :param permission_level: The permission_level of this UpdateCloudCollaborator.  # noqa: E501
+        :type: PermissionLevel
+        """
+        if self.local_vars_configuration.client_side_validation and permission_level is None:  # noqa: E501
+            raise ValueError("Invalid value for `permission_level`, must not be `None`")  # noqa: E501
+
+        self._permission_level = permission_level
+
+    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, UpdateCloudCollaborator):
+            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, UpdateCloudCollaborator):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/commands/cloud_commands.py

@@ -1,7 +1,9 @@
+from io import StringIO
 import re
 from typing import List, Optional
 
 import click
+import yaml
 
 import anyscale
 from anyscale.cli_logger import BlockLogger
@@ -321,11 +323,12 @@ def cloud_config_get(
             "The positional argument CLOUD_NAME and the keyword argument --name "
             "were both provided. Please only provide one of these two arguments."
         )
-    print(
-        CloudController().get_cloud_config(
-            cloud_name=cloud_name or name, cloud_id=cloud_id,
-        )
+    config = CloudController().get_cloud_config(
+        cloud_name=cloud_name or name, cloud_id=cloud_id,
     )
+    stream = StringIO()
+    yaml.dump(config.spec, stream)
+    print(stream.getvalue())
 
 
 @cloud_config_group.command(
@@ -354,13 +357,26 @@ def cloud_config_get(
         "extra data transfer cost from the cloud provider by enabling this feature."
     ),
 )
+@click.option(
+    "--spec-file",
+    type=str,
+    required=False,
+    help="Provide a path to a specification file.",
+)
 def cloud_config_update(
     cloud_name: Optional[str],
     name: Optional[str],
     cloud_id: Optional[str],
     enable_log_ingestion: Optional[bool],
+    spec_file: Optional[str],
 ) -> None:
+    if any([enable_log_ingestion is not None]) and spec_file:
+        raise click.ClickException(
+            "Please provide only one of the following arguments: --enable-log-ingestion, --disable-log-ingestion, --spec-file."
+        )
+
     if any([enable_log_ingestion is not None]):
+        # 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 "
@@ -390,6 +406,10 @@ def cloud_config_update(
             cloud_id=cloud_id,
             enable_log_ingestion=enable_log_ingestion,
         )
+    elif spec_file:
+        CloudController().update_cloud_config(
+            cloud_name=cloud_name or name, cloud_id=cloud_id, spec_file=spec_file,
+        )
     else:
         raise click.ClickException(
             "Please provide at least one of the following arguments: --enable-log-ingestion, --disable-log-ingestion."

anyscale/commands/command_examples.py

@@ -560,3 +560,7 @@ collaborators:
   - email: "test2@anyscale.com"
     permission_level: "readonly"
 """
+
+SERVICE_ARCHIVE_EXAMPLE = """\
+$ anyscale service archive --name my_service
+"""

anyscale/commands/service_commands.py

@@ -9,7 +9,9 @@ import yaml
 
 from anyscale._private.models.image_uri import ImageURI
 from anyscale.cli_logger import BlockLogger
+from anyscale.commands import command_examples
 from anyscale.commands.util import (
+    AnyscaleCommand,
     convert_kv_strings_to_dict,
     LegacyAnyscaleCommand,
     override_env_vars,
@@ -736,3 +738,61 @@ def terminate(
         project_id=project_id,
     )
     service_controller.terminate(service_id)
+
+
+@service_cli.command(
+    name="archive",
+    help="Archive a service.",
+    cls=AnyscaleCommand,
+    example=command_examples.SERVICE_ARCHIVE_EXAMPLE,
+)
+@click.option(
+    "-n", "--name", required=False, default=None, type=str, help="Name of the service.",
+)
+@click.option(
+    "-f",
+    "--config-file",
+    required=False,
+    default=None,
+    type=str,
+    help="Path to a YAML config file to read the name from.",
+)
+@click.option(
+    "--cloud",
+    required=False,
+    default=None,
+    type=str,
+    help="The Anyscale Cloud to run this workload on. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
+)
+@click.option(
+    "--project",
+    required=False,
+    default=None,
+    type=str,
+    help="Named project to use for the service. If not provided, the default project for the cloud will be used (or, if running in a workspace, the project of the workspace).",
+)
+def archive(
+    name: Optional[str],
+    config_file: Optional[str],
+    cloud: Optional[str],
+    project: Optional[str],
+) -> None:
+    """Archive a service.
+
+    To specify the service by name, use the --name flag. To specify the service by id, use the --id flag. Either name or
+id should be used, specifying both will result in an error.
+    """
+    if name is not None and config_file is not None:
+        raise click.ClickException(
+            "Only one of '--name' and '--config-file' can be provided."
+        )
+
+    if config_file is not None:
+        name = _read_name_from_config_file(config_file)
+
+    if name is None:
+        raise click.ClickException(
+            "Service name must be provided using '--name' or in a config file using '-f'."
+        )
+
+    anyscale.service.archive(name=name, cloud=cloud, project=project)

anyscale/controllers/cloud_controller.py

@@ -5,6 +5,7 @@ Fetches data required and formats output for `anyscale cloud` commands.
 import copy
 import json
 from os import getenv
+import pathlib
 import re
 import secrets
 import time
@@ -15,6 +16,7 @@ import boto3
 from botocore.exceptions import ClientError, NoCredentialsError
 import click
 from click import Abort, ClickException
+import yaml
 
 from anyscale import __version__ as anyscale_version
 from anyscale.aws_iam_policies import get_anyscale_iam_permissions_ec2_restricted
@@ -24,6 +26,7 @@ from anyscale.client.openapi_client.models import (
     CloudAnalyticsEventCloudResource,
     CloudAnalyticsEventCommandName,
     CloudAnalyticsEventName,
+    CloudDeploymentConfig,
     CloudProviders,
     CloudState,
     CloudWithCloudResource,
@@ -59,7 +62,6 @@ from anyscale.cloud_resource import (
 )
 from anyscale.cloud_utils import (
     get_cloud_id_and_name,
-    get_cloud_json_from_id,
     get_cloud_resource_by_cloud_id,
     get_organization_id,
 )
@@ -1382,23 +1384,28 @@ class CloudController(BaseController):
 
     def get_cloud_config(
         self, cloud_name: Optional[str] = None, cloud_id: Optional[str] = None,
-    ) -> str:
+    ) -> CloudDeploymentConfig:
         """Get a cloud's current JSON configuration."""
 
         cloud_id, cloud_name = get_cloud_id_and_name(
             self.api_client, cloud_id, cloud_name
         )
 
-        return str(get_cloud_json_from_id(cloud_id, self.api_client)["config"])
+        # In the future we will expose cloud_deployment id as a parameter, for now, it's just a placeholder.
+        config: CloudDeploymentConfig = self.api_client.get_cloud_deployment_config_api_v2_clouds_cloud_id_deployment_cloud_deployment_id_config_get(
+            cloud_id=cloud_id, cloud_deployment_id="default"
+        ).result
+
+        return config
 
     def update_cloud_config(
         self,
         cloud_name: Optional[str] = None,
         cloud_id: Optional[str] = None,
         enable_log_ingestion: Optional[bool] = None,
+        spec_file: Optional[str] = None,
     ):
         """Update a cloud's configuration."""
-
         cloud_id, cloud_name = get_cloud_id_and_name(
             self.api_client, cloud_id, cloud_name
         )
@@ -1410,6 +1417,24 @@ class CloudController(BaseController):
                 f"Successfully updated log ingestion configuration for cloud, "
                 f"{cloud_id} to {enable_log_ingestion}"
             )
+        elif spec_file is not None:
+            path = pathlib.Path(spec_file)
+            if not path.exists():
+                raise FileNotFoundError(f"File {spec_file} does not exist.")
+
+            if not path.is_file():
+                raise ValueError(f"File {spec_file} is not a file.")
+
+            spec = yaml.safe_load(path.read_text())
+            config = CloudDeploymentConfig(spec=spec)
+            self.api_client.update_cloud_deployment_config_api_v2_clouds_cloud_id_deployment_cloud_deployment_id_config_put(
+                cloud_id=cloud_id,
+                cloud_deployment_id="default",
+                cloud_deployment_config=config,
+            )
+            self.log.info(
+                f"Successfully updated cloud configuration for cloud {cloud_name}"
+            )
 
     def set_default_cloud(
         self, cloud_name: Optional[str], cloud_id: Optional[str],