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

anyscale/client/openapi_client/models/metric.py

@@ -36,17 +36,27 @@ class Metric(object):
         'name': 'str',
         'current_value': 'float',
         'max_over_time': 'float',
-        'rate': 'float'
+        'min_over_time': 'float',
+        'median_over_time': 'float',
+        'rate': 'float',
+        'max_rate': 'float',
+        'min_rate': 'float',
+        'median_rate': 'float'
     }
 
     attribute_map = {
         'name': 'name',
         'current_value': 'current_value',
         'max_over_time': 'max_over_time',
-        'rate': 'rate'
+        'min_over_time': 'min_over_time',
+        'median_over_time': 'median_over_time',
+        'rate': 'rate',
+        'max_rate': 'max_rate',
+        'min_rate': 'min_rate',
+        'median_rate': 'median_rate'
     }
 
-    def __init__(self, name=None, current_value=None, max_over_time=None, rate=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, name=None, current_value=None, max_over_time=None, min_over_time=None, median_over_time=None, rate=None, max_rate=None, min_rate=None, median_rate=None, local_vars_configuration=None):  # noqa: E501
         """Metric - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -55,7 +65,12 @@ class Metric(object):
         self._name = None
         self._current_value = None
         self._max_over_time = None
+        self._min_over_time = None
+        self._median_over_time = None
         self._rate = None
+        self._max_rate = None
+        self._min_rate = None
+        self._median_rate = None
         self.discriminator = None
 
         self.name = name
@@ -63,8 +78,18 @@ class Metric(object):
             self.current_value = current_value
         if max_over_time is not None:
             self.max_over_time = max_over_time
+        if min_over_time is not None:
+            self.min_over_time = min_over_time
+        if median_over_time is not None:
+            self.median_over_time = median_over_time
         if rate is not None:
             self.rate = rate
+        if max_rate is not None:
+            self.max_rate = max_rate
+        if min_rate is not None:
+            self.min_rate = min_rate
+        if median_rate is not None:
+            self.median_rate = median_rate
 
     @property
     def name(self):
@@ -131,6 +156,48 @@ class Metric(object):
 
         self._max_over_time = max_over_time
 
+    @property
+    def min_over_time(self):
+        """Gets the min_over_time of this Metric.  # noqa: E501
+
+
+        :return: The min_over_time of this Metric.  # noqa: E501
+        :rtype: float
+        """
+        return self._min_over_time
+
+    @min_over_time.setter
+    def min_over_time(self, min_over_time):
+        """Sets the min_over_time of this Metric.
+
+
+        :param min_over_time: The min_over_time of this Metric.  # noqa: E501
+        :type: float
+        """
+
+        self._min_over_time = min_over_time
+
+    @property
+    def median_over_time(self):
+        """Gets the median_over_time of this Metric.  # noqa: E501
+
+
+        :return: The median_over_time of this Metric.  # noqa: E501
+        :rtype: float
+        """
+        return self._median_over_time
+
+    @median_over_time.setter
+    def median_over_time(self, median_over_time):
+        """Sets the median_over_time of this Metric.
+
+
+        :param median_over_time: The median_over_time of this Metric.  # noqa: E501
+        :type: float
+        """
+
+        self._median_over_time = median_over_time
+
     @property
     def rate(self):
         """Gets the rate of this Metric.  # noqa: E501
@@ -152,6 +219,69 @@ class Metric(object):
 
         self._rate = rate
 
