anyscale 0.25.1__py3-none-any.whl → 0.25.3__py3-none-any.whl

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],
@@ -1641,12 +1666,14 @@ class CloudController(BaseController):
             logger=logger,
             strict=strict,
         )
-        verify_aws_efs_result = verify_aws_efs(
-            cloud_resource=cloud_resource,
-            boto3_session=boto3_session,
-            logger=logger,
-            strict=strict,
-        )
+        verify_aws_efs_result = True
+        if cloud_resource.aws_efs_id:
+            verify_aws_efs_result = verify_aws_efs(
+                cloud_resource=cloud_resource,
+                boto3_session=boto3_session,
+                logger=logger,
+                strict=strict,
+            )
         # Cloudformation is only used in managed cloud setup. Set to True in BYOR case because it's not used.
         verify_aws_cloudformation_stack_result = True
         if not is_bring_your_own_resource:
@@ -1676,9 +1703,12 @@ class CloudController(BaseController):
             f"iam roles: {self._passed_or_failed_str_from_bool(verify_aws_iam_roles_result)}",
             f"security groups: {self._passed_or_failed_str_from_bool(verify_aws_security_groups_result)}",
             f"s3: {self._passed_or_failed_str_from_bool(verify_aws_s3_result)}",
-            f"efs: {self._passed_or_failed_str_from_bool(verify_aws_efs_result)}",
             f"cloudformation stack: {self._passed_or_failed_str_from_bool(verify_aws_cloudformation_stack_result) if not is_bring_your_own_resource else 'N/A'}",
         ]
