anyscale 0.26.17__py3-none-any.whl → 0.26.19__py3-none-any.whl

anyscale/client/openapi_client/models/workspace_template_readme.py

@@ -0,0 +1,181 @@
+# 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 WorkspaceTemplateReadme(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 = {
+        'content': 'str',
+        'title': 'str',
+        'description': 'str'
+    }
+
+    attribute_map = {
+        'content': 'content',
+        'title': 'title',
+        'description': 'description'
+    }
+
+    def __init__(self, content=None, title=None, description=None, local_vars_configuration=None):  # noqa: E501
+        """WorkspaceTemplateReadme - 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._content = None
+        self._title = None
+        self._description = None
+        self.discriminator = None
+
+        self.content = content
+        self.title = title
+        self.description = description
+
+    @property
+    def content(self):
+        """Gets the content of this WorkspaceTemplateReadme.  # noqa: E501
+
+        The content of the readme.  # noqa: E501
+
+        :return: The content of this WorkspaceTemplateReadme.  # noqa: E501
+        :rtype: str
+        """
+        return self._content
+
+    @content.setter
+    def content(self, content):
+        """Sets the content of this WorkspaceTemplateReadme.
+
+        The content of the readme.  # noqa: E501
+
+        :param content: The content of this WorkspaceTemplateReadme.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and content is None:  # noqa: E501
+            raise ValueError("Invalid value for `content`, must not be `None`")  # noqa: E501
+
+        self._content = content
+
+    @property
+    def title(self):
+        """Gets the title of this WorkspaceTemplateReadme.  # noqa: E501
+
+        The title of the workspace template  # noqa: E501
+
+        :return: The title of this WorkspaceTemplateReadme.  # noqa: E501
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this WorkspaceTemplateReadme.
+
+        The title of the workspace template  # noqa: E501
+
+        :param title: The title of this WorkspaceTemplateReadme.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and title is None:  # noqa: E501
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
+
+        self._title = title
+
+    @property
+    def description(self):
+        """Gets the description of this WorkspaceTemplateReadme.  # noqa: E501
+
+        The description of the workspace template  # noqa: E501
+
+        :return: The description of this WorkspaceTemplateReadme.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this WorkspaceTemplateReadme.
+
+        The description of the workspace template  # noqa: E501
+
+        :param description: The description of this WorkspaceTemplateReadme.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and description is None:  # noqa: E501
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
+
+        self._description = description
+
+    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, WorkspaceTemplateReadme):
+            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, WorkspaceTemplateReadme):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/client/openapi_client/models/{archivedlogsinfo_response.py → workspacetemplatereadme_response.py}

@@ -18,7 +18,7 @@ import six
 from openapi_client.configuration import Configuration
 
 
-class ArchivedlogsinfoResponse(object):
+class WorkspacetemplatereadmeResponse(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
@@ -33,7 +33,7 @@ class ArchivedlogsinfoResponse(object):
                             and the value is json key in definition.
     """
     openapi_types = {
-        'result': 'ArchivedLogsInfo'
+        'result': 'WorkspaceTemplateReadme'
     }
 
     attribute_map = {
@@ -41,7 +41,7 @@ class ArchivedlogsinfoResponse(object):
     }
 
     def __init__(self, result=None, local_vars_configuration=None):  # noqa: E501
-        """ArchivedlogsinfoResponse - a model defined in OpenAPI"""  # noqa: E501
+        """WorkspacetemplatereadmeResponse - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
         self.local_vars_configuration = local_vars_configuration
@@ -53,21 +53,21 @@ class ArchivedlogsinfoResponse(object):
 
     @property
     def result(self):
-        """Gets the result of this ArchivedlogsinfoResponse.  # noqa: E501
+        """Gets the result of this WorkspacetemplatereadmeResponse.  # noqa: E501
 
 
-        :return: The result of this ArchivedlogsinfoResponse.  # noqa: E501
-        :rtype: ArchivedLogsInfo
+        :return: The result of this WorkspacetemplatereadmeResponse.  # noqa: E501
+        :rtype: WorkspaceTemplateReadme
         """
         return self._result
 
     @result.setter
     def result(self, result):
-        """Sets the result of this ArchivedlogsinfoResponse.
+        """Sets the result of this WorkspacetemplatereadmeResponse.
 
 
-        :param result: The result of this ArchivedlogsinfoResponse.  # noqa: E501
-        :type: ArchivedLogsInfo
+        :param result: The result of this WorkspacetemplatereadmeResponse.  # noqa: E501
+        :type: WorkspaceTemplateReadme
         """
         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
@@ -108,14 +108,14 @@ class ArchivedlogsinfoResponse(object):
 
     def __eq__(self, other):
         """Returns true if both objects are equal"""
-        if not isinstance(other, ArchivedlogsinfoResponse):
+        if not isinstance(other, WorkspacetemplatereadmeResponse):
             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, ArchivedlogsinfoResponse):
