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

anyscale/commands/command_examples.py

@@ -629,6 +629,18 @@ Output
 --enable-system-cluster is specified. [...] Are you sure you want to enable system cluster? [y/N]: y
 Output
 (anyscale +11.4s) Successfully enabled system cluster for cloud cloud_id
+
+$ anyscale cloud config update --cloud-id cloud_id --spec-file iam.yaml
+Output
+(anyscale +2.1s) Successfully updated cloud configuration for cloud my-cloud (resource: cldrsrc_xyz123)
+
+$ anyscale cloud config update --cloud-id cloud_id --resource shared-usw2 --spec-file iam.yaml
+Output
+(anyscale +2.1s) Successfully updated cloud configuration for cloud my-cloud (resource: cldrsrc_abc456)
+
+$ anyscale cloud config update --cloud-id cloud_id --cloud-resource-id cldrsrc_xyz123 --spec-file iam.yaml
+Output
+(anyscale +2.1s) Successfully updated cloud configuration for cloud my-cloud (resource: cldrsrc_xyz123)
 """
 
 CLOUD_TERMINATE_SYSTEM_CLUSTER_EXAMPLE = """\

anyscale/commands/service_account_commands.py

@@ -106,24 +106,3 @@ def delete(email: Optional[str], name: Optional[str]) -> None:
         log.info(f"Service account {email or name} deleted successfully.")
     except ValueError as e:
         log.error(f"Error deleting service account: {e}")
-
-
-@service_account_cli.command(
-    name="rotate-api-keys", help="Rotate all api keys of a service account."
-)
-@click.option(
-    "--email", help="Rotate API keys for the service account with this email.", type=str
-)
-@click.option(
-    "--name", help="Rotate API keys for the service account with this name.", type=str
-)
-def rotate_api_keys(email: Optional[str], name: Optional[str]) -> None:
-    try:
-        api_key = anyscale.service_account.rotate_api_keys(email, name)
-
-        log.info(
-            f"\nAll API keys for service account {email or name} rotated successfully."
-        )
-        _print_new_api_key(api_key)
-    except ValueError as e:
-        log.error(f"Error rotating API keys: {e}")

anyscale/compute_config/_private/compute_config_sdk.py

@@ -84,6 +84,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                 resources=self._convert_resource_dict_to_api_model(config.resources)
                 if config.resources is not None or schedulable_by_default
                 else UNSCHEDULABLE_RESOURCES,
+                labels=config.labels,
                 flags=flags or None,
                 advanced_configurations_json=config.advanced_instance_config or None,
             )
@@ -110,6 +111,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                 name=config.name,
                 instance_type=config.instance_type,
                 resources=self._convert_resource_dict_to_api_model(config.resources),
+                labels=config.labels,
                 min_workers=config.min_nodes,
                 max_workers=config.max_nodes,
                 use_spot=config.market_type
@@ -318,6 +320,7 @@ class PrivateComputeConfigSDK(BaseSDK):
         return HeadNodeConfig(
             instance_type=api_model.instance_type,
             resources=self._convert_api_model_to_resource_dict(api_model.resources),
+            labels=api_model.labels,
             advanced_instance_config=self._convert_api_model_to_advanced_instance_config(
                 api_model,
             ),
@@ -365,6 +368,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                     resources=self._convert_api_model_to_resource_dict(
                         api_model.resources
                     ),
+                    labels=api_model.labels,
                     advanced_instance_config=self._convert_api_model_to_advanced_instance_config(
                         api_model,
                     ),

anyscale/compute_config/models.py

@@ -6,6 +6,7 @@ from anyscale._private.models import ModelBase, ModelEnum
 
 
 ResourceDict = Dict[str, float]
+LabelDict = Dict[str, str]
 AdvancedInstanceConfigDict = Dict[str, Any]
 
 
@@ -30,6 +31,18 @@ def _validate_resource_dict(r: Optional[ResourceDict], *, field_name: str):
             )
 
 
