anyscale 0.26.13__py3-none-any.whl → 0.26.15__py3-none-any.whl

anyscale/client/openapi_client/models/task_type.py

@@ -0,0 +1,100 @@
+# coding: utf-8
+
+"""
+    Managed Ray API
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from openapi_client.configuration import Configuration
+
+
+class TaskType(object):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    NORMAL = "NORMAL"
+    ACTOR = "ACTOR"
+
+    allowable_values = [NORMAL, ACTOR]  # noqa: E501
+
+    """
+    Attributes:
+      openapi_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    openapi_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self, local_vars_configuration=None):  # noqa: E501
+        """TaskType - a model defined in OpenAPI"""  # noqa: E501
+        if local_vars_configuration is None:
+            local_vars_configuration = Configuration()
+        self.local_vars_configuration = local_vars_configuration
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, TaskType):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, TaskType):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/client/openapi_client/models/tasksummary_response.py

@@ -0,0 +1,121 @@
+# coding: utf-8
+
+"""
+    Managed Ray API
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from openapi_client.configuration import Configuration
+
+
+class TasksummaryResponse(object):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      openapi_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    openapi_types = {
+        'result': 'TaskSummary'
+    }
+
+    attribute_map = {
+        'result': 'result'
+    }
+
+    def __init__(self, result=None, local_vars_configuration=None):  # noqa: E501
+        """TasksummaryResponse - a model defined in OpenAPI"""  # noqa: E501
+        if local_vars_configuration is None:
+            local_vars_configuration = Configuration()
+        self.local_vars_configuration = local_vars_configuration
+
+        self._result = None
+        self.discriminator = None
+
+        self.result = result
+
+    @property
+    def result(self):
+        """Gets the result of this TasksummaryResponse.  # noqa: E501
+
+
+        :return: The result of this TasksummaryResponse.  # noqa: E501
+        :rtype: TaskSummary
+        """
+        return self._result
+
+    @result.setter
+    def result(self, result):
+        """Sets the result of this TasksummaryResponse.
+
+
+        :param result: The result of this TasksummaryResponse.  # noqa: E501
+        :type: TaskSummary
+        """
+        if self.local_vars_configuration.client_side_validation and result is None:  # noqa: E501
+            raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
+
+        self._result = result
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, TasksummaryResponse):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, TasksummaryResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/cloud_resource.py

@@ -71,7 +71,7 @@ def compare_dicts_diff(d1: Dict[Any, Any], d2: Dict[Any, Any]) -> str:
     )
 
 
-AWS_RESOURCE_DICT: Dict[str, CloudAnalyticsEventCloudResource] = {
+AWS_RESOURCE_DICT: Dict[str, str] = {
     "VPC": CloudAnalyticsEventCloudResource.AWS_VPC,
     "Subnet": CloudAnalyticsEventCloudResource.AWS_SUBNET,
     "Security group": CloudAnalyticsEventCloudResource.AWS_SECURITY_GROUP,

anyscale/cloud_utils.py

@@ -11,6 +11,7 @@ from anyscale.client.openapi_client.models import (
     CreateCloudResource,
     CreateCloudResourceGCP,
 )
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.sdk.anyscale_client.models.cloud import Cloud
 
 
@@ -114,7 +115,8 @@ def get_cloud_resource_by_cloud_id(
 
 
 def get_last_used_cloud(
-    project_id: Optional[str], anyscale_api_client: Optional[DefaultApi] = None
+    project_id: Optional[str],
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> str:
     """Return the name of the cloud last used in the project.
 