+        if not isinstance(other, WorkspacetemplatereadmeResponse):
             return True
 
         return self.to_dict() != other.to_dict()

anyscale/commands/cloud_commands.py

@@ -1112,7 +1112,16 @@ def add_collaborators(cloud: str, users_file: str,) -> None:
     type=str,
     required=False,
 )
-def get_cloud(cloud_id: Optional[str], name: Optional[str]) -> None:
+@click.option(
+    "--output",
+    "-o",
+    help="File to write the full cloud YAML to.",
+    type=str,
+    required=False,
+)
+def get_cloud(
+    cloud_id: Optional[str], name: Optional[str], output: Optional[str]
+) -> None:
     """
     Retrieve a cloud by its name or ID and display its details.
 
@@ -1131,9 +1140,20 @@ def get_cloud(cloud_id: Optional[str], name: Optional[str]) -> None:
             log.error("Cloud not found.")
             return
 
-        cloud_dict = cloud.to_dict() if hasattr(cloud, "to_dict") else cloud.__dict__
+        if output:
+            # Include all cloud deployments for the cloud.
+            result = CloudController().get_cloud_deployments(
+                cloud_id=cloud.id, cloud_name=cloud.name
+            )
 
-        print(yaml.dump(cloud_dict, sort_keys=False))
+            with open(output, "w") as f:
+                yaml.dump(result, f, sort_keys=False)
+
+        else:
+            cloud_dict = (
+                cloud.to_dict() if hasattr(cloud, "to_dict") else cloud.__dict__
+            )
+            print(yaml.dump(cloud_dict, sort_keys=False))
 
     except ValueError as e:
         log.error(f"Error retrieving cloud: {e}")
@@ -1189,15 +1209,38 @@ def get_default_cloud() -> None:
     type=bool,
     required=False,
     default=False,
+    is_flag=True,
 )
 @click.option(
     "--out",
-    help="Output file name for the report.",
+    help="Output file name for the report. (Default jobs_report.html)",
     type=str,
     required=False,
-    default="jobs_report.html",
+    default=None,
+)
+@click.option(
+    "--sort-by",
+    help=(
+        "Column to sort by. (Default created_at). "
+        "created_at: Job creation time. "
+        "gpu: Unused GPU hours. "
+        "cpu: Unused CPU hours. "
+        "instances: Number of instances."
+    ),
+    type=click.Choice(["created_at", "gpu", "cpu", "instances"], case_sensitive=False),
+    required=False,
+    default="created_at",
 )
-def generate_jobs_report(cloud_id: str, csv: bool, out: str) -> None:
+@click.option(
+    "--sort-order",
+    help="Sort order. (Default desc)",
+    type=click.Choice(["asc", "desc"], case_sensitive=False),
+    required=False,
+    default="desc",
+)
+def generate_jobs_report(
+    cloud_id: str, csv: bool, out: Optional[str], sort_by: str, sort_order: str
+) -> None:
     """
     Generate a report of the jobs created in the last 7 days in HTML format.
     Shows unused CPU-hours, unused GPU-hours, and other data.
