anyscale 0.26.47__py3-none-any.whl → 0.26.49__py3-none-any.whl

anyscale/_private/workload/workload_config.py

@@ -2,7 +2,12 @@ from dataclasses import dataclass, field
 from typing import Dict, List, Optional, Union
 
 from anyscale._private.models import ImageURI, ModelBase
-from anyscale.compute_config.models import ComputeConfig
+from anyscale.compute_config.models import (
+    compute_config_type_from_dict,
+    ComputeConfig,
+    ComputeConfigType,
+    MultiDeploymentComputeConfig,
+)
 
 
 @dataclass(frozen=True)
@@ -40,24 +45,27 @@ class WorkloadConfig(ModelBase):
         if containerfile is not None and not isinstance(containerfile, str):
             raise TypeError("'containerfile' must be a string.")
 
-    compute_config: Union[ComputeConfig, Dict, str, None] = field(
+    compute_config: Union[ComputeConfigType, Dict, str, None] = field(
         default=None,
         metadata={
-            "docstring": "The name of an existing registered compute config or an inlined ComputeConfig object."
+            "docstring": "The name of an existing registered compute config or an inlined ComputeConfig or MultiDeploymentComputeConfig object."
         },
     )
 
     def _validate_compute_config(
-        self, compute_config: Union[ComputeConfig, Dict, str, None]
-    ) -> Union[None, str, ComputeConfig]:
+        self, compute_config: Union[ComputeConfigType, Dict, str, None]
+    ) -> Union[None, str, ComputeConfigType]:
         if compute_config is None or isinstance(compute_config, str):
             return compute_config
 
         if isinstance(compute_config, dict):
-            compute_config = ComputeConfig.from_dict(compute_config)
-        if not isinstance(compute_config, ComputeConfig):
+            compute_config = compute_config_type_from_dict(compute_config)
+
+        if not isinstance(
+            compute_config, (ComputeConfig, MultiDeploymentComputeConfig)
+        ):
             raise TypeError(
-                "'compute_config' must be a string, ComputeConfig, or corresponding dict"
+                "'compute_config' must be a string, ComputeConfig, MultiDeploymentComputeConfig, or corresponding dict"
             )
 
         return compute_config

anyscale/_private/workload/workload_sdk.py