+def _validate_label_dict(labels: Optional[LabelDict]):
+    if labels is None:
+        return
+
+    # Convert any non-string keys/values to strings to ensure compatibility
+    for k, v in labels.items():
+        if not isinstance(k, str):
+            raise TypeError(f"'labels' keys must be strings, but got: {k}")
+        if not isinstance(v, str):
+            raise TypeError(f"'labels' values must be strings, but got: {v}")
+
+
 def _validate_advanced_instance_config_dict(c: Optional[AdvancedInstanceConfigDict]):
     if c is None:
         return
@@ -119,6 +132,17 @@ class _NodeConfig(ModelBase):
     def _validate_resources(self, resources: Optional[ResourceDict]):
         _validate_resource_dict(resources, field_name="resources")
 
+    labels: Optional[LabelDict] = field(
+        default=None,
+        repr=False,
+        metadata={
+            "docstring": "Labels to associate the node with for scheduling purposes. Defaults to the list of Ray & Anyscale default labels."
+        },
+    )
+
+    def _validate_labels(self, labels: Optional[LabelDict]):
+        _validate_label_dict(labels)
+
     advanced_instance_config: Optional[AdvancedInstanceConfigDict] = field(
         default=None,
         repr=False,

anyscale/controllers/cloud_controller.py

@@ -1929,18 +1929,94 @@ class CloudController(BaseController):
             f"Successfully removed resource {resource_name} from cloud {cloud_name}!"
         )
 
+    def _resolve_cloud_resource_id(
+        self,
+        cloud_id: str,
+        resource: Optional[str] = None,
+        cloud_resource_id: Optional[str] = None,
+    ) -> str:
+        """
+        Resolve cloud resource ID based on resolution order: id > name > primary.
+
+        Returns the resolved cloud_resource_id to use for API calls.
+        """
+        # If cloud_resource_id is provided, use it directly
+        if cloud_resource_id:
+            self.log.info(f"Using provided cloud resource ID: {cloud_resource_id}")
+            return cloud_resource_id
+
+        # If resource name is provided, resolve by name
+        if resource:
+            # Get all cloud resources to resolve by name
+            cloud_resources = self.api_client.get_cloud_deployments_api_v2_clouds_cloud_id_deployments_get(
+                cloud_id=cloud_id
+            ).results
+
+            if not cloud_resources:
+                raise RuntimeError(f"No cloud resources found for cloud {cloud_id}")
+
+            # Find resources with matching name
+            matching_resources = [r for r in cloud_resources if r.name == resource]
+
+            if not matching_resources:
+                raise RuntimeError(
+                    f"No cloud resource found with name '{resource}' in cloud {cloud_id}"
+                )
+
+            if len(matching_resources) > 1:
+                raise RuntimeError(
+                    f"Multiple cloud resources found with name '{resource}'. "
+                    f"Please use --cloud-resource-id to specify which resource to use. "
+                    f"Available resource IDs: {[r.cloud_deployment_id for r in matching_resources]}"
+                )
+
+            resolved_id = matching_resources[0].cloud_deployment_id
+            self.log.info(f"Resolved resource name '{resource}' to ID: {resolved_id}")
+            return resolved_id
+
+        # Default to primary resource (marked with is_default=True)
+        cloud_resources = self.api_client.get_cloud_deployments_api_v2_clouds_cloud_id_deployments_get(
+            cloud_id=cloud_id
+        ).results
+
+        if not cloud_resources:
+            raise RuntimeError(f"No cloud resources found for cloud {cloud_id}")
+
+        # Find primary resource (is_default=True)
+        primary_resources = [r for r in cloud_resources if r.is_default]
+
+        if not primary_resources:
+            raise RuntimeError(f"No primary cloud resource found for cloud {cloud_id}")
+
+        if len(primary_resources) > 1:
+            raise RuntimeError(
+                f"Multiple primary cloud resources found for cloud {cloud_id}"
+            )
+
+        resolved_id = primary_resources[0].cloud_deployment_id
+        self.log.info(f"Using primary cloud resource ID: {resolved_id}")
+        return resolved_id
+
     def get_cloud_config(
-        self, cloud_name: Optional[str] = None, cloud_id: Optional[str] = None,
+        self,
+        cloud_name: Optional[str] = None,
+        cloud_id: Optional[str] = None,
+        resource: Optional[str] = None,
+        cloud_resource_id: Optional[str] = None,
     ) -> CloudDeploymentConfig:
         """Get a cloud's current JSON configuration."""
 