+    @property
+    def max_rate(self):
+        """Gets the max_rate of this Metric.  # noqa: E501
+
+
+        :return: The max_rate of this Metric.  # noqa: E501
+        :rtype: float
+        """
+        return self._max_rate
+
+    @max_rate.setter
+    def max_rate(self, max_rate):
+        """Sets the max_rate of this Metric.
+
+
+        :param max_rate: The max_rate of this Metric.  # noqa: E501
+        :type: float
+        """
+
+        self._max_rate = max_rate
+
+    @property
+    def min_rate(self):
+        """Gets the min_rate of this Metric.  # noqa: E501
+
+
+        :return: The min_rate of this Metric.  # noqa: E501
+        :rtype: float
+        """
+        return self._min_rate
+
+    @min_rate.setter
+    def min_rate(self, min_rate):
+        """Sets the min_rate of this Metric.
+
+
+        :param min_rate: The min_rate of this Metric.  # noqa: E501
+        :type: float
+        """
+
+        self._min_rate = min_rate
+
+    @property
+    def median_rate(self):
+        """Gets the median_rate of this Metric.  # noqa: E501
+
+
+        :return: The median_rate of this Metric.  # noqa: E501
+        :rtype: float
+        """
+        return self._median_rate
+
+    @median_rate.setter
+    def median_rate(self, median_rate):
+        """Sets the median_rate of this Metric.
+
+
+        :param median_rate: The median_rate of this Metric.  # noqa: E501
+        :type: float
+        """
+
+        self._median_rate = median_rate
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale/client/openapi_client/models/ray_session.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 RaySession(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 = {
+        'ray_session_name': 'str'
+    }
+
+    attribute_map = {
+        'ray_session_name': 'ray_session_name'
+    }
+
+    def __init__(self, ray_session_name=None, local_vars_configuration=None):  # noqa: E501
+        """RaySession - 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._ray_session_name = None
+        self.discriminator = None
+
+        self.ray_session_name = ray_session_name
+
+    @property
+    def ray_session_name(self):
+        """Gets the ray_session_name of this RaySession.  # noqa: E501
+
+
+        :return: The ray_session_name of this RaySession.  # noqa: E501
+        :rtype: str
+        """
+        return self._ray_session_name
+
+    @ray_session_name.setter
+    def ray_session_name(self, ray_session_name):
+        """Sets the ray_session_name of this RaySession.
+
+
+        :param ray_session_name: The ray_session_name of this RaySession.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and ray_session_name is None:  # noqa: E501
+            raise ValueError("Invalid value for `ray_session_name`, must not be `None`")  # noqa: E501
+
+        self._ray_session_name = ray_session_name
+
+    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, RaySession):
+            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, RaySession):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/cloud/__init__.py

@@ -38,14 +38,14 @@ class CloudSDK:
     )
     def add_collaborators(
         self, cloud: str, collaborators: List[CreateCloudCollaborator],
-    ) -> str:
+    ) -> None:
         """
         Batch add collaborators to a cloud.
 
         :param cloud: The cloud to add users to.
         :param collaborators: The list of collaborators to add to the cloud.
         """
