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

anyscale/client/openapi_client/models/workspace_template_readme.py

@@ -35,16 +35,20 @@ class WorkspaceTemplateReadme(object):
     openapi_types = {
         'content': 'str',
         'title': 'str',
-        'description': 'str'
+        'description': 'str',
+        'icon_type': 'str',
+        'icon_bg_color': 'str'
     }
 
     attribute_map = {
         'content': 'content',
         'title': 'title',
-        'description': 'description'
+        'description': 'description',
+        'icon_type': 'icon_type',
+        'icon_bg_color': 'icon_bg_color'
     }
 
-    def __init__(self, content=None, title=None, description=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, content=None, title=None, description=None, icon_type=None, icon_bg_color=None, local_vars_configuration=None):  # noqa: E501
         """WorkspaceTemplateReadme - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -53,11 +57,17 @@ class WorkspaceTemplateReadme(object):
         self._content = None
         self._title = None
         self._description = None
+        self._icon_type = None
+        self._icon_bg_color = None
         self.discriminator = None
 
         self.content = content
         self.title = title
         self.description = description
+        if icon_type is not None:
+            self.icon_type = icon_type
+        if icon_bg_color is not None:
+            self.icon_bg_color = icon_bg_color
 
     @property
     def content(self):
@@ -134,6 +144,52 @@ class WorkspaceTemplateReadme(object):
 
         self._description = description
 
+    @property
+    def icon_type(self):
+        """Gets the icon_type of this WorkspaceTemplateReadme.  # noqa: E501
+
+        The remix icon name of the icon for the workspace template  # noqa: E501
+
+        :return: The icon_type of this WorkspaceTemplateReadme.  # noqa: E501
+        :rtype: str
+        """
+        return self._icon_type
+
+    @icon_type.setter
+    def icon_type(self, icon_type):
+        """Sets the icon_type of this WorkspaceTemplateReadme.
+
+        The remix icon name of the icon for the workspace template  # noqa: E501
+
+        :param icon_type: The icon_type of this WorkspaceTemplateReadme.  # noqa: E501
+        :type: str
+        """
+
+        self._icon_type = icon_type
+
+    @property
+    def icon_bg_color(self):
+        """Gets the icon_bg_color of this WorkspaceTemplateReadme.  # noqa: E501
+
+        The background color of the icon for the workspace template  # noqa: E501
+
+        :return: The icon_bg_color of this WorkspaceTemplateReadme.  # noqa: E501
+        :rtype: str
+        """
+        return self._icon_bg_color
+
+    @icon_bg_color.setter
+    def icon_bg_color(self, icon_bg_color):
+        """Sets the icon_bg_color of this WorkspaceTemplateReadme.
+
+        The background color of the icon for the workspace template  # noqa: E501
+
+        :param icon_bg_color: The icon_bg_color of this WorkspaceTemplateReadme.  # noqa: E501
+        :type: str
+        """
+
+        self._icon_bg_color = icon_bg_color
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale/cloud/__init__.py

@@ -14,9 +14,12 @@ from anyscale.cloud.commands import (
     _GET_ARG_DOCSTRINGS,
     _GET_DEFAULT_EXAMPLE,
     _GET_EXAMPLE,
+    _TERMINATE_SYSTEM_CLUSTER_ARG_DOCSTRINGS,
+    _TERMINATE_SYSTEM_CLUSTER_EXAMPLE,
     add_collaborators,
     get,
     get_default,
+    terminate_system_cluster,
 )
 from anyscale.cloud.models import Cloud, CreateCloudCollaborator
 from anyscale.connect import ClientBuilder
@@ -73,6 +76,18 @@ class CloudSDK:
         """
         return self._private_sdk.get_default()
 