-        cloud_id, cloud_name = get_cloud_id_and_name(
+        resolved_cloud_id, cloud_name = get_cloud_id_and_name(
             self.api_client, cloud_id, cloud_name
         )
 
-        # In the future we will expose cloud_deployment id as a parameter, for now, it's just a placeholder.
+        # Resolve the cloud resource ID to use
+        resolved_cloud_resource_id = self._resolve_cloud_resource_id(
+            resolved_cloud_id, resource, cloud_resource_id
+        )
+
         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"
+            cloud_id=resolved_cloud_id, cloud_deployment_id=resolved_cloud_resource_id
         ).result
 
         return config
@@ -1951,21 +2027,23 @@ class CloudController(BaseController):
         cloud_id: Optional[str] = None,
         enable_log_ingestion: Optional[bool] = None,
         spec_file: Optional[str] = None,
+        resource: Optional[str] = None,
+        cloud_resource_id: Optional[str] = None,
     ):
         """Update a cloud's configuration."""
         if enable_log_ingestion is None and spec_file is None:
             return
 
-        cloud_id, cloud_name = get_cloud_id_and_name(
+        resolved_cloud_id, cloud_name = get_cloud_id_and_name(
             self.api_client, cloud_id, cloud_name
         )
         if enable_log_ingestion is not None:
             self._update_customer_aggregated_logs_config(
-                cloud_id=cloud_id, is_enabled=enable_log_ingestion,  # type: ignore
+                cloud_id=resolved_cloud_id, is_enabled=enable_log_ingestion,  # type: ignore
             )
             self.log.info(
                 f"Successfully updated log ingestion configuration for cloud, "
-                f"{cloud_id} to {enable_log_ingestion}"
+                f"{resolved_cloud_id} to {enable_log_ingestion}"
             )
         elif spec_file is not None:
             path = pathlib.Path(spec_file)
@@ -1975,15 +2053,21 @@ class CloudController(BaseController):
             if not path.is_file():
                 raise ValueError(f"File {spec_file} is not a file.")
 
+            # Resolve the cloud resource ID to use
+            resolved_cloud_resource_id = self._resolve_cloud_resource_id(
+                resolved_cloud_id, resource, cloud_resource_id
+            )
+
             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_id=resolved_cloud_id,
+                cloud_deployment_id=resolved_cloud_resource_id,
                 cloud_deployment_config=config,
             )
             self.log.info(
-                f"Successfully updated cloud configuration for cloud {cloud_name}"
+                f"Successfully updated cloud configuration for cloud {cloud_name} "
+                f"(resource: {resolved_cloud_resource_id})"
             )
 
     def set_default_cloud(
@@ -2693,7 +2777,6 @@ class CloudController(BaseController):
             provider=provider,
             cloud_deployment_id=cloud_resource_id,
             region=region if cloud_provider == CloudProviders.AZURE else None,
-            kubernetes_zones=kubernetes_zones,
             operator_iam_identity=anyscale_operator_iam_identity
             if cloud_provider == CloudProviders.AZURE
             else None,
@@ -2939,7 +3022,6 @@ class CloudController(BaseController):
                     provider="aws",
                     cloud_deployment_id=cloud_resource_id,
                     region=region,
-                    kubernetes_zones=kubernetes_zones,
                 )
                 self.log.info(
                     f"Cloud registration complete! To install the Anyscale operator, run:\n\n{helm_command}"
@@ -3434,7 +3516,6 @@ class CloudController(BaseController):
                     provider="gcp",
                     cloud_deployment_id=cloud_resource_id,
                     region=region,
-                    kubernetes_zones=kubernetes_zones,
                     operator_iam_identity=anyscale_service_account_email,
                 )
                 gcloud_command = self._generate_gcp_workload_identity_command(
@@ -4160,7 +4241,6 @@ class CloudController(BaseController):
         provider: str,
         cloud_deployment_id: str,
         region: Optional[str] = None,
-        kubernetes_zones: Optional[List[str]] = None,
         operator_iam_identity: Optional[str] = None,
         anyscale_cli_token: Optional[str] = None,
     ) -> str:
@@ -4171,7 +4251,6 @@ class CloudController(BaseController):
             provider: Cloud provider ('aws', 'gcp', 'azure', 'generic')
             cloud_deployment_id: The cloud deployment ID from registration
             region: Cloud region (optional for generic provider)
-            kubernetes_zones: Optional list of Kubernetes zones
             operator_iam_identity: IAM identity for the operator (GCP service account email, Azure client ID)
             anyscale_cli_token: CLI token (required for Azure and generic providers)
 
@@ -4226,11 +4305,6 @@ class CloudController(BaseController):
             ]
         )
 
-        # Add zones if provided (mainly for K8s deployments)
-        if kubernetes_zones:
-            zones_str = ",".join(kubernetes_zones)
-            command_parts.append(f"  --set-string zones={zones_str}")
-
         return " \\\n".join(command_parts)
 
     def _generate_gcp_workload_identity_command(

anyscale/sdk/anyscale_client/models/compute_node_type.py

@@ -36,6 +36,7 @@ class ComputeNodeType(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',
@@ -46,13 +47,14 @@ class ComputeNodeType(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',
         'flags': 'flags'
     }
 
-    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, 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, local_vars_configuration=None):  # noqa: E501
         """ComputeNodeType - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -61,6 +63,7 @@ class ComputeNodeType(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
@@ -71,6 +74,8 @@ class ComputeNodeType(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:
@@ -153,6 +158,29 @@ class ComputeNodeType(object):
 
         self._resources = resources
 
+    @property
+    def labels(self):
+        """Gets the labels of this ComputeNodeType.  # 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 ComputeNodeType.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._labels
+
+    @labels.setter
+    def labels(self, labels):
+        """Sets the labels of this ComputeNodeType.
+
+        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 ComputeNodeType.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._labels = labels
+
     @property
     def aws_advanced_configurations_json(self):
         """Gets the aws_advanced_configurations_json of this ComputeNodeType.  # noqa: E501

anyscale/sdk/anyscale_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/service_account/_private/service_account_sdk.py

@@ -33,8 +33,11 @@ class PrivateServiceAccountSDK(BaseSDK):
             raise ValueError(f"No service account {identifier} found.")
 
         if len(service_accounts) > 1:
+            names = [sa.name for sa in service_accounts]
+            emails = [sa.email for sa in service_accounts]
             raise ValueError(
-                f"Internal server error when fetching service account {identifier}. Please contact support."
+                f"Found {len(service_accounts)} service accounts matching '{identifier}'. "
+                f"Names: {names}, Emails: {emails}. This should not happen - please contact support."
             )
 
     def _get_service_account(
@@ -44,6 +47,12 @@ class PrivateServiceAccountSDK(BaseSDK):
         service_accounts = self.client.get_organization_collaborators(
             email=email, name=name, is_service_account=True
         )
+
+        if name is not None:
+            service_accounts = [sa for sa in service_accounts if sa.name == name]
+        if email is not None:
+            service_accounts = [sa for sa in service_accounts if sa.email == email]
+
         self._validate_exactly_one_service_account_per_email_or_name(
             service_accounts, identifier
         )

anyscale/version.py

@@ -1 +1 @@
-__version__ = "0.26.61"
+__version__ = "0.26.63"