anyscale 0.26.7__py3-none-any.whl → 0.26.9__py3-none-any.whl

anyscale/commands/service_commands.py

@@ -1,6 +1,7 @@
 from io import StringIO
 from json import dumps as json_dumps
 import pathlib
+import sys
 from typing import Any, Dict, Optional, Tuple
 
 import click
@@ -171,7 +172,7 @@ def _read_name_from_config_file(path: str):
     required=False,
     default=None,
     type=str,
-    help="The Anyscale Cloud to run this workload on. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
+    help="The Anyscale Cloud of this workload. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
 )
 @click.option(
     "--project",
@@ -334,7 +335,7 @@ def deploy(  # noqa: PLR0912, PLR0913 C901
     required=False,
     default=None,
     type=str,
-    help="The Anyscale Cloud to run this workload on. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
+    help="The Anyscale Cloud of this workload. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
 )
 @click.option(
     "--project",
@@ -415,7 +416,7 @@ def status(
     required=False,
     default=None,
     type=str,
-    help="The Anyscale Cloud to run this workload on. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
+    help="The Anyscale Cloud of this workload. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
 )
 @click.option(
     "--project",
@@ -481,7 +482,7 @@ def wait(
     required=False,
     default=None,
     type=str,
-    help="The Anyscale Cloud to run this workload on. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
+    help="The Anyscale Cloud of this workload. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
 )
 @click.option(
     "--project",
@@ -746,23 +747,64 @@ def terminate(
     cls=AnyscaleCommand,
     example=command_examples.SERVICE_ARCHIVE_EXAMPLE,
 )
+@click.option(
+    "--service-id", "--id", required=False, help="ID of service.",
+)
 @click.option(
     "-n", "--name", required=False, default=None, type=str, help="Name of the service.",
 )
 @click.option(
-    "-f",
-    "--config-file",
+    "--cloud",
     required=False,
     default=None,
     type=str,
-    help="Path to a YAML config file to read the name from.",
+    help="The Anyscale Cloud of this workload. If not provided, the organization default will be used.",
+)
+@click.option(
+    "--project",
+    required=False,
+    default=None,
+    type=str,
+    help="Named project to use for the service. If not provided, the default project for the cloud will be used (or, if running in a workspace, the project of the workspace).",
+)
+def archive(
+    service_id: Optional[str],
+    name: Optional[str],
+    cloud: Optional[str],
+    project: Optional[str],
+) -> None:
+    """Archive a service."""
+
+    if (service_id and name) or (not service_id and not name):
+        log.error("Exactly one of '--id/--service-id' or '--name' must be provided.")
+        sys.exit(1)
+
+    identifier = name if name else service_id
+    try:
+        anyscale.service.archive(id=service_id, name=name, cloud=cloud, project=project)
+        log.info(f"Successfully archived service: {identifier}")
+    except Exception as e:  # noqa: BLE001
+        log.error(f"Error archiving service: {e}")
+
+
+@service_cli.command(
+    name="delete",
+    help="Delete a service.",
+    cls=AnyscaleCommand,
+    example=command_examples.SERVICE_DELETE_EXAMPLE,
+)
+@click.option(
+    "--service-id", "--id", required=False, help="ID of service.",
+)
+@click.option(
+    "-n", "--name", required=False, default=None, type=str, help="Name of the service.",
 )
 @click.option(
     "--cloud",
     required=False,
     default=None,
     type=str,
-    help="The Anyscale Cloud to run this workload on. If not provided, the organization default will be used (or, if running in a workspace, the cloud of the workspace).",
+    help="The Anyscale Cloud of this workload. If not provided, the organization default will be used.",
 )
 @click.option(
     "--project",
@@ -771,28 +813,21 @@ def terminate(
     type=str,
     help="Named project to use for the service. If not provided, the default project for the cloud will be used (or, if running in a workspace, the project of the workspace).",
 )
-def archive(
+def delete(
+    service_id: Optional[str],
     name: Optional[str],
-    config_file: Optional[str],
     cloud: Optional[str],
     project: Optional[str],
 ) -> None:
-    """Archive a service.
+    """Delete a service"""
 
-    To specify the service by name, use the --name flag. To specify the service by id, use the --id flag. Either name or
-id should be used, specifying both will result in an error.
-    """
-    if name is not None and config_file is not None:
-        raise click.ClickException(
-            "Only one of '--name' and '--config-file' can be provided."
-        )
-
-    if config_file is not None:
-        name = _read_name_from_config_file(config_file)
+    if (service_id and name) or (not service_id and not name):
+        log.error("Exactly one of '--id/--service-id' or '--name' must be provided.")
+        sys.exit(1)
 
-    if name is None:
-        raise click.ClickException(
-            "Service name must be provided using '--name' or in a config file using '-f'."
-        )
-
-    anyscale.service.archive(name=name, cloud=cloud, project=project)
+    identifier = name if name else service_id
+    try:
+        anyscale.service.delete(id=service_id, name=name, cloud=cloud, project=project)
+        log.info(f"Successfully deleted service: {identifier}")
+    except Exception as e:  # noqa: BLE001
+        log.error(f"Error deleting service: {e}")

anyscale/job/_private/job_sdk.py

@@ -12,9 +12,6 @@ from anyscale.client.openapi_client.models.create_job_queue_config import (
     CreateJobQueueConfig,
 )
 from anyscale.client.openapi_client.models.job_queue_spec import JobQueueSpec
-from anyscale.client.openapi_client.models.job_status import (
-    JobStatus as BackendJobStatus,
-)
 from anyscale.client.openapi_client.models.production_job import ProductionJob
 from anyscale.client.openapi_client.models.ray_runtime_env_config import (
     RayRuntimeEnvConfig,
@@ -30,6 +27,7 @@ from anyscale.job.models import (
 )
 from anyscale.sdk.anyscale_client.models import Job
 from anyscale.sdk.anyscale_client.models.ha_job_states import HaJobStates
+from anyscale.sdk.anyscale_client.models.job_status import JobStatus as BackendJobStatus
 from anyscale.utils.runtime_env import parse_requirements_file
 
 

anyscale/sdk/anyscale_client/__init__.py

@@ -203,6 +203,7 @@ from anyscale_client.models.ssoconfig_response import SsoconfigResponse
 from anyscale_client.models.start_cluster_options import StartClusterOptions
 from anyscale_client.models.start_session_options import StartSessionOptions
 from anyscale_client.models.static_sso_config import StaticSSOConfig
+from anyscale_client.models.system_workload_name import SystemWorkloadName
 from anyscale_client.models.terminate_cluster_options import TerminateClusterOptions
 from anyscale_client.models.terminate_session_options import TerminateSessionOptions
 from anyscale_client.models.text_query import TextQuery

anyscale/sdk/anyscale_client/models/__init__.py

@@ -189,6 +189,7 @@ from anyscale_client.models.ssoconfig_response import SsoconfigResponse
 from anyscale_client.models.start_cluster_options import StartClusterOptions
 from anyscale_client.models.start_session_options import StartSessionOptions
 from anyscale_client.models.static_sso_config import StaticSSOConfig
+from anyscale_client.models.system_workload_name import SystemWorkloadName
 from anyscale_client.models.terminate_cluster_options import TerminateClusterOptions
 from anyscale_client.models.terminate_session_options import TerminateSessionOptions
 from anyscale_client.models.text_query import TextQuery