+    @sdk_docs(
+        doc_py_example=_TERMINATE_SYSTEM_CLUSTER_EXAMPLE,
+        arg_docstrings=_TERMINATE_SYSTEM_CLUSTER_ARG_DOCSTRINGS,
+    )
+    def terminate_system_cluster(self, cloud_id: str, wait: bool = False) -> str:
+        """
+        Terminate the system cluster for a given cloud.
+
+        :return: ID of the terminated system cluster.
+        """
+        return self._private_sdk.terminate_system_cluster(cloud_id, wait)
+
 
 # Note: indentation here matches that of connect.py::ClientBuilder.
 BUILDER_HELP_FOOTER = """
@@ -94,6 +109,7 @@ class CloudModule(ModuleType):
         self.add_collaborators = add_collaborators
         self.get = get
         self.get_default = get_default
+        self.terminate_system_cluster = terminate_system_cluster
 
         # Expose Anyscale connect
         self.new_builder = self._new_builder()

anyscale/cloud/_private/cloud_sdk.py

@@ -1,6 +1,7 @@
 from typing import List, Optional
 
 from anyscale._private.sdk.base_sdk import BaseSDK
+from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.models import (
     Cloud as CloudModel,
     CreateCloudCollaborator as CreateCloudCollaboratorModel,
@@ -11,6 +12,10 @@ from anyscale.cloud.models import (
     ComputeStack,
     CreateCloudCollaborator,
 )
+from anyscale.sdk.anyscale_client.models import ClusterState
+
+
+logger = BlockLogger()
 
 
 class PrivateCloudSDK(BaseSDK):
@@ -80,3 +85,31 @@ class PrivateCloudSDK(BaseSDK):
             is_default=openapi_cloud.is_default,
             compute_stack=compute_stack,
         )
+
+    def terminate_system_cluster(self, cloud_id: str, wait: bool) -> str:
+        resp = self.client.terminate_system_cluster(cloud_id)
+        if wait:
+            self._wait_for_system_cluster_status(cloud_id, ClusterState.TERMINATED)
+        else:
+            logger.info(f"System cluster termination initiated for cloud {cloud_id}.")
+        return resp.result.cluster_id
+
+    def _wait_for_system_cluster_status(
+        self,
+        cloud_id: str,
+        goal_status: str,
+        timeout_s: int = 500,
+        interval_s: int = 10,
+    ) -> bool:
+        self.logger.info("Waiting for system cluster termination...", end="")
+        for _ in self.timer.poll(timeout_s=timeout_s, interval_s=interval_s):
+            status = self.client.describe_system_workload_get_status(cloud_id)
+            if status == goal_status:
+                print(".")
+                self.logger.info(f"System cluster for cloud '{cloud_id}' is {status}.")
+                return True
+            else:
+                print(".", end="")
+        raise TimeoutError(
+            f"Timed out waiting for system cluster termination for cloud '{cloud_id}'. Last seen status: {status}."
+        )

anyscale/cloud/commands.py

@@ -114,3 +114,38 @@ def get_default(*, _private_sdk: Optional[PrivateCloudSDK] = None) -> Optional[C
     :return: The default `Cloud` object if it exists, otherwise `None`.
     """
     return _private_sdk.get_default()  # type: ignore
+
+
+_TERMINATE_SYSTEM_CLUSTER_EXAMPLE = """
+import anyscale
+
+# Terminate the system cluster for the cloud with the specified ID
+anyscale.cloud.terminate_system_cluster(cloud_id="cloud_id", wait=True)
+"""
+
+_TERMINATE_SYSTEM_CLUSTER_ARG_DOCSTRINGS = {
+    "cloud_id": "The ID of the cloud whose system cluster should be terminated.",
+    "wait": "If True, wait for the system cluster to be terminated before returning. Defaults to False.",
+}
+
+
+@sdk_command(
+    _CLOUD_SDK_SINGLETON_KEY,
+    PrivateCloudSDK,
+    doc_py_example=_TERMINATE_SYSTEM_CLUSTER_EXAMPLE,
+    arg_docstrings=_TERMINATE_SYSTEM_CLUSTER_ARG_DOCSTRINGS,
+)
+def terminate_system_cluster(
+    cloud_id: str,
+    wait: Optional[bool] = False,
+    *,
+    _private_sdk: Optional[PrivateCloudSDK] = None,
+) -> str:
+    """
+    Terminate the system cluster for the specified cloud.
+
+    :param cloud: The name of the cloud whose system cluster should be terminated.
+    :param wait: If True, wait for the system cluster to be terminated before returning. Defaults to False.
+    :return: ID of the terminated system cluster.
+    """
+    return _private_sdk.terminate_system_cluster(cloud_id, wait)  # type: ignore

anyscale/commands/cloud_commands.py

@@ -1269,3 +1269,38 @@ def generate_jobs_report(
         )
     except ValueError as e:
         log.error(f"Error generating jobs report: {e}")
