anyscale 0.24.11__tar.gz → 0.24.13__tar.gz

{anyscale-0.24.11 → anyscale-0.24.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.24.11
+Version: 0.24.13
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License

{anyscale-0.24.11 → anyscale-0.24.13}/anyscale/_private/anyscale_client/anyscale_client.py

@@ -18,6 +18,7 @@ from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.api.default_api import DefaultApi as InternalApi
 from anyscale.client.openapi_client.models import (
     ArchiveStatus,
+    Cloud,
     CloudDataBucketFileType,
     CloudDataBucketPresignedUploadInfo,
     CloudDataBucketPresignedUploadRequest,
@@ -218,10 +219,24 @@ class AnyscaleClient(AnyscaleClientInterface):
         self._cloud_id_cache[cloud_name] = cloud_id
         return cloud_id
 
-    def create_anonymous_compute_config(self, config: ComputeTemplateConfig) -> str:
+    def get_cloud(self, *, cloud_id: str) -> Optional[Cloud]:
+        try:
+            cloud: Cloud = self._internal_api_client.get_cloud_api_v2_clouds_cloud_id_get(
+                cloud_id
+            ).result
+            return cloud
+        except InternalApiException as e:
+            if e.status == 404:
+                return None
+
+            raise e from None
+
+    def create_compute_config(
+        self, config: ComputeTemplateConfig, *, name: Optional[str] = None
+    ) -> str:
         return self._internal_api_client.create_compute_template_api_v2_compute_templates_post(
             create_compute_template=CreateComputeTemplate(
-                config=config, anonymous=True,
+                config=config, name=name, anonymous=name is None
             )
         ).result.id
 
@@ -283,13 +298,16 @@ class AnyscaleClient(AnyscaleClientInterface):
                 standard_template = self._build_standard_compute_template_from_existing_auto_config(
                     workspace_config
                 )
-                return self.create_anonymous_compute_config(standard_template)
+                return self.create_compute_config(standard_template,)
             else:
                 return workspace_cluster.cluster_compute_id
 
-        # NOTE(edoakes): for some reason the API endpoint is called "cluster compute" but this
-        # is the non-deprecated API to use for compute configs.
-        return self._external_api_client.get_default_cluster_compute().result.id
+        return self.get_default_compute_config(cloud_id=self.get_cloud_id()).id
+
+    def get_default_compute_config(self, *, cloud_id: str) -> ClusterCompute:
+        return self._external_api_client.get_default_cluster_compute(
+            cloud_id=cloud_id,
+        ).result
 
     def _build_standard_compute_template_from_existing_auto_config(
         self, compute_config: ClusterComputeConfig

{anyscale-0.24.11 → anyscale-0.24.13}/anyscale/_private/anyscale_client/common.py

@@ -3,6 +3,7 @@ from typing import List, Optional
 
 from anyscale._private.models.image_uri import ImageURI
 from anyscale.client.openapi_client.models import (
+    Cloud,
     ComputeTemplateConfig,
     CreateInternalProductionJob,
     DecoratedComputeTemplate,
@@ -11,6 +12,7 @@ from anyscale.client.openapi_client.models import (
 from anyscale.sdk.anyscale_client.models import (
     ApplyServiceModel,
     Cluster,
+    ClusterCompute,
     ServiceModel,
 )
 from anyscale.utils.workspace_notification import WorkspaceNotification
@@ -20,7 +22,7 @@ from anyscale.utils.workspace_notification import WorkspaceNotification
 # Maybe just make it part of the release process to update it, or fetch the
 # default builds and get the latest one. The best thing to do is probably
 # to populate this in the backend.
-DEFAULT_RAY_VERSION = "2.9.2"
+DEFAULT_RAY_VERSION = "2.10.0"
 DEFAULT_PYTHON_VERSION = "py310"
 RUNTIME_ENV_PACKAGE_FORMAT = "pkg_{content_hash}.zip"
 
@@ -93,8 +95,21 @@ class AnyscaleClientInterface(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def create_anonymous_compute_config(self, config: ComputeTemplateConfig) -> str:
-        """Create an anonymous compute config and return its ID."""
+    def get_cloud(self, *, cloud_id: str) -> Optional[Cloud]:
+        """Get the cloud model for the provided cloud ID.
+
+        Returns `None` if the cloud ID was not found.
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    def create_compute_config(
+        self, config: ComputeTemplateConfig, *, name: Optional[str] = None
+    ) -> str:
+        """Create a compute config and return its ID.
+
+        If a name is not provided, the compute config will be "anonymous."
+        """
         raise NotImplementedError
 
     @abstractmethod
@@ -121,6 +136,11 @@ class AnyscaleClientInterface(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def get_default_compute_config(self, *, cloud_id: str) -> ClusterCompute:
+        """Get the default compute config for the provided cloud ID."""
+        raise NotImplementedError
+
     @abstractmethod
     def get_default_build_id(self) -> str:
         """Get the default build id.

{anyscale-0.24.11 → anyscale-0.24.13}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -9,6 +9,7 @@ from anyscale._private.anyscale_client.common import (
 from anyscale._private.models.image_uri import ImageURI
 from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.models import (
+    Cloud,
     ComputeTemplateConfig,
     CreateInternalProductionJob,
     DecoratedComputeTemplate,
@@ -22,6 +23,8 @@ from anyscale.sdk.anyscale_client.models import (
     ApplyServiceModel,
     Cluster,
     ClusterCompute,
+    ClusterComputeConfig,
+    ComputeNodeType,
     ServiceEventCurrentState,
     ServiceModel,
 )
@@ -39,6 +42,7 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
     BASE_UI_URL = "http://fake.com"
     CLOUD_BUCKET = "s3://fake-bucket/{cloud_id}"
     DEFAULT_CLOUD_ID = "fake-default-cloud-id"
+    DEFAULT_CLOUD_NAME = "fake-default-cloud"
     DEFAULT_PROJECT_ID = "fake-default-project-id"
     DEFAULT_CLUSTER_COMPUTE_ID = "fake-default-cluster-compute-id"
     DEFAULT_CLUSTER_ENV_BUILD_ID = "fake-default-cluster-env-build-id"
@@ -68,6 +72,32 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         self._upload_uri_mapping: Dict[str, str] = {}
         self._submitted_job: Optional[CreateInternalProductionJob] = None
 
+        # Cloud ID -> Cloud.
+        self._clouds: Dict[str, Cloud] = {
+            self.DEFAULT_CLOUD_ID: Cloud(
+                id=self.DEFAULT_CLOUD_ID,
+                name=self.DEFAULT_CLOUD_NAME,
+                local_vars_configuration=OPENAPI_NO_VALIDATION,
+            ),
+        }
+
+        # Cloud ID -> default ClusterCompute.
+        self._default_compute_configs: Dict[str, ClusterCompute] = {
+            self.DEFAULT_CLOUD_ID: ClusterCompute(
+                id=self.DEFAULT_CLUSTER_COMPUTE_ID,
+                config=ClusterComputeConfig(
+                    cloud_id=self.DEFAULT_CLOUD_ID,
+                    head_node_type=ComputeNodeType(
+                        name="default-head-node",
+                        instance_type="m5.2xlarge",
+                        resources={"CPU": 8, "GPU": 1},
+                    ),
+                    local_vars_configuration=OPENAPI_NO_VALIDATION,
+                ),
+                local_vars_configuration=OPENAPI_NO_VALIDATION,
+            ),
+        }
+
     def get_job_ui_url(self, job_id: str) -> str:
         return f"{self.BASE_UI_URL}/jobs/{job_id}"
 
@@ -148,18 +178,33 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
 
         return f"cloud-{cloud_name}-id"
 
+    def add_cloud(self, cloud: Cloud):
+        self._clouds[cloud.id] = cloud
+
+    def get_cloud(self, *, cloud_id: str) -> Optional[Cloud]:
+        return self._clouds.get(cloud_id, None)
+
     def add_compute_config(self, compute_config: DecoratedComputeTemplate):
         self._compute_configs[compute_config.id] = compute_config
         self._compute_config_name_to_id[compute_config.name] = compute_config.id
 
-    def create_anonymous_compute_config(self, config: ComputeTemplateConfig) -> str:
-        compute_config_id = f"compute-config-id-{str(uuid.uuid4())}"
+    def create_compute_config(
+        self, config: ComputeTemplateConfig, *, name: Optional[str] = None
+    ) -> str:
+        unique_id = str(uuid.uuid4())
+        compute_config_id = f"compute-config-id-{unique_id}"
+        if name is None:
+            anonymous = True
+            name = f"anonymous-compute-config-{unique_id}"
+        else:
+            anonymous = False
+
         self.add_compute_config(
             DecoratedComputeTemplate(
                 id=compute_config_id,
-                name=f"compute-config-{str(uuid.uuid4())}",
+                name=name,
                 config=config,
-                anonymous=True,
+                anonymous=anonymous,
                 local_vars_configuration=OPENAPI_NO_VALIDATION,
             ),
         )
@@ -180,7 +225,15 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         if workspace_cluster is not None:
             return workspace_cluster.cluster_compute_id
 
-        return self.DEFAULT_CLUSTER_COMPUTE_ID
+        return self.get_default_compute_config(cloud_id=self.get_cloud_id()).id
+
+    def set_default_compute_config(
+        self, compute_config: ClusterCompute, *, cloud_id: str
+    ):
+        self._default_compute_configs[cloud_id] = compute_config
+
+    def get_default_compute_config(self, *, cloud_id: str) -> ClusterCompute:
+        return self._default_compute_configs[cloud_id]
 
     def set_image_uri_mapping(self, image_uri: ImageURI, build_id: str):
         self._image_uri_to_build_id[image_uri] = build_id

{anyscale-0.24.11 → anyscale-0.24.13}/anyscale/_private/models/__init__.py

@@ -1,3 +1,2 @@
 from anyscale._private.models.image_uri import ImageURI
 from anyscale._private.models.model_base import ModelBase
-from anyscale._private.models.workload_config import WorkloadConfig

{anyscale-0.24.11 → anyscale-0.24.13}/anyscale/_private/models/model_base.py

@@ -71,9 +71,12 @@ class ModelBase:
         return cls(**d)
 
     @classmethod
-    def from_yaml(cls, path: str) -> "ModelBase":
+    def from_yaml(cls, path: str, **kwargs,) -> "ModelBase":
         with open(path) as f:
-            return cls.from_dict(yaml.safe_load(f))
+            args = yaml.safe_load(f) or {}
+            if kwargs:
+                args.update(kwargs)
+            return cls.from_dict(args)
 
     def to_dict(self, *, exclude_none: bool = True) -> Dict[str, Any]:
         """Convert the model to a dictionary representation.

anyscale-0.24.13/anyscale/_private/sdk/base_sdk.py

@@ -0,0 +1,28 @@
+from typing import Optional
+
+from anyscale._private.anyscale_client import (
+    AnyscaleClient,
+    AnyscaleClientInterface,
+)
+from anyscale.cli_logger import BlockLogger
+
+
+class BaseSDK:
+    """Shared parent class for all SDKs."""
+
+    def __init__(
+        self,
+        *,
+        logger: Optional[BlockLogger] = None,
+        client: Optional[AnyscaleClientInterface] = None,
+    ):
+        self._logger = logger or BlockLogger()
+        self._client = client or AnyscaleClient()
+
+    @property
+    def logger(self) -> BlockLogger:
+        return self._logger
+
+    @property
+    def client(self) -> AnyscaleClientInterface:
+        return self._client

anyscale-0.24.13/anyscale/_private/workload/__init__.py

@@ -0,0 +1,2 @@
+from anyscale._private.workload.workload_config import WorkloadConfig
+from anyscale._private.workload.workload_sdk import WorkloadSDK

{anyscale-0.24.11/anyscale/_private/models → anyscale-0.24.13/anyscale/_private/workload}/workload_config.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass, field
 from typing import Dict, List, Optional, Union
 
 from anyscale._private.models import ImageURI, ModelBase
+from anyscale.compute_config.models import ComputeConfig
 
 
 @dataclass(frozen=True)
@@ -26,11 +27,22 @@ class WorkloadConfig(ModelBase):
         if containerfile is not None and not isinstance(containerfile, str):
             raise TypeError("'containerfile' must be a string.")
 
-    compute_config: Optional[Union[Dict, str]] = field(default=None)
+    compute_config: Union[None, str, Dict, ComputeConfig] = field(default=None)
 
-    def _validate_compute_config(self, compute_config: Optional[Union[Dict, str]]):
-        if compute_config is not None and not isinstance(compute_config, (str, dict)):
-            raise TypeError("'compute_config' must be a string or dictionary.")
+    def _validate_compute_config(
+        self, compute_config: Union[None, str, Dict, ComputeConfig]
+    ) -> Union[None, str, ComputeConfig]:
+        if compute_config is None or isinstance(compute_config, str):
+            return compute_config
+
+        if isinstance(compute_config, dict):
+            compute_config = ComputeConfig.from_dict(compute_config)
+        if not isinstance(compute_config, ComputeConfig):
+            raise TypeError(
+                "'compute_config' must be a string, ComputeConfig, or corresponding dict"
+            )
+
+        return compute_config
 
     working_dir: Optional[str] = field(default=None, repr=False)
 

{anyscale-0.24.11/anyscale/_private/sdk → anyscale-0.24.13/anyscale/_private/workload}/workload_sdk.py

@@ -4,15 +4,13 @@ import pathlib
 from typing import Any, Dict, List, Optional, Union
 
 from anyscale._private.anyscale_client import (
-    AnyscaleClient,
     AnyscaleClientInterface,
     WORKSPACE_CLUSTER_NAME_PREFIX,
 )
+from anyscale._private.sdk.base_sdk import BaseSDK
 from anyscale.cli_logger import BlockLogger
-from anyscale.client.openapi_client.models import (
-    ComputeTemplateConfig,
-    DecoratedComputeTemplateConfig,
-)
+from anyscale.compute_config._private.compute_config_sdk import ComputeConfigSDK
+from anyscale.compute_config.models import ComputeConfig
 from anyscale.utils.runtime_env import is_dir_remote_uri, parse_requirements_file
 
 
@@ -21,7 +19,7 @@ ENABLE_IMAGE_BUILD_FOR_TRACKED_REQUIREMENTS = (
 )
 
 
-class WorkloadSDK:
+class WorkloadSDK(BaseSDK):
     """Shared parent class for job and service SDKs."""
 
     def __init__(
@@ -30,19 +28,13 @@ class WorkloadSDK:
         logger: Optional[BlockLogger] = None,
         client: Optional[AnyscaleClientInterface] = None,
     ):
-        self._logger = logger or BlockLogger()
-        self._client = client or AnyscaleClient()
+        super().__init__(logger=logger, client=client)
         self._enable_image_build_for_tracked_requirements = (
             ENABLE_IMAGE_BUILD_FOR_TRACKED_REQUIREMENTS
         )
-
-    @property
-    def logger(self) -> BlockLogger:
-        return self._logger
-
-    @property
-    def client(self) -> AnyscaleClientInterface:
-        return self._client
+        self._compute_config_sdk = ComputeConfigSDK(
+            logger=self.logger, client=self.client,
+        )
 
     @property
     def enable_image_build_for_tracked_requirements(self) -> bool:
@@ -167,7 +159,7 @@ class WorkloadSDK:
         return new_runtime_envs
 
     def resolve_compute_config_to_id(
-        self, compute_config: Optional[Union[str, Dict]]
+        self, compute_config: Union[None, str, ComputeConfig]
     ) -> str:
         """Resolve the passed compute config to an ID that can be passed to the backend.
 
@@ -187,13 +179,8 @@ class WorkloadSDK:
                     f"The compute config '{compute_config}' does not exist."
                 )
         else:
-            try:
-                compute_config_template = ComputeTemplateConfig(**compute_config)
-            except (ValueError, TypeError) as e:
-                raise RuntimeError(f"Invalid compute config: {e}.")
-
-            compute_config_id = self._client.create_anonymous_compute_config(
-                compute_config_template
+            compute_config_id = self._compute_config_sdk.create_compute_config(
+                compute_config
             )
 
         return compute_config_id
@@ -239,11 +226,11 @@ class WorkloadSDK:
 
     def get_user_facing_compute_config(
         self, compute_config_id: str,
-    ) -> Union[str, Dict]:
+    ) -> Union[str, ComputeConfig]:
         """Get the compute config in a format to be displayed in a user-facing status.
 
         If the compute config refers to an anonymous compute config, its config
-        dictionary will be returned. Else the name of the compute config will be
+        object will be returned. Else the name of the compute config will be
         returned in the form: '<name>:<version>'.
         """
         compute_config = self._client.get_compute_config(compute_config_id)
@@ -252,24 +239,11 @@ class WorkloadSDK:
                 f"Failed to get compute config for ID {compute_config_id}."
             )
 
+        compute_config_name = compute_config.name
+        if compute_config.version is not None:
+            compute_config_name += f":{compute_config.version}"
+
         if not compute_config.anonymous:
-            compute_config_name = compute_config.name
-            if compute_config.version is not None:
-                compute_config_name += f":{compute_config.version}"
             return compute_config_name
 
-        config: DecoratedComputeTemplateConfig = compute_config.config
-        config_dict = {
-            # Strip some internal fields that we don't want to expose to the user.
-            # TODO(edoakes): we should improve the compute config model and avoid this.
-            k: v
-            for k, v in config.to_dict().items()
-            if k
-            not in {
-                "cloud",
-                "cloud_id",
-                "maximum_uptime_minutes",
-                "idle_termination_minutes",
-            }
-        }
-        return self._strip_none_values_from_dict(config_dict)
+        return self._compute_config_sdk.get_compute_config(compute_config_name)

{anyscale-0.24.11 → anyscale-0.24.13}/anyscale/commands/job_commands.py

@@ -45,48 +45,119 @@ def job_cli() -> None:
     is_flag=True,
     help="Whether to block this CLI command until the job succeeds (or reaches another terminal state)",
 )
+@click.option(
+    "--config-file",
+    required=False,
+    default=None,
+    type=str,
+    help="Path to a YAML config file to use for this job. Command-line flags will overwrite values read from the file.",
+)
+@click.option(
+    "--image-uri",
+    required=False,
+    default=None,
+    type=str,
+    help="Container image to use for this job. When running in a workspace, this defaults to the image of the workspace.",
+)
+@click.option(
+    "--containerfile",
+    required=False,
+    default=None,
+    type=str,
+    help="Path to a containerfile to build the image to use for the job. This is exclusive with --image-uri.",
+)
 @click.argument("entrypoint", required=False, nargs=-1, type=click.UNPROCESSED)
-def submit(
+def submit(  # noqa: PLR0912 PLR0913 C901
     entrypoint: Tuple[str],
     name: Optional[str],
     description: Optional[str],
     follow: Optional[bool],
     wait: Optional[bool],
+    config_file: Optional[str],
+    image_uri: Optional[str],
+    containerfile: Optional[str],
 ):
     """Submit a job.
 
-    The job config can be specified from a file or inlined in this command:
-
-    $ anyscale job submit config.yaml # Submit from a config file.
-
-    $ anyscale job submit -- python main.py # Submit from an inlined entrypoint.
+    The job config can be specified in one of the following ways:
+    * Job config can be specified with command-line arguments. In this case, the
+      entrypoint should be specified as the positional arguments starting with `--`.
+      Other arguments can be specified with command-line flags. E.g.
+      * `anyscale job submit -- python main.py`: submit a job with the entrypoint `python main.py`.
+      * `anyscale job submit --name my-job -- python main.py`: submit a job with the name `my-job` and the
+        entrypoint `python main.py`.
+    * Job config can also be specified in a YAML file with the `--config-file` flag.
+      In this case, you can still override arguments with command-line flags. E.g.
+      * `anyscale job submit --config-file config.yaml`: submit a job with the config in `config.yaml`.
+      * `anyscale job submit --config-file config.yaml -- python main.py`: submit a job with the config in `config.yaml`
+        and override the entrypoint with `python main.py`.
+    * [Deprecated] If the positional argument is a single string that ends with .yaml, this is treated as a config file.
+      E.g. `anyscale job submit config.yaml`.
 
     By default, this command submits the job asynchronously and exits. To wait for the job to complete, use the `--wait` flag.
     """
 
-    if len(entrypoint) == 0:
-        raise click.ClickException(
-            "Either a config file or an inlined entrypoint must be provided."
-        )
-
-    config_path: Optional[str] = None
-    if len(entrypoint) == 1:
-        maybe_config_path = entrypoint[0]
-        if pathlib.Path(maybe_config_path).is_file():
-            config_path = entrypoint[0]
-            log.info(f"Submitting job from config file: '{config_path}'.")
-        elif maybe_config_path.endswith(".yaml"):
+    job_controller = JobController()
+    if len(entrypoint) == 1 and entrypoint[0].endswith(".yaml"):
+        # If entrypoint is a single string that ends with .yaml, e.g. `anyscale job submit config.yaml`,
+        # treat it as a config file, and use the old job submission API.
+        if config_file is not None:
+            raise click.ClickException(
+                "`--config-file` should not be used when providing a config file as the entrypoint."
+            )
+        if image_uri:
+            raise click.ClickException(
+                "`--image-uri` should not be used when providing a config file as the entrypoint."
+            )
+        if containerfile:
             raise click.ClickException(
-                f"Job config file '{maybe_config_path}' not found."
+                "`--containerfile` should not be used when providing a config file as the entrypoint."
             )
 
-    job_controller = JobController()
-    if config_path is not None:
-        job_id = job_controller.submit(config_path, name=name, description=description,)
+        config_file = entrypoint[0]
+        if not pathlib.Path(config_file).is_file():
+            raise click.ClickException(f"Job config file '{config_file}' not found.")
+        log.info(f"Submitting job from config file {config_file}.")
+
+        job_id = job_controller.submit(config_file, name=name, description=description,)
     else:
-        job_id = anyscale.job.submit(
-            JobConfig(name=name, entrypoint=list2cmdline(entrypoint))
-        )
+        # Otherwise, use the new job submission API. E.g.
+        # `anyscale job submit -- python main.py`,
+        # or `anyscale job submit --config-file config.yaml`.
+        if len(entrypoint) == 0 and config_file is None:
+            raise click.ClickException(
+                "Either a config file or an inlined entrypoint must be provided."
+            )
+        if config_file is not None and not pathlib.Path(config_file).is_file():
+            raise click.ClickException(f"Job config file '{config_file}' not found.")
+        if follow:
+            log.warning("`--follow` is deprecated, use `--wait` instead.")
+
+        args = {}
+        if len(entrypoint) > 0:
+            args["entrypoint"] = list2cmdline(entrypoint)
+        if name:
+            args["name"] = name
+        if description:
+            args["description"] = description
+
+        if containerfile and image_uri:
+            raise click.ClickException(
+                "Only one of '--containerfile' and '--image-uri' can be provided."
+            )
+
+        if image_uri:
+            args["image_uri"] = image_uri
+
+        if containerfile:
+            args["containerfile"] = containerfile
+
+        if config_file is not None:
+            config = JobConfig.from_yaml(config_file, **args)
+        else:
+            config = JobConfig.from_dict(args)
+        log.info(f"Submitting job with config {config}.")
+        job_id = anyscale.job.submit(config)
 
     if follow or wait:
         job_controller.log.info(

{anyscale-0.24.11 → anyscale-0.24.13}/anyscale/commands/service_commands.py

@@ -86,7 +86,7 @@ def _read_name_from_config_file(path: str):
     required=False,
     default=None,
     type=str,
-    help="Container image to use for the service. This cannot be changed when using --in-place. When running in a workspace, this defaults to the image of the workspace.",
+    help="Container image to use for the service. This cannot be changed when using --in-place and is exclusive with --containerfile. When running in a workspace, this defaults to the image of the workspace.",
 )
 @click.option(
     "--containerfile",