anyscale 0.24.88__py3-none-any.whl → 0.25.0__py3-none-any.whl

anyscale/commands/machine_pool_commands.py

@@ -2,10 +2,16 @@
 This file holds all of the CLI commands for the "anyscale machine-pool" path.
 """
 
+import json
+
 import click
 import tabulate
 import yaml
 
+from anyscale.client.openapi_client.models import (
+    DescribeMachinePoolResponse,
+    SchedulerInfo,
+)
 from anyscale.commands import command_examples
 from anyscale.commands.util import AnyscaleCommand
 from anyscale.controllers.machine_pool_controller import MachinePoolController
@@ -71,6 +77,110 @@ def update_machine_pool(name: str, spec_file: str) -> None:
     print(f"Updated machine pool '{name}'.")
 
 
+@machine_pool_cli.command(
+    name="describe",
+    help="Describe a machine pool in Anyscale.",
+    cls=AnyscaleCommand,
+    example=command_examples.MACHINE_POOL_DESCRIBE_EXAMPLE,
+    is_beta=True,
+)
+@click.option("--name", type=str, required=True, help="Provide a machine pool name.")
+@click.option(
+    "--format",
+    "format_",
+    type=str,
+    default="table",
+    required=False,
+    help="Output format (table, json).",
+)
+def describe(name: str, format_: str) -> None:
+    machine_pool_controller = MachinePoolController()
+    response: DescribeMachinePoolResponse = machine_pool_controller.describe_machine_pool(
+        machine_pool_name=name
+    )
+    scheduler_info: SchedulerInfo = response.scheduler_info  # type: ignore
+    if format_ == "json":
+        print(json.dumps(scheduler_info.to_dict(), default=str))
+    elif format_ == "table":
+        machines_table = []
+        columns = [
+            "MACHINE ID",
+            "TYPE",
+            "PARTITION",
+            "STATE",
+            "WORKLOAD DETAILS",
+            "WORKLOAD SCORE",
+            "WORKLOAD START TIME",
+            "CLOUD INSTANCE ID",
+        ]
+        for row in scheduler_info.machines:
+            machines_table.append(
+                [
+                    row.machine_id,
+                    row.machine_type,
+                    row.partition,
+                    row.allocation_state,
+                    f"{row.workload_info.workload_type}/{row.workload_info.workload_name}/{row.workload_info.workload_cloud}"
+                    if row.workload_info.workload_name
+                    else "",
+                    row.workload_score,
+                    str(
+                        row.workload_info.workload_start_time.astimezone().strftime(
+                            "%m/%d/%Y %I:%M:%S %p %Z"
+                        )
+                    )
+                    if row.workload_info.workload_name
+                    else "",
+                    row.cloud_instance_id,
+                ]
+            )
+
+        # Sort by (type, partition, state, workload start time)
+        machines_table.sort(key=lambda x: (x[1], x[2], x[3], x[6]))
+
+        print("Machines:")
+        print(
+            tabulate.tabulate(
+                machines_table, tablefmt="outline", headers=columns, stralign="left"
+            )
+        )
+
+        requests_table = []
+        columns = [
+            "SIZE",
+            "MACHINE TYPE",
+            "WORKLOAD DETAILS",
+            "WORKLOAD START TIME",
+            "WORKLOAD CLOUD",
+            "PARTITION SCORES",
+        ]
+        for row in scheduler_info.requests:
+            requests_table.append(
+                [
+                    row.size,
+                    row.machine_type,
+                    f"{row.workload_info.workload_type}/{row.workload_info.workload_name}",
+                    str(
+                        row.workload_info.workload_start_time.astimezone().strftime(
+                            "%m/%d/%Y %I:%M:%S %p %Z"
+                        )
+                    )
+                    if row.workload_info.workload_name
+                    else "",
+                    row.workload_info.workload_cloud,
+                    row.partition_scores,
+                ]
+            )
+
+        # Sort by (machine type, workload start time, size)
+        print("Requests:")
+        print(
+            tabulate.tabulate(
+                requests_table, tablefmt="outline", headers=columns, stralign="left"
+            )
+        )
+
+
 @machine_pool_cli.command(
     name="delete",
     help="Delete a machine pool in Anyscale.",
@@ -122,7 +232,9 @@ def list_machine_pools(format_: str) -> None:
                 ]
             )
         print(
-            tabulate.tabulate(table, tablefmt="plain", headers=columns, stralign="left")
+            tabulate.tabulate(
+                table, tablefmt="simple_grid", headers=columns, stralign="left"
+            )
         )
     elif format_ == "yaml":
         rows = []

anyscale/commands/organization_invitation_commands.py

@@ -0,0 +1,98 @@
+import click
+from dateutil import tz
+from rich import print as rprint
+import tabulate
+
+import anyscale
+from anyscale.cli_logger import BlockLogger
+from anyscale.commands import command_examples
+from anyscale.commands.util import AnyscaleCommand
+
+
+log = BlockLogger()  # CLI Logger
+
+
+@click.group("organization-invitation", help="Manage organization invitations.")
+def organization_invitation_cli() -> None:
+    pass
+
+
+@organization_invitation_cli.command(
+    name="create",
+    cls=AnyscaleCommand,
+    example=command_examples.ORGANIZATION_INVITATION_CREATE_EXAMPLE,
+)
+@click.option(
+    "--emails",
+    required=True,
+    type=str,
+    help="The emails to send the organization invitations to. Delimited by commas.",
+)
+def create(emails: str,) -> None:
+    """
+    Creates organization invitations for the provided emails.
+    """
+    log.info("Creating organization invitations...")
+
+    success_emails, error_messages = anyscale.organization_invitation.create(
+        emails.split(",")
+    )
+
+    if success_emails:
+        log.info(f"Organization invitations sent to: {', '.join(success_emails)}")
+
+    if error_messages:
+        for error_message in error_messages:
+            log.error(
+                f"Failed to send organization invitations with the following errors: {error_message}"
+            )
+
+
+@organization_invitation_cli.command(
+    name="list",
+    cls=AnyscaleCommand,
+    example=command_examples.ORGANIZATION_INVITATION_LIST_EXAMPLE,
+)
+def list() -> None:  # noqa: A001
+    """
+    Lists organization invitations.
+    """
+    organization_invitations = anyscale.organization_invitation.list()
+
+    table = tabulate.tabulate(
+        [
+            (
+                i.id,
+                i.email,
+                i.created_at.astimezone(tz=tz.tzlocal()).strftime("%m/%d/%Y %I:%M %p"),
+                i.expires_at.astimezone(tz=tz.tzlocal()).strftime("%m/%d/%Y %I:%M %p"),
+            )
+            for i in organization_invitations
+        ],
+        headers=["ID", "Email", "Created At", "Expires At"],
+    )
+    rprint(table)
+
+
+@organization_invitation_cli.command(
+    name="delete",
+    cls=AnyscaleCommand,
+    example=command_examples.ORGANIZATION_INVITATION_DELETE_EXAMPLE,
+)
+@click.option(
+    "--email",
+    required=True,
+    type=str,
+    help="The email of the organization invitation to delete.",
+)
+def delete(email: str,) -> None:
+    """
+    Deletes an organization invitation.
+    """
+    try:
+        organization_invitation_email = anyscale.organization_invitation.delete(email)
+    except ValueError as e:
+        log.error(f"Failed to delete organization invitation: {e}")
+        return
+
+    log.info(f"Organization invitation for {organization_invitation_email} deleted.")

anyscale/commands/project_commands.py

@@ -2,10 +2,16 @@ from typing import Optional
 
 import click
 
+import anyscale
 from anyscale.cli_logger import BlockLogger
-from anyscale.commands.util import LegacyAnyscaleCommand, NotRequiredIf
+from anyscale.commands import command_examples
+from anyscale.commands.util import AnyscaleCommand, LegacyAnyscaleCommand, NotRequiredIf
 from anyscale.controllers.project_controller import ProjectController
-from anyscale.project import validate_project_name
+from anyscale.project.models import (
+    CreateProjectCollaborator,
+    CreateProjectCollaborators,
+)
+from anyscale.project_utils import validate_project_name
 from anyscale.util import validate_non_negative_arg
 
 
@@ -201,3 +207,47 @@ def init(project_id: Optional[str], name: Optional[str],) -> None:
 def create(name: str, parent_cloud_id: str) -> None:
     project_controller = ProjectController()
     project_controller.create(name, parent_cloud_id)
+
+
+@project_cli.command(
+    name="add-collaborators",
+    help="Add collaborators to the project.",
+    cls=AnyscaleCommand,
+    example=command_examples.PROJECT_ADD_COLLABORATORS_EXAMPLE,
+)
+@click.option(
+    "--cloud",
+    "-c",
+    help="Name of the cloud that the project belongs to.",
+    required=True,
+)
+@click.option(
+    "--project",
+    "-p",
+    help="Name of the project to add collaborators to.",
+    required=True,
+)
+@click.option(
+    "--users-file",
+    help="Path to a YAML file containing a list of users to add to the project.",
+    required=True,
+)
+def add_collaborators(cloud: str, project: str, users_file: str,) -> None:
+    collaborators = CreateProjectCollaborators.from_yaml(users_file)
+
+    try:
+        anyscale.project.add_collaborators(
+            cloud=cloud,
+            project=project,
+            collaborators=[
+                CreateProjectCollaborator(**collaborator)
+                for collaborator in collaborators.collaborators
+            ],
+        )
+    except ValueError as e:
+        log.error(f"Error adding collaborators to project: {e}")
+        return
+
+    log.info(
+        f"Successfully added {len(collaborators.collaborators)} collaborators to project {project}."
+    )

anyscale/commands/resource_quota_commands.py

@@ -1,11 +1,14 @@
 from typing import List, Optional, Tuple
 
 import click
+from rich import print as rprint
+import tabulate
 
+import anyscale
 from anyscale.cli_logger import BlockLogger
 from anyscale.commands import command_examples
 from anyscale.commands.util import AnyscaleCommand
-from anyscale.controllers.resource_quota_controller import ResourceQuotaController
+from anyscale.resource_quota.models import CreateResourceQuota, ResourceQuota
 from anyscale.util import validate_non_negative_arg
 
 
@@ -17,6 +20,43 @@ def resource_quota_cli() -> None:
     pass
 
 
+def _format_resource_quotas(resource_quotas: List[ResourceQuota]) -> str:
+    table_rows = []
+    for resource_quota in resource_quotas:
+        table_rows.append(
+            [
+                resource_quota.id,
+                resource_quota.name,
+                resource_quota.cloud_id,
+                resource_quota.project_id,
+                resource_quota.user_id,
+                resource_quota.is_enabled,
+                resource_quota.created_at.strftime("%m/%d/%Y"),
+                resource_quota.deleted_at.strftime("%m/%d/%Y")
+                if resource_quota.deleted_at
+                else None,
+                resource_quota.quota,
+            ]
+        )
+    table = tabulate.tabulate(
+        table_rows,
+        headers=[
+            "ID",
+            "NAME",
+            "CLOUD ID",
+            "PROJECT ID",
+            "USER ID",
+            "IS ENABLED",
+            "CREATED AT",
+            "DELETED AT",
+            "QUOTA",
+        ],
+        tablefmt="plain",
+    )
+
+    return f"Resource quotas:\n{table}"
+
+
 @resource_quota_cli.command(
     name="create",
     help="Create a resource quota.",
@@ -84,8 +124,7 @@ def create(  # noqa: PLR0913
 
     `$ anyscale resource-quota create -n my-resource-quota --cloud my-cloud --project my-project --user-email test@myorg.com --num-cpus 10 --num-instances 10 --num-gpus 10 --num-accelerators L4 5 --num-accelerators T4 10`
     """
