anyscale 0.24.38__tar.gz → 0.24.40__tar.gz

{anyscale-0.24.38 → anyscale-0.24.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.24.38
+Version: 0.24.40
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -1,11 +1,10 @@
 from abc import ABC, abstractmethod
-import asyncio
 import io
 import logging
 import os
 import pathlib
 import time
-from typing import Any, Callable, cast, Dict, Generator, IO, List, Optional, Tuple
+from typing import Any, Callable, Dict, Generator, IO, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import requests
@@ -17,9 +16,9 @@ from anyscale._private.anyscale_client.common import (
     RUNTIME_ENV_PACKAGE_FORMAT,
 )
 from anyscale._private.models.image_uri import ImageURI
-from anyscale.api_utils.job_logs_util import _get_job_logs_from_storage_bucket_streaming
+from anyscale.api_utils.logs_util import _download_log_from_s3_url_sync
 from anyscale.authenticate import AuthenticationBlock, get_auth_api_client
-from anyscale.cli_logger import BlockLogger, LogsLogger
+from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.api.default_api import DefaultApi as InternalApi
 from anyscale.client.openapi_client.models import (
     ArchiveStatus,
@@ -67,6 +66,7 @@ from anyscale.sdk.anyscale_client.models.sort_by_clause_jobs_sort_field import (
 from anyscale.sdk.anyscale_client.models.sort_order import SortOrder
 from anyscale.sdk.anyscale_client.rest import ApiException as ExternalApiException
 from anyscale.shared_anyscale_utils.conf import ANYSCALE_HOST
+from anyscale.shared_anyscale_utils.latest_ray_version import LATEST_RAY_VERSION
 from anyscale.util import (
     get_cluster_model_for_current_workspace,
     get_endpoint,
@@ -680,7 +680,11 @@ class AnyscaleClient(AnyscaleClientInterface):
         return cluster_environment
 
     def get_cluster_env_build_id_from_containerfile(
-        self, cluster_env_name: str, containerfile: str, anonymous: bool = True
+        self,
+        cluster_env_name: str,
+        containerfile: str,
+        anonymous: bool = True,
+        ray_version: Optional[str] = None,
     ) -> str:
         cluster_env = self._find_or_create_cluster_env(
             cluster_env_name, anonymous=anonymous
@@ -692,13 +696,16 @@ class AnyscaleClient(AnyscaleClientInterface):
             if (
                 build.status == ClusterEnvironmentBuildStatus.SUCCEEDED
                 and build.containerfile == containerfile
+                # we don't need to check the ray_version because checking the containerfile is enough.
             ):
                 return build.id
 
         try:
             build_op = self._external_api_client.create_cluster_environment_build(
                 CreateClusterEnvironmentBuild(
-                    cluster_environment_id=cluster_env.id, containerfile=containerfile,
+                    cluster_environment_id=cluster_env.id,
+                    containerfile=containerfile,
+                    ray_version=ray_version,  # we don't use the latest version here if ray_version is Noneb/c the backend will try to parse the base image to decide the ray version.
                 )
             ).result
         except ExternalApiException as e:
@@ -718,7 +725,10 @@ class AnyscaleClient(AnyscaleClientInterface):
         return build_op.cluster_environment_build_id
 
     def get_cluster_env_build_id_from_image_uri(
-        self, image_uri: ImageURI, registry_login_secret: Optional[str] = None
+        self,
+        image_uri: ImageURI,
+        registry_login_secret: Optional[str] = None,
+        ray_version: Optional[str] = None,
     ) -> str:
         if image_uri.is_cluster_env_image():
             identifier = image_uri.to_cluster_env_identifier()
@@ -742,7 +752,6 @@ class AnyscaleClient(AnyscaleClientInterface):
         cluster_env = self._find_or_create_cluster_env(cluster_env_name, anonymous=True)
         image_uri_str = str(image_uri)
 
-        # since we encode the image_uri into the cluster env name, there should exist one and only one build that matches the image_uri.
         cluster_env_builds = self._external_api_client.list_cluster_environment_builds(
             cluster_environment_id=cluster_env.id, count=1
         ).results
@@ -752,6 +761,7 @@ class AnyscaleClient(AnyscaleClientInterface):
             and build.docker_image_name == image_uri_str
             and build.registry_login_secret == registry_login_secret
             and build.status == ClusterEnvironmentBuildStatus.SUCCEEDED
+            and build.ray_version == ray_version
         ):
             return build.id
 
@@ -762,6 +772,7 @@ class AnyscaleClient(AnyscaleClientInterface):
                 cluster_environment_id=cluster_env.id,
                 docker_image_name=image_uri_str,
                 registry_login_secret=registry_login_secret,
+                ray_version=ray_version if ray_version else LATEST_RAY_VERSION,
             )
         ).result
 
@@ -783,12 +794,14 @@ class AnyscaleClient(AnyscaleClientInterface):
                 "This should not happen, so please contact Anyscale support."
             )
 
-    def get_service(self, name: str) -> Optional[ServiceModel]:
+    def get_service(
+        self, name: str, *, cloud: Optional[str], project: Optional[str]
+    ) -> Optional[ServiceModel]:
         # TODO(edoakes): this endpoint is very slow and there's no reason we should need
         # to use this complex list endpoint just to fetch a service by name.
         paging_token = None
-        cloud_id = self.get_cloud_id()
-        project_id = self.get_project_id(parent_cloud_id=cloud_id)
+        cloud_id = self.get_cloud_id(cloud_name=cloud)
+        project_id = self.get_project_id(parent_cloud_id=cloud_id, name=project)
         service: Optional[ServiceModel] = None
         while True:
             resp = self._external_api_client.list_services(
@@ -939,24 +952,70 @@ class AnyscaleClient(AnyscaleClientInterface):
 
         return info.file_uri
 
-    def logs_for_job_run(self, job_run_id: str) -> str:
-        """Retrieves logs from the streaming job logs folder in S3/GCS"""
-        logs = ""
+    def _fetch_log_chunks(self, job_run_id: str) -> Tuple[List[str], Any]:
+        all_log_chunk_urls = []
+        MAX_PAGE_SIZE = 1000
         next_page_token = None
-        cluster_journal_events_start_line = 0
-
-        (logs, next_page_token, cluster_journal_events_start_line, _,) = asyncio.run(
-            _get_job_logs_from_storage_bucket_streaming(
-                self._internal_api_client,
-                cast(
-                    LogsLogger, self.logger
-                ),  # self.logger is a BlockLogger, cast to LogsLogger subclass
-                job_run_id=job_run_id,
-                remove_escape_chars=False,
+        bearer_token = None
+        while True:
+            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,
-                cluster_journal_events_start_line=cluster_journal_events_start_line,
-                no_cluster_journal_events=True,
+                page_size=MAX_PAGE_SIZE,
+            ).result
+
+            if bearer_token is None:
+                bearer_token = log_download_result.bearer_token
+
+            all_log_chunk_urls.extend(
+                [chunk.chunk_url for chunk in log_download_result.log_chunks]
             )
-        )
 
+            next_page_token = log_download_result.next_page_token
+            if next_page_token is None:
+                break
+
+        return all_log_chunk_urls, bearer_token
+
+    def _read_log_lines(
+        self,
+        log_chunk_urls: List[str],
+        head: bool,
+        bearer_token: Any,
+        max_lines: Optional[int],
+    ) -> str:
+        # TODO(mowen): Would be nice to return some placeholder here to allow all new
+        # logs to be read from a particular point onwards.
+        result_lines: List[str] = []
+        step = 1 if head else -1
+        line_count = 0
+        for chunk_url in log_chunk_urls[::step]:
+            log_lines = _download_log_from_s3_url_sync(
+                chunk_url, bearer_token=bearer_token
+            ).splitlines()
+
+            if max_lines is not None:
+                lines_to_add = min(len(log_lines), max_lines - line_count)
+            else:
+                lines_to_add = len(log_lines)
+            line_count += lines_to_add
+
+            if head:
+                result_lines = result_lines + log_lines[:lines_to_add]
+            else:
+                result_lines = log_lines[-1 * lines_to_add :] + result_lines
+
+            if line_count == max_lines:
+                break
+
+        return "\n".join(result_lines) + "\n"
+
+    def logs_for_job_run(
+        self, job_run_id: str, head: bool = False, max_lines: Optional[int] = None
+    ) -> str:
+        """Retrieves logs from the streaming job logs folder in S3/GCS"""
+
+        all_log_chunk_urls, bearer_token = self._fetch_log_chunks(job_run_id)
+
+        logs = self._read_log_lines(all_log_chunk_urls, head, bearer_token, max_lines)
         return logs

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/_private/anyscale_client/common.py

@@ -210,7 +210,11 @@ class AnyscaleClientInterface(ABC):
 
     @abstractmethod
     def get_cluster_env_build_id_from_containerfile(
-        self, cluster_env_name: str, containerfile: str, anonymous: bool
+        self,
+        cluster_env_name: str,
+        containerfile: str,
+        anonymous: bool,
+        ray_version: Optional[str] = None,
     ) -> str:
         """Get the cluster environment build ID for the cluster environment with provided containerfile.
         Look for an existing cluster environment with the provided name.
@@ -221,7 +225,10 @@ class AnyscaleClientInterface(ABC):
 
     @abstractmethod
     def get_cluster_env_build_id_from_image_uri(
-        self, image_uri: ImageURI, registry_login_secret: Optional[str] = None
+        self,
+        image_uri: ImageURI,
+        registry_login_secret: Optional[str] = None,
+        ray_version: Optional[str] = None,
     ):
         """Get the cluster environment build ID for the cluster environment with provided image_uri.
 
@@ -247,8 +254,10 @@ class AnyscaleClientInterface(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def get_service(self, name: str) -> Optional[ServiceModel]:
-        """Get a service by name.
+    def get_service(
+        self, name: str, *, cloud: Optional[str], project: Optional[str]
+    ) -> Optional[ServiceModel]:
+        """Get a service by name. Filter by cloud and project.
 
         Returns None if not found.
         """
@@ -345,7 +354,13 @@ class AnyscaleClientInterface(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def logs_for_job_run(self, job_run_id: str) -> str:
+    def logs_for_job_run(
+        self,
+        job_run_id: str,
+        head: bool = False,
+        tail: bool = True,
+        max_lines: Optional[int] = None,
+    ) -> str:
         """Returns the logs associated with a particular job run.
 
         The job_run_id is the backend id for the job run.

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -39,6 +39,7 @@ from anyscale.sdk.anyscale_client.models import (
     ServiceVersionState,
 )
 from anyscale.sdk.anyscale_client.models.cluster_environment import ClusterEnvironment
+from anyscale.shared_anyscale_utils.latest_ray_version import LATEST_RAY_VERSION
 from anyscale.utils.workspace_notification import WorkspaceNotification
 
 
@@ -54,7 +55,9 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     CLOUD_BUCKET = "s3://fake-bucket/{cloud_id}"
     DEFAULT_CLOUD_ID = "fake-default-cloud-id"
     DEFAULT_CLOUD_NAME = "fake-default-cloud"
+    DEFAULT_PROJECT_NAME = "fake-default-project"
     DEFAULT_PROJECT_ID = "fake-default-project-id"
+    DEFAULT_CLUSTER_COMPUTE_NAME = "fake-default-cluster-compute"
     DEFAULT_CLUSTER_COMPUTE_ID = "fake-default-cluster-compute-id"
     DEFAULT_CLUSTER_ENV_BUILD_ID = "fake-default-cluster-env-build-id"
 
@@ -133,6 +136,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         # Cloud ID -> default ClusterCompute.
         compute_config = ClusterCompute(
             id=self.DEFAULT_CLUSTER_COMPUTE_ID,
+            name=self.DEFAULT_CLUSTER_COMPUTE_NAME,
             config=ClusterComputeConfig(
                 cloud_id=self.DEFAULT_CLOUD_ID,
                 head_node_type=ComputeNodeType(
@@ -426,7 +430,11 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         return None
 
     def get_cluster_env_build_id_from_containerfile(
-        self, cluster_env_name: str, containerfile: str, anonymous: bool  # noqa: ARG002
+        self,
+        cluster_env_name: str,
+        containerfile: str,
+        anonymous: bool,
+        ray_version: Optional[str] = None,  # noqa: ARG002
     ) -> str:
         for build in self._builds.values():
             if build.containerfile == containerfile:
@@ -452,16 +460,21 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             containerfile=containerfile,
             status=ClusterEnvironmentBuildStatus.SUCCEEDED,
             local_vars_configuration=OPENAPI_NO_VALIDATION,
+            ray_version=ray_version,
             revision=latest_build.revision + 1 if latest_build is not None else 1,  # type: ignore
         )
         return build_id
 
     def get_cluster_env_build_id_from_image_uri(
-        self, image_uri: ImageURI, registry_login_secret: Optional[str] = None
+        self,
+        image_uri: ImageURI,
+        registry_login_secret: Optional[str] = None,
+        ray_version: Optional[str] = None,
     ) -> str:
         for build in self._builds.values():
             if (
                 build.docker_image_name == image_uri.image_uri
+                and ray_version == build.ray_version
                 and build.registry_login_secret == registry_login_secret
             ):
                 return build.id  # type: ignore
@@ -480,6 +493,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             docker_image_name=image_uri.image_uri,
             status=ClusterEnvironmentBuildStatus.SUCCEEDED,
             registry_login_secret=registry_login_secret,
+            ray_version=ray_version if ray_version else LATEST_RAY_VERSION,
             local_vars_configuration=OPENAPI_NO_VALIDATION,
         )
         return build_id
@@ -496,9 +510,18 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     def update_service(self, model: ServiceModel):
         self._services[model.id] = model
 
-    def get_service(self, name: str) -> Optional[ServiceModel]:
+    def get_service(
+        self, name: str, *, cloud: Optional[str], project: Optional[str]
+    ) -> Optional[ServiceModel]:
+        cloud_id = self.get_cloud_id(cloud_name=cloud)
+        cloud_project_dict = self._project_to_id.get(cloud_id, None)
+        project_id = (
+            cloud_project_dict.get(project, None) if cloud_project_dict else None
+        )
         for service in self._services.values():
-            if service.name == name:
+            if service.name == name and (
+                project_id is None or service.project_id == project_id
+            ):
                 return service
 
         return None
@@ -553,7 +576,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         self._job_runs[prod_job_id].append(model)
 
     def register_project_by_name(
-        self, name: str, cloud: str = DEFAULT_CLOUD_NAME
+        self, name: str, cloud: str = DEFAULT_CLOUD_NAME, project_id: str = None
     ) -> str:
         """Helper method to create project name to project id mapping."""
         cloud_id = self.get_cloud_id(cloud_name=cloud)
@@ -563,7 +586,8 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         if name in cloud_project_dict:
             return cloud_project_dict[name]
         else:
-            project_id = f"project-id-{uuid.uuid4()!s}"
+            if project_id is None:
+                project_id = f"project-id-{uuid.uuid4()!s}"
             cloud_project_dict[name] = project_id
             return project_id
 
@@ -573,7 +597,14 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
 
     def rollout_service(self, model: ApplyServiceModel) -> ServiceModel:
         self._rolled_out_model = model
-        existing_service = self.get_service(model.name)
+        # TODO(mowen): This feels convoluted, is there a better way to pull cloud name and project name from the model?
+        project_model = self.get_project(model.project_id)
+        project = project_model.name if project_model else None
+        compute_config = self.get_compute_config(model.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(model.name, project=project, cloud=cloud)
         if existing_service is not None:
             service_id = existing_service.id
         else:
@@ -583,6 +614,8 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             id=service_id,
             name=model.name,
             current_state=ServiceEventCurrentState.RUNNING,
+            cloud_id=cloud_id,
+            project_id=model.project_id,
             base_url="http://fake-service-url",
             auth_token="fake-auth-token"
             if model.config.access.use_bearer_token
@@ -680,5 +713,16 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     def add_job_run_logs(self, job_run_id: str, logs: str):
         self._job_run_logs[job_run_id] = logs
 
-    def logs_for_job_run(self, job_run_id: str) -> str:
-        return self._job_run_logs[job_run_id]
+    def logs_for_job_run(
+        self,
+        job_run_id: str,
+        head: bool = False,  # noqa: ARG002
+        max_lines: Optional[int] = None,  # noqa: ARG002
+    ) -> str:
+        log_lines = self._job_run_logs.get(job_run_id, "").splitlines()
+        if max_lines is None:
+            max_lines = len(log_lines)
+        if head:
+            return "\n".join(log_lines[:max_lines])
+        else:
+            return "\n".join(log_lines[-1 * max_lines :])

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/_private/docgen/README.md

@@ -1,6 +1,6 @@
 Tool to autogenerate documentation for the Anyscale SDK/CLI that can be embedded in a [Docusarus](https://docusaurus.io/) site.
 
-This is used by: https://github.com/anyscale/endpoint-docs.
+This is used by: https://github.com/anyscale/docs/tree/master/docs/reference.
 
 Usage:
 ```bash

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/_private/docgen/__main__.py

@@ -9,9 +9,12 @@ import click
 import anyscale
 from anyscale._private.docgen.generator import MarkdownGenerator, Module
 from anyscale.commands import (
+    cloud_commands,
     compute_config_commands,
     image_commands,
     job_commands,
+    logs_commands,
+    service_account_commands,
     service_commands,
 )
 from anyscale.compute_config.models import (
@@ -24,6 +27,7 @@ from anyscale.compute_config.models import (
 from anyscale.image.models import ImageBuild, ImageBuildStatus
 from anyscale.job.models import (
     JobConfig,
+    JobLogMode,
     JobRunState,
     JobRunStatus,
     JobState,
@@ -51,6 +55,9 @@ ALL_MODULES = [
             job_commands.status,
             job_commands.terminate,
             job_commands.archive,
+            job_commands.logs,
+            job_commands.wait,
+            job_commands.list,
         ],
         sdk_prefix="anyscale.job",
         sdk_commands=[
@@ -59,8 +66,9 @@ ALL_MODULES = [
             anyscale.job.terminate,
             anyscale.job.archive,
             anyscale.job.get_logs,
+            anyscale.job.wait,
         ],
-        models=[JobConfig, JobState, JobStatus, JobRunStatus, JobRunState],
+        models=[JobConfig, JobState, JobStatus, JobRunStatus, JobRunState, JobLogMode],
     ),
     Module(
         title="Service",
@@ -114,6 +122,21 @@ ALL_MODULES = [
             ComputeConfigVersion,
         ],
     ),
+    Module(
+        title="Service Account",
+        filename="service-account.md",
+        cli_prefix="anyscale service-account",
+        cli_commands=[
+            service_account_commands.create,
+            service_account_commands.create_api_key,
+            service_account_commands.list_service_accounts,
+            service_account_commands.delete,
+            service_account_commands.rotate_api_keys,
+        ],
+        sdk_prefix="anyscale.service_account",
+        sdk_commands=[],
+        models=[],
+    ),
     Module(
         title="Image",
         filename="image.md",
@@ -123,6 +146,25 @@ ALL_MODULES = [
         sdk_commands=[anyscale.image.build, anyscale.image.get,],
         models=[ImageBuild, ImageBuildStatus],
     ),
+    Module(
+        title="Cloud",
+        filename="cloud.md",
+        cli_prefix="anyscale cloud",
+        cli_commands=[cloud_commands.cloud_config_update],
+        sdk_prefix="anyscale.cloud",
+        sdk_commands=[],
+        models=[],
+        cli_command_group_prefix={cloud_commands.cloud_config_update: "config"},
+    ),
+    Module(
+        title="Logs",
+        filename="logs.md",
+        cli_prefix="anyscale logs",
+        cli_commands=[logs_commands.anyscale_logs_cluster],
+        sdk_prefix="anyscale.logs",
+        sdk_commands=[],
+        models=[],
+    ),
 ]
 
 

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/_private/docgen/generator.py

@@ -36,6 +36,7 @@ class Module:
     sdk_prefix: str
     sdk_commands: List[Callable]
     models: List[ModelType]
+    cli_command_group_prefix: Optional[Dict[click.Command, str]] = None
 
 
 class MarkdownGenerator:
@@ -91,8 +92,12 @@ class MarkdownGenerator:
                     f"  - [{m.title} CLI]({filename_no_extension}#{title_anchor}-cli)\n"
                 )
                 for t in m.cli_commands:
+                    if m.cli_command_group_prefix and t in m.cli_command_group_prefix:
+                        cli_prefix = f"{m.cli_prefix} {m.cli_command_group_prefix[t]}"
+                    else:
+                        cli_prefix = m.cli_prefix
                     output += "\n" + self._gen_markdown_for_cli_command(
-                        t, cli_prefix=m.cli_prefix
+                        t, cli_prefix=cli_prefix
                     )
 
             if len(m.sdk_commands) > 0:
@@ -321,7 +326,7 @@ class MarkdownGenerator:
                 if param["name"] in CLI_OPTIONS_TO_SKIP:
                     continue
 
-                name = "/".join(param["opts"])
+                name = "/".join(param["opts"] + param.get("secondary_opts", []))
                 help_str = param.get("help", None)
                 assert (
                     help_str

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/_private/workload/workload_config.py

@@ -93,7 +93,7 @@ class WorkloadConfig(ModelBase):
         default=None,
         repr=False,
         metadata={
-            "docstring": "A list of requirements or a path to a `requirements.txt` file for the workload. When running inside a workspace, this defaults to the workspace-tracked requirements."
+            "docstring": "A list of pip requirements or a path to a `requirements.txt` file for the workload. When running inside a workspace, this defaults to the workspace-tracked requirements."
         },
     )
 
@@ -129,7 +129,7 @@ class WorkloadConfig(ModelBase):
         default=None,
         repr=True,
         metadata={
-            "docstring": "A list of local directories that will be uploaded and added to the Python path."
+            "docstring": "A list of local directories or remote URIs that will be uploaded and added to the Python path."
         },
     )
 
@@ -176,3 +176,20 @@ class WorkloadConfig(ModelBase):
             registry_login_secret, str
         ):
             raise TypeError("'registry_login_secret' must be a string.")
+
+    ray_version: Optional[str] = field(
+        default=None,
+        metadata={
+            "docstring": "The Ray version (X.Y.Z) specified for this image specified by either an image URI or a containerfile. If not provided, the latest Ray version will be used."
+        },
+    )
+
+    def _validate_ray_version(self, ray_version: Optional[str]):
+        if ray_version is not None and not isinstance(ray_version, str):
+            raise TypeError("'ray_version' must be a string.")
+        if ray_version:
+            vs = ray_version.split(".")
+            if len(vs) != 3:
+                raise ValueError(
+                    f"Invalid Ray version format: {ray_version}. Must be in the format 'X.Y.Z'."
+                )

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/api_utils/logs_util.py

@@ -3,6 +3,7 @@ import re
 from typing import List, Optional
 
 import aiohttp
+import requests
 
 from anyscale.shared_anyscale_utils.utils.asyncio import gather_in_batches
 
@@ -43,6 +44,16 @@ async def _download_log_from_s3_url(
             return await response.text()
 
 
+def _download_log_from_s3_url_sync(
+    url: str, bearer_token: Optional[str] = None,
+) -> str:
+    # Note that the URL is presigned, so no token needs to be passed in the request
+    headers = {"Authorization": f"Bearer {bearer_token}"} if bearer_token else {}
+    response = requests.get(url, headers=headers)
+    response.raise_for_status()
+    return response.text
+
+
 def _remove_ansi_escape_sequences(s: str) -> str:
     # Required as the log may contain ANSI escape sequeneces (e.g. for coloring in the terminal)
     # Regex pattern from https://stackoverflow.com/a/14693789

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/client/README.md

@@ -94,6 +94,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get**](docs/DefaultApi.md#check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get) | **GET** /api/v2/userinfo/check_is_feature_flag_on | Check Is Feature Flag On
 *DefaultApi* | [**check_one_time_password_api_v2_users_request_otp_token_otp_get**](docs/DefaultApi.md#check_one_time_password_api_v2_users_request_otp_token_otp_get) | **GET** /api/v2/users/request_otp_token/{otp} | Check One Time Password
 *DefaultApi* | [**check_waitlist_status_api_v2_aioa_cloud_waitlist_check_status_get**](docs/DefaultApi.md#check_waitlist_status_api_v2_aioa_cloud_waitlist_check_status_get) | **GET** /api/v2/aioa_cloud_waitlist/check_status | Check Waitlist Status
+*DefaultApi* | [**clean_grafana_dashboards_api_v2_clouds_cloud_id_clean_grafana_dashboards_post**](docs/DefaultApi.md#clean_grafana_dashboards_api_v2_clouds_cloud_id_clean_grafana_dashboards_post) | **POST** /api/v2/clouds/{cloud_id}/clean-grafana-dashboards | Clean Grafana Dashboards
 *DefaultApi* | [**cli_api_v2_machines_cli_get**](docs/DefaultApi.md#cli_api_v2_machines_cli_get) | **GET** /api/v2/machines/cli | Cli
 *DefaultApi* | [**clone_workspace_api_v2_experimental_workspaces_from_workspace_post**](docs/DefaultApi.md#clone_workspace_api_v2_experimental_workspaces_from_workspace_post) | **POST** /api/v2/experimental_workspaces/from_workspace | Clone Workspace
 *DefaultApi* | [**create_aica_endpoint_api_v2_aica_endpoints_post**](docs/DefaultApi.md#create_aica_endpoint_api_v2_aica_endpoints_post) | **POST** /api/v2/aica_endpoints/ | Create Aica Endpoint
@@ -450,6 +451,8 @@ Class | Method | HTTP request | Description
  - [CardId](docs/CardId.md)
  - [CardListResponse](docs/CardListResponse.md)
  - [ChangePasswordParams](docs/ChangePasswordParams.md)
+ - [CleanupLeakedGrafanaDashboardResponse](docs/CleanupLeakedGrafanaDashboardResponse.md)
+ - [CleanupleakedgrafanadashboardresponseResponse](docs/CleanupleakedgrafanadashboardresponseResponse.md)
  - [CloneExperimentalWorkspace](docs/CloneExperimentalWorkspace.md)
  - [Cloud](docs/Cloud.md)
  - [CloudAnalyticsEvent](docs/CloudAnalyticsEvent.md)
@@ -646,6 +649,7 @@ Class | Method | HTTP request | Description
  - [GCPMemorystoreInstanceConfig](docs/GCPMemorystoreInstanceConfig.md)
  - [GCPNodeDisk](docs/GCPNodeDisk.md)
  - [GCPNodeOptions](docs/GCPNodeOptions.md)
+ - [GrafanaDashboard](docs/GrafanaDashboard.md)
  - [GrpcProtocolConfig](docs/GrpcProtocolConfig.md)
  - [HTTPValidationError](docs/HTTPValidationError.md)
  - [HaJobErrorTypes](docs/HaJobErrorTypes.md)

{anyscale-0.24.38 → anyscale-0.24.40}/anyscale/client/openapi_client/__init__.py

@@ -98,6 +98,8 @@ from openapi_client.models.card import Card
 from openapi_client.models.card_id import CardId
 from openapi_client.models.card_list_response import CardListResponse
 from openapi_client.models.change_password_params import ChangePasswordParams
+from openapi_client.models.cleanup_leaked_grafana_dashboard_response import CleanupLeakedGrafanaDashboardResponse
+from openapi_client.models.cleanupleakedgrafanadashboardresponse_response import CleanupleakedgrafanadashboardresponseResponse
 from openapi_client.models.clone_experimental_workspace import CloneExperimentalWorkspace
 from openapi_client.models.cloud import Cloud
 from openapi_client.models.cloud_analytics_event import CloudAnalyticsEvent
@@ -294,6 +296,7 @@ from openapi_client.models.gcp_file_store_config import GCPFileStoreConfig
 from openapi_client.models.gcp_memorystore_instance_config import GCPMemorystoreInstanceConfig
 from openapi_client.models.gcp_node_disk import GCPNodeDisk
 from openapi_client.models.gcp_node_options import GCPNodeOptions
+from openapi_client.models.grafana_dashboard import GrafanaDashboard
 from openapi_client.models.grpc_protocol_config import GrpcProtocolConfig
 from openapi_client.models.http_validation_error import HTTPValidationError
 from openapi_client.models.ha_job_error_types import HaJobErrorTypes