-        return self._private_sdk.add_collaborators(cloud, collaborators)
+        self._private_sdk.add_collaborators(cloud, collaborators)
 
     @sdk_docs(
         doc_py_example=_GET_EXAMPLE, arg_docstrings=_GET_ARG_DOCSTRINGS,

anyscale/cloud/_private/cloud_sdk.py

@@ -16,10 +16,10 @@ from anyscale.cloud.models import (
 class PrivateCloudSDK(BaseSDK):
     def add_collaborators(
         self, cloud: str, collaborators: List[CreateCloudCollaborator]
-    ) -> str:
+    ) -> None:
         cloud_id = self.client.get_cloud_id(cloud_name=cloud, compute_config_id=None)
 
-        return self.client.add_cloud_collaborators(
+        self.client.add_cloud_collaborators(
             cloud_id=cloud_id,
             collaborators=[
                 CreateCloudCollaboratorModel(

anyscale/cloud/commands.py

@@ -39,7 +39,10 @@ _ADD_COLLABORATORS_ARG_DOCSTRINGS = {
     arg_docstrings=_ADD_COLLABORATORS_ARG_DOCSTRINGS,
 )
 def add_collaborators(
-    cloud: str, collaborators: List[CreateCloudCollaborator], *, _sdk: PrivateCloudSDK,
+    cloud: str,
+    collaborators: List[CreateCloudCollaborator],
+    *,
+    _private_sdk: Optional[PrivateCloudSDK] = None,
 ) -> str:
     """
     Batch add collaborators to a cloud.
@@ -47,7 +50,7 @@ def add_collaborators(
     :param cloud: The cloud to add users to.
     :param collaborators: The list of collaborators to add to the cloud.
     """
-    return _sdk.add_collaborators(cloud, collaborators)
+    return _private_sdk.add_collaborators(cloud, collaborators)  # type: ignore
 
 
 _GET_EXAMPLE = """
@@ -76,7 +79,7 @@ def get(
     id: Optional[str] = None,  # noqa: A002
     name: Optional[str] = None,
     *,
-    _sdk: PrivateCloudSDK,
+    _private_sdk: Optional[PrivateCloudSDK] = None,
 ) -> Optional[Cloud]:
     """
     Get the cloud model for the provided cloud ID or name.
@@ -87,7 +90,7 @@ def get(
     :param name: The name of the cloud to retrieve.
     :return: A `Cloud` object if found, otherwise `None`.
     """
-    return _sdk.get(id=id, name=name)
+    return _private_sdk.get(id=id, name=name)  # type: ignore
 
 
 _GET_DEFAULT_EXAMPLE = """
@@ -104,10 +107,10 @@ default_cloud = anyscale.cloud.get_default()
     doc_py_example=_GET_DEFAULT_EXAMPLE,
     arg_docstrings={},
 )
-def get_default(*, _sdk: PrivateCloudSDK,) -> Optional[Cloud]:
+def get_default(*, _private_sdk: Optional[PrivateCloudSDK] = None) -> Optional[Cloud]:
     """
     Get the user's default cloud.
 
     :return: The default `Cloud` object if it exists, otherwise `None`.
     """
-    return _sdk.get_default()
+    return _private_sdk.get_default()  # type: ignore

anyscale/cloud_utils.py

@@ -100,6 +100,7 @@ def get_cloud_resource_by_cloud_id(
 ) -> Union[CreateCloudResource, CreateCloudResourceGCP]:
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
+    assert anyscale_api_client is not None
     cloud_resource = None
     if cloud_provider == "AWS":
         cloud = anyscale_api_client.get_cloud_with_cloud_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get(
@@ -133,12 +134,12 @@ def get_last_used_cloud(
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
     if project_id:
-        cloud_id = anyscale_api_client.get_project(project_id).result.last_used_cloud_id
+        cloud_id = anyscale_api_client.get_project(project_id).result.last_used_cloud_id  # type: ignore
     else:
         cloud_id = None
     if cloud_id:
         try:
-            cloud = anyscale_api_client.get_cloud(cloud_id).result
+            cloud = anyscale_api_client.get_cloud(cloud_id).result  # type: ignore
         except Exception:  # noqa: BLE001
             raise click.ClickException(
                 f"Failed to fetch Cloud with id: {cloud_id}. Please specify `cloud` in the command."
@@ -175,12 +176,12 @@ def get_all_clouds(
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
 
-    cloud_list_response = anyscale_api_client.search_clouds({"paging": {"count": 50}})
+    cloud_list_response = anyscale_api_client.search_clouds({"paging": {"count": 50}})  # type: ignore
     all_clouds = cloud_list_response.results
     next_paging_token = cloud_list_response.metadata.next_paging_token
 
     while next_paging_token:
-        cloud_list_response = anyscale_api_client.search_clouds(
+        cloud_list_response = anyscale_api_client.search_clouds(  # type: ignore
             {"paging": {"count": 50, "paging_token": next_paging_token}}
         )
         next_paging_token = cloud_list_response.metadata.next_paging_token

anyscale/cluster_compute.py

@@ -43,7 +43,7 @@ def get_default_cluster_compute(
             cloud_name = get_last_used_cloud(project_id, anyscale_api_client)
 
     cloud_id, _ = get_cloud_id_and_name(api_client, cloud_name=cloud_name)
-    config_object = anyscale_api_client.get_default_compute_config(cloud_id).result
+    config_object = anyscale_api_client.get_default_compute_config(cloud_id).result  # type: ignore
     compute_template = register_compute_template(config_object, api_client=api_client)
     return compute_template
 
@@ -156,7 +156,7 @@ def get_selected_cloud_id_or_default(
             api_client=api_client, cloud_id=cloud_id, cloud_name=cloud_name,
         )
     elif cluster_compute_id:
-        parent_cloud_id = anyscale_api_client.get_cluster_compute(
+        parent_cloud_id = anyscale_api_client.get_cluster_compute(  # type: ignore
             cluster_compute_id
         ).result.config.cloud_id
     elif cluster_compute_config:

anyscale/cluster_env.py

@@ -114,6 +114,7 @@ def get_cluster_env_from_name(
 
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
+    assert anyscale_api_client is not None
     cluster_envs = anyscale_api_client.search_cluster_environments(
         {"name": {"equals": cluster_env_name}, "paging": {"count": 1}}
     ).results
@@ -164,6 +165,7 @@ def validate_successful_build(
 
     if anyscale_api_client is None:
         anyscale_api_client = get_auth_api_client().anyscale_api_client
+    assert anyscale_api_client is not None
     build = anyscale_api_client.get_cluster_environment_build(build_id).result
     if build.status != "succeeded":
         cluster_env = anyscale_api_client.get_cluster_environment(

anyscale/commands/cloud_commands.py

@@ -1166,3 +1166,46 @@ def get_default_cloud() -> None:
 
     except ValueError as e:
         log.error(f"Error retrieving default cloud: {e}")
+
+
+@cloud_cli.command(
+    name="jobs-report",
+    help=(
+        "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."
+    ),
+    cls=AnyscaleCommand,
+    hidden=True,
+)
+@click.option(
+    "--cloud-id",
+    help="ID of the cloud to generate a report on.",
+    type=str,
+    required=True,
+)
+@click.option(
+    "--csv",
+    help="Outputs the report in CSV format.",
+    type=bool,
+    required=False,
+    default=False,
+)
+@click.option(
+    "--out",
+    help="Output file name for the report.",
+    type=str,
+    required=False,
+    default="jobs_report.html",
+)
+def generate_jobs_report(cloud_id: str, csv: bool, out: 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.
+    :param cloud_id: The ID of the cloud to generate a report on.
+    :param csv: Outputs the report in CSV format.
+    :param out: Output file name for the report.
+    """
+    try:
+        CloudController().generate_jobs_report(cloud_id, csv, out)
+    except ValueError as e:
+        log.error(f"Error generating jobs report: {e}")

anyscale/commands/login_commands.py

@@ -32,7 +32,10 @@ def get_unauthenticated_openapi_client():
     default=7,
     help="Expire the token after this many days.",
 )
-def anyscale_login(no_expire: bool, expire_in_days: int) -> None:
+@click.option(
+    "--no-browser", is_flag=True, default=False, help="Do not open the browser.",
+)
+def anyscale_login(no_expire: bool, expire_in_days: int, no_browser: bool) -> None:
     """Log in to Anyscale using a URL
     This is the only unauthenticated API usage in the CLI."""
     if expire_in_days < 0 or no_expire:
@@ -52,8 +55,26 @@ def anyscale_login(no_expire: bool, expire_in_days: int) -> None:
 
     # Open the URL in the browser. This will work on most platforms.
     # OK to suppress any uncaught exceptions, because the URL will be printed out anyway.
-    with contextlib.suppress(Exception):
-        webbrowser.open(r.url)
+    if not no_browser:
+        with contextlib.suppress(Exception):
+            try:
+                # Only attempt to open browser if it's not a CLI browser (which doesn't support JavaScript)
+                if webbrowser.get().basename not in [
+                    "www-browser",
+                    "elinks",
+                    "links",
+                    "lynx",
+                    "w3m",
+                ]:
+                    webbrowser.open_new_tab(r.url)
+                else:
+                    log.info(
+                        "Could not open a JavaScript-capable web browser. Open the above URL in your browser manually."
+                    )
+            except webbrowser.Error:
+                log.info(
+                    "Could not open a web browser. Open the above URL in your browser manually."
+                )
 
     # give user 3 minutes to log in (3 seconds per attempt)
     for _i in range(60):

anyscale/commands/schedule_commands.py

@@ -11,7 +11,7 @@ from anyscale.cli_logger import BlockLogger
 from anyscale.commands import command_examples
 from anyscale.commands.util import AnyscaleCommand, LegacyAnyscaleCommand
 from anyscale.controllers.schedule_controller import ScheduleController
-from anyscale.schedule.models import ScheduleConfig, ScheduleState
+from anyscale.schedule.models import JobConfig, ScheduleConfig, ScheduleState
 
 
 log = BlockLogger()  # CLI Logger
@@ -85,6 +85,7 @@ def apply(config_file: str, name: Optional[str],) -> None:
     config = ScheduleConfig.from_yaml(config_file)
 
     if name is not None:
+        assert isinstance(config.job_config, JobConfig)
         config = config.options(job_config=config.job_config.options(name=name),)
 
     log.info(f"Applying schedule with config {config}.")

anyscale/compute_config/commands.py

@@ -45,13 +45,16 @@ _CREATE_ARG_DOCSTRINGS = {
     arg_docstrings=_CREATE_ARG_DOCSTRINGS,
 )
 def create(
-    config: ComputeConfig, *, name: Optional[str], _sdk: PrivateComputeConfigSDK,
+    config: ComputeConfig,
+    *,
+    name: Optional[str],
+    _private_sdk: Optional[PrivateComputeConfigSDK] = None,
 ) -> str:
     """Create a new version of a compute config.
 
     Returns the full name of the registered compute config, including the version.
     """
-    full_name, _ = _sdk.create_compute_config(config, name=name)
+    full_name, _ = _private_sdk.create_compute_config(config, name=name)  # type: ignore
     return full_name
 
 
@@ -74,11 +77,11 @@ _GET_ARG_DOCSTRINGS = {
     arg_docstrings=_GET_ARG_DOCSTRINGS,
 )
 def get(
-    name: str,
+    name: Optional[str],
     *,
     include_archived: bool = False,
     _id: Optional[str] = None,
-    _sdk: PrivateComputeConfigSDK,
+    _private_sdk: Optional[PrivateComputeConfigSDK] = None,
 ) -> ComputeConfigVersion:
     """Get the compute config with the specified name.
 
@@ -88,7 +91,7 @@ def get(
     # NOTE(edoakes): I want to avoid exposing fetching by ID in the public API,
     # but it's needed for parity with the existing CLI. Therefore I am adding it
     # as a hidden private API that can be used like: (`name="", _id=id`).
-    return _sdk.get_compute_config(
+    return _private_sdk.get_compute_config(  # type: ignore
         name=name or None, id=_id, include_archived=include_archived
     )
 
@@ -108,7 +111,12 @@ _ARCHIVE_ARG_DOCSTRINGS = {"name": "Name of the compute config."}
     doc_py_example=_ARCHIVE_EXAMPLE,
     arg_docstrings=_ARCHIVE_ARG_DOCSTRINGS,
 )
-def archive(name: str, *, _id: Optional[str] = None, _sdk: PrivateComputeConfigSDK):
+def archive(
+    name: Optional[str],
+    *,
+    _id: Optional[str] = None,
+    _private_sdk: Optional[PrivateComputeConfigSDK] = None,
+):
     """Archive a compute config and all of its versions.
 
     The name can contain an optional version, e.g., 'name:version'.
@@ -119,4 +127,4 @@ def archive(name: str, *, _id: Optional[str] = None, _sdk: PrivateComputeConfigS
     # NOTE(edoakes): I want to avoid exposing fetching by ID in the public API,
     # but it's needed for parity with the existing CLI. Therefore I am adding it
     # as a hidden private API that can be used like: (`name="", _id=id`).
-    return _sdk.archive_compute_config(name=name or None, id=_id)
+    return _private_sdk.archive_compute_config(name=name or None, id=_id)  # type: ignore