+
+
+@cloud_cli.command(
+    name="terminate-system-cluster",
+    help="Terminate the system cluster for a specific given cloud.",
+    cls=AnyscaleCommand,
+    example=command_examples.CLOUD_TERMINATE_SYSTEM_CLUSTER_EXAMPLE,
+)
+@click.option(
+    "--cloud-id",
+    "--id",
+    help="ID of the cloud to terminate the system cluster for.",
+    type=str,
+    required=True,
+)
+@click.option(
+    "-w",
+    "--wait",
+    required=False,
+    default=False,
+    type=bool,
+    is_flag=True,
+    help="Block this CLI command and print logs until the job finishes.",
+)
+def terminate_system_cluster(cloud_id: str, wait: Optional[bool]) -> None:
+    """
+    Terminate the system cluster for a specific cloud.
+
+    :param cloud_id: The ID of the cloud to terminate the system cluster for.
+    :param wait: If True, wait for the system cluster to be terminated before returning. Defaults to False.
+    """
+    try:
+        anyscale.cloud.terminate_system_cluster(cloud_id, wait)
+    except ValueError as e:
+        log.error(f"Error terminating system cluster: {e}")

anyscale/commands/command_examples.py

@@ -673,6 +673,12 @@ is_default: true
 compute_stack: VM
 """
 
+CLOUD_TERMINATE_SYSTEM_CLUSTER_EXAMPLE = """\
+$ anyscale cloud terminate-system-cluster --cloud-id cloud_id --wait
+(anyscale +1.3s) Waiting for system cluster termination............
+(anyscale +1m22.9s) System cluster for cloud 'cloud_id' is Terminated.
+"""
+
 SERVICE_ARCHIVE_EXAMPLE = """\
 $ anyscale service archive --name my_service
 """

anyscale/commands/list_util.py

@@ -32,7 +32,47 @@ def _paginate(iterator: Iterator[Any], page_size: Optional[int]) -> Iterator[Lis
             yield page
 
 
-def display_list(  # noqa: PLR0913
+def _render_page(
+    page: List[Any],
+    item_formatter: Callable[[Any], Dict[str, Any]],
+    table_creator: Callable[[bool], Table],
+    json_output: bool,
+    is_first: bool,
+    page_num: int,
+    console: Console,
+) -> int:
+    """Render a single page of items."""
+    if page_num > 1:  # Only show page number for pages after first
+        console.print(f"[dim]Page {page_num}[/dim]")
+
+    rows = [item_formatter(item) for item in page]
+    if json_output:
+        json_str = json_dumps(rows, indent=2, cls=AnyscaleJSONEncoder)
+        console.print_json(json=json_str)
+    else:
+        tbl = table_creator(is_first)
+        for row in rows:
+            tbl.add_row(*row.values())
+        console.print(tbl)
+
+    return len(page)
+
+
+def _should_continue_pagination(
+    page_size: int, current_page_size: int, console: Console
+) -> bool:
+    """Prompt user to continue pagination if needed."""
+    if current_page_size < page_size:
+        return False  # Last page, no need to prompt
+
+    console.print()
+    console.print(
+        "[dim]Press [bold]Enter[/bold] to continue, [bold]q[/bold] to quit…[/]"
+    )
+    return input("> ").strip().lower() != "q"
+
+
+def display_list(  # noqa: PLR0913, PLR0912
     iterator: Iterator[Any],
     item_formatter: Callable[[Any], Dict[str, Any]],
     table_creator: Callable[[bool], Table],
@@ -65,56 +105,78 @@ def display_list(  # noqa: PLR0913
     total_count = 0
     pages = _paginate(iterator, page_size if interactive else max_items)
 
-    # fetch first page under spinner
+    # Start interactive session if needed
+    if interactive:
+        try:
+            from anyscale.telemetry import start_interactive_session
+
+            start_interactive_session()
+        except Exception:  # noqa: BLE001
+            pass
+
+    # Fetch and render first page
     with console.status("Retrieving items…", spinner="dots"):
         try:
             first_page = next(pages)
         except StopIteration:
             first_page = []
 
-    def _render(page: List[Any], is_first: bool, page_num: int):
-        nonlocal total_count
-        total_count += len(page)
-        if interactive:
-            console.print(f"[dim]Page {page_num}[/dim]")
-        rows = [item_formatter(item) for item in page]
-        if json_output:
-            json_str = json_dumps(rows, indent=2, cls=AnyscaleJSONEncoder)
-            console.print_json(json=json_str)
-        else:
-            tbl = table_creator(is_first)
-            for row in rows:
-                tbl.add_row(*row.values())
-            console.print(tbl)
-
-    # render first page
     if first_page:
-        _render(first_page, True, page_num=1)
+        total_count += _render_page(
+            first_page, item_formatter, table_creator, json_output, True, 1, console
+        )
 
-    # non-interactive: stop after first page
+    # For interactive commands, mark when command logic completes
+    if interactive:
+        try:
+            from anyscale.telemetry import mark_command_complete
+
+            mark_command_complete()
+        except Exception:  # noqa: BLE001
+            pass
+
+    # Non-interactive: stop after first page
     if not interactive:
         return total_count
 
-    # interactive: prompt after full first page
-    if len(first_page) == page_size:
-        console.print()
-        console.print(
-            "[dim]Press [bold]Enter[/bold] to continue, [bold]q[/bold] to quit…[/]"
-        )
-        if input("> ").strip().lower() == "q":
-            return total_count
+    # Interactive: check if user wants to continue
+    if not _should_continue_pagination(page_size, len(first_page), console):
+        return total_count
 
-    # render remaining pages
+    # Render remaining pages with correct telemetry timing
     page_num = 2
-    for page in pages:
-        _render(page, False, page_num)
-        if len(page) == page_size:
-            console.print()
-            console.print(
-                "[dim]Press [bold]Enter[/bold] to continue, [bold]q[/bold] to quit…[/]"
-            )
-            if input("> ").strip().lower() == "q":
-                break
+    while True:
+        # Start page fetch timing and generate new trace ID BEFORE fetching
+        try:
+            from anyscale.telemetry import mark_page_fetch_start
+
+            mark_page_fetch_start(page_num)
+        except Exception:  # noqa: BLE001
+            pass
+
+        # Now fetch the page (with the new trace ID)
+        try:
+            page = next(pages)
+        except StopIteration:
+            break
+
+        # Render the page
+        total_count += _render_page(
+            page, item_formatter, table_creator, json_output, False, page_num, console
+        )
+
+        # Complete page fetch telemetry
+        try:
+            from anyscale.telemetry import mark_page_fetch_complete
+
+            mark_page_fetch_complete(page_num)
+        except Exception:  # noqa: BLE001
+            pass
+
+        # Check if user wants to continue or if this was the last page
+        if not _should_continue_pagination(page_size, len(page), console):
+            break
+
         page_num += 1
 
     return total_count

anyscale/integrations.py

@@ -20,8 +20,6 @@ WANDB_API_KEY_NAME = "WANDB_API_KEY_NAME"  # pragma: allowlist secret
 WANDB_PROJECT_NAME = "WANDB_PROJECT_NAME"
 WANDB_GROUP_NAME = "WANDB_GROUP_NAME"
 
-FLAG_WANDB_INTEGRATION_PROTOTYPE = "wandb-integration-prototype"
-
 log = BlockLogger()  # Anyscale CLI Logger
 
 
@@ -131,13 +129,6 @@ def wandb_setup_api_key_hook() -> Optional[str]:
     be called by the OSS WandbLoggerCallback. Because this is called
     before wandb.init(), any other setup can also be done here.
     """