-    resource_quota_controller = ResourceQuotaController()
-    resource_quota_controller.create(
+    create_resource_quota = CreateResourceQuota(
         name=name,
         cloud=cloud,
         project=project,
@@ -96,6 +135,35 @@ def create(  # noqa: PLR0913
         num_accelerators=dict(num_accelerators),
     )
 
+    try:
+        with log.spinner("Creating resource quota..."):
+            resource_quota = anyscale.resource_quota.create(create_resource_quota)
+
+        create_resource_quota_message = [f"Name: {name}\nCloud name: {cloud}"]
+        if project:
+            create_resource_quota_message.append(f"Project name: {project}")
+        if user_email:
+            create_resource_quota_message.append(f"User email: {user_email}")
+        if num_cpus:
+            create_resource_quota_message.append(f"Number of CPUs: {num_cpus}")
+        if num_instances:
+            create_resource_quota_message.append(
+                f"Number of instances: {num_instances}"
+            )
+        if num_gpus:
+            create_resource_quota_message.append(f"Number of GPUs: {num_gpus}")
+        if num_accelerators:
+            create_resource_quota_message.append(
+                f"Number of accelerators: {dict(num_accelerators)}"
+            )
+
+        log.info("\n".join(create_resource_quota_message))
+        log.info(f"Resource quota created successfully ID: {resource_quota.id}")
+
+    except ValueError as e:
+        log.error(f"Error creating resource quota: {e}")
+        return
+
 
 @resource_quota_cli.command(
     name="list",
@@ -141,8 +209,7 @@ def list_resource_quotas(
 
     `$ anyscale resource-quota list -n my-resource-quota --cloud my-cloud`
     """
-    resource_quota_controller = ResourceQuotaController()
-    resource_quota_controller.list_resource_quotas(
+    resource_quotas = anyscale.resource_quota.list(
         name=name,
         cloud=cloud,
         creator_id=creator_id,
@@ -150,6 +217,8 @@ def list_resource_quotas(
         max_items=max_items,
     )
 
+    rprint(_format_resource_quotas(resource_quotas))
+
 
 @resource_quota_cli.command(
     name="delete",
@@ -168,8 +237,14 @@ def delete(id: str) -> None:  # noqa: A002
 
     `$ anyscale resource-quota delete --id rsq_123`
     """
-    resource_quota_controller = ResourceQuotaController()
-    resource_quota_controller.delete(id)
+    try:
+        with log.spinner("Deleting resource quota..."):
+            anyscale.resource_quota.delete(resource_quota_id=id)
+    except ValueError as e:
+        log.error(f"Error deleting resource quota: {e}")
+        return
+
+    log.info(f"Resource quota with ID {id} deleted successfully.")
 
 
 @resource_quota_cli.command(
@@ -189,8 +264,14 @@ def enable(id: str) -> None:  # noqa: A002
 
     `$ anyscale resource-quota enable --id rsq_123`
     """
-    resource_quota_controller = ResourceQuotaController()
-    resource_quota_controller.set_status(id, is_enabled=True)
+    try:
+        with log.spinner("Setting resource quota status..."):
+            anyscale.resource_quota.enable(resource_quota_id=id)
+    except ValueError as e:
+        log.error(f"Error enabling resource quota: {e}")
+        return
+
+    log.info(f"Enabled resource quota with ID {id} successfully.")
 
 
 @resource_quota_cli.command(
@@ -210,5 +291,11 @@ def disable(id: str) -> None:  # noqa: A002
 
     `$ anyscale resource-quota disable --id rsq_123`
     """
-    resource_quota_controller = ResourceQuotaController()
-    resource_quota_controller.set_status(id, is_enabled=False)
+    try:
+        with log.spinner("Setting resource quota status..."):
+            anyscale.resource_quota.disable(resource_quota_id=id)
+    except ValueError as e:
+        log.error(f"Error disabling resource quota: {e}")
+        return
+
+    log.info(f"Disabled resource quota with ID {id} successfully.")

anyscale/commands/service_commands.py

@@ -125,7 +125,7 @@ def _read_name_from_config_file(path: str):
     required=False,
     default=None,
     type=str,
-    help="Path to a requirements.txt file containing dependencies for the service. These will be installed on top of the image. When running in a workspace, this defaults to the workspace dependencies.",
+    help="Path to a requirements.txt file containing dependencies for the service. Anyscale installs these dependencies on top of the image. If you deploy a service from a workspace, the default is to use the workspace dependencies, but specifying this option overrides them.",
 )
 @click.option(
     "-i",

anyscale/commands/session_commands_hidden.py

@@ -4,7 +4,11 @@ from typing import Optional
 
 import click
 
-from anyscale.project import get_project_id, get_project_session, load_project_or_throw
+from anyscale.project_utils import (
+    get_project_id,
+    get_project_session,
+    load_project_or_throw,
+)
 from anyscale.shared_anyscale_utils.util import execution_log_name
 from anyscale.snapshot import copy_file
 from anyscale.util import deserialize_datetime, send_json_request

anyscale/commands/user_commands.py

@@ -29,7 +29,7 @@ def user_cli() -> None:
 )
 def admin_batch_create(users_file: str,) -> None:
     """
-    Batch create users without email verification as an admin.
+    Batch create, as an admin, users without email verification.
     """
     log.info("Creating users...")
 

anyscale/commands/util.py

@@ -125,8 +125,8 @@ def convert_kv_strings_to_dict(strings: Tuple[str]) -> Dict[str, str]:
     """
     ret_dict = {}
     for s in strings:
-        split = s.split("=")
-        if len(split) != 2:
+        split = s.split("=", maxsplit=1)
+        if len(split) != 2 or len(split[1]) == 0:
             raise click.ClickException(
                 f"Invalid key-value string '{s}'. Must be of the form 'key=value'."
             )

anyscale/commands/workspace_commands.py

@@ -15,7 +15,7 @@ from anyscale.commands import workspace_commands_v2
 from anyscale.commands.util import LegacyAnyscaleCommand
 from anyscale.controllers.cluster_controller import ClusterController
 from anyscale.controllers.workspace_controller import WorkspaceController
-from anyscale.project import find_project_root
+from anyscale.project_utils import find_project_root
 from anyscale.shared_anyscale_utils.utils.byod import BYODInfo
 from anyscale.util import get_endpoint
 from anyscale.workspace_utils import (

anyscale/connect.py

@@ -48,7 +48,7 @@ from anyscale.connect_utils.start_interactive_session import (  # pylint:disable
     _get_interactive_shell_frame,
     start_interactive_session_block,
 )
-import anyscale.project
+import anyscale.project_utils
 from anyscale.sdk.anyscale_client.sdk import AnyscaleSDK
 from anyscale.shared_anyscale_utils.util import slugify
 from anyscale.util import PROJECT_NAME_ENV_VAR

anyscale/connect_utils/project.py

@@ -7,13 +7,14 @@ import yaml
 import anyscale
 from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
-from anyscale.cloud import (
+from anyscale.cloud_utils import (
     get_cloud_id_and_name,
     get_last_used_cloud,
     get_organization_default_cloud,
 )
 from anyscale.cluster_compute import get_cluster_compute_from_name
 import anyscale.conf
+import anyscale.project_utils
 from anyscale.sdk.anyscale_client import ComputeTemplateConfig
 from anyscale.utils.connect_helpers import find_project_id
 
@@ -70,7 +71,7 @@ class ProjectBlock:
         self.log.open_block(self.block_label, block_title="Choosing a project")
 
         if self.project_dir is None and project_name is None:
-            self.project_dir = anyscale.project.find_project_root(os.getcwd())
+            self.project_dir = anyscale.project_utils.find_project_root(os.getcwd())
 
         parent_cloud_id = self._get_parent_cloud_id(
             self.cloud_name, self.cluster_compute_name, self.cluster_compute_dict,
@@ -186,8 +187,10 @@ class ProjectBlock:
         project_yaml = os.path.join(project_dir, ".anyscale.yaml")
         if os.path.exists(project_yaml):
             # Validate format of project yaml and get project id
-            proj_def = anyscale.project.ProjectDefinition(project_dir)
-            project_id: Optional[str] = anyscale.project.get_project_id(proj_def.root)
+            proj_def = anyscale.project_utils.ProjectDefinition(project_dir)
+            project_id: Optional[str] = anyscale.project_utils.get_project_id(
+                proj_def.root
+            )
             if not project_id:
                 raise click.ClickException(
                     f"{project_yaml} is not correctly formatted. Please attach to a different "

anyscale/controllers/cloud_controller.py

@@ -43,12 +43,6 @@ from anyscale.client.openapi_client.models import (
 from anyscale.client.openapi_client.models.gcp_file_store_config import (
     GCPFileStoreConfig,
 )
-from anyscale.cloud import (
-    get_cloud_id_and_name,
-    get_cloud_json_from_id,
-    get_cloud_resource_by_cloud_id,
-    get_organization_id,
-)
 from anyscale.cloud_resource import (
     associate_aws_subnets_with_azs,
     GCS_STORAGE_PREFIX,
@@ -63,6 +57,12 @@ from anyscale.cloud_resource import (
     verify_aws_subnets,
     verify_aws_vpc,
 )
+from anyscale.cloud_utils import (
+    get_cloud_id_and_name,
+    get_cloud_json_from_id,
+    get_cloud_resource_by_cloud_id,
+    get_organization_id,
+)
 from anyscale.conf import ANYSCALE_IAM_ROLE_NAME
 from anyscale.controllers.base_controller import BaseController
 from anyscale.controllers.cloud_functional_verification_controller import (

anyscale/controllers/cloud_functional_verification_controller.py

@@ -30,7 +30,7 @@ from anyscale.client.openapi_client.models import (
     SessionState,
 )
 from anyscale.controllers.base_controller import BaseController
-from anyscale.project import get_default_project
+from anyscale.project_utils import get_default_project
 from anyscale.sdk.anyscale_client.models import (
     ComputeNodeType,
     ComputeTemplateQuery,

anyscale/controllers/cluster_controller.py

@@ -7,7 +7,7 @@ import tabulate
 import yaml
 
 from anyscale.cli_logger import BlockLogger
-from anyscale.cloud import get_cloud_id_and_name, get_last_used_cloud
+from anyscale.cloud_utils import get_cloud_id_and_name, get_last_used_cloud
 from anyscale.cluster_compute import (
     get_cluster_compute_from_name,
     get_default_cluster_compute,
@@ -18,7 +18,7 @@ from anyscale.cluster_env import (
     get_default_cluster_env_build,
 )
 from anyscale.controllers.base_controller import BaseController
-from anyscale.project import (
+from anyscale.project_utils import (
     get_and_validate_project_id,
     get_proj_id_from_name,
     get_project_id,

anyscale/controllers/compute_config_controller.py

@@ -14,7 +14,7 @@ from anyscale.anyscale_pydantic import (
     validator,
 )
 from anyscale.cli_logger import BlockLogger
-from anyscale.cloud import get_cloud_id_and_name
+from anyscale.cloud_utils import get_cloud_id_and_name
 from anyscale.cluster_compute import get_cluster_compute_from_name
 from anyscale.conf import IDLE_TIMEOUT_DEFAULT_MINUTES
 from anyscale.controllers.base_controller import BaseController

anyscale/controllers/experimental_integrations_controller.py

@@ -3,7 +3,7 @@ from typing import Optional
 import click
 
 from anyscale.cli_logger import BlockLogger
-from anyscale.cloud import get_cloud_id_and_name
+from anyscale.cloud_utils import get_cloud_id_and_name
 from anyscale.controllers.base_controller import BaseController