anyscale 0.26.68__py3-none-any.whl → 0.26.70__py3-none-any.whl

anyscale/client/openapi_client/models/workspace_template_version.py

@@ -40,6 +40,7 @@ class WorkspaceTemplateVersion(object):
         'id': 'str',
         'version': 'int',
         'creator_id': 'str',
+        'creator_email': 'str',
         'created_at': 'datetime'
     }
 
@@ -51,10 +52,11 @@ class WorkspaceTemplateVersion(object):
         'id': 'id',
         'version': 'version',
         'creator_id': 'creator_id',
+        'creator_email': 'creator_email',
         'created_at': 'created_at'
     }
 
-    def __init__(self, template_id=None, image_uri=None, compute_configs=None, artifacts=None, id=None, version=None, creator_id=None, created_at=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, template_id=None, image_uri=None, compute_configs=None, artifacts=None, id=None, version=None, creator_id=None, creator_email=None, created_at=None, local_vars_configuration=None):  # noqa: E501
         """WorkspaceTemplateVersion - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -67,6 +69,7 @@ class WorkspaceTemplateVersion(object):
         self._id = None
         self._version = None
         self._creator_id = None
+        self._creator_email = None
         self._created_at = None
         self.discriminator = None
 
@@ -80,6 +83,7 @@ class WorkspaceTemplateVersion(object):
         self.id = id
         self.version = version
         self.creator_id = creator_id
+        self.creator_email = creator_email
         self.created_at = created_at
 
     @property
@@ -251,6 +255,31 @@ class WorkspaceTemplateVersion(object):
 
         self._creator_id = creator_id
 
+    @property
+    def creator_email(self):
+        """Gets the creator_email of this WorkspaceTemplateVersion.  # noqa: E501
+
+        Email of the creator  # noqa: E501
+
+        :return: The creator_email of this WorkspaceTemplateVersion.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_email
+
+    @creator_email.setter
+    def creator_email(self, creator_email):
+        """Sets the creator_email of this WorkspaceTemplateVersion.
+
+        Email of the creator  # noqa: E501
+
+        :param creator_email: The creator_email of this WorkspaceTemplateVersion.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and creator_email is None:  # noqa: E501
+            raise ValueError("Invalid value for `creator_email`, must not be `None`")  # noqa: E501
+
+        self._creator_email = creator_email
+
     @property
     def created_at(self):
         """Gets the created_at of this WorkspaceTemplateVersion.  # noqa: E501

anyscale/client/openapi_client/models/workspace_template_version_data_object.py

@@ -40,6 +40,7 @@ class WorkspaceTemplateVersionDataObject(object):
         'id': 'str',
         'version': 'int',
         'creator_id': 'str',
+        'creator_email': 'str',
         'created_at': 'datetime'
     }
 
@@ -51,10 +52,11 @@ class WorkspaceTemplateVersionDataObject(object):
         'id': 'id',
         'version': 'version',
         'creator_id': 'creator_id',
+        'creator_email': 'creator_email',
         'created_at': 'created_at'
     }
 
-    def __init__(self, template_id=None, image_uri=None, compute_configs=None, artifacts=None, id=None, version=None, creator_id=None, created_at=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, template_id=None, image_uri=None, compute_configs=None, artifacts=None, id=None, version=None, creator_id=None, creator_email=None, created_at=None, local_vars_configuration=None):  # noqa: E501
         """WorkspaceTemplateVersionDataObject - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -67,6 +69,7 @@ class WorkspaceTemplateVersionDataObject(object):
         self._id = None
         self._version = None
         self._creator_id = None
+        self._creator_email = None
         self._created_at = None
         self.discriminator = None
 
@@ -80,6 +83,7 @@ class WorkspaceTemplateVersionDataObject(object):
         self.id = id
         self.version = version
         self.creator_id = creator_id
+        self.creator_email = creator_email
         self.created_at = created_at
 
     @property
@@ -251,6 +255,31 @@ class WorkspaceTemplateVersionDataObject(object):
 
         self._creator_id = creator_id
 
+    @property
+    def creator_email(self):
+        """Gets the creator_email of this WorkspaceTemplateVersionDataObject.  # noqa: E501
+
+        Email of the creator  # noqa: E501
+
+        :return: The creator_email of this WorkspaceTemplateVersionDataObject.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_email
+
+    @creator_email.setter
+    def creator_email(self, creator_email):
+        """Sets the creator_email of this WorkspaceTemplateVersionDataObject.
+
+        Email of the creator  # noqa: E501
+
+        :param creator_email: The creator_email of this WorkspaceTemplateVersionDataObject.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and creator_email is None:  # noqa: E501
+            raise ValueError("Invalid value for `creator_email`, must not be `None`")  # noqa: E501
+
+        self._creator_email = creator_email
+
     @property
     def created_at(self):
         """Gets the created_at of this WorkspaceTemplateVersionDataObject.  # noqa: E501