-    api_client = get_auth_api_client(log_output=False).api_client
-    feature_flag_on = api_client.check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get(
-        FLAG_WANDB_INTEGRATION_PROTOTYPE
-    ).result.is_on
-    if not feature_flag_on:
-        return None
-
     protected_api_key = wandb_get_api_key()
 
     try:
@@ -171,11 +162,6 @@ def set_wandb_project_group_env_vars():
     for production jobs, workspaces, and Ray jobs.
     """
     api_client = get_auth_api_client(log_output=False).api_client
-    feature_flag_on = api_client.check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get(
-        FLAG_WANDB_INTEGRATION_PROTOTYPE
-    ).result.is_on
-    if not feature_flag_on:
-        return
 
     wandb_project_default = None
     wandb_group_default = None
@@ -224,12 +210,6 @@ def wandb_send_run_info_hook(run: Any) -> None:
     api_client = auth_api_client.api_client
     anyscale_api_client = auth_api_client.anyscale_api_client
 
-    feature_flag_on = api_client.check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get(
-        FLAG_WANDB_INTEGRATION_PROTOTYPE
-    ).result.is_on
-    if not feature_flag_on:
-        return
-
     try:
         import wandb
     except ImportError:

anyscale/scripts.py

@@ -43,6 +43,7 @@ from anyscale.commands.user_commands import user_cli
 from anyscale.commands.workspace_commands import workspace_cli
 from anyscale.commands.workspace_commands_v2 import workspace_cli as workspace_cli_v2
 import anyscale.conf
+import anyscale.telemetry  # IMPORTANT: auto-patches click instrumentation on import
 from anyscale.utils.cli_version_check_util import log_warning_if_version_needs_upgrade