anyscale 0.26.30__py3-none-any.whl → 0.26.32__py3-none-any.whl

anyscale/_private/anyscale_client/anyscale_client.py

@@ -46,6 +46,7 @@ from anyscale.client.openapi_client.models import (
     CloudDataBucketPresignedUrlResponse,
     CloudDataBucketPresignedUrlScheme,
     CloudNameOptions,
+    ClusteroperationResponse,
     ComputeTemplate,
     ComputeTemplateConfig,
     ComputeTemplateQuery,
@@ -68,6 +69,7 @@ from anyscale.client.openapi_client.models import (
     ExperimentalWorkspace,
     FineTunedModel,
     FinetunedmodelListResponse,
+    GetOrCreateBuildFromImageUriRequest,
     InternalProductionJob,
     JobQueueSortDirective,
     JobQueuesQuery,
@@ -81,6 +83,7 @@ from anyscale.client.openapi_client.models import (
     SessionState,
     StartSessionOptions,
     StopSessionOptions,
+    SystemWorkloadName,
     WorkspaceDataplaneProxiedArtifacts,
 )
 from anyscale.client.openapi_client.models.create_schedule import CreateSchedule
@@ -595,6 +598,19 @@ class AnyscaleClient(AnyscaleClientInterface):
             cloud_id, collaborators
         )
 
+    @handle_api_exceptions
+    def terminate_system_cluster(self, cloud_id: str) -> ClusteroperationResponse:
+        return self._internal_api_client.terminate_system_cluster_api_v2_system_workload_cloud_id_terminate_post(
+            cloud_id
+        )
+
+    @handle_api_exceptions
+    def describe_system_workload_get_status(self, cloud_id: str) -> str:
+        res = self._internal_api_client.describe_system_workload_api_v2_system_workload_cloud_id_describe_post(
+            cloud_id, SystemWorkloadName.RAY_OBS_EVENTS_API_SERVICE, start_cluster=False
+        ).result
+        return res.status
+
     @handle_api_exceptions
     def create_compute_config(
         self, config: ComputeTemplateConfig, *, name: Optional[str] = None
@@ -946,69 +962,15 @@ class AnyscaleClient(AnyscaleClientInterface):
         ray_version: Optional[str] = None,
         name: Optional[str] = None,
     ) -> str:
-        if image_uri.is_cluster_env_image():
-            identifier = image_uri.to_cluster_env_identifier()
-            try:
-                build = self._external_api_client.find_cluster_environment_build_by_identifier(
-                    identifier=identifier
-                ).result
-                if build.status == ClusterEnvironmentBuildStatus.SUCCEEDED:
-                    return build.id
-                else:
-                    raise RuntimeError(
-                        f"Legacy cluster environment build '{identifier}' is not a successful build."
-                    )
-            except ExternalApiException as e:
-                if e.status == 404:
-                    raise RuntimeError(
-                        f"Legacy cluster environment '{identifier}' is not found."
-                    )
-        elif image_uri.is_default_image():
-            # Default image
-            cluster_envs = self._internal_api_client.list_application_templates_api_v2_application_templates_get(
-                image_name_contains=image_uri.image_uri
-            ).results
-            for cluster_env in cluster_envs:
-                if (
-                    cluster_env.latest_build is not None
-                    and cluster_env.latest_build.docker_image_name
-                    == image_uri.image_uri
-                ):
-                    return cluster_env.latest_build.id
-            raise RuntimeError(f"Default image '{image_uri.image_uri}' is not found.")
-
-        # BYOD image
-        cluster_env_name = name if name else image_uri.to_cluster_env_name()
-        image_uri_str = str(image_uri)
-        cluster_env = self._find_or_create_cluster_env(
-            cluster_env_name,
-            anonymous=not name,
-            image_uri=image_uri_str,
-            registry_login_secret=registry_login_secret,
-            ray_version=ray_version,
-        )
-        for build in self.list_cluster_env_builds(cluster_env.id):
-            if (
-                # NOTE: Ignore ray version mismatch for now. We plan to eventually remove ray version from the API model.
-                build.docker_image_name == image_uri_str
-                and build.registry_login_secret == registry_login_secret
-                and build.status == ClusterEnvironmentBuildStatus.SUCCEEDED
-            ):
-                return build.id
-
-        # Still create a new build if the cluster env already exists but the build does not match the image_uri.
-        result = self._external_api_client.create_cluster_environment_build(
-            CreateClusterEnvironmentBuild(
-                # For historical reasons, we have to use docker_image_name instead of image_uri; but it is just a URI to the image.
-                cluster_environment_id=cluster_env.id,
-                docker_image_name=image_uri_str,
+        build = self._internal_api_client.get_or_create_build_from_image_uri_api_v2_builds_get_or_create_build_from_image_uri_post(
+            GetOrCreateBuildFromImageUriRequest(
+                image_uri=str(image_uri),
                 registry_login_secret=registry_login_secret,
-                ray_version=ray_version if ray_version else LATEST_RAY_VERSION,
+                ray_version=ray_version,
+                cluster_env_name=name,
             )
         ).result
-
-        assert result.completed
-        return result.cluster_environment_build_id
+        return build.id
 
     @handle_api_exceptions
     def send_workspace_notification(

anyscale/_private/anyscale_client/common.py

@@ -8,6 +8,7 @@ from anyscale.client.openapi_client.models import (
     AdminCreateUser,
     AnyscaleServiceAccount,
     Cloud,
+    ClusteroperationResponse,
     ComputeTemplateConfig,
     CreateCloudCollaborator,
     CreateExperimentalWorkspace,
@@ -54,7 +55,7 @@ from anyscale.utils.workspace_notification import WorkspaceNotification
 # Maybe just make it part of the release process to update it, or fetch the
 # default builds and get the latest one. The best thing to do is probably
 # to populate this in the backend.
-DEFAULT_RAY_VERSION = "2.46.0"  # RAY_RELEASE_UPDATE: update to latest version.
+DEFAULT_RAY_VERSION = "2.47.1"  # RAY_RELEASE_UPDATE: update to latest version.
 DEFAULT_PYTHON_VERSION = "py311"
 RUNTIME_ENV_PACKAGE_FORMAT = "pkg_{content_hash}.zip"
 
@@ -175,6 +176,16 @@ class AnyscaleClientInterface(ABC):
         """Batch add collaborators to a cloud."""
         raise NotImplementedError
 
+    @abstractmethod
+    def terminate_system_cluster(self, cloud_id: str) -> ClusteroperationResponse:
+        """Terminate the system cluster for the provided cloud ID."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def describe_system_workload_get_status(self, cloud_id: str) -> str:
+        """Get the status of the system cluster for the provided cloud ID."""
+        raise NotImplementedError
+
     @abstractmethod
     def create_compute_config(
         self, config: ComputeTemplateConfig, *, name: Optional[str] = None

anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -19,6 +19,9 @@ from anyscale.client.openapi_client.models import (
     AnyscaleServiceAccount,
     Cloud,
     CloudProviders,
+    ClusterOperation,
+    ClusteroperationResponse,
+    ClusterState,
     ComputeTemplateConfig,
     CreateCloudCollaborator,
     CreateExperimentalWorkspace,
@@ -177,6 +180,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         self._organization_collaborators: List[OrganizationCollaborator] = []
         self._organization_invitations: Dict[str, OrganizationInvitation] = {}
         self._resource_quotas: Dict[str, ResourceQuota] = {}
+        self._system_cluster_status: Dict[str, str] = {}
 
         # Cloud ID -> Cloud.
         self._clouds: Dict[str, Cloud] = {
@@ -369,6 +373,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
 
     def add_cloud(self, cloud: Cloud):
         self._clouds[cloud.id] = cloud
+        self._system_cluster_status[cloud.id] = ClusterState.RUNNING
 
     def get_cloud(self, *, cloud_id: str) -> Optional[Cloud]:
         return self._clouds.get(cloud_id, None)
@@ -401,6 +406,25 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         else:
             self._cloud_collaborators[cloud_id].extend(collaborators)
 
+    def terminate_system_cluster(
+        self, cloud_id: str
+    ) -> Optional[ClusteroperationResponse]:
+        self._system_cluster_status[cloud_id] = ClusterState.TERMINATING
+        return ClusteroperationResponse(
+            result=ClusterOperation(
+                id="sop_123",
+                completed=False,
+                progress=None,
+                result=None,
+                cluster_id="fake-system-cluster-id",
+                cluster_operation_type="terminate",
+            )
+        )
+
+    def describe_system_workload_get_status(self, cloud_id: str) -> str:
+        self._system_cluster_status[cloud_id] = ClusterState.TERMINATED
+        return self._system_cluster_status[cloud_id]
+
     def add_compute_config(self, compute_config: DecoratedComputeTemplate) -> int:
         compute_config.version = (
             len(self._compute_config_name_to_ids[compute_config.name]) + 1

anyscale/_private/docgen/__main__.py

@@ -436,12 +436,14 @@ ALL_MODULES = [
             cloud_commands.add_collaborators,
             cloud_commands.get_cloud,
             cloud_commands.get_default_cloud,
+            cloud_commands.terminate_system_cluster,
         ],
         sdk_prefix="anyscale.cloud",
         sdk_commands=[
             anyscale.cloud.add_collaborators,
             anyscale.cloud.get,
             anyscale.cloud.get_default,
+            anyscale.cloud.terminate_system_cluster,
         ],
         models=[
             CloudPermissionLevel,