anyscale 0.26.69__py3-none-any.whl → 0.26.71__py3-none-any.whl

anyscale/_private/anyscale_client/anyscale_client.py

@@ -34,6 +34,7 @@ from anyscale.client.openapi_client.models import (
     AdminCreateUser,
     AnyscaleServiceAccount,
     ApiKeyParameters,
+    ApplyProductionServiceMultiVersionV2Model,
     ArchiveStatus,
     Cloud,
     CloudDataBucketAccessMode,
@@ -54,11 +55,14 @@ from anyscale.client.openapi_client.models import (
     CreateOrganizationInvitation,
     CreateResourceQuota,
     CreateUserProjectCollaborator,
+    DecoratedCloudResource,
     DecoratedComputeTemplate,
     DecoratedjobqueueListResponse,
     DecoratedlistserviceapimodelListResponse,
     DecoratedProductionServiceV2APIModel,
+    DecoratedProductionServiceV2VersionAPIModel,
     DecoratedSession,
+    DeleteResourceTagsRequest,
     ExperimentalWorkspace,
     GetOrCreateBuildFromImageUriRequest,
     InternalProductionJob,
@@ -72,12 +76,14 @@ from anyscale.client.openapi_client.models import (
     ProjectListResponse,
     ResourceQuota,
     ResourceQuotaStatus,
+    ResourceTagResourceType,
     ServerSessionToken,
     SessionSshKey,
     SessionState,
     StartSessionOptions,
     StopSessionOptions,
     SystemWorkloadName,
+    UpsertResourceTagsRequest,
     WorkspaceDataplaneProxiedArtifacts,
     WriteProject,
 )
@@ -575,6 +581,14 @@ class AnyscaleClient(AnyscaleClientInterface):
         cloud_id = self.get_cloud_id(cloud_name=name)
         return self.get_cloud(cloud_id=cloud_id)
 
+    @handle_api_exceptions
+    def get_cloud_resource_by_name(
+        self, cloud_id: str, cloud_resource_name: str
+    ) -> Optional[DecoratedCloudResource]:
+        return self._internal_api_client.find_cloud_resource_by_name_api_v2_clouds_cloud_id_find_cloud_resource_by_name_post(
+            cloud_id=cloud_id, cloud_resource_name=cloud_resource_name,
+        ).result
+
     @handle_api_exceptions
     def get_default_cloud(self) -> Optional[Cloud]:
         try:
@@ -702,9 +716,11 @@ class AnyscaleClient(AnyscaleClientInterface):
         )
 
     @handle_api_exceptions
-    def get_default_compute_config(self, *, cloud_id: str) -> ClusterCompute:
+    def get_default_compute_config(
+        self, *, cloud_id: str, cloud_resource_id: Optional[str] = None
+    ) -> ClusterCompute:
         return self._external_api_client.get_default_cluster_compute(
-            cloud_id=cloud_id,
+            cloud_id=cloud_id, cloud_resource_id=cloud_resource_id
         ).result
 
     def _build_standard_compute_template_from_existing_auto_config(
@@ -1022,6 +1038,7 @@ class AnyscaleClient(AnyscaleClientInterface):
         *,
         name: Optional[str] = None,
         state_filter: Optional[List[str]] = None,
+        tag_filter: Optional[List[str]] = None,
         creator_id: Optional[str] = None,
         cloud: Optional[str] = None,
         project: Optional[str] = None,
@@ -1047,12 +1064,38 @@ class AnyscaleClient(AnyscaleClientInterface):
             archive_status=ArchiveStatus.ALL
             if include_archived
             else ArchiveStatus.NOT_ARCHIVED,
+            tag_filter=tag_filter,
             count=count if count else self.LIST_ENDPOINT_COUNT,
             paging_token=paging_token,
             sort_field=sort_field,
             sort_order=sort_order,
         )
 
+    def get_service_versions(
+        self, service_id: str, read_all_versions: bool = False,
+    ) -> List[DecoratedProductionServiceV2VersionAPIModel]:
+        resp = self._internal_api_client.get_service_versions_api_v2_services_v2_service_id_versions_get(
+            service_id=service_id,
+        )
+
+        if not read_all_versions:
+            return resp.results
+
+        all_versions: List[DecoratedProductionServiceV2VersionAPIModel] = []
+        all_versions.extend(resp.results)
+        paging_token = resp.metadata.next_paging_token
+
+        while paging_token is not None:
+            resp = self._internal_api_client.get_service_versions_api_v2_services_v2_service_id_versions_get(
+                service_id=service_id,
+                count=self.LIST_ENDPOINT_COUNT,
+                paging_token=paging_token,
+            )
+            all_versions.extend(resp.results)
+            paging_token = resp.metadata.next_paging_token
+
+        return all_versions
+
     @handle_api_exceptions
     def get_project(self, project_id: str) -> Project:
         return self._internal_api_client.get_project_api_v2_projects_project_id_get(
@@ -1206,6 +1249,7 @@ class AnyscaleClient(AnyscaleClientInterface):
         cluster_status: Optional[SessionState] = None,
         project: Optional[str] = None,
         cloud: Optional[str] = None,
+        tags_filter: Optional[Dict[str, List[str]]] = None,
         count: Optional[int] = None,
         paging_token: Optional[str] = None,
         sorting_directives: Optional[List[JobQueueSortDirective]] = None,
@@ -1224,6 +1268,7 @@ class AnyscaleClient(AnyscaleClientInterface):
                 cluster_status=cluster_status,
                 project_id=project_id,
                 cloud_id=cloud_id,
+                tags_filter=tags_filter,
                 paging=PageQuery(count=count, paging_token=paging_token),
                 sorting_directives=sorting_directives,
             ),
@@ -1238,6 +1283,15 @@ class AnyscaleClient(AnyscaleClientInterface):
         ).result
         return result
 