@@ -161,7 +163,9 @@ def get_last_used_cloud(
     return cast(str, cloud_name)
 
 
-def get_all_clouds(anyscale_api_client: Optional[DefaultApi] = None) -> List[Cloud]:
+def get_all_clouds(
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
+) -> List[Cloud]:
     """Fetches all Clouds the user has access to.
     Returns:
         List of all Clouds the user has access to.

anyscale/cluster_compute.py

@@ -1,5 +1,5 @@
 import re
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Union
 
 from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
@@ -10,6 +10,7 @@ from anyscale.sdk.anyscale_client import (
     ComputeTemplateConfig,
     CreateComputeTemplate,
 )
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.sdk.anyscale_client.models.cluster_compute_config import (
     ClusterComputeConfig,
 )
@@ -27,7 +28,7 @@ def get_default_cluster_compute(
     cloud_name: Optional[str],
     project_id: Optional[str],
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ComputeTemplate:
     if api_client is None:
         api_client = get_auth_api_client().api_client
@@ -134,7 +135,7 @@ def register_compute_template(
 
 def get_selected_cloud_id_or_default(
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
     cluster_compute_id: Optional[str] = None,
     cluster_compute_config: Optional[ClusterComputeConfig] = None,
     cloud_id: Optional[str] = None,

anyscale/cluster_env.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Optional, Union
 
 import click
 
@@ -6,6 +6,7 @@ from anyscale.authenticate import get_auth_api_client
 from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.api.default_api import DefaultApi
 from anyscale.sdk.anyscale_client import ClusterEnvironmentBuild
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.shared_anyscale_utils.utils.byod import is_byod_id
 from anyscale.util import get_endpoint, get_ray_and_py_version_for_default_cluster_env
 
@@ -15,7 +16,7 @@ log = BlockLogger()
 
 def get_default_cluster_env_build(
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     ray_version, py_version = get_ray_and_py_version_for_default_cluster_env()
 
@@ -38,7 +39,8 @@ def get_default_cluster_env_build(
 
 
 def get_build_from_cluster_env_identifier(
-    cluster_env_identifier: str, anyscale_api_client: Optional[DefaultApi] = None,
+    cluster_env_identifier: str,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     """
     Get a build id from a cluster environment identifier of form `my_cluster_env:1` or
@@ -103,7 +105,8 @@ def get_build_from_cluster_env_identifier(
 
 
 def get_cluster_env_from_name(
-    cluster_env_name: str, anyscale_api_client: Optional[DefaultApi] = None,
+    cluster_env_name: str,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
 ) -> ClusterEnvironmentBuild:
     """
     Get id of the cluster env (not build) given the name.
@@ -123,7 +126,7 @@ def get_cluster_env_from_name(
 
 def list_builds(
     cluster_env_id: str,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
     max_items: Optional[int] = None,
 ) -> List[ClusterEnvironmentBuild]:
     """

anyscale/commands/command_examples.py

@@ -1,4 +1,5 @@
 JOB_SUBMIT_EXAMPLE = """\
+# Submit a job without a yaml file, this will inherit the environment from the workspace.
 $ anyscale job submit --name my-job --wait -- python main.py
 Output
 (anyscale +1.0s) Submitting job with config JobConfig(name='my-job', image_uri=None, compute_config=None, env_vars=None, py_modules=None, cloud=None, project=None, ray_version=None, job_queue_config=None).
@@ -10,6 +11,27 @@ Output
 (anyscale +3.5s) Waiting for job 'prodjob_6ntzknwk1i9b1uw1zk1gp9dbhe' to reach target state SUCCEEDED, currently in state: STARTING
 (anyscale +1m19.7s) Job 'prodjob_6ntzknwk1i9b1uw1zk1gp9dbhe' transitioned from STARTING to SUCCEEDED
 (anyscale +1m19.7s) Job 'prodjob_6ntzknwk1i9b1uw1zk1gp9dbhe' reached target state, exiting
+
+# Submit a job specified by a yaml file, this will run a job with the specified settings.
+# See https://docs.anyscale.com/reference/job-api/#jobconfig for a list of all available fields.
+$ cat job.yaml
+name: my-job
+entrypoint: python main.py
+image_uri: anyscale/ray:2.44.1-slim-py312-cu128 # (Optional) Exclusive with `containerfile`.
+# compute_config: # (Optional) An inline dictionary can also be provided.
+#   head_node:
+#     instance_type: m5.8xlarge
+working_dir: . # (Optional) Use current working directory "." as the working_dir. Can be any local path or remote .zip file in cloud storage.
+requirements: # (Optional) List of requirements files to install. Can also be a path to a requirements.txt.
+  - emoji
+max_retries: 0 # (Optional) Maximum number of times the job will be retried before being marked failed. Defaults to `1`.
+$ anyscale job submit -f job.yaml
+Output
+(anyscale +1.0s) Submitting job with config JobConfig(name='my-job', image_uri='anyscale/ray:2.44.1-slim-py312-cu128', compute_config=None, env_vars=None, py_modules=None, py_executable=None, cloud=None, project=None, ray_version=None, job_queue_config=None).
+(anyscale +4.2s) Uploading local dir '.' to cloud storage.
+(anyscale +5.4s) Job 'my-job' submitted, ID: 'prodjob_ugk21r7pt6sbsxfuxn1an82x3e'.
+(anyscale +5.4s) View the job in the UI: https://console.anyscale.com/jobs/prodjob_ugk21r7pt6sbsxfuxn1an82x3e
+(anyscale +5.4s) Use `--wait` to wait for the job to run and stream logs.
 """
 
 JOB_STATUS_EXAMPLE = """\

anyscale/compute_config/_private/compute_config_sdk.py

@@ -154,7 +154,7 @@ class PrivateComputeConfigSDK(BaseSDK):
         # `worker_nodes=None` uses the default serverless config, so this only happens if `worker_nodes`
         # is explicitly set to an empty list.
         # Returns the default cloud if user-provided cloud is not specified (`None`).
-        cloud_id = self.client.get_cloud_id(cloud_name=compute_config.cloud)
+        cloud_id = self.client.get_cloud_id(cloud_name=compute_config.cloud)  # type: ignore
         cloud = self.client.get_cloud(cloud_id=cloud_id)
         if cloud is None:
             raise RuntimeError(

anyscale/connect_utils/prepare_cluster.py

@@ -275,11 +275,21 @@ class PrepareClusterBlock:
             # Try to generate an auto-incrementing cluster name from the first 100 clusters.
             # If there are more than 40 clusters with, we will generate a random name.
             # If the name is already taken, we will re-try with a different random name.
-            results = list_entities(
-                self.anyscale_api_client.list_sessions, project_id, max=100
-            )
+            used_names: List[str] = []
+            has_more = True
+            paging_token = None
+            while has_more:
+                resp = self.anyscale_api_client.search_clusters(
+                    clusters_query={
+                        "project_id": project_id,
+                        "paging": {"count": 50, "paging_token": paging_token},
+                    }
+                )
+                used_names.extend([c.name for c in resp.results])
+                paging_token = resp.metadata.next_paging_token
+                has_more = paging_token is not None
+
             self.log.debug("-> Starting a new cluster")
-            used_names = [s.name for s in results]
             for i in range(MAX_CLUSTERS):
                 name = f"cluster-{i}"
                 if name not in used_names:

anyscale/controllers/cloud_controller.py

@@ -3243,7 +3243,7 @@ class CloudController(BaseController):
         *,
         cloud_resource: Any,
         edit_details: Dict[str, Optional[str]],
-        gcp_filestore_config: GCPFileStoreConfig,
+        gcp_filestore_config: Optional[GCPFileStoreConfig],
         gcp_filestore_instance_id: Optional[str],
         gcp_filestore_location: Optional[str],
         gcp_utils,
@@ -3276,7 +3276,7 @@ class CloudController(BaseController):
         cloud_id: str,
         cloud_resource: Any,
         edit_details: Dict[str, Optional[str]],
-        gcp_filestore_config: GCPFileStoreConfig,
+        gcp_filestore_config: Optional[GCPFileStoreConfig],
         gcp_utils,
     ):
         rollback_cmd = self._generate_rollback_command(

anyscale/controllers/cloud_functional_verification_controller.py

@@ -820,11 +820,13 @@ class CloudFunctionalVerificationController(BaseController):
             )
 
         confirmation_message.append(
-            "The instances will be terminated after verification. Do you want to continue?"
+            "The instances will be terminated after verification."
         )
 
+        self.log.info("\n".join(confirmation_message))
+
         confirm(
-            "\n".join(confirmation_message), yes,
+            "Continue?", yes,
         )
 
         verification_results: List[bool] = []

anyscale/controllers/service_controller.py

@@ -342,7 +342,7 @@ class ServiceController(BaseController):
     def _overwrite_runtime_env_in_v2_ray_serve_config(self, config: ServiceConfig):
         """Modifies config in place."""
         ray_serve_config = config.ray_serve_config
-        if "applications" in ray_serve_config:
+        if ray_serve_config is not None and "applications" in ray_serve_config:
             for ray_serve_app_config in ray_serve_config["applications"]:
                 ray_serve_app_config["runtime_env"] = override_runtime_env_config(
                     runtime_env=ray_serve_app_config.get("runtime_env"),

anyscale/project_utils.py

@@ -14,6 +14,7 @@ from anyscale.cluster_compute import (
     get_cluster_compute_from_name,
     get_selected_cloud_id_or_default,
 )
+from anyscale.sdk.anyscale_client.api.default_api import DefaultApi as SDKDefaultApi
 from anyscale.sdk.anyscale_client.models.cluster_compute_config import (
     ClusterComputeConfig,
 )
@@ -395,7 +396,7 @@ def get_and_validate_project_id(
     project_name: Optional[str],
     parent_cloud_id: Optional[str],
     api_client: DefaultApi,
-    anyscale_api_client: DefaultApi,
+    anyscale_api_client: Union[DefaultApi, SDKDefaultApi],
 ) -> str:
     project_name = project_name or os.environ.get(PROJECT_NAME_ENV_VAR)
     if project_id:
@@ -421,7 +422,7 @@ def get_and_validate_project_id(
 
 def get_default_project(
     api_client: Optional[DefaultApi] = None,
-    anyscale_api_client: Optional[DefaultApi] = None,
+    anyscale_api_client: Optional[Union[DefaultApi, SDKDefaultApi]] = None,
     parent_cloud_id: Optional[str] = None,
 ):
     """
@@ -448,7 +449,7 @@ def get_default_project(
 
 
 def infer_project_id(  # noqa PLR0913
-    anyscale_api_client: DefaultApi,
+    anyscale_api_client: Union[DefaultApi, SDKDefaultApi],
     api_client: DefaultApi,
     log: BlockLogger,
     project_id: Optional[str],