+        if cloud_resource.aws_efs_id:
+            verification_result_summary.append(
+                f"efs: {self._passed_or_failed_str_from_bool(verify_aws_efs_result)}"
+            )
         if cloud_resource.memorydb_cluster_config is not None:
             verification_result_summary.append(
                 f"memorydb cluster: {self._passed_or_failed_str_from_bool(verify_aws_memorydb_cluster_result)}"
@@ -1875,7 +1905,7 @@ class CloudController(BaseController):
         name: str,
         vpc_id: str,
         subnet_ids: List[str],
-        efs_id: str,
+        efs_id: Optional[str],
         anyscale_iam_role_id: str,
         instance_iam_role_id: str,
         security_group_ids: List[str],
@@ -2012,10 +2042,7 @@ class CloudController(BaseController):
             # When running on the VM compute stack, validate and retrieve the EFS mount target IP.
             # When running on the K8S compute stack, EFS is optional; if efs_id is provided, then
             # validate and retrieve the EFS mount target IP.
-            enable_efs = compute_stack == ComputeStack.VM or (
-                compute_stack == ComputeStack.K8S and efs_id
-            )
-            if enable_efs:
+            if efs_id:
                 try:
                     boto3_session = boto3.Session(region_name=region)
                     aws_efs_mount_target_ip = _get_aws_efs_mount_target_ip(
@@ -2106,7 +2133,8 @@ class CloudController(BaseController):
             # TODO (shomilj): Add verification to the K8S compute stack as well.
             if compute_stack == ComputeStack.VM:
                 with self.log.spinner("Verifying cloud resources...") as spinner:
-                    assert boto3_session is not None
+                    if boto3_session is None:
+                        boto3_session = boto3.Session(region_name=region)
                     if not skip_verifications and not self.verify_aws_cloud_resources(
                         cloud_resource=create_cloud_resource,
                         boto3_session=boto3_session,
@@ -2264,15 +2292,17 @@ class CloudController(BaseController):
                 gcp_logger,
                 strict=strict,
             )
-            verify_filestore_result = verify_lib.verify_filestore(
-                factory, cloud_resource, region, gcp_logger, strict=strict
-            )
             verify_cloud_storage_result = verify_lib.verify_cloud_storage(
                 factory, cloud_resource, project_id, region, gcp_logger, strict=strict,
             )
             verify_anyscale_access_result = verify_anyscale_access(
                 self.api_client, cloud_id, CloudProviders.GCP, self.log
             )
+            verify_filestore_result = True
+            if cloud_resource.gcp_filestore_config.instance_name:
+                verify_filestore_result = verify_lib.verify_filestore(
+                    factory, cloud_resource, region, gcp_logger, strict=strict
+                )
             verify_memorystore_result = True
             if cloud_resource.memorystore_instance_config is not None:
                 verify_memorystore_result = verify_lib.verify_memorystore(
@@ -2287,10 +2317,13 @@ class CloudController(BaseController):
             f"anyscale iam service account: {self._passed_or_failed_str_from_bool(verify_gcp_access_service_account_result)}",
             f"cluster node service account: {self._passed_or_failed_str_from_bool(verify_gcp_dataplane_service_account_result)}",
             f"firewall policy: {self._passed_or_failed_str_from_bool(verify_firewall_policy_result)}",
-            f"filestore: {self._passed_or_failed_str_from_bool(verify_filestore_result)}",
             f"cloud storage: {self._passed_or_failed_str_from_bool(verify_cloud_storage_result)}",
         ]
 
+        if cloud_resource.gcp_filestore_config.instance_name:
+            verification_results.append(
+                f"filestore: {self._passed_or_failed_str_from_bool(verify_filestore_result)}"
+            )
         if cloud_resource.memorystore_instance_config is not None:
             verification_results.append(
                 f"memorystore: {self._passed_or_failed_str_from_bool(verify_memorystore_result)}"
@@ -2425,9 +2458,7 @@ class CloudController(BaseController):
                 instance_service_account_email = ""
                 subnet_names = []
 
-            enable_filestore = compute_stack == ComputeStack.VM or (
-                filestore_location and filestore_instance_id
-            )
+            enable_filestore = filestore_location and filestore_instance_id
 
             # Normally, for Kubernetes clouds, we don't need a VPC name, since networking is managed by Kubernetes.
             # For Kubernetes clouds on GCP where Filestore is enabled, we require the VPC name, since it is needed
@@ -2458,7 +2489,9 @@ class CloudController(BaseController):
                 filestore_config = GCPFileStoreConfig(
                     instance_name="", mount_target_ip="", root_dir=""
                 )
-                vpc_name = ""
+                if compute_stack == ComputeStack.K8S:
+                    # Set vpc_name to empty string for Kubernetes clouds
+                    vpc_name = ""
 
             if memorystore_instance_name:
                 memorystore_instance_config = gcp_utils.get_gcp_memorystore_config(

anyscale/controllers/cluster_controller.py

@@ -411,7 +411,6 @@ class ClusterController(BaseController):
                 cluster.id,
                 cluster.state,
                 cluster.cloud_id,
-                cluster.cost_since_restarted_dollars,
                 get_endpoint(f"/projects/{cluster.project_id}/clusters/{cluster.id}"),
             ]
             for cluster in cluster_list
@@ -419,14 +418,7 @@ class ClusterController(BaseController):
 
         table = tabulate.tabulate(
             clusters_table,
-            headers=[
-                "NAME",
-                "ID",
-                "STATE",
-                "CLOUD ID",
-                "COST SINCE LAST START",
-                "URL",
-            ],
+            headers=["NAME", "ID", "STATE", "CLOUD ID", "URL",],
             tablefmt="plain",
         )
         print(f"Clusters:\n{table}")

anyscale/controllers/job_controller.py

@@ -316,7 +316,6 @@ class JobController(BaseController):
             output_map = {
                 "Name": job.name,
                 "Id": job.id,
-                "Cost (dollars)": job.cost_dollars,
                 "Project name": job.project.name,
                 "Cluster name": job.last_job_run.cluster.name
                 if job.last_job_run and job.last_job_run.cluster
@@ -371,7 +370,6 @@ class JobController(BaseController):
             [
                 job.name,
                 job.id,
-                job.cost_dollars,
                 job.project.name,
                 job.last_job_run.cluster.name
                 if job.last_job_run and job.last_job_run.cluster
@@ -390,7 +388,6 @@ class JobController(BaseController):
             headers=[
                 "NAME",
                 "ID",
-                "COST",
                 "PROJECT NAME",
                 "CLUSTER NAME",
                 "CURRENT STATE",

anyscale/resource_quota/_private/resource_quota_sdk.py

@@ -22,13 +22,22 @@ class PrivateResourceQuotaSDK(BaseSDK):
             else None
         )
 
-        user_id = (
-            self.client.get_organization_collaborator(
+        user_id = None
+        if create_resource_quota.user_email:
+            users = self.client.get_organization_collaborators(
                 email=create_resource_quota.user_email
-            ).user_id
-            if create_resource_quota.user_email
-            else None
-        )
+            )
+
+            if len(users) == 0:
+                raise ValueError(
+                    f"User with email '{create_resource_quota.user_email}' not found."
+                )
+
+            if len(users) > 1:
+                raise ValueError(
+                    f"Multiple users found for email '{create_resource_quota.user_email}'. Please contact Anyscale support."
+                )
+            user_id = users[0].user_id
 
         create_resource_quota_model = CreateResourceQuotaModel(
             name=create_resource_quota.name,

anyscale/sdk/anyscale_client/api/default_api.py

@@ -150,6 +150,120 @@ class DefaultApi(object):
             _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def archive_service(self, service_id, **kwargs):  # noqa: E501
+        """Archive Service  # noqa: E501
+
+        Archives a Service. It is a no-op if already archived.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.archive_service(service_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str service_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: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        return self.archive_service_with_http_info(service_id, **kwargs)  # noqa: E501
+
+    def archive_service_with_http_info(self, service_id, **kwargs):  # noqa: E501
+        """Archive Service  # noqa: E501
+
+        Archives a Service. It is a no-op if already archived.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.archive_service_with_http_info(service_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str service_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: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        local_var_params = locals()
+
+        all_params = [
+            'service_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 archive_service" % key
+                )
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+        # verify the required parameter 'service_id' is set
+        if self.api_client.client_side_validation and ('service_id' not in local_var_params or  # noqa: E501
+                                                        local_var_params['service_id'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `service_id` when calling `archive_service`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'service_id' in local_var_params:
+            path_params['service_id'] = local_var_params['service_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(
+            '/services/{service_id}/archive', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # 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 create_app_config(self, create_app_config, **kwargs):  # noqa: E501
         """Create App Config  # noqa: E501
 
@@ -7266,6 +7380,7 @@ class DefaultApi(object):
         :param str project_id: project_id to filter by
         :param str name: name to filter by
         :param list[ServiceEventCurrentState] state_filter: A list of Service states to filter by
+        :param ArchiveStatus archive_status: The archive status to filter by. Defaults to unarchived.
         :param str creator_id: creator_id to filter by
         :param str cloud_id: cloud_id to filter by
         :param ServiceSortField sort_field: If absent, the default sorting order is 1. status (active first).2. Last updated at (desc). 3. Name (asc).
@@ -7298,6 +7413,7 @@ class DefaultApi(object):
         :param str project_id: project_id to filter by
         :param str name: name to filter by
         :param list[ServiceEventCurrentState] state_filter: A list of Service states to filter by
+        :param ArchiveStatus archive_status: The archive status to filter by. Defaults to unarchived.
         :param str creator_id: creator_id to filter by
         :param str cloud_id: cloud_id to filter by
         :param ServiceSortField sort_field: If absent, the default sorting order is 1. status (active first).2. Last updated at (desc). 3. Name (asc).
@@ -7324,6 +7440,7 @@ class DefaultApi(object):
             'project_id',
             'name',
             'state_filter',
+            'archive_status',
             'creator_id',
             'cloud_id',
             'sort_field',
@@ -7365,6 +7482,8 @@ class DefaultApi(object):
         if 'state_filter' in local_var_params and local_var_params['state_filter'] is not None:  # noqa: E501
             query_params.append(('state_filter', local_var_params['state_filter']))  # noqa: E501
             collection_formats['state_filter'] = 'multi'  # noqa: E501
+        if 'archive_status' in local_var_params and local_var_params['archive_status'] is not None:  # noqa: E501
+            query_params.append(('archive_status', local_var_params['archive_status']))  # noqa: E501
         if 'creator_id' in local_var_params and local_var_params['creator_id'] is not None:  # noqa: E501
             query_params.append(('creator_id', local_var_params['creator_id']))  # noqa: E501
         if 'cloud_id' in local_var_params and local_var_params['cloud_id'] is not None:  # noqa: E501