anyscale/cloud/models.py

@@ -497,9 +497,9 @@ compute_stack: VM
 region: us-west-2
 networking_mode: PUBLIC
 object_storage:
-bucket_name: s3://my-bucket
+  bucket_name: s3://my-bucket
 file_storage:
-file_storage_id: fs-12345678901234567
+  file_storage_id: fs-12345678901234567
 aws_config:
   vpc_id: vpc-12345678901234567
   subnet_ids:

anyscale/commands/cloud_commands.py

@@ -23,7 +23,10 @@ from anyscale.client.openapi_client.models import (
 from anyscale.client.openapi_client.models.compute_stack import ComputeStack
 from anyscale.cloud.models import CreateCloudCollaborator, CreateCloudCollaborators
 from anyscale.commands import command_examples
-from anyscale.commands.setup_k8s import setup_kubernetes_cloud
+from anyscale.commands.setup_k8s import (
+    setup_kubernetes_cloud,
+    setup_kubernetes_cloud_resource,
+)
 from anyscale.commands.util import AnyscaleCommand, OptionPromptNull
 from anyscale.controllers.cloud_controller import CloudController
 from anyscale.util import (
@@ -137,14 +140,11 @@ def default_region(provider: str) -> str:
     show_default=True,
 )
 @click.option(
-    "--cluster-name",
-    help="Kubernetes cluster name (required for k8s stack).",
-    required=False,
-    type=str,
+    "--cluster-name", help="Kubernetes cluster name. (K8s)", required=False, type=str,
 )
 @click.option(
     "--namespace",
-    help="Kubernetes namespace for Anyscale operator (for k8s stack).",
+    help="Kubernetes namespace for Anyscale operator. (K8s)",
     required=False,
     type=str,
     default="anyscale-operator",
@@ -166,13 +166,13 @@ def default_region(provider: str) -> str:
     "--anyscale-managed",
     is_flag=True,
     default=False,
-    help="Let anyscale create all the resources.",
+    help="Let anyscale create all the resources. (VM)",
 )
 @click.option(
     "--enable-head-node-fault-tolerance",
     is_flag=True,
     default=False,
-    help="Whether to enable head node fault tolerance for services.",
+    help="Whether to enable head node fault tolerance for services. (VM)",
 )
 @click.option(
     "--yes", "-y", is_flag=True, default=False, help="Skip asking for confirmation."
@@ -193,17 +193,24 @@ def default_region(provider: str) -> str:
     type=click.Choice([e.value for e in SharedStorageType], case_sensitive=False),
     default=SharedStorageType.OBJECT_STORAGE.value,
     show_default=True,
-    help="The type of shared storage to use for the cloud. Use 'object-storage' for cloud bucket-based storage (e.g., S3, GCS), or 'nfs' for network file systems.",
+    help="The type of shared storage to use for the cloud. Use 'object-storage' for cloud bucket-based storage (e.g., S3, GCS), or 'nfs' for network file systems. (VM)",
 )
 @click.option(
     "--values-file",
-    help="Path to save the generated Helm values file (for k8s stack, default: auto-generated with timestamp).",
+    help="Path to save the generated Helm values file (for k8s stack, default: auto-generated with timestamp). (K8s)",
     required=False,
     type=str,
 )
 @click.option(
     "--debug", is_flag=True, default=False, help="Enable debug logging.",
 )
+@click.option(
+    "--operator-chart",
+    help="Path to operator chart (skips helm repo add/update). (K8s)",
+    required=False,
+    type=str,
+    hidden=True,
+)
 def setup_cloud(  # noqa: PLR0913
     provider: str,
     region: str,
@@ -220,6 +227,7 @@ def setup_cloud(  # noqa: PLR0913
     shared_storage: str,
     values_file: Optional[str],
     debug: bool,
+    operator_chart: Optional[str],
 ) -> None:
     # TODO (congding): remove `anyscale_managed` in the future, now keeping it for compatibility
 
@@ -241,6 +249,7 @@ def setup_cloud(  # noqa: PLR0913
             yes=yes,
             values_file=values_file,
             debug=debug,
+            operator_chart=operator_chart,
         )
         return
 
@@ -375,6 +384,134 @@ def cloud_resource_create(
         print(e)
 
 
+@cloud_resource_group.command(
+    name="setup",
+    help="Set up cloud resources for an existing cloud on a Kubernetes cluster.",
+    cls=AnyscaleCommand,
+    is_alpha=True,
+)
+@click.option(
+    "--provider",
+    help="The cloud provider type.",
+    required=True,
+    type=click.Choice(["aws", "gcp"], case_sensitive=False),
+)
+@click.option(
+    "--region", help="Region to set up the resources in.", required=True,
+)
+@click.option(
+    "--stack",
+    help="The compute stack to use (only k8s is supported for this command).",
+    required=False,
+    type=click.Choice(["k8s"], case_sensitive=False),
+    default="k8s",
+    show_default=True,
+)
+@click.option(
+    "--cloud",
+    help="The name of the existing cloud to add resources to. Either this or --cloud-id is required.",
+    type=str,
+    required=False,
+)
+@click.option(
+    "--cloud-id",
+    help="The ID of the existing cloud to add resources to. Either this or --cloud is required.",
+    type=str,
+    required=False,
+)
+@click.option(
+    "--cluster-name", help="Kubernetes cluster name.", required=True, type=str,
+)
+@click.option(
+    "--namespace",
+    help="Kubernetes namespace for Anyscale operator.",
+    required=False,
+    type=str,
+    default="anyscale-operator",
+)
+@click.option(
+    "--project-id",
+    help="Globally Unique project ID for GCP clouds (e.g., my-project-abc123)",
+    required=False,
+    type=str,
+)
+@click.option(
+    "--functional-verify",
+    help="Verify the cloud is functional. This will check that the cloud can launch workspace/service.",
+    required=False,
+    is_flag=False,
+    flag_value="workspace",
+)
+@click.option(
+    "--yes", "-y", is_flag=True, default=False, help="Skip asking for confirmation."
+)
+@click.option(
+    "--values-file",
+    help="Path to save the generated Helm values file (default: auto-generated with timestamp).",
+    required=False,
+    type=str,
+)
+@click.option(
+    "--debug", is_flag=True, default=False, help="Enable debug logging.",
+)
+@click.option(
+    "--operator-chart",
+    help="Path to operator chart (skips helm repo add/update).",
+    required=False,
+    type=str,
+    hidden=True,
+)
+@click.option(
+    "--resource-name",
+    help="Name for the cloud resource (optional, will be auto-generated if not provided)",
+    required=False,
+    type=str,
+    default=None,
+)
+def cloud_resource_setup(  # noqa: PLR0913
+    provider: str,
+    region: str,
+    stack: str,
+    cloud: Optional[str],
+    cloud_id: Optional[str],
+    cluster_name: str,
+    namespace: str,
+    project_id: Optional[str],
+    functional_verify: Optional[str],
+    yes: bool,
+    values_file: Optional[str],
+    debug: bool,
+    operator_chart: Optional[str],
+    resource_name: Optional[str],
+) -> None:
+    """
+    Set up cloud resources for an existing Anyscale cloud on a Kubernetes cluster.
+
+    This command sets up infrastructure (S3/GCS buckets, IAM roles, etc.) and installs
+    the Anyscale operator on your Kubernetes cluster, then creates a cloud resource in
+    an existing cloud instead of registering a new cloud.
+    """
+    # Validate stack
+    if stack != "k8s":
+        raise click.ClickException("Only --stack=k8s is supported for this command.")
+
+    setup_kubernetes_cloud_resource(
+        provider=provider,
+        region=region,
+        cloud_name=cloud,
+        cloud_id=cloud_id,
+        cluster_name=cluster_name,
+        namespace=namespace,
+        project_id=project_id,
+        functional_verify=bool(functional_verify),
+        yes=yes,
+        values_file=values_file,
+        debug=debug,
+        operator_chart=operator_chart,
+        resource_name=resource_name,
+    )
+
+
 @cloud_resource_group.command(
     name="delete",
     help="Remove a cloud resource from an existing cloud.",
@@ -445,7 +582,7 @@ def cloud_resource_delete(cloud: str, resource: str, yes: bool,) -> None:
 @click.option(
     "--resources-file",
     "-f",
-    help="EXPERIMENTAL: Path to a YAML file defining a list of cloud resources. Schema: https://docs.anyscale.com/reference/cloud/#cloudresource.",
+    help="EXPERIMENTAL: Path to a YAML file defining a single cloud resource or a list of cloud resources. Schema: https://docs.anyscale.com/reference/cloud/#cloudresource.",
     required=False,
 )
 @click.option(

anyscale/commands/command_examples.py

@@ -538,6 +538,59 @@ $ anyscale project get-default --cloud my-cloud-id --json
 """
 
 
+CLOUD_SETUP_K8S_AWS_EXAMPLE = """\
+# Set up a Kubernetes cloud on AWS EKS
+$ anyscale cloud setup --provider aws --region us-west-2 --name my-k8s-cloud \\
+    --stack k8s --cluster-name my-eks-cluster --namespace anyscale-operator \\
+    --debug --yes
+Output
+(anyscale +1.0s) Setting up Kubernetes cloud 'my-k8s-cloud' on AWS
+(anyscale +1.5s) Required CLI tools are installed (kubectl, helm, aws)
+(anyscale +2.3s) Using namespace: anyscale-operator
+(anyscale +5.2s) Cluster discovered: arn:aws:eks:us-west-2:123456789012:cluster/my-eks-cluster
+(anyscale +8.4s) Setting up AWS infrastructure...
+(anyscale +1m12.3s) CloudFormation stack created
+(anyscale +1m15.7s) Cloud registered with ID: cld_abc123
+(anyscale +1m18.2s) Adding Anyscale Helm repository...
+(anyscale +1m20.5s) Installing Anyscale operator...
+(anyscale +1m25.8s) Generated Helm values file: anyscale-helm-values-aws-anyscale-operator-20241015_175602.yaml
+(anyscale +2m45.3s) Helm installation completed successfully
+(anyscale +2m45.4s) Kubernetes cloud 'my-k8s-cloud' setup completed successfully!
+"""
+
+CLOUD_SETUP_K8S_GCP_EXAMPLE = """\
+# Set up a Kubernetes cloud on GCP GKE
+$ anyscale cloud setup --provider gcp --region us-central1 --name my-gke-cloud \\
+    --stack k8s --cluster-name my-gke-cluster --namespace anyscale-operator \\
+    --project-id my-project-123 --yes
+Output
+(anyscale +1.0s) Setting up Kubernetes cloud 'my-gke-cloud' on GCP
+(anyscale +1.5s) Required CLI tools are installed (kubectl, helm, gcloud, gsutil)
+(anyscale +2.3s) Using namespace: anyscale-operator
+(anyscale +5.8s) Cluster discovered: gke_my-project-123_us-central1_my-gke-cluster
+(anyscale +9.2s) Setting up GCP infrastructure...
+(anyscale +15.4s) Created GCS bucket: anyscale-k8s-my-gke-cloud-a1b2c3d4
+(anyscale +18.7s) Created service account: anyscale-operator-e5f6g7h8@my-project-123.iam.gserviceaccount.com
+(anyscale +25.3s) GCP resources created successfully
+(anyscale +28.1s) Cloud registered with ID: cld_xyz789
+(anyscale +30.5s) Installing Anyscale operator...
+(anyscale +35.8s) Generated Helm values file: anyscale-helm-values-gcp-anyscale-operator-20241015_180215.yaml
+(anyscale +1m55.2s) Helm installation completed successfully
+(anyscale +1m55.3s) Kubernetes cloud 'my-gke-cloud' setup completed successfully!
+"""
+
+CLOUD_SETUP_K8S_CUSTOM_VALUES_EXAMPLE = """\
+# Set up a Kubernetes cloud with a custom Helm values file path
+$ anyscale cloud setup --provider aws --region us-west-2 --name my-k8s-cloud \\
+    --stack k8s --cluster-name my-eks-cluster \\
+    --values-file /path/to/custom-values.yaml --yes
+Output
+(anyscale +1.0s) Setting up Kubernetes cloud 'my-k8s-cloud' on AWS
+...
+(anyscale +1m25.8s) Generated Helm values file: /path/to/custom-values.yaml
+...
+"""
+
 CLOUD_ADD_COLLABORATORS_EXAMPLE = """\
 $ anyscale cloud add-collaborators --cloud cloud_name --users-file collaborators.yaml
 (anyscale +1.3s) Successfully added 2 collaborators to cloud cloud_name.

anyscale/commands/job_commands.py

@@ -347,7 +347,7 @@ and override the entrypoint with `python main.py`.
         log.info("Use `--wait` to wait for the job to run and stream logs.")
 
     if wait:
-        anyscale.job.wait(id=job_id)
+        anyscale.job.wait(id=job_id, follow=True)
 
 
 # TODO(mowen): Add cloud support for this when we refactor to new SDK method