@@ -1205,7 +1248,12 @@ def generate_jobs_report(cloud_id: str, csv: bool, out: str) -> None:
     :param csv: Outputs the report in CSV format.
     :param out: Output file name for the report.
     """
+    if out is None:
+        out = "jobs_report.html" if not csv else "jobs_report.csv"
+
     try:
-        CloudController().generate_jobs_report(cloud_id, csv, out)
+        CloudController().generate_jobs_report(
+            cloud_id, csv, out, sort_by, sort_order == "asc"
+        )
     except ValueError as e:
         log.error(f"Error generating jobs report: {e}")

anyscale/connect_utils/prepare_cluster.py

@@ -56,6 +56,7 @@ BUILD_STEPS = [
 # Default minutes for autosuspend.
 DEFAULT_AUTOSUSPEND_TIMEOUT = 120
 
+
 # Default docker images to use for connect clusters.
 def _get_base_image(image: str, ray_version: str, cpu_or_gpu: str) -> str:
     py_version = "".join(str(x) for x in sys.version_info[0:2])
@@ -557,34 +558,36 @@ class PrepareClusterBlock:
         """
         Get the default cluster env build based on the local python and ray versions.
         """
-        py_version = "".join(str(x) for x in sys.version_info[0:2])
-        if sys.version_info.major == 3 and sys.version_info.minor == 10:
-            py_version = "310"
-        if py_version not in ["36", "37", "38", "39", "310"]:
+        major, minor = sys.version_info[:2]
+        MIN_PY_VER = (3, 8)
+        MAX_PY_VER = (3, 12)
+
+        if not (MIN_PY_VER <= (major, minor) <= MAX_PY_VER):
             raise ValueError(
-                "No default cluster env for py{}. Please use a version of python between 3.6 and 3.8.".format(
-                    py_version
-                )
+                f"No default container image for python version {major}.{minor}."
+                f"Please use a Python version between {MIN_PY_VER[0]}.{MIN_PY_VER[1]} "
+                f"and {MAX_PY_VER[0]}.{MAX_PY_VER[1]}."
             )
+
         ray_version = self._ray.__version__
         if version.parse(ray_version) < version.parse(MINIMUM_RAY_VERSION):
             raise ValueError(
-                f"No default cluster env for Ray version {ray_version}. Please upgrade "
+                f"No default container image for Ray version {ray_version}. Please upgrade "
                 f"to a version >= {MINIMUM_RAY_VERSION}."
             )
         if "dev0" in ray_version:
             raise ValueError(
                 f"Your locally installed Ray version is {ray_version}. "
-                "There is no default cluster environments for nightly versions of Ray."
+                "There is no default container image for nightly versions of Ray."
             )
         try:
             build = self.api_client.get_default_cluster_env_build_api_v2_builds_default_py_version_ray_version_get(
-                f"py{py_version}", ray_version
+                f"py{major}{minor}", ray_version
             ).result
             return build
         except Exception:  # noqa: BLE001
             raise RuntimeError(
-                f"Failed to get default cluster env for Ray: {ray_version} on Python: py{py_version}"
+                f"Failed to get default container image for Ray: {ray_version} on Python: py{major}{minor}"
             )
 
     def _get_cluster_build(
@@ -815,14 +818,16 @@ class PrepareClusterBlock:
         return compute_template_id
 
     def _register_compute_template(
-        self, project_id: str, config_object: ComputeTemplateConfig
+        self, project_id: str, config_object: ComputeTemplateConfig  # noqa: ARG002
     ) -> str:
         """
