anyscale 0.24.83__tar.gz → 0.24.85__tar.gz

{anyscale-0.24.83 → anyscale-0.24.85}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.24.83
+Version: 0.24.85
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License
 Provides-Extra: backend
 Provides-Extra: gcp
+Provides-Extra: azure
 Provides-Extra: all
 License-File: LICENSE
 License-File: NOTICE

{anyscale-0.24.83 → anyscale-0.24.85}/anyscale/__init__.py

@@ -18,9 +18,19 @@ path.append(os.path.join(anyscale_dir, "client"))
 path.append(os.path.join(anyscale_dir, "sdk"))
 
 import anyscale
-from anyscale import compute_config, image, integrations, job, llm, schedule, service
+from anyscale import (
+    aggregated_instance_usage,
+    compute_config,
+    image,
+    integrations,
+    job,
+    llm,
+    schedule,
+    service,
+)
 from anyscale._private.anyscale_client import AnyscaleClient, AnyscaleClientInterface
 from anyscale._private.sdk.base_sdk import Timer
+from anyscale.aggregated_instance_usage import AggregatedInstanceUsageSDK
 from anyscale.authenticate import AuthenticationBlock
 from anyscale.cli_logger import BlockLogger
 from anyscale.cluster import get_job_submission_client_cluster_info
@@ -89,6 +99,9 @@ class Anyscale:
             api_clients=(auth_block.anyscale_api_client, auth_block.api_client),
             host=_host,
         )
+        self._aggregated_instance_usage_sdk = AggregatedInstanceUsageSDK(
+            client=self._anyscale_client
+        )
         self._job_sdk = JobSDK(client=self._anyscale_client)
         self._service_sdk = ServiceSDK(client=self._anyscale_client)
         self._compute_config_sdk = ComputeConfigSDK(client=self._anyscale_client)
@@ -105,6 +118,9 @@ class Anyscale:
         obj = cls.__new__(cls)
         super(Anyscale, obj).__init__()
         obj._anyscale_client = client  # noqa: SLF001
+        obj._aggregated_instance_usage_sdk = AggregatedInstanceUsageSDK(  # noqa: SLF001
+            client=client, logger=logger, timer=timer
+        )
         obj._job_sdk = JobSDK(client=client, logger=logger, timer=timer)  # noqa: SLF001
         obj._service_sdk = ServiceSDK(  # noqa: SLF001
             client=client, logger=logger, timer=timer
@@ -121,6 +137,10 @@ class Anyscale:
         )
         return obj
 
+    @property
+    def aggregated_instance_usage(self) -> AggregatedInstanceUsageSDK:  # noqa: F811
+        return self._aggregated_instance_usage_sdk
+
     @property
     def job(self) -> JobSDK:  # noqa: F811
         return self._job_sdk

{anyscale-0.24.83 → anyscale-0.24.85}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -6,6 +6,7 @@ import json
 import logging
 import os
 import pathlib
+import re
 import time
 from typing import Any, Callable, Dict, Generator, IO, List, Optional, Tuple
 from urllib.parse import urlparse
@@ -1119,14 +1120,34 @@ class AnyscaleClient(AnyscaleClientInterface):
                 # If the presigned URL scheme is SMART_OPEN, upload to cloud storage using the provided bucket name, path, & environment, and the smart_open library.
                 bucket_name = info.bucket_name
                 bucket_path = info.bucket_path
-                env_vars: Dict[str, str] = {
-                    "AWS_ENDPOINT_URL": info.url,
-                }
+                file_uri = info.file_uri
 
-                with set_env(**env_vars), smart_open.open(
-                    f"{bucket_name}/{bucket_path}", "wb",
-                ) as fout:
-                    fout.write(zip_file_bytes)
+                if file_uri and file_uri.startswith("azure"):
+
+                    from anyscale.utils.imports.azure import (
+                        try_import_azure_storage_blob_BlobServiceClient,
+                    )
+
+                    # Smartopen needs transport_params to be passed in for Azure.
+                    blob_service_client = (
+                        try_import_azure_storage_blob_BlobServiceClient()
+                    )
+
+                    transport_params = {
+                        "client": blob_service_client.from_connection_string(info.url),
+                    }
+                    with smart_open.open(
+                        f"{file_uri}", "wb", transport_params=transport_params,
+                    ) as fout:
+                        fout.write(zip_file_bytes)
+                else:
+                    env_vars: Dict[str, str] = {
+                        "AWS_ENDPOINT_URL": info.url,
+                    }
+                    with set_env(**env_vars), smart_open.open(
+                        f"{bucket_name}/{bucket_path}", "wb",
+                    ) as fout:
+                        fout.write(zip_file_bytes)
 
             else:
                 # Default to HTTP PUT.
