anyscale 0.26.69__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 (
@@ -381,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.",
@@ -451,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/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

anyscale/commands/service_commands.py

@@ -79,8 +79,9 @@ def _read_name_from_config_file(path: str):
     "-f",
     "--config-file",
     required=False,
-    default=None,
+    default=[],
     type=str,
+    multiple=True,
     help="Path to a YAML config file to deploy. When deploying from a file, import path and arguments cannot be provided. Command-line flags will overwrite values read from the file.",
 )
 @click.option(
@@ -202,8 +203,15 @@ def _read_name_from_config_file(path: str):
     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).",
 )
+@click.option(
+    "--versions",
+    required=False,
+    default=None,
+    type=str,
+    help="Defines the traffic and capacity percents per version. Capacity defaults to traffic.",
+)
 def deploy(  # noqa: PLR0912, PLR0913 C901
-    config_file: Optional[str],
+    config_file: List[str],
     import_path: Optional[str],
     arguments: Tuple[str],
     name: Optional[str],
@@ -222,6 +230,7 @@ def deploy(  # noqa: PLR0912, PLR0913 C901
     py_module: Tuple[str],
     cloud: Optional[str],
     project: Optional[str],
+    versions: Optional[str],
 ):
     """Deploy or update a service.
 
@@ -238,102 +247,156 @@ def deploy(  # noqa: PLR0912, PLR0913 C901
     Command-line flags override values in the config file.
     """
 
-    if config_file is not None:
-        if import_path is not None or len(arguments) > 0:
+    if versions is None:
+        if len(config_file) == 1:
+            if import_path is not None or len(arguments) > 0:
+                raise click.ClickException(
+                    "When a config file is provided, import path and application arguments can't be."
+                )
+
+            if not pathlib.Path(config_file[0]).is_file():
+                raise click.ClickException(f"Config file '{config_file[0]}' not found.")
+
+            config = ServiceConfig.from_yaml(config_file[0])
+        elif len(config_file) > 1:
             raise click.ClickException(
-                "When a config file is provided, import path and application arguments can't be."
+                "Multiple config files can be provided only when deploying multiple versions with --versions."
             )
+        else:
+            # when config_file is not provided.
+            if import_path is None:
+                raise click.ClickException(
+                    "Either config file or import path must be provided."
+                )
+
+            if (
+                import_path.endswith((".yaml", ".yml"))
+                or pathlib.Path(import_path).is_file()
+            ):
+                log.warning(
+                    f"The provided import path '{import_path}' looks like a config file. Did you mean to use '-f config.yaml'?"
+                )
 
-        if not pathlib.Path(config_file).is_file():
-            raise click.ClickException(f"Config file '{config_file}' not found.")
+            app: Dict[str, Any] = {"import_path": import_path}
+            arguments_dict = convert_kv_strings_to_dict(arguments)
+            if arguments_dict:
+                app["args"] = arguments_dict
 
-        config = ServiceConfig.from_yaml(config_file)
-    else:
-        if import_path is None:
+            config = ServiceConfig(applications=[app])
+
+        if containerfile and image_uri:
+            raise click.ClickException(
+                "Only one of '--containerfile' and '--image-uri' can be provided."
+            )
+
+        if ray_version and (not image_uri and not containerfile):
             raise click.ClickException(
-                "Either config file or import path must be provided."
+                "Ray version can only be used with an image or containerfile.",
             )
 
-        if (
-            import_path.endswith((".yaml", ".yml"))
-            or pathlib.Path(import_path).is_file()
+        if registry_login_secret and (
+            not image_uri or ImageURI.from_str(image_uri).is_cluster_env_image()
         ):
-            log.warning(
-                f"The provided import path '{import_path}' looks like a config file. Did you mean to use '-f config.yaml'?"
+            raise click.ClickException(
+                "Registry login secret can only be used with an image that is not hosted on Anyscale."
             )
 
-        app: Dict[str, Any] = {"import_path": import_path}
-        arguments_dict = convert_kv_strings_to_dict(arguments)
-        if arguments_dict:
-            app["args"] = arguments_dict
+        if name is not None:
+            config = config.options(name=name)
 
-        config = ServiceConfig(applications=[app])
+        if image_uri is not None:
+            config = config.options(image_uri=image_uri)
 
-    if containerfile and image_uri:
-        raise click.ClickException(
-            "Only one of '--containerfile' and '--image-uri' can be provided."
-        )
+        if registry_login_secret is not None:
+            config = config.options(registry_login_secret=registry_login_secret)
 
-    if ray_version and (not image_uri and not containerfile):
-        raise click.ClickException(
-            "Ray version can only be used with an image or containerfile.",
-        )
+        if ray_version is not None:
+            config = config.options(ray_version=ray_version)
 
-    if registry_login_secret and (
-        not image_uri or ImageURI.from_str(image_uri).is_cluster_env_image()
-    ):
-        raise click.ClickException(
-            "Registry login secret can only be used with an image that is not hosted on Anyscale."
-        )
+        if containerfile is not None:
+            config = config.options(containerfile=containerfile)
 
-    if name is not None:
-        config = config.options(name=name)
+        if compute_config is not None:
+            config = config.options(compute_config=compute_config)
 
-    if image_uri is not None:
-        config = config.options(image_uri=image_uri)
+        if working_dir is not None:
+            config = config.options(working_dir=working_dir)
 
-    if registry_login_secret is not None:
-        config = config.options(registry_login_secret=registry_login_secret)
+        if exclude:
+            config = config.options(excludes=[e for e in exclude])
 
-    if ray_version is not None:
-        config = config.options(ray_version=ray_version)
+        if requirements is not None:
+            config = config.options(requirements=requirements)
 
-    if containerfile is not None:
-        config = config.options(containerfile=containerfile)
+        if env:
+            config = override_env_vars(config, convert_kv_strings_to_dict(env))
 
-    if compute_config is not None:
-        config = config.options(compute_config=compute_config)
+        if py_module:
+            for module in py_module:
+                if not pathlib.Path(module).is_dir():
+                    raise click.ClickException(
+                        f"Python module path '{module}' does not exist or is not a directory."
+                    )
+            config = config.options(py_modules=[*py_module])
 
-    if working_dir is not None:
-        config = config.options(working_dir=working_dir)
+        if cloud is not None:
+            config = config.options(cloud=cloud)
+        if project is not None:
+            config = config.options(project=project)
 
-    if exclude:
-        config = config.options(excludes=[e for e in exclude])
+        configs = config
+    else:
+        # When multiple versions are being deployed.
+        configs = [ServiceConfig.from_yaml(config) for config in config_file]
+        for config in configs:
+            if name is not None:
+                config = config.options(name=name)
 
-    if requirements is not None:
-        config = config.options(requirements=requirements)
+            if cloud is not None:
+                config = config.options(cloud=cloud)
 
-    if env:
-        config = override_env_vars(config, convert_kv_strings_to_dict(env))
+            if project is not None:
+                config = config.options(project=project)
 
-    if py_module:
-        for module in py_module:
-            if not pathlib.Path(module).is_dir():
-                raise click.ClickException(
-                    f"Python module path '{module}' does not exist or is not a directory."
-                )
-        config = config.options(py_modules=[*py_module])
+            if image_uri is not None:
+                log.warning("--image-uri is ignored.")
+
+            if registry_login_secret is not None:
+                log.warning("--registry-login-secret is ignored.")
+
+            if ray_version is not None:
+                log.warning("--ray-version is ignored.")
+
+            if containerfile is not None:
+                log.warning("--containerfile is ignored.")
+
+            if compute_config is not None:
+                log.warning("--compute-config is ignored.")
 
-    if cloud is not None:
-        config = config.options(cloud=cloud)
-    if project is not None:
-        config = config.options(project=project)
+            if working_dir is not None:
+                log.warning("--working-dir is ignored.")
+
+            if exclude:
+                log.warning("--exclude is ignored.")
+
+            if requirements is not None:
+                log.warning("--requirements is ignored.")
+
+            if env:
+                log.warning("--env is ignored.")
+
+            if py_module:
+                log.warning("--py-module is ignored.")
 
     anyscale.service.deploy(
-        config,
+        configs,
         in_place=in_place,
         canary_percent=canary_percent,
         max_surge_percent=max_surge_percent,
+        versions=versions,
+        name=name,
+        cloud=cloud,
+        project=project,
     )