@@ -10,7 +10,11 @@ from anyscale._private.anyscale_client import (
 from anyscale._private.sdk.base_sdk import BaseSDK, Timer
 from anyscale.cli_logger import BlockLogger
 from anyscale.compute_config._private.compute_config_sdk import PrivateComputeConfigSDK
-from anyscale.compute_config.models import ComputeConfig
+from anyscale.compute_config.models import (
+    ComputeConfig,
+    ComputeConfigType,
+    MultiDeploymentComputeConfig,
+)
 from anyscale.image._private.image_sdk import PrivateImageSDK
 from anyscale.utils.runtime_env import is_dir_remote_uri, parse_requirements_file
 
@@ -139,8 +143,8 @@ class WorkloadSDK(BaseSDK):
                 return local_path_to_uri[target]
 
             if has_multiple_cloud_deployments:
-                raise ValueError(
-                    "Local directory uploads are not supported for compute configurations with multiple cloud deployments."
+                self.logger.warning(
+                    "For compute configurations with multiple cloud deployments, local directories will only be uploaded to the object storage of the primary cloud deployment."
                 )
 
             self.logger.info(f"Uploading local dir '{target}' to cloud storage.")
@@ -189,7 +193,9 @@ class WorkloadSDK(BaseSDK):
         return new_runtime_envs
 
     def _resolve_compute_config_id(
-        self, compute_config: Union[str, ComputeConfig], cloud: Optional[str] = None,
+        self,
+        compute_config: Union[str, ComputeConfigType, None],
+        cloud: Optional[str] = None,
     ) -> str:
         """Resolve the passed compute config to its ID.
 
@@ -207,6 +213,15 @@ class WorkloadSDK(BaseSDK):
                 raise ValueError(
                     f"The compute config '{compute_config}' does not exist."
                 )
+        elif compute_config is None:
+            cloud_id = self.client.get_cloud_id(cloud_name=cloud)  # type: ignore
+            compute_config_id = self._client.get_default_compute_config(
+                cloud_id=cloud_id
+            ).id
+            if compute_config_id is None:
+                raise ValueError(
+                    f"The default compute config for cloud '{cloud}' does not exist."
+                )
         else:
             _, compute_config_id = self._compute_config_sdk.create_compute_config(
                 compute_config
@@ -217,7 +232,7 @@ class WorkloadSDK(BaseSDK):
     def resolve_compute_config_and_cloud_id(
         self,
         *,
-        compute_config: Union[ComputeConfig, Dict, str, None],
+        compute_config: Union[ComputeConfigType, Dict, str, None],
         cloud: Union[None, str],
     ) -> Tuple[str, str]:
         """Resolve the passed compute config to its ID and corresponding cloud ID.
@@ -252,7 +267,9 @@ class WorkloadSDK(BaseSDK):
         else:
             # If we are creating a new compute config, ensure cloud is set accordingly
             if (
-                isinstance(compute_config, ComputeConfig)
+                isinstance(
+                    compute_config, (ComputeConfig, MultiDeploymentComputeConfig)
+                )
                 and compute_config.cloud is None
             ):
                 compute_config = replace(compute_config, cloud=cloud)
@@ -315,7 +332,7 @@ class WorkloadSDK(BaseSDK):
 
     def get_user_facing_compute_config(
         self, compute_config_id: str,
-    ) -> Union[str, ComputeConfig]:
+    ) -> Union[str, ComputeConfigType]:
         """Get the compute config in a format to be displayed in a user-facing status.
 
         If the compute config refers to an anonymous compute config, its config

anyscale/client/README.md

@@ -308,6 +308,8 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**put_workspace_proxied_dataplane_artifacts_api_v2_experimental_workspaces_workspace_id_proxied_dataplane_artifacts_put**](docs/DefaultApi.md#put_workspace_proxied_dataplane_artifacts_api_v2_experimental_workspaces_workspace_id_proxied_dataplane_artifacts_put) | **PUT** /api/v2/experimental_workspaces/{workspace_id}/proxied_dataplane_artifacts | Put Workspace Proxied Dataplane Artifacts
 *DefaultApi* | [**put_workspace_wandb_run_details_api_v2_integrations_workspace_wandb_run_details_workspace_id_put**](docs/DefaultApi.md#put_workspace_wandb_run_details_api_v2_integrations_workspace_wandb_run_details_workspace_id_put) | **PUT** /api/v2/integrations/workspace_wandb_run_details/{workspace_id} | Put Workspace Wandb Run Details
 *DefaultApi* | [**query_aggregated_logs_api_v2_logs_query_aggregated_logs_get**](docs/DefaultApi.md#query_aggregated_logs_api_v2_logs_query_aggregated_logs_get) | **GET** /api/v2/logs/query_aggregated_logs | Query Aggregated Logs
+*DefaultApi* | [**query_api_v2_metrics_query_get**](docs/DefaultApi.md#query_api_v2_metrics_query_get) | **GET** /api/v2/metrics/query | Query
+*DefaultApi* | [**query_range_api_v2_metrics_query_range_get**](docs/DefaultApi.md#query_range_api_v2_metrics_query_range_get) | **GET** /api/v2/metrics/query_range | Query Range
 *DefaultApi* | [**receive_cli_usage_api_v2_cli_usage_post**](docs/DefaultApi.md#receive_cli_usage_api_v2_cli_usage_post) | **POST** /api/v2/cli_usage/ | Receive Cli Usage
 *DefaultApi* | [**redirect_to_service_api_v2_sessions_cluster_id_services_get**](docs/DefaultApi.md#redirect_to_service_api_v2_sessions_cluster_id_services_get) | **GET** /api/v2/sessions/{cluster_id}/services | Redirect To Service
 *DefaultApi* | [**redirect_to_tools_api_v2_services_v2_service_id_tools_get**](docs/DefaultApi.md#redirect_to_tools_api_v2_services_v2_service_id_tools_get) | **GET** /api/v2/services-v2/{service_id}/tools | Redirect To Tools
@@ -352,6 +354,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**try_claim_cloud_api_v2_aioa_cloud_waitlist_claim_cloud_post**](docs/DefaultApi.md#try_claim_cloud_api_v2_aioa_cloud_waitlist_claim_cloud_post) | **POST** /api/v2/aioa_cloud_waitlist/claim_cloud | Try Claim Cloud
 *DefaultApi* | [**try_login_api_v2_users_try_login_post**](docs/DefaultApi.md#try_login_api_v2_users_try_login_post) | **POST** /api/v2/users/try-login | Try Login
 *DefaultApi* | [**update_cloud_auto_add_user_api_v2_clouds_cloud_id_auto_add_user_put**](docs/DefaultApi.md#update_cloud_auto_add_user_api_v2_clouds_cloud_id_auto_add_user_put) | **PUT** /api/v2/clouds/{cloud_id}/auto_add_user | Update Cloud Auto Add User
+*DefaultApi* | [**update_cloud_deployment_api_v2_clouds_cloud_id_update_deployment_put**](docs/DefaultApi.md#update_cloud_deployment_api_v2_clouds_cloud_id_update_deployment_put) | **PUT** /api/v2/clouds/{cloud_id}/update_deployment | Update Cloud Deployment
 *DefaultApi* | [**update_cloud_deployment_config_api_v2_clouds_cloud_id_deployment_cloud_deployment_id_config_put**](docs/DefaultApi.md#update_cloud_deployment_config_api_v2_clouds_cloud_id_deployment_cloud_deployment_id_config_put) | **PUT** /api/v2/clouds/{cloud_id}/deployment/{cloud_deployment_id}/config | Update Cloud Deployment Config
 *DefaultApi* | [**update_cloud_deployments_api_v2_clouds_cloud_id_deployments_put**](docs/DefaultApi.md#update_cloud_deployments_api_v2_clouds_cloud_id_deployments_put) | **PUT** /api/v2/clouds/{cloud_id}/deployments | Update Cloud Deployments
 *DefaultApi* | [**update_cloud_with_cloud_resource_api_v2_clouds_with_cloud_resource_gcp_router_cloud_id_put**](docs/DefaultApi.md#update_cloud_with_cloud_resource_api_v2_clouds_with_cloud_resource_gcp_router_cloud_id_put) | **PUT** /api/v2/clouds_with_cloud_resource_gcp_router/{cloud_id} | Update Cloud With Cloud Resource
@@ -366,6 +369,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**update_payment_info_api_v2_organization_billing_update_payment_info_post**](docs/DefaultApi.md#update_payment_info_api_v2_organization_billing_update_payment_info_post) | **POST** /api/v2/organization_billing/update_payment_info | Update Payment Info
 *DefaultApi* | [**update_resource_notification_api_v2_resource_notifications_resource_notification_id_put**](docs/DefaultApi.md#update_resource_notification_api_v2_resource_notifications_resource_notification_id_put) | **PUT** /api/v2/resource_notifications/{resource_notification_id} | Update Resource Notification
 *DefaultApi* | [**update_resource_quota_api_v2_resource_quotas_resource_quota_id_patch**](docs/DefaultApi.md#update_resource_quota_api_v2_resource_quotas_resource_quota_id_patch) | **PATCH** /api/v2/resource_quotas/{resource_quota_id} | Update Resource Quota
+*DefaultApi* | [**update_system_cluster_config_api_v2_clouds_cloud_id_update_system_cluster_config_put**](docs/DefaultApi.md#update_system_cluster_config_api_v2_clouds_cloud_id_update_system_cluster_config_put) | **PUT** /api/v2/clouds/{cloud_id}/update_system_cluster_config | Update System Cluster Config
 *DefaultApi* | [**upload_session_command_logs_api_v2_session_commands_session_command_id_upload_logs_post**](docs/DefaultApi.md#upload_session_command_logs_api_v2_session_commands_session_command_id_upload_logs_post) | **POST** /api/v2/session_commands/{session_command_id}/upload_logs | Upload Session Command Logs
 *DefaultApi* | [**upsert_billing_version_api_v2_organization_billing_billing_versions_put**](docs/DefaultApi.md#upsert_billing_version_api_v2_organization_billing_billing_versions_put) | **PUT** /api/v2/organization_billing/billing_versions | Upsert Billing Version
 *DefaultApi* | [**upsert_support_request_for_user_organization_api_v2_support_requests_support_request_put**](docs/DefaultApi.md#upsert_support_request_for_user_organization_api_v2_support_requests_support_request_put) | **PUT** /api/v2/support_requests/support_request | Upsert Support Request For User Organization
@@ -394,7 +398,7 @@ Class | Method | HTTP request | Description
  - [AggregatedusageResponse](docs/AggregatedusageResponse.md)
  - [AioaCloudWaitlistRecord](docs/AioaCloudWaitlistRecord.md)
  - [AioacloudwaitlistrecordResponse](docs/AioacloudwaitlistrecordResponse.md)
- - [AlertType](docs/AlertType.md)
+ - [AlertIssueType](docs/AlertIssueType.md)
  - [AnyscaleAWSAccount](docs/AnyscaleAWSAccount.md)
  - [AnyscaleServiceAccount](docs/AnyscaleServiceAccount.md)
  - [AnyscaleawsaccountResponse](docs/AnyscaleawsaccountResponse.md)
@@ -482,7 +486,6 @@ Class | Method | HTTP request | Description
  - [ClouddatabucketpresigneduploadinfoResponse](docs/ClouddatabucketpresigneduploadinfoResponse.md)
  - [ClouddatabucketpresignedurlresponseResponse](docs/ClouddatabucketpresignedurlresponseResponse.md)
  - [ClouddeploymentListResponse](docs/ClouddeploymentListResponse.md)
- - [ClouddeploymentResponse](docs/ClouddeploymentResponse.md)
  - [ClouddeploymentconfigResponse](docs/ClouddeploymentconfigResponse.md)
  - [CloudoverviewdashboardResponse](docs/CloudoverviewdashboardResponse.md)
  - [CloudregionandzonesResponse](docs/CloudregionandzonesResponse.md)
@@ -581,6 +584,7 @@ Class | Method | HTTP request | Description
  - [DatasetuploadResponse](docs/DatasetuploadResponse.md)
  - [DecoratedApplicationTemplate](docs/DecoratedApplicationTemplate.md)
  - [DecoratedBuild](docs/DecoratedBuild.md)
+ - [DecoratedCloudDeployment](docs/DecoratedCloudDeployment.md)
  - [DecoratedComputeTemplate](docs/DecoratedComputeTemplate.md)
  - [DecoratedComputeTemplateConfig](docs/DecoratedComputeTemplateConfig.md)
  - [DecoratedInteractiveSession](docs/DecoratedInteractiveSession.md)
@@ -601,6 +605,7 @@ Class | Method | HTTP request | Description
  - [DecoratedapplicationtemplateResponse](docs/DecoratedapplicationtemplateResponse.md)
  - [DecoratedbuildListResponse](docs/DecoratedbuildListResponse.md)
  - [DecoratedbuildResponse](docs/DecoratedbuildResponse.md)
+ - [DecoratedclouddeploymentResponse](docs/DecoratedclouddeploymentResponse.md)
  - [DecoratedcomputetemplateListResponse](docs/DecoratedcomputetemplateListResponse.md)
  - [DecoratedcomputetemplateResponse](docs/DecoratedcomputetemplateResponse.md)
  - [DecoratedinteractivesessionListResponse](docs/DecoratedinteractivesessionListResponse.md)
@@ -746,6 +751,8 @@ Class | Method | HTTP request | Description
  - [MachinepoolsearchresultListResponse](docs/MachinepoolsearchresultListResponse.md)
  - [MachinestateinfoListResponse](docs/MachinestateinfoListResponse.md)
  - [Metric](docs/Metric.md)
+ - [MetricsQueryResponse](docs/MetricsQueryResponse.md)
+ - [MetricsqueryresponseResponse](docs/MetricsqueryresponseResponse.md)
  - [MetronomeCustomerInfoModel](docs/MetronomeCustomerInfoModel.md)
  - [MetronomeDashboardType](docs/MetronomeDashboardType.md)
  - [MetronomecustomerinfomodelListResponse](docs/MetronomecustomerinfomodelListResponse.md)
@@ -783,6 +790,7 @@ Class | Method | HTTP request | Description
  - [OperatorBranch](docs/OperatorBranch.md)
  - [OperatorId](docs/OperatorId.md)
  - [OperatorMetrics](docs/OperatorMetrics.md)
+ - [OperatorStatus](docs/OperatorStatus.md)
  - [Organization](docs/Organization.md)
  - [OrganizationCollaborator](docs/OrganizationCollaborator.md)
  - [OrganizationConfiguration](docs/OrganizationConfiguration.md)

anyscale/client/openapi_client/__init__.py

@@ -42,7 +42,7 @@ from openapi_client.models.aggregatedinstanceusagecsv_list_response import Aggre
 from openapi_client.models.aggregatedusage_response import AggregatedusageResponse
 from openapi_client.models.aioa_cloud_waitlist_record import AioaCloudWaitlistRecord
 from openapi_client.models.aioacloudwaitlistrecord_response import AioacloudwaitlistrecordResponse
-from openapi_client.models.alert_type import AlertType
+from openapi_client.models.alert_issue_type import AlertIssueType
 from openapi_client.models.anyscale_aws_account import AnyscaleAWSAccount
 from openapi_client.models.anyscale_service_account import AnyscaleServiceAccount
 from openapi_client.models.anyscaleawsaccount_response import AnyscaleawsaccountResponse
@@ -130,7 +130,6 @@ from openapi_client.models.cloudcollaborator_list_response import Cloudcollabora
 from openapi_client.models.clouddatabucketpresigneduploadinfo_response import ClouddatabucketpresigneduploadinfoResponse
 from openapi_client.models.clouddatabucketpresignedurlresponse_response import ClouddatabucketpresignedurlresponseResponse
 from openapi_client.models.clouddeployment_list_response import ClouddeploymentListResponse
-from openapi_client.models.clouddeployment_response import ClouddeploymentResponse
 from openapi_client.models.clouddeploymentconfig_response import ClouddeploymentconfigResponse
 from openapi_client.models.cloudoverviewdashboard_response import CloudoverviewdashboardResponse
 from openapi_client.models.cloudregionandzones_response import CloudregionandzonesResponse
@@ -229,6 +228,7 @@ from openapi_client.models.dataset_upload import DatasetUpload
 from openapi_client.models.datasetupload_response import DatasetuploadResponse
 from openapi_client.models.decorated_application_template import DecoratedApplicationTemplate
 from openapi_client.models.decorated_build import DecoratedBuild
+from openapi_client.models.decorated_cloud_deployment import DecoratedCloudDeployment
 from openapi_client.models.decorated_compute_template import DecoratedComputeTemplate
 from openapi_client.models.decorated_compute_template_config import DecoratedComputeTemplateConfig
 from openapi_client.models.decorated_interactive_session import DecoratedInteractiveSession
@@ -249,6 +249,7 @@ from openapi_client.models.decoratedapplicationtemplate_list_response import Dec
 from openapi_client.models.decoratedapplicationtemplate_response import DecoratedapplicationtemplateResponse
 from openapi_client.models.decoratedbuild_list_response import DecoratedbuildListResponse
 from openapi_client.models.decoratedbuild_response import DecoratedbuildResponse
+from openapi_client.models.decoratedclouddeployment_response import DecoratedclouddeploymentResponse
 from openapi_client.models.decoratedcomputetemplate_list_response import DecoratedcomputetemplateListResponse
 from openapi_client.models.decoratedcomputetemplate_response import DecoratedcomputetemplateResponse
 from openapi_client.models.decoratedinteractivesession_list_response import DecoratedinteractivesessionListResponse
@@ -394,6 +395,8 @@ from openapi_client.models.machine_state_info import MachineStateInfo
 from openapi_client.models.machinepoolsearchresult_list_response import MachinepoolsearchresultListResponse
 from openapi_client.models.machinestateinfo_list_response import MachinestateinfoListResponse
 from openapi_client.models.metric import Metric
+from openapi_client.models.metrics_query_response import MetricsQueryResponse
+from openapi_client.models.metricsqueryresponse_response import MetricsqueryresponseResponse
 from openapi_client.models.metronome_customer_info_model import MetronomeCustomerInfoModel
 from openapi_client.models.metronome_dashboard_type import MetronomeDashboardType
 from openapi_client.models.metronomecustomerinfomodel_list_response import MetronomecustomerinfomodelListResponse
@@ -431,6 +434,7 @@ from openapi_client.models.operation_result import OperationResult
 from openapi_client.models.operator_branch import OperatorBranch
 from openapi_client.models.operator_id import OperatorId
 from openapi_client.models.operator_metrics import OperatorMetrics
+from openapi_client.models.operator_status import OperatorStatus
 from openapi_client.models.organization import Organization
 from openapi_client.models.organization_collaborator import OrganizationCollaborator
 from openapi_client.models.organization_configuration import OrganizationConfiguration