anyscale 0.26.29__py3-none-any.whl → 0.26.31__py3-none-any.whl

anyscale/__init__.py

@@ -25,6 +25,7 @@ from anyscale import (
     image,
     integrations,
     job,
+    job_queue,
     llm,
     organization_invitation,
     project,
@@ -46,6 +47,7 @@ from anyscale.compute_config import ComputeConfigSDK
 from anyscale.connect import ClientBuilder
 from anyscale.image import ImageSDK
 from anyscale.job import JobSDK
+from anyscale.job_queue import JobQueueSDK
 from anyscale.llm import LLMSDK
 from anyscale.organization_invitation import OrganizationInvitationSDK
 from anyscale.project import ProjectSDK
@@ -119,6 +121,7 @@ class Anyscale:
             client=self._anyscale_client
         )
         self._job_sdk = JobSDK(client=self._anyscale_client)
+        self._job_queue_sdk = JobQueueSDK(client=self._anyscale_client)
         self._service_sdk = ServiceSDK(client=self._anyscale_client)
         self._compute_config_sdk = ComputeConfigSDK(client=self._anyscale_client)
         self._cloud_sdk = CloudSDK(client=self._anyscale_client)
@@ -146,6 +149,9 @@ class Anyscale:
             client=client, logger=logger, timer=timer
         )
         obj._job_sdk = JobSDK(client=client, logger=logger, timer=timer)  # noqa: SLF001
+        obj._job_queue_sdk = JobQueueSDK(  # noqa: SLF001
+            client=client, logger=logger, timer=timer
+        )
         obj._service_sdk = ServiceSDK(  # noqa: SLF001
             client=client, logger=logger, timer=timer
         )
@@ -187,6 +193,10 @@ class Anyscale:
     def job(self) -> JobSDK:  # noqa: F811
         return self._job_sdk
 
+    @property
+    def job_queue(self) -> JobQueueSDK:  # noqa: F811
+        return self._job_queue_sdk
+
     @property
     def service(self) -> ServiceSDK:  # noqa: F811
         return self._service_sdk

anyscale/_private/anyscale_client/anyscale_client.py