-        Register compute template with a default name and return the compute template id."""
+        Register compute template with a default name and return the compute template id.
+        """
         created_template = self.api_client.create_compute_template_api_v2_compute_templates_post(
             create_compute_template=CreateComputeTemplate(
                 name=gen_valid_name("autogenerated-config"),
-                project_id=project_id,
+                # project ID is deprecated in compute config
+                project_id=None,
                 config=config_object,
                 anonymous=True,
             )

anyscale/controllers/cloud_controller.py

@@ -1388,6 +1388,43 @@ class CloudController(BaseController):
                 cloud_id, CloudProviders.AWS, functions_to_verify, yes,
             )
 
+    def get_cloud_deployments(self, cloud_id: str, cloud_name: str) -> Dict[str, Any]:
+        cloud = self.api_client.get_cloud_api_v2_clouds_cloud_id_get(
+            cloud_id=cloud_id,
+        ).result
+
+        if cloud.is_aioa:
+            raise ValueError(
+                "Listing cloud deployments is only supported for customer-hosted clouds."
+            )
+
+        try:
+            deployments = self.api_client.get_cloud_deployments_api_v2_clouds_cloud_id_deployments_get(
+                cloud_id=cloud_id,
+            ).results
+        except Exception as e:  # noqa: BLE001
+            raise ClickException(
+                f"Failed to get cloud deployments for cloud {cloud_name} ({cloud_id}). Error: {e}"
+            )
+
+        # Avoid displaying fields with empty values (since the values for optional fields default to None).
+        def remove_empty_values(d):
+            if isinstance(d, dict):
+                return {
+                    k: remove_empty_values(v)
+                    for k, v in d.items()
+                    if remove_empty_values(v)
+                }
+            return d
+
+        return {
+            "id": cloud_id,
+            "name": cloud_name,
+            "deployments": [
+                remove_empty_values(deployment.to_dict()) for deployment in deployments
+            ],
+        }
+
     def get_cloud_config(
         self, cloud_name: Optional[str] = None, cloud_id: Optional[str] = None,
     ) -> CloudDeploymentConfig:
@@ -3650,7 +3687,9 @@ class CloudController(BaseController):
 
     ### End of edit cloud ###
 
-    def generate_jobs_report(self, cloud_id: str, csv: bool, out_path: str) -> None:
+    def generate_jobs_report(
+        self, cloud_id: str, csv: bool, out_path: str, sort: str, sort_order_asc: bool
+    ) -> None:
         end_time = datetime.now()
         start_time = end_time - timedelta(days=7)
 
@@ -3690,7 +3729,25 @@ class CloudController(BaseController):
             for job in full_results
             if job.job_state in TERMINAL_HA_JOB_STATES and job.job_report is not None
         ]
-        filtered_results.sort(key=lambda x: x.created_at)
+        if sort == "created_at":
+            filtered_results.sort(
+                key=lambda x: x.created_at, reverse=not sort_order_asc
+            )
+        elif sort == "gpu":
+            filtered_results.sort(
+                key=lambda x: x.job_report.unused_gpu_hours or 0,
+                reverse=not sort_order_asc,
+            )
+        elif sort == "cpu":
+            filtered_results.sort(
+                key=lambda x: x.job_report.unused_cpu_hours or 0,
+                reverse=not sort_order_asc,
+            )
+        elif sort == "instances":
+            filtered_results.sort(
+                key=lambda x: x.job_report.max_instances_launched or 0,
+                reverse=not sort_order_asc,
+            )
 
         with open(out_path, "w") as out_file:
             if csv:
@@ -3710,7 +3767,7 @@ class CloudController(BaseController):
                     max_instances_launched = job.job_report.max_instances_launched or ""
 
                     out_file.write(
-                        f"{job.job_id},{job.job_name},{job_state},{str(job.created_at)},{finished_at},{duration},{unused_cpu_hours},{unused_gpu_hours},{max_instances_launched}\n"
+                        f'"{job.job_id}","{job.job_name}","{job_state}","{str(job.created_at)}","{finished_at}","{duration}","{unused_cpu_hours}","{unused_gpu_hours}","{max_instances_launched}"\n'
                     )
             else:
                 out_file.write(