+    @handle_api_exceptions
+    def rollout_service_multi_version(
+        self, model: ApplyProductionServiceMultiVersionV2Model
+    ) -> DecoratedProductionServiceV2APIModel:
+        result = self._internal_api_client.apply_service_multi_version_api_v2_services_v2_apply_multi_version_put(
+            model
+        ).result
+        return result
+
     @handle_api_exceptions
     def rollback_service(
         self, service_id: str, *, max_surge_percent: Optional[int] = None
@@ -1493,7 +1547,7 @@ class AnyscaleClient(AnyscaleClientInterface):
 
         return all_log_chunk_urls, bearer_token
 
-    def _read_log_lines(
+    def _read_log_lines(  # noqa: PLR0912
         self,
         log_chunk_urls: List[str],
         head: bool,
@@ -1558,6 +1612,8 @@ class AnyscaleClient(AnyscaleClientInterface):
             if line_count == max_lines:
                 break
 
+        if not result_lines:
+            return ""
         return "\n".join(result_lines) + "\n"
 
     @handle_api_exceptions
@@ -1584,6 +1640,52 @@ class AnyscaleClient(AnyscaleClientInterface):
         )
         return logs
 
+    @handle_api_exceptions
+    def stream_logs_for_job_run(
+        self, job_run_id: str, next_page_token: Optional[str] = None,
+    ) -> Tuple[str, Optional[str]]:
+        """Stream logs incrementally for a job run with pagination support.
+
+        Args:
+            job_run_id: The ID of the job run to fetch logs for
+            next_page_token: Token for fetching the next page of logs (for incremental streaming)
+
+        Returns:
+            Tuple of (logs, next_page_token) where next_page_token can be used for the next call
+        """
+        # Fetch only the new log chunks since the last call
+        if next_page_token:
+            # Incremental fetch - get only new chunks
+            log_download_result = self._internal_api_client.get_job_logs_download_v2_api_v2_logs_job_logs_download_v2_job_id_get(
+                job_id=job_run_id, next_page_token=next_page_token,
+            ).result
+        else:
+            # First fetch - get all available chunks
+            log_download_result = self._internal_api_client.get_job_logs_download_v2_api_v2_logs_job_logs_download_v2_job_id_get(
+                job_id=job_run_id,
+            ).result
+
+        # Download and concatenate log chunks
+        log_chunk_urls = [chunk.chunk_url for chunk in log_download_result.log_chunks]
+        bearer_token = log_download_result.bearer_token
+
+        logs = self._read_log_lines(
+            log_chunk_urls,
+            head=False,
+            bearer_token=bearer_token,
+            max_lines=None,
+            parse_json=False,
+        )
+
+        # Return logs and the token for the next page
+        new_next_page_token = (
+            log_download_result.next_page_token
+            if len(log_download_result.log_chunks) > 0
+            else next_page_token
+        )
+
+        return logs, new_next_page_token
+
     @handle_api_exceptions
     def controller_logs_for_service_version(
         self,
@@ -2079,3 +2181,24 @@ class AnyscaleClient(AnyscaleClientInterface):
         self._internal_api_client.set_resource_quota_status_api_v2_resource_quotas_resource_quota_id_status_patch(
             resource_quota_id, ResourceQuotaStatus(is_enabled=is_enabled)
         ).result
+
+    @handle_api_exceptions
+    def upsert_resource_tags(
+        self,
+        resource_type: ResourceTagResourceType,
+        resource_id: str,
+        tags: Dict[str, str],
+    ) -> None:
+        req = UpsertResourceTagsRequest(
+            resource_type=resource_type, resource_id=resource_id, tags=tags
+        )
+        self._internal_api_client.upsert_resource_tags_api_v2_tags_resource_put(req)
+
+    @handle_api_exceptions
+    def delete_resource_tags(
+        self, resource_type: ResourceTagResourceType, resource_id: str, keys: List[str],
+    ) -> None:
+        req = DeleteResourceTagsRequest(
+            resource_type=resource_type, resource_id=resource_id, keys=keys
+        )
+        self._internal_api_client.delete_resource_tags_api_v2_tags_resource_delete(req)

anyscale/_private/anyscale_client/common.py

@@ -7,6 +7,7 @@ from anyscale.client.openapi_client.models import (
     AdminCreatedUser,
     AdminCreateUser,
     AnyscaleServiceAccount,
+    ApplyProductionServiceMultiVersionV2Model,
     Cloud,
     ClusteroperationResponse,
     CollaboratorType,
@@ -16,10 +17,12 @@ from anyscale.client.openapi_client.models import (
     CreateInternalProductionJob,
     CreateResourceQuota,
     CreateUserProjectCollaborator,
+    DecoratedCloudResource,
     DecoratedComputeTemplate,
     DecoratedjobqueueListResponse,
     DecoratedlistserviceapimodelListResponse,
     DecoratedProductionServiceV2APIModel,
+    DecoratedProductionServiceV2VersionAPIModel,
     InternalProductionJob,
     JobQueueSortDirective,
     OrganizationCollaborator,
@@ -28,6 +31,7 @@ from anyscale.client.openapi_client.models import (
     ProjectBase,
     ProjectListResponse,
     ResourceQuota,
+    ResourceTagResourceType,
     ServerSessionToken,
     SessionState,
     WorkspaceDataplaneProxiedArtifacts,
@@ -57,7 +61,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.50.0"  # RAY_RELEASE_UPDATE: update to latest version.
+DEFAULT_RAY_VERSION = "2.51.0"  # RAY_RELEASE_UPDATE: update to latest version
 DEFAULT_PYTHON_VERSION = "py311"
 RUNTIME_ENV_PACKAGE_FORMAT = "pkg_{content_hash}.zip"
 
@@ -166,6 +170,13 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def get_cloud_resource_by_name(
+        self, cloud_id: str, cloud_resource_name: str
+    ) -> Optional[DecoratedCloudResource]:
+        """Get a cloud resource by name."""
+        raise NotImplementedError
+
     @abstractmethod
     def get_default_cloud(self) -> Optional[Cloud]:
         """Get the user's default cloud."""
@@ -234,7 +245,9 @@ class AnyscaleClientInterface(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def get_default_compute_config(self, *, cloud_id: str) -> ClusterCompute:
+    def get_default_compute_config(
+        self, *, cloud_id: str, cloud_resource_id: Optional[str] = None
+    ) -> ClusterCompute:
         """Get the default compute config for the provided cloud ID."""
         raise NotImplementedError
 
@@ -345,6 +358,7 @@ class AnyscaleClientInterface(ABC):
         *,
         name: Optional[str],
         state_filter: Optional[List[str]],
+        tag_filter: Optional[List[str]],
         creator_id: Optional[str],
         cloud: Optional[str],
         project: Optional[str],
@@ -381,6 +395,13 @@ class AnyscaleClientInterface(ABC):
         """List projects."""
         raise NotImplementedError
 
+    @abstractmethod
+    def get_service_versions(
+        self, service_id: str, read_all_versions: bool = False
+    ) -> List[DecoratedProductionServiceV2VersionAPIModel]:
+        """Get the versions of a service."""
+        raise NotImplementedError
+
     @abstractmethod
     def create_project(self, project: WriteProject) -> ProjectBase:
         """Create a project."""
@@ -453,6 +474,7 @@ class AnyscaleClientInterface(ABC):
         cluster_status: Optional[SessionState] = None,
         project: Optional[str] = None,
         cloud: Optional[str] = None,
+        tags_filter: Optional[Dict[str, List[str]]] = None,
         count: Optional[int] = None,
         paging_token: Optional[str] = None,
         sorting_directives: Optional[List[JobQueueSortDirective]] = None,
@@ -470,6 +492,16 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def rollout_service_multi_version(
+        self, model: ApplyProductionServiceMultiVersionV2Model
+    ) -> DecoratedProductionServiceV2APIModel:
+        """Deploy or update the service to use the provided multi-version configs.
+
+        Returns the service ID.
+        """
+        raise NotImplementedError
+
     @abstractmethod
     def rollback_service(
         self, service_id: str, *, max_surge_percent: Optional[int] = None
@@ -821,3 +853,20 @@ class AnyscaleClientInterface(ABC):
     ) -> None:
         """Set the status of a resource quota."""
         raise NotImplementedError
+
+    @abstractmethod
+    def upsert_resource_tags(
+        self,
+        resource_type: ResourceTagResourceType,
+        resource_id: str,
+        tags: Dict[str, str],
+    ) -> None:
+        """Upsert tags (add/update) for a resource."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def delete_resource_tags(
+        self, resource_type: ResourceTagResourceType, resource_id: str, keys: List[str],
+    ) -> None:
+        """Delete tags for the provided keys from a resource."""
+        raise NotImplementedError

anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -2,7 +2,7 @@ from collections import defaultdict
 from datetime import date, datetime
 import logging
 import os
-from typing import DefaultDict, Dict, Generator, List, Optional, Tuple
+from typing import DefaultDict, Dict, Generator, List, Optional, Tuple, Union
 from unittest.mock import Mock
 import uuid
 
@@ -16,6 +16,7 @@ from anyscale.client.openapi_client.models import (
     AdminCreatedUser,
     AdminCreateUser,
     AnyscaleServiceAccount,
+    ApplyProductionServiceMultiVersionV2Model,
     Cloud,
     CloudProviders,
     ClusterOperation,
@@ -28,9 +29,11 @@ from anyscale.client.openapi_client.models import (
     CreateInternalProductionJob,
     CreateResourceQuota,
     CreateUserProjectCollaborator,
+    DecoratedCloudResource,
     DecoratedComputeTemplate,
     DecoratedlistserviceapimodelListResponse,
     DecoratedProductionServiceV2APIModel,
+    DecoratedProductionServiceV2VersionAPIModel,
     DeletedPlatformFineTunedModel,
     ExperimentalWorkspace,
     FineTunedModel,
@@ -50,6 +53,7 @@ from anyscale.client.openapi_client.models import (
     ProjectBase,
     ProjectListResponse,
     ResourceQuota,
+    ResourceTagResourceType,
     ServerSessionToken,
     WorkspaceDataplaneProxiedArtifacts,
     WriteProject,
@@ -153,6 +157,9 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         self._workspace_cluster: Optional[Cluster] = None
         self._workspace_dependency_tracking_enabled: bool = False
         self._services: Dict[str, DecoratedProductionServiceV2APIModel] = {}
+        self._versions: Dict[
+            str, Dict[str, ProductionServiceV2VersionModel]
+        ] = defaultdict(dict)
         self._archived_services: Dict[str, DecoratedProductionServiceV2APIModel] = {}
         self._deleted_services: Dict[str, DecoratedProductionServiceV2APIModel] = {}
         self._jobs: Dict[str, ProductionJob] = {}
@@ -409,6 +416,11 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
                 return c
         return None
 
+    def get_cloud_resource_by_name(
+        self, cloud_id: str, cloud_resource_name: str  # noqa: ARG002
+    ) -> Optional[DecoratedCloudResource]:
+        return None
+
     def get_default_cloud(self) -> Optional[Cloud]:
         return self._clouds.get(self.DEFAULT_CLOUD_ID, None)
 
@@ -536,7 +548,9 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     ):
         self._default_compute_configs[cloud_id] = compute_config
 
-    def get_default_compute_config(self, *, cloud_id: str) -> ClusterCompute:
+    def get_default_compute_config(
+        self, *, cloud_id: str, cloud_resource_id: Optional[str] = None  # noqa: ARG002
+    ) -> ClusterCompute:
         return self._default_compute_configs[cloud_id]
 
     def list_cluster_env_builds(
@@ -658,6 +672,9 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
 
     def update_service(self, model: DecoratedProductionServiceV2APIModel):
         self._services[model.id] = model
+        if model.versions is not None:
+            for version in model.versions:
+                self._versions[model.id][version.id] = version
 
     def get_service(
         self,
@@ -897,7 +914,11 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             return project_id
 
     @property
-    def rolled_out_model(self) -> Optional[ApplyProductionServiceV2Model]:
+    def rolled_out_model(
+        self,
+    ) -> Optional[
+        Union[ApplyProductionServiceV2Model, ApplyProductionServiceMultiVersionV2Model]
+    ]:
         return self._rolled_out_model
 
     def rollout_service(
@@ -917,6 +938,18 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         else:
             service_id = f"service-id-{uuid.uuid4()!s}"
 
+        primary_version = ProductionServiceV2VersionModel(
+            id=str(uuid.uuid4()),
+            created_at=datetime.now(),
+            version=model.version,
+            current_state=ServiceVersionState.RUNNING,
+            weight=100,
+            build_id=model.build_id,
+            compute_config_id=model.compute_config_id,
+            ray_serve_config=model.ray_serve_config,
+            ray_gcs_external_storage_config=model.ray_gcs_external_storage_config,
+            local_vars_configuration=OPENAPI_NO_VALIDATION,
+        )
         service = DecoratedProductionServiceV2APIModel(
             id=service_id,
             name=model.name,
@@ -925,18 +958,56 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             current_state=ServiceEventCurrentState.STARTING,
             base_url=f"http://{model.name}.fake.url",
             auth_token="fake-auth-token",
-            primary_version=ProductionServiceV2VersionModel(
+            primary_version=primary_version,
+            versions=[primary_version],
+            local_vars_configuration=OPENAPI_NO_VALIDATION,
+        )
+        self.update_service(service)
+        return service
+
+    def rollout_service_multi_version(
+        self, model: ApplyProductionServiceMultiVersionV2Model
+    ) -> DecoratedProductionServiceV2APIModel:
+        self._rolled_out_model = model
+        version = model.service_versions[0]
+        project_model = self.get_project(version.project_id)
+        project = project_model.name if project_model else None
+        compute_config = self.get_compute_config(version.compute_config_id)
+        cloud_id = compute_config.config.cloud_id if compute_config else None
+        cloud_model = self.get_cloud(cloud_id=cloud_id)
+        cloud = cloud_model.name if cloud_model else None
+        existing_service = self.get_service(version.name, project=project, cloud=cloud)
+        if existing_service is not None:
+            service_id = existing_service.id
+        else:
+            service_id = f"service-id-{uuid.uuid4()!s}"
+
+        service_versions = []
+        for version in model.service_versions:
+            service_version = ProductionServiceV2VersionModel(
                 id=str(uuid.uuid4()),
                 created_at=datetime.now(),
-                version="primary",
+                version=version.version,
                 current_state=ServiceVersionState.RUNNING,
-                weight=100,
-                build_id=model.build_id,
-                compute_config_id=model.compute_config_id,
-                ray_serve_config=model.ray_serve_config,
-                ray_gcs_external_storage_config=model.ray_gcs_external_storage_config,
+                weight=version.traffic_percent,
+                build_id=version.build_id,
+                compute_config_id=version.compute_config_id,
+                ray_serve_config=version.ray_serve_config,
+                ray_gcs_external_storage_config=version.ray_gcs_external_storage_config,
                 local_vars_configuration=OPENAPI_NO_VALIDATION,
-            ),
+            )
+            service_versions.append(service_version)
+
+        service = DecoratedProductionServiceV2APIModel(
+            id=service_id,
+            name=version.name,
+            project_id=version.project_id,
+            cloud_id=self.get_cloud_id(compute_config_id=version.compute_config_id),
+            current_state=ServiceEventCurrentState.STARTING,
+            base_url=f"http://{version.name}.fake.url",
+            auth_token="fake-auth-token",
+            primary_version="",
+            versions=service_versions,
             local_vars_configuration=OPENAPI_NO_VALIDATION,
         )
         self.update_service(service)
@@ -1551,6 +1622,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         *,
         name: Optional[str] = None,
         state_filter: Optional[List[str]] = None,
+        tag_filter: Optional[List[str]] = None,  # noqa: ARG002
         creator_id: Optional[str] = None,  # noqa: ARG002
         cloud: Optional[str] = None,
         project: Optional[str] = None,
@@ -1603,3 +1675,23 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             local_vars_configuration=OPENAPI_NO_VALIDATION,
         )
         return response
+
+    def get_service_versions(
+        self, service_id: str, read_all_versions: bool = False  # noqa: ARG002
+    ) -> List[DecoratedProductionServiceV2VersionAPIModel]:
+        return list(self._versions[service_id].values())
+
+    def upsert_resource_tags(
+        self,
+        resource_type: ResourceTagResourceType,
+        resource_id: str,
+        tags: Dict[str, str],
+    ) -> None:
+        _ = resource_type, resource_id, tags
+        return None
+
+    def delete_resource_tags(
+        self, resource_type: ResourceTagResourceType, resource_id: str, keys: List[str],
+    ) -> None:
+        _ = resource_type, resource_id, keys
+        return None