@@ -60,6 +60,7 @@ from anyscale.client.openapi_client.models import (
     Dataset as InternalDataset,
     DatasetUpload,
     DecoratedComputeTemplate,
+    DecoratedjobqueueListResponse,
     DecoratedlistserviceapimodelListResponse,
     DecoratedProductionServiceV2APIModel,
     DecoratedSession,
@@ -67,7 +68,10 @@ from anyscale.client.openapi_client.models import (
     ExperimentalWorkspace,
     FineTunedModel,
     FinetunedmodelListResponse,
+    GetOrCreateBuildFromImageUriRequest,
     InternalProductionJob,
+    JobQueueSortDirective,
+    JobQueuesQuery,
     ListResourceQuotasQuery,
     OrganizationCollaborator,
     OrganizationInvitation,
@@ -75,13 +79,18 @@ from anyscale.client.openapi_client.models import (
     ResourceQuotaStatus,
     ServerSessionToken,
     SessionSshKey,
+    SessionState,
     StartSessionOptions,
     StopSessionOptions,
     WorkspaceDataplaneProxiedArtifacts,
 )
 from anyscale.client.openapi_client.models.create_schedule import CreateSchedule
+from anyscale.client.openapi_client.models.decorated_job_queue import DecoratedJobQueue
 from anyscale.client.openapi_client.models.decorated_schedule import DecoratedSchedule
 from anyscale.client.openapi_client.models.production_job import ProductionJob
+from anyscale.client.openapi_client.models.update_job_queue_request import (
+    UpdateJobQueueRequest,
+)
 from anyscale.client.openapi_client.rest import ApiException as InternalApiException
 from anyscale.cluster_compute import parse_cluster_compute_name_version
 from anyscale.feature_flags import FLAG_DEFAULT_WORKING_DIR_FOR_PROJ
@@ -938,69 +947,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(
@@ -1154,6 +1109,67 @@ class AnyscaleClient(AnyscaleClientInterface):
         )
         return job_runs
 
+    @handle_api_exceptions
+    def get_job_queue(self, job_queue_id: str) -> Optional[DecoratedJobQueue]:
+        try:
+            return self._internal_api_client.get_job_queue_api_v2_job_queues_job_queue_id_get(
+                job_queue_id
+            ).result
+        except InternalApiException as e:
+            if e.status == 404:
+                return None
+
+            raise e from None
+
+    @handle_api_exceptions
+    def update_job_queue(
+        self,
+        job_queue_id: str,
+        max_concurrency: Optional[int] = None,
+        idle_timeout_s: Optional[int] = None,
+    ) -> DecoratedJobQueue:
+        if max_concurrency is None and idle_timeout_s is None:
+            raise ValueError("No fields to update")
+
+        return self._internal_api_client.update_job_queue_api_v2_job_queues_job_queue_id_put(
+            job_queue_id,
+            update_job_queue_request=UpdateJobQueueRequest(
+                max_concurrency=max_concurrency, idle_timeout_sec=idle_timeout_s,
+            ),
+        ).result
+
+    @handle_api_exceptions
+    def list_job_queues(
+        self,
+        *,
+        name: Optional[str] = None,
+        creator_id: Optional[str] = None,
+        cluster_status: Optional[SessionState] = None,
+        project: Optional[str] = None,
+        cloud: Optional[str] = None,
+        count: Optional[int] = None,
+        paging_token: Optional[str] = None,
+        sorting_directives: Optional[List[JobQueueSortDirective]] = None,
+    ) -> DecoratedjobqueueListResponse:
+        cloud_id = self.get_cloud_id(cloud_name=cloud) if cloud else None
+        project_id = (
+            self.get_project_id(parent_cloud_id=cloud_id, name=project)
+            if project
+            else None
+        )
+
+        return self._internal_api_client.list_job_queues_api_v2_job_queues_post(
+            job_queues_query=JobQueuesQuery(
+                name=name,
+                creator_id=creator_id,
+                cluster_status=cluster_status,
+                project_id=project_id,
+                cloud_id=cloud_id,
+                paging=PageQuery(count=count, paging_token=paging_token),
+                sorting_directives=sorting_directives,
+            ),
+        )
+
     @handle_api_exceptions
     def rollout_service(
         self, model: ApplyProductionServiceV2Model

anyscale/_private/anyscale_client/common.py

@@ -15,19 +15,23 @@ from anyscale.client.openapi_client.models import (
     CreateResourceQuota,
     CreateUserProjectCollaborator,
     DecoratedComputeTemplate,
+    DecoratedjobqueueListResponse,
     DecoratedlistserviceapimodelListResponse,
     DecoratedProductionServiceV2APIModel,
     DeletedPlatformFineTunedModel,
     FineTunedModel,
     InternalProductionJob,
+    JobQueueSortDirective,
     OrganizationCollaborator,
     OrganizationInvitation,
     Project,
     ResourceQuota,
     ServerSessionToken,
+    SessionState,
     WorkspaceDataplaneProxiedArtifacts,
 )
 from anyscale.client.openapi_client.models.create_schedule import CreateSchedule
+from anyscale.client.openapi_client.models.decorated_job_queue import DecoratedJobQueue
 from anyscale.client.openapi_client.models.decorated_schedule import DecoratedSchedule
 from anyscale.client.openapi_client.models.decorated_session import DecoratedSession
 from anyscale.client.openapi_client.models.production_job import ProductionJob
@@ -50,7 +54,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.0"  # RAY_RELEASE_UPDATE: update to latest version.
 DEFAULT_PYTHON_VERSION = "py311"
 RUNTIME_ENV_PACKAGE_FORMAT = "pkg_{content_hash}.zip"
 
@@ -366,6 +370,24 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def get_job_queue(self, job_queue_id: str) -> Optional[DecoratedJobQueue]:
+        """Get a job queue by id.
+
+        Returns None if not found.
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    def update_job_queue(
+        self,
+        job_queue_id: str,
+        max_concurrency: Optional[int] = None,
+        idle_timeout_s: Optional[int] = None,
+    ) -> DecoratedJobQueue:
+        """Update a job queue."""
+        raise NotImplementedError
+
     @abstractmethod
     def get_job_runs(self, job_id: str) -> List[APIJobRun]:
         """Returns all job runs for a given job id.
@@ -374,6 +396,22 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def list_job_queues(
+        self,
+        *,
+        name: Optional[str] = None,
+        creator_id: Optional[str] = None,
+        cluster_status: Optional[SessionState] = None,
+        project: Optional[str] = None,
+        cloud: Optional[str] = None,
+        count: Optional[int] = None,
+        paging_token: Optional[str] = None,
+        sorting_directives: Optional[List[JobQueueSortDirective]] = None,
+    ) -> DecoratedjobqueueListResponse:
+        """List job queues."""
+        raise NotImplementedError
+
     @abstractmethod
     def rollout_service(
         self, model: ApplyProductionServiceV2Model

anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -49,6 +49,7 @@ from anyscale.client.openapi_client.models import (
     WorkspaceDataplaneProxiedArtifacts,
 )
 from anyscale.client.openapi_client.models.create_schedule import CreateSchedule
+from anyscale.client.openapi_client.models.decorated_job_queue import DecoratedJobQueue
 from anyscale.client.openapi_client.models.decorated_schedule import DecoratedSchedule
 from anyscale.client.openapi_client.models.decorated_session import DecoratedSession
 from anyscale.client.openapi_client.models.session_ssh_key import SessionSshKey
@@ -150,6 +151,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         self._deleted_services: Dict[str, DecoratedProductionServiceV2APIModel] = {}
         self._jobs: Dict[str, ProductionJob] = {}
         self._job_runs: Dict[str, List[APIJobRun]] = defaultdict(list)
+        self._job_queues: Dict[str, DecoratedJobQueue] = {}
         self._project_to_id: Dict[Optional[str] : Dict[Optional[str], str]] = {}
         self._project_collaborators: Dict[str, List[CreateUserProjectCollaborator]] = {}
         self._rolled_out_model: Optional[ApplyProductionServiceV2Model] = None
@@ -702,6 +704,15 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     def update_job_run(self, prod_job_id: str, model: APIJobRun):
         self._job_runs[prod_job_id].append(model)
 
+    def list_job_queues(self) -> List[DecoratedJobQueue]:
+        return list(self._job_queues.values())
+
+    def get_job_queue(self, job_queue_id: str) -> Optional[DecoratedJobQueue]:
+        return self._job_queues.get(job_queue_id, None)
+
+    def update_job_queue(self, model: DecoratedJobQueue):
+        self._job_queues[model.id] = model
+
     def register_project_by_name(
         self,
         name: str,

anyscale/_private/docgen/__main__.py

@@ -527,8 +527,12 @@ ALL_MODULES = [
         cli_prefix="anyscale machine-pool",
         cli_commands=[
             machine_pool_commands.create_machine_pool,
+            machine_pool_commands.update_machine_pool,
             machine_pool_commands.delete_machine_pool,
+            machine_pool_commands.attach_machine_pool_to_cloud,
+            machine_pool_commands.detach_machine_pool_from_cloud,
             machine_pool_commands.list_machine_pools,
+            machine_pool_commands.describe,
         ],
         sdk_prefix="anyscale.machine_pool",
         sdk_commands=[],