@@ -1758,3 +1779,69 @@ class AnyscaleClient(AnyscaleClientInterface):
             paging_token = resp.metadata.next_paging_token
 
         return results[:max_items] if max_items else results
+
+    @handle_api_exceptions
+    def download_aggregated_instance_usage_csv(
+        self,
+        start_date,
+        end_date,
+        cloud_id=None,
+        project_id=None,
+        directory=None,
+        hide_progress_bar=False,
+    ) -> str:
+        with FileDownloadProgress() as progress:
+            task_id = progress.add_task(
+                description="Preparing aggregated instance usage CSV",
+                visible=not hide_progress_bar,
+            )
+
+            resp = self._internal_api_client.download_aggregated_instance_usage_csv_api_v2_aggregated_instance_usage_download_csv_get(
+                start_date=start_date,
+                end_date=end_date,
+                cloud_id=cloud_id,
+                project_id=project_id,
+                _preload_content=False,
+            )
+
+            progress.update(
+                task_id, description="Downloading aggregated instance usage CSV"
+            )
+
+            # Set the total size of the download for the progress bar
+            total_size = int(resp.headers.get("content-length", 0))
+            progress.update(task_id, total=total_size)
+
+            # Construct the filepath to save the downloaded file
+            content_disposition = resp.headers.get("content-disposition", "")
+            filename_regex = re.search(
+                r'filename="?(?P<filename>[^"]+)"?', content_disposition
+            )
+
+            if not filename_regex:
+                filename = f"aggregated_instance_usage_{start_date}_{end_date}.zip"
+            else:
+                filename = filename_regex.group("filename")
+
+            if directory:
+                filepath = os.path.join(directory, filename)
+            else:
+                filepath = filename
+
+            # Download the file
+            try:
+                with open(filepath, "wb") as f:
+                    for chunk in resp.stream(Bytes.MB):
+                        if chunk:
+                            f.write(chunk)
+                            progress.update(task_id, advance=len(chunk))
+            except Exception as e:  # noqa: BLE001
+                raise ValueError(f"Failed to download to '{filepath}': {e}") from None
+
+            progress.update(task_id, completed=total_size)
+            progress.console.print(
+                f"Download complete! File saved to '{filepath}'",
+                style=Style(bold=True, color="green"),
+            )
+
+        return filepath

{anyscale-0.24.83 → anyscale-0.24.85}/anyscale/_private/anyscale_client/common.py

@@ -1,4 +1,5 @@
 from abc import ABC, abstractmethod
+from datetime import date
 from typing import Dict, Generator, List, Optional, Tuple
 
 from anyscale._private.models.image_uri import ImageURI
@@ -577,3 +578,16 @@ class AnyscaleClientInterface(ABC):
     ):
         """Update a workspace."""
         raise NotImplementedError
+
+    @abstractmethod
+    def download_aggregated_instance_usage_csv(
+        self,
+        start_date: date,
+        end_date: date,
+        cloud_id: Optional[str] = None,
+        project_id: Optional[str] = None,
+        directory: Optional[str] = None,
+        hide_progress_bar: bool = False,
+    ) -> str:
+        """Download the aggregated instance usage csv."""
+        raise NotImplementedError

{anyscale-0.24.83 → anyscale-0.24.85}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -1,6 +1,7 @@
 from collections import defaultdict
-from datetime import datetime
+from datetime import date, datetime
 import logging
+import os
 from typing import DefaultDict, Dict, Generator, List, Optional, Tuple
 from unittest.mock import Mock
 import uuid
@@ -1060,3 +1061,20 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
             compute_config = self.get_compute_config(workspace.compute_config_id)
             assert compute_config is not None
             compute_config.idle_timeout_minutes = idle_timeout_minutes
+
+    def download_aggregated_instance_usage_csv(
+        self,
+        start_date: date,
+        end_date: date,
+        cloud_id: Optional[str] = None,  # noqa: ARG002
+        project_id: Optional[str] = None,  # noqa: ARG002
+        directory: Optional[str] = None,
+        hide_progress_bar: bool = False,  # noqa: ARG002
+    ) -> str:
+        filename = f"aggregated_instance_usage_{start_date}_{end_date}.zip"
+        if directory:
+            filepath = os.path.join(directory, filename)
+        else:
+            filepath = filename
+
+        return filepath

{anyscale-0.24.83 → anyscale-0.24.85}/anyscale/_private/docgen/models.md

@@ -357,8 +357,9 @@ Name | Type | Description | Notes
 **allowed_azs** | **List[str]** | The availability zones that sessions are allowed to be launched in, e.g. \"us-west-2a\". If not specified or \"any\" is provided as the option, any AZ may be used. If \"any\" is provided, it must be the only item in the list. | [optional] [default to null]
 **head_node_type** | [**ComputeNodeType**](#computenodetype) | Node configuration to use for the head node.  | [default to null]
 **worker_node_types** | [**List[WorkerNodeType]**](#workernodetype) | A list of node types to use for worker nodes.  | [optional] [default to null]
-**aws_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
-**gcp_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**aws_advanced_configurations_json** | [**object**](#) | [DEPRECATED: use advanced_configurations_json instead] The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**gcp_advanced_configurations_json** | [**object**](#) | [DEPRECATED: use advanced_configurations_json instead] The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**advanced_configurations_json** | [**object**](#) | Advanced configurations for this compute node type to pass to the cloud provider when launching this instance. | [optional] [default to null]
 **maximum_uptime_minutes** | **int** | If set to a positive number, Anyscale will terminate the cluster this many minutes after cluster start. | [optional] [default to null]
 **auto_select_worker_config** | **bool** | If set to true, worker node groups will automatically be selected based on workload. | [optional] [default to false]
 **flags** | [**object**](#) | A set of advanced cluster-level flags that can be used to configure a particular workload. | [optional] [default to null]
@@ -646,6 +647,7 @@ Name | Type | Description | Notes
 **resources** | [**Resources**](#resources) | Declaration of node resources for Autoscaler. | [optional] [default to null]
 **aws_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
 **gcp_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**advanced_configurations_json** | [**object**](#) | Advanced configurations for this compute node type to pass to the cloud provider when launching this instance. | [optional] [default to null]
 **flags** | [**object**](#) | A set of advanced node-level flags that can be used to configure a particular workload. | [optional] [default to null]
 
 ## ComputeStack
@@ -688,6 +690,7 @@ Name | Type | Description | Notes
 **worker_node_types** | [**List[WorkerNodeType]**](#workernodetype) | A list of node types to use for worker nodes.  | [optional] [default to null]
 **aws_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
 **gcp_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**advanced_configurations_json** | [**object**](#) | Advanced configurations for this compute node type to pass to the cloud provider when launching this instance. | [optional] [default to null]
 **maximum_uptime_minutes** | **int** | If set to a positive number, Anyscale will terminate the cluster this many minutes after cluster start. | [optional] [default to null]
 **auto_select_worker_config** | **bool** | If set to true, worker node groups will automatically be selected based on workload. | [optional] [default to false]
 **flags** | [**object**](#) | A set of advanced cluster-level flags that can be used to configure a particular workload. | [optional] [default to null]
@@ -869,8 +872,9 @@ Name | Type | Description | Notes
 **allowed_azs** | **List[str]** | The availability zones that sessions are allowed to be launched in, e.g. \"us-west-2a\". If not specified or \"any\" is provided as the option, any AZ may be used. If \"any\" is provided, it must be the only item in the list. | [optional] [default to null]
 **head_node_type** | [**ComputeNodeType**](#computenodetype) | Node configuration to use for the head node.  | [default to null]
 **worker_node_types** | [**List[WorkerNodeType]**](#workernodetype) | A list of node types to use for worker nodes.  | [optional] [default to null]
-**aws_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
-**gcp_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**aws_advanced_configurations_json** | [**object**](#) | [DEPRECATED: use advanced_configurations_json instead] The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**gcp_advanced_configurations_json** | [**object**](#) | [DEPRECATED: use advanced_configurations_json instead] The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**advanced_configurations_json** | [**object**](#) | Advanced configurations for this compute node type to pass to the cloud provider when launching this instance. | [optional] [default to null]
 **maximum_uptime_minutes** | **int** | If set to a positive number, Anyscale will terminate the cluster this many minutes after cluster start. | [optional] [default to null]
 **auto_select_worker_config** | **bool** | If set to true, worker node groups will automatically be selected based on workload. | [optional] [default to false]
 **flags** | [**object**](#) | A set of advanced cluster-level flags that can be used to configure a particular workload. | [optional] [default to null]
@@ -938,6 +942,7 @@ Name | Type | Description | Notes
 **worker_node_types** | [**List[WorkerNodeType]**](#workernodetype) | A list of node types to use for worker nodes.  | [optional] [default to null]
 **aws_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
 **gcp_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**advanced_configurations_json** | [**object**](#) | Advanced configurations for this compute node type to pass to the cloud provider when launching this instance. | [optional] [default to null]
 **maximum_uptime_minutes** | **int** | If set to a positive number, Anyscale will terminate the cluster this many minutes after cluster start. | [optional] [default to null]
 **auto_select_worker_config** | **bool** | If set to true, worker node groups will automatically be selected based on workload. | [optional] [default to false]
 **flags** | [**object**](#) | A set of advanced cluster-level flags that can be used to configure a particular workload. | [optional] [default to null]
@@ -1534,7 +1539,7 @@ Name | Type | Description | Notes
 **creator_id** | [**TextQuery**](#textquery) | Filters Projects by creator_id. If this field is absent, no filtering is done. | [optional] [default to null]
 **paging** | [**PageQuery**](#pagequery) | Pagination information. | [optional] [default to null]
 **parent_cloud_id** | [**TextQuery**](#textquery) | Filters Projects by parent_cloud_id. If this field is absent, no filtering is done. | [optional] [default to null]
-**include_defaults** | **bool** | Whether to include default projects in the results. | [optional] [default to false]
+**include_defaults** | **bool** | Whether to include default projects in the results. | [optional] [default to true]
 
 ## Protocols
 
@@ -2188,6 +2193,7 @@ Name | Type | Description | Notes
 **worker_node_types** | [**List[WorkerNodeType]**](#workernodetype) | A list of node types to use for worker nodes.  | [optional] [default to null]
 **aws_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
 **gcp_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**advanced_configurations_json** | [**object**](#) | Advanced configurations for this compute node type to pass to the cloud provider when launching this instance. | [optional] [default to null]
 **maximum_uptime_minutes** | **int** | If set to a positive number, Anyscale will terminate the cluster this many minutes after cluster start. | [optional] [default to null]
 **auto_select_worker_config** | **bool** | If set to true, worker node groups will automatically be selected based on workload. | [optional] [default to false]
 **flags** | [**object**](#) | A set of advanced cluster-level flags that can be used to configure a particular workload. | [optional] [default to null]
@@ -2245,6 +2251,7 @@ Name | Type | Description | Notes
 **resources** | [**Resources**](#resources) | Declaration of node resources for Autoscaler. | [optional] [default to null]
 **aws_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly AWS APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
 **gcp_advanced_configurations_json** | [**object**](#) | The advanced configuration json that we pass directly GCP APIs when launching an instance. We may do some validation on this json and reject the json if it is using a configuration that Anyscale does not support. | [optional] [default to null]
+**advanced_configurations_json** | [**object**](#) | Advanced configurations for this compute node type to pass to the cloud provider when launching this instance. | [optional] [default to null]
 **flags** | [**object**](#) | A set of advanced node-level flags that can be used to configure a particular workload. | [optional] [default to null]
 **min_workers** | **int** | The minimum number of nodes of this type that Anyscale should spin up. | [optional] [default to null]
 **max_workers** | **int** | The maximum number of nodes of this type that Anyscale should spin up. | [optional] [default to null]

anyscale-0.24.85/anyscale/aggregated_instance_usage/__init__.py

@@ -0,0 +1,36 @@
+from typing import Optional
+
+from anyscale._private.anyscale_client import AnyscaleClientInterface
+from anyscale._private.sdk import sdk_docs
+from anyscale._private.sdk.base_sdk import Timer
+from anyscale.aggregated_instance_usage._private.aggregated_instance_usage_sdk import (
+    PrivateAggregatedInstanceUsageSDK,
+)
+from anyscale.aggregated_instance_usage.commands import (
+    _DOWNLOAD_ARG_DOCSTRINGS,
+    _DOWNLOAD_CSV_EXAMPLE,
+    download_csv,
+)
+from anyscale.aggregated_instance_usage.models import DownloadCSVFilters
+from anyscale.cli_logger import BlockLogger
+
+
+class AggregatedInstanceUsageSDK:
+    def __init__(
+        self,
+        *,
+        client: Optional[AnyscaleClientInterface] = None,
+        logger: Optional[BlockLogger] = None,
+        timer: Optional[Timer] = None,
+    ):
+        self._private_sdk = PrivateAggregatedInstanceUsageSDK(
+            client=client, logger=logger, timer=timer
+        )
+
+    @sdk_docs(
+        doc_py_example=_DOWNLOAD_CSV_EXAMPLE, arg_docstrings=_DOWNLOAD_ARG_DOCSTRINGS,
+    )
+    def download_csv(self, filters: DownloadCSVFilters,) -> str:  # noqa: F811
+        """Downloads aggregated instance usage CSV.
+        """
+        return self._private_sdk.download_csv(filters=filters)

anyscale-0.24.85/anyscale/aggregated_instance_usage/_private/aggregated_instance_usage_sdk.py

@@ -0,0 +1,30 @@
+from datetime import date
+
+from anyscale._private.sdk.base_sdk import BaseSDK
+from anyscale.aggregated_instance_usage.models import DownloadCSVFilters
+
+
+class PrivateAggregatedInstanceUsageSDK(BaseSDK):
+    def download_csv(self, filters: DownloadCSVFilters) -> str:
+        cloud_id = (
+            self.client.get_cloud_id(cloud_name=filters.cloud, compute_config_id=None)
+            if filters.cloud
+            else None
+        )
+
+        project_id = (
+            self.client.get_project_id(parent_cloud_id=cloud_id, name=filters.project)
+            if filters.project
+            else None
+        )
+
+        return self.client.download_aggregated_instance_usage_csv(
+            start_date=date.fromisoformat(filters.start_date),
+            end_date=date.fromisoformat(filters.end_date),
+            cloud_id=cloud_id,
+            project_id=project_id,
+            directory=filters.directory,
+            hide_progress_bar=filters.hide_progress_bar
+            if filters.hide_progress_bar
+            else False,
+        )

anyscale-0.24.85/anyscale/aggregated_instance_usage/commands.py

@@ -0,0 +1,42 @@
+from anyscale._private.sdk import sdk_command
+from anyscale.aggregated_instance_usage._private.aggregated_instance_usage_sdk import (
+    PrivateAggregatedInstanceUsageSDK,
+)
+from anyscale.aggregated_instance_usage.models import DownloadCSVFilters
+
+
+_AGGREGATED_INSTANCE_USAGE_SDK_SINGLETON_KEY = "aggregated_instance_usage_sdk"
+
+_DOWNLOAD_CSV_EXAMPLE = """
+import anyscale
+from anyscale.aggregated_instance_usage.models import DownloadCSVFilters
+
+anyscale.aggregated_instance_usage.download_csv(
+    DownloadCSVFilters(
+        start_date="2024-10-01",
+        end_date="2024-10-02",
+        cloud="cloud_name",
+        project="project_name",
+        directory="/directory",
+        hide_progress_bar=False,
+    ),
+)
+"""
+
+_DOWNLOAD_ARG_DOCSTRINGS = {
+    "filters": "The filter of the instance usage to be downloaded."
+}
+
+
+@sdk_command(
+    _AGGREGATED_INSTANCE_USAGE_SDK_SINGLETON_KEY,
+    PrivateAggregatedInstanceUsageSDK,
+    doc_py_example=_DOWNLOAD_CSV_EXAMPLE,
+    arg_docstrings=_DOWNLOAD_ARG_DOCSTRINGS,
+)
+def download_csv(
+    filters: DownloadCSVFilters, *, _sdk: PrivateAggregatedInstanceUsageSDK
+) -> str:
+    """Downloads aggregated instance usage CSV.
+    """
+    return _sdk.download_csv(filters)

anyscale-0.24.85/anyscale/aggregated_instance_usage/models.py

@@ -0,0 +1,85 @@
+from dataclasses import dataclass, field
+from datetime import date
+from typing import Optional
+
+from anyscale._private.models import ModelBase
+
+
+@dataclass(frozen=True)
+class DownloadCSVFilters(ModelBase):
+    """Filters to use when downloading usage CSVs.
+    """
+
+    __doc_py_example__ = """\
+import anyscale
+from anyscale.aggregated_instance_usage.models import DownloadCSVFilters
+
+download_csv_filters = DownloadCSVFilters(
+    # Start date for the usage CSV (inclusive)
+    start_date="2024-10-01",
+    # End date for the usage CSV (inclusive)
+    end_date="2024-10-31",
+    # Optional cloud name to filter by
+    cloud="cloud_name",
+    # Optional project name to filter by
+    project="project_name",
+    # Optional directory to save the CSV to
+    directory="/directory",
+    # Optional hide progress bar
+    hide_progress_bar=False,
+)
+"""
+
+    def _validate_date(self, date_string: str):
+        if not isinstance(date_string, str):
+            raise TypeError("date must be a string.")
+        try:
+            date.fromisoformat(date_string)
+        except ValueError:
+            raise ValueError("Incorrect date format, should be YYYY-MM-DD")
+
+    start_date: str = field(
+        metadata={"docstring": "Start date for the usage CSV (inclusive)."}
+    )
+
+    def _validate_start_date(self, start_date: str):
+        self._validate_date(start_date)
+
+    end_date: str = field(
+        metadata={"docstring": "End date for the usage CSV (inclusive)."}
+    )
+
+    def _validate_end_date(self, end_date: str):
+        self._validate_date(end_date)
+
+    cloud: Optional[str] = field(
+        default=None, metadata={"docstring": "Optional cloud name to filter by."},
+    )
+
+    def _validate_cloud(self, cloud: Optional[str]):
+        if cloud is not None and not isinstance(cloud, str):
+            raise TypeError("cloud must be a string.")
+
+    project: Optional[str] = field(
+        default=None, metadata={"docstring": "Optional project name to filter by."},
+    )
+
+    def _validate_project(self, project: Optional[str]):
+        if project is not None and not isinstance(project, str):
+            raise TypeError("project must be a string.")
+
+    directory: Optional[str] = field(
+        default=None, metadata={"docstring": "Optional directory to save the CSV to."},
+    )
+
+    def _validate_directory(self, directory: Optional[str]):
+        if directory is not None and not isinstance(directory, str):
+            raise TypeError("directory must be a string.")
+
+    hide_progress_bar: Optional[bool] = field(
+        default=False, metadata={"docstring": "Optional hide progress bar."},
+    )
+
+    def _validate_hide_progress_bar(self, hide_progress_bar: Optional[bool]):
+        if hide_progress_bar is not None and not isinstance(hide_progress_bar, bool):
+            raise TypeError("hide_progress_bar must be a boolean.")

{anyscale-0.24.83 → anyscale-0.24.85}/anyscale/authenticate.py

@@ -168,7 +168,7 @@ class AuthenticationBlock:
         if anyscale.util.credentials_check_sanity(credentials):
             return
         else:
-            url = anyscale.util.get_endpoint("/credentials")
+            url = anyscale.util.get_endpoint("/v2/api-keys")
             raise click.ClickException(
                 "Your user credentials are invalid. Please go to "
                 f"{url} and follow the instructions to properly set your credentials."
@@ -192,7 +192,7 @@ class AuthenticationBlock:
                     f"Your user credentials for {anyscale.util.get_endpoint('')} "
                     "are invalid or have expired. "
                     "Please run `anyscale login` or follow the instructions at "
-                    f"{anyscale.util.get_endpoint('/credentials')} to properly "
+                    f"{anyscale.util.get_endpoint('/v2/api-keys')} to properly "
                     "set your credentials."
                 )
             else:
@@ -230,7 +230,7 @@ class AuthenticationBlock:
             return env_token, CREDENTIALS_ENVVAR
         path = os.path.expanduser(CREDENTIALS_FILE)
         if not os.path.exists(path):
-            url = anyscale.util.get_endpoint("/credentials")
+            url = anyscale.util.get_endpoint("/v2/api-keys")
             host = anyscale.util.get_endpoint("")
             raise click.ClickException(
                 "Credentials not found. You need to create an account at {} "
@@ -246,7 +246,7 @@ class AuthenticationBlock:
                     "user credentials again by going to {} and "
                     "following the instructions. If this does not work, "
                     "please contact Anyscale support.".format(
-                        anyscale.util.get_endpoint("/credentials")
+                        anyscale.util.get_endpoint("/v2/api-keys")
                     )
                 )
                 raise click.ClickException(msg)
@@ -255,7 +255,7 @@ class AuthenticationBlock:
             raise click.ClickException(
                 "The credential file is not valid. Please regenerate it by following "
                 "the instructions at {}".format(
-                    anyscale.util.get_endpoint("/credentials")
+                    anyscale.util.get_endpoint("/v2/api-keys")
                 )
             )
         return received_token, CREDENTIALS_FILE

{anyscale-0.24.83 → anyscale-0.24.85}/anyscale/client/README.md

@@ -315,6 +315,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**list_job_queues_api_v2_job_queues_post**](docs/DefaultApi.md#list_job_queues_api_v2_job_queues_post) | **POST** /api/v2/job_queues/ | List Job Queues
 *DefaultApi* | [**list_job_states_api_v2_decorated_ha_job_states_get**](docs/DefaultApi.md#list_job_states_api_v2_decorated_ha_job_states_get) | **GET** /api/v2/decorated_ha_job_states/ | List Job States
 *DefaultApi* | [**list_jobs_api_v2_decorated_unified_jobs_get**](docs/DefaultApi.md#list_jobs_api_v2_decorated_unified_jobs_get) | **GET** /api/v2/decorated_unified_jobs/ | List Jobs
+*DefaultApi* | [**list_long_running_workloads_api_v2_decorated_sessions_long_running_workloads_get**](docs/DefaultApi.md#list_long_running_workloads_api_v2_decorated_sessions_long_running_workloads_get) | **GET** /api/v2/decorated_sessions/long-running-workloads | List Long Running Workloads
 *DefaultApi* | [**list_machine_pools_api_v2_machine_pools_get**](docs/DefaultApi.md#list_machine_pools_api_v2_machine_pools_get) | **GET** /api/v2/machine_pools/ | List Machine Pools
 *DefaultApi* | [**list_machines_api_v2_machines_get**](docs/DefaultApi.md#list_machines_api_v2_machines_get) | **GET** /api/v2/machines/ | List Machines
 *DefaultApi* | [**list_metronome_customer_info_api_v2_metronome_customer_info_get**](docs/DefaultApi.md#list_metronome_customer_info_api_v2_metronome_customer_info_get) | **GET** /api/v2/metronome_customer_info/ | List Metronome Customer Info
@@ -353,6 +354,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**register_api_v2_kubernetes_manager_register_post**](docs/DefaultApi.md#register_api_v2_kubernetes_manager_register_post) | **POST** /api/v2/kubernetes_manager/register | Register
 *DefaultApi* | [**register_buffer_api_v2_anyscaled_register_buffer_post**](docs/DefaultApi.md#register_buffer_api_v2_anyscaled_register_buffer_post) | **POST** /api/v2/anyscaled/register_buffer | Register Buffer
 *DefaultApi* | [**register_build_api_v2_anyscaled_register_build_post**](docs/DefaultApi.md#register_build_api_v2_anyscaled_register_build_post) | **POST** /api/v2/anyscaled/register_build | Register Build
+*DefaultApi* | [**register_machine_api_v2_anyscaled_register_machine_post**](docs/DefaultApi.md#register_machine_api_v2_anyscaled_register_machine_post) | **POST** /api/v2/anyscaled/register_machine | Register Machine
 *DefaultApi* | [**register_user_api_v2_users_post**](docs/DefaultApi.md#register_user_api_v2_users_post) | **POST** /api/v2/users/ | Register User
 *DefaultApi* | [**register_v2_api_v2_anyscaled_register_v2_post**](docs/DefaultApi.md#register_v2_api_v2_anyscaled_register_v2_post) | **POST** /api/v2/anyscaled/register_v2 | Register V2
 *DefaultApi* | [**remove_organization_collaborator_api_v2_organization_collaborators_identity_id_delete**](docs/DefaultApi.md#remove_organization_collaborator_api_v2_organization_collaborators_identity_id_delete) | **DELETE** /api/v2/organization_collaborators/{identity_id} | Remove Organization Collaborator
@@ -402,6 +404,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**update_dns_api_v2_dns_post**](docs/DefaultApi.md#update_dns_api_v2_dns_post) | **POST** /api/v2/dns/ | Update Dns
 *DefaultApi* | [**update_instance_usage_budget_api_v2_instance_usage_budgets_instance_usage_budget_id_put**](docs/DefaultApi.md#update_instance_usage_budget_api_v2_instance_usage_budgets_instance_usage_budget_id_put) | **PUT** /api/v2/instance_usage_budgets/{instance_usage_budget_id} | Update Instance Usage Budget
 *DefaultApi* | [**update_job_queue_config_api_v2_decorated_ha_jobs_production_job_id_update_job_queue_config_put**](docs/DefaultApi.md#update_job_queue_config_api_v2_decorated_ha_jobs_production_job_id_update_job_queue_config_put) | **PUT** /api/v2/decorated_ha_jobs/{production_job_id}/update_job_queue_config | Update Job Queue Config
+*DefaultApi* | [**update_machine_pool_api_v2_machine_pools_update_post**](docs/DefaultApi.md#update_machine_pool_api_v2_machine_pools_update_post) | **POST** /api/v2/machine_pools/update | Update Machine Pool
 *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* | [**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
@@ -786,6 +789,8 @@ Class | Method | HTTP request | Description
  - [LogsOutput](docs/LogsOutput.md)
  - [LogsoutputResponse](docs/LogsoutputResponse.md)
  - [LogstreamResponse](docs/LogstreamResponse.md)
+ - [LongRunningWorkload](docs/LongRunningWorkload.md)
+ - [LongrunningworkloadListResponse](docs/LongrunningworkloadListResponse.md)
  - [MachineAllocationState](docs/MachineAllocationState.md)
  - [MachineConnectionState](docs/MachineConnectionState.md)
  - [MachineInfo](docs/MachineInfo.md)
@@ -1004,10 +1009,12 @@ Class | Method | HTTP request | Description
  - [UpdateComputeTemplate](docs/UpdateComputeTemplate.md)
  - [UpdateComputeTemplateConfig](docs/UpdateComputeTemplateConfig.md)
  - [UpdateEndpoint](docs/UpdateEndpoint.md)
+ - [UpdateMachinePoolRequest](docs/UpdateMachinePoolRequest.md)
  - [UpdateModelDeployment](docs/UpdateModelDeployment.md)
  - [UpdateOrganizationCollaborator](docs/UpdateOrganizationCollaborator.md)
  - [UpdateProjectCollaborator](docs/UpdateProjectCollaborator.md)
  - [UpdateResourceQuota](docs/UpdateResourceQuota.md)
+ - [UpdatemachinepoolresponseResponse](docs/UpdatemachinepoolresponseResponse.md)
  - [UploadSessionCommandLogsLocations](docs/UploadSessionCommandLogsLocations.md)
  - [UploadsessioncommandlogslocationsResponse](docs/UploadsessioncommandlogslocationsResponse.md)
  - [UserInfo](docs/UserInfo.md)
@@ -1028,6 +1035,7 @@ Class | Method | HTTP request | Description
  - [WebterminalListResponse](docs/WebterminalListResponse.md)
  - [WebterminalResponse](docs/WebterminalResponse.md)
  - [WorkerNodeType](docs/WorkerNodeType.md)
+ - [WorkloadType](docs/WorkloadType.md)
  - [WorkspaceDataplaneArtifact](docs/WorkspaceDataplaneArtifact.md)
  - [WorkspaceDataplaneArtifacts](docs/WorkspaceDataplaneArtifacts.md)
  - [WorkspaceDataplaneProxiedArtifacts](docs/WorkspaceDataplaneProxiedArtifacts.md)

{anyscale-0.24.83 → anyscale-0.24.85}/anyscale/client/openapi_client/__init__.py

@@ -396,6 +396,8 @@ from openapi_client.models.logitembatch_response import LogitembatchResponse
 from openapi_client.models.logs_output import LogsOutput
 from openapi_client.models.logsoutput_response import LogsoutputResponse
 from openapi_client.models.logstream_response import LogstreamResponse
+from openapi_client.models.long_running_workload import LongRunningWorkload
+from openapi_client.models.longrunningworkload_list_response import LongrunningworkloadListResponse
 from openapi_client.models.machine_allocation_state import MachineAllocationState
 from openapi_client.models.machine_connection_state import MachineConnectionState
 from openapi_client.models.machine_info import MachineInfo
@@ -614,10 +616,12 @@ from openapi_client.models.update_cluster_dns import UpdateClusterDns
 from openapi_client.models.update_compute_template import UpdateComputeTemplate
 from openapi_client.models.update_compute_template_config import UpdateComputeTemplateConfig
 from openapi_client.models.update_endpoint import UpdateEndpoint
+from openapi_client.models.update_machine_pool_request import UpdateMachinePoolRequest
 from openapi_client.models.update_model_deployment import UpdateModelDeployment
 from openapi_client.models.update_organization_collaborator import UpdateOrganizationCollaborator
 from openapi_client.models.update_project_collaborator import UpdateProjectCollaborator
 from openapi_client.models.update_resource_quota import UpdateResourceQuota
+from openapi_client.models.updatemachinepoolresponse_response import UpdatemachinepoolresponseResponse
 from openapi_client.models.upload_session_command_logs_locations import UploadSessionCommandLogsLocations
 from openapi_client.models.uploadsessioncommandlogslocations_response import UploadsessioncommandlogslocationsResponse
 from openapi_client.models.user_info import UserInfo
@@ -638,6 +642,7 @@ from openapi_client.models.web_terminal import WebTerminal
 from openapi_client.models.webterminal_list_response import WebterminalListResponse
 from openapi_client.models.webterminal_response import WebterminalResponse
 from openapi_client.models.worker_node_type import WorkerNodeType
+from openapi_client.models.workload_type import WorkloadType
 from openapi_client.models.workspace_dataplane_artifact import WorkspaceDataplaneArtifact
 from openapi_client.models.workspace_dataplane_artifacts import WorkspaceDataplaneArtifacts
 from openapi_client.models.workspace_dataplane_proxied_artifacts import WorkspaceDataplaneProxiedArtifacts