anyscale 0.26.3__py3-none-any.whl → 0.26.5__py3-none-any.whl

anyscale/client/openapi_client/models/operator_metrics.py

@@ -0,0 +1,256 @@
+# 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 OperatorMetrics(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 = {
+        'id': 'str',
+        'name': 'str',
+        'state': 'DatasetState',
+        'progress': 'int',
+        'total': 'int',
+        'metrics': 'dict(str, Metric)'
+    }
+
+    attribute_map = {
+        'id': 'id',
+        'name': 'name',
+        'state': 'state',
+        'progress': 'progress',
+        'total': 'total',
+        'metrics': 'metrics'
+    }
+
+    def __init__(self, id=None, name=None, state=None, progress=None, total=None, metrics=None, local_vars_configuration=None):  # noqa: E501
+        """OperatorMetrics - 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._id = None
+        self._name = None
+        self._state = None
+        self._progress = None
+        self._total = None
+        self._metrics = None
+        self.discriminator = None
+
+        self.id = id
+        self.name = name
+        self.state = state
+        self.progress = progress
+        self.total = total
+        self.metrics = metrics
+
+    @property
+    def id(self):
+        """Gets the id of this OperatorMetrics.  # noqa: E501
+
+
+        :return: The id of this OperatorMetrics.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this OperatorMetrics.
+
+
+        :param id: The id of this OperatorMetrics.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and id is None:  # noqa: E501
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this OperatorMetrics.  # noqa: E501
+
+
+        :return: The name of this OperatorMetrics.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this OperatorMetrics.
+
+
+        :param name: The name of this OperatorMetrics.  # noqa: E501
+        :type: str
+        """
+        if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def state(self):
+        """Gets the state of this OperatorMetrics.  # noqa: E501
+
+
+        :return: The state of this OperatorMetrics.  # noqa: E501
+        :rtype: DatasetState
+        """
+        return self._state
+
+    @state.setter
+    def state(self, state):
+        """Sets the state of this OperatorMetrics.
+
+
+        :param state: The state of this OperatorMetrics.  # noqa: E501
+        :type: DatasetState
+        """
+        if self.local_vars_configuration.client_side_validation and state is None:  # noqa: E501
+            raise ValueError("Invalid value for `state`, must not be `None`")  # noqa: E501
+
+        self._state = state
+
+    @property
+    def progress(self):
+        """Gets the progress of this OperatorMetrics.  # noqa: E501
+
+
+        :return: The progress of this OperatorMetrics.  # noqa: E501
+        :rtype: int
+        """
+        return self._progress
+
+    @progress.setter
+    def progress(self, progress):
+        """Sets the progress of this OperatorMetrics.
+
+
+        :param progress: The progress of this OperatorMetrics.  # noqa: E501
+        :type: int
+        """
+        if self.local_vars_configuration.client_side_validation and progress is None:  # noqa: E501
+            raise ValueError("Invalid value for `progress`, must not be `None`")  # noqa: E501
+
+        self._progress = progress
+
+    @property
+    def total(self):
+        """Gets the total of this OperatorMetrics.  # noqa: E501
+
+
+        :return: The total of this OperatorMetrics.  # noqa: E501
+        :rtype: int
+        """
+        return self._total
+
+    @total.setter
+    def total(self, total):
+        """Sets the total of this OperatorMetrics.
+
+
+        :param total: The total of this OperatorMetrics.  # noqa: E501
+        :type: int
+        """
+        if self.local_vars_configuration.client_side_validation and total is None:  # noqa: E501
+            raise ValueError("Invalid value for `total`, must not be `None`")  # noqa: E501
+
+        self._total = total
+
+    @property
+    def metrics(self):
+        """Gets the metrics of this OperatorMetrics.  # noqa: E501
+
+
+        :return: The metrics of this OperatorMetrics.  # noqa: E501
+        :rtype: dict(str, Metric)
+        """
+        return self._metrics
+
+    @metrics.setter
+    def metrics(self, metrics):
+        """Sets the metrics of this OperatorMetrics.
+
+
+        :param metrics: The metrics of this OperatorMetrics.  # noqa: E501
+        :type: dict(str, Metric)
+        """
+        if self.local_vars_configuration.client_side_validation and metrics is None:  # noqa: E501
+            raise ValueError("Invalid value for `metrics`, must not be `None`")  # noqa: E501
+
+        self._metrics = metrics
+
+    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, OperatorMetrics):
+            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, OperatorMetrics):
+            return True
+
+        return self.to_dict() != other.to_dict()

anyscale/client/openapi_client/models/ray_runtime_env_config.py

@@ -35,6 +35,7 @@ class RayRuntimeEnvConfig(object):
     openapi_types = {
         'working_dir': 'str',
         'py_modules': 'list[str]',
+        'py_executable': 'str',
         'pip': 'list[str]',
         'conda': 'object',
         'env_vars': 'dict(str, str)',
@@ -44,13 +45,14 @@ class RayRuntimeEnvConfig(object):
     attribute_map = {
         'working_dir': 'working_dir',
         'py_modules': 'py_modules',
+        'py_executable': 'py_executable',
         'pip': 'pip',
         'conda': 'conda',
         'env_vars': 'env_vars',
         'config': 'config'
     }
 
-    def __init__(self, working_dir=None, py_modules=None, pip=None, conda=None, env_vars=None, config=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, working_dir=None, py_modules=None, py_executable=None, pip=None, conda=None, env_vars=None, config=None, local_vars_configuration=None):  # noqa: E501
         """RayRuntimeEnvConfig - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -58,6 +60,7 @@ class RayRuntimeEnvConfig(object):
 
         self._working_dir = None
         self._py_modules = None
+        self._py_executable = None
         self._pip = None
         self._conda = None
         self._env_vars = None
@@ -68,6 +71,8 @@ class RayRuntimeEnvConfig(object):
             self.working_dir = working_dir
         if py_modules is not None:
             self.py_modules = py_modules
+        if py_executable is not None:
+            self.py_executable = py_executable
         if pip is not None:
             self.pip = pip
         if conda is not None:
@@ -123,6 +128,29 @@ class RayRuntimeEnvConfig(object):
 
         self._py_modules = py_modules
 
+    @property
+    def py_executable(self):
+        """Gets the py_executable of this RayRuntimeEnvConfig.  # noqa: E501
+
+        Specifies the executable used for running the Ray workers. It can include arguments as well.  # noqa: E501
+
+        :return: The py_executable of this RayRuntimeEnvConfig.  # noqa: E501
+        :rtype: str
+        """
+        return self._py_executable
+
+    @py_executable.setter
+    def py_executable(self, py_executable):
+        """Sets the py_executable of this RayRuntimeEnvConfig.
+
+        Specifies the executable used for running the Ray workers. It can include arguments as well.  # noqa: E501
+
+        :param py_executable: The py_executable of this RayRuntimeEnvConfig.  # noqa: E501
+        :type: str
+        """
+
+        self._py_executable = py_executable
+
     @property
     def pip(self):
         """Gets the pip of this RayRuntimeEnvConfig.  # noqa: E501

anyscale/client/openapi_client/models/train_run.py

@@ -42,8 +42,10 @@ class TrainRun(object):
         'start_time_ms': 'int',
         'end_time_ms': 'int',
         'attempts': 'list[TrainRunAttempt]',
+        'total_attempts': 'int',
         'job_details': 'JobDetails',
-        'session_name': 'str'
+        'session_name': 'str',
+        'controller_log_id': 'str'
     }
 
     attribute_map = {
@@ -56,11 +58,13 @@ class TrainRun(object):
         'start_time_ms': 'start_time_ms',
         'end_time_ms': 'end_time_ms',
         'attempts': 'attempts',
+        'total_attempts': 'total_attempts',
         'job_details': 'job_details',
-        'session_name': 'session_name'
+        'session_name': 'session_name',
+        'controller_log_id': 'controller_log_id'
     }
 
-    def __init__(self, id=None, name=None, job_id=None, controller_actor_id=None, status=None, status_detail=None, start_time_ms=None, end_time_ms=None, attempts=None, job_details=None, session_name=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, id=None, name=None, job_id=None, controller_actor_id=None, status=None, status_detail=None, start_time_ms=None, end_time_ms=None, attempts=None, total_attempts=None, job_details=None, session_name=None, controller_log_id=None, local_vars_configuration=None):  # noqa: E501
         """TrainRun - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -75,8 +79,10 @@ class TrainRun(object):
         self._start_time_ms = None
         self._end_time_ms = None
         self._attempts = None
+        self._total_attempts = None
         self._job_details = None
         self._session_name = None
+        self._controller_log_id = None
         self.discriminator = None
 
         self.id = id
@@ -91,9 +97,12 @@ class TrainRun(object):
         if end_time_ms is not None:
             self.end_time_ms = end_time_ms
         self.attempts = attempts
+        self.total_attempts = total_attempts
         self.job_details = job_details
         if session_name is not None:
             self.session_name = session_name
+        if controller_log_id is not None:
+            self.controller_log_id = controller_log_id
 
     @property
     def id(self):
@@ -296,6 +305,29 @@ class TrainRun(object):
 
         self._attempts = attempts
 
+    @property
+    def total_attempts(self):
+        """Gets the total_attempts of this TrainRun.  # noqa: E501
+
+
+        :return: The total_attempts of this TrainRun.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_attempts
+
+    @total_attempts.setter
+    def total_attempts(self, total_attempts):
+        """Sets the total_attempts of this TrainRun.
+
+
+        :param total_attempts: The total_attempts of this TrainRun.  # noqa: E501
+        :type: int
+        """
+        if self.local_vars_configuration.client_side_validation and total_attempts is None:  # noqa: E501
+            raise ValueError("Invalid value for `total_attempts`, must not be `None`")  # noqa: E501
+
+        self._total_attempts = total_attempts
+
     @property
     def job_details(self):
         """Gets the job_details of this TrainRun.  # noqa: E501
@@ -340,6 +372,27 @@ class TrainRun(object):
 
         self._session_name = session_name
 
+    @property
+    def controller_log_id(self):
+        """Gets the controller_log_id of this TrainRun.  # noqa: E501
+
+
+        :return: The controller_log_id of this TrainRun.  # noqa: E501
+        :rtype: str
+        """
+        return self._controller_log_id
+
+    @controller_log_id.setter
+    def controller_log_id(self, controller_log_id):
+        """Sets the controller_log_id of this TrainRun.
+
+
+        :param controller_log_id: The controller_log_id of this TrainRun.  # noqa: E501
+        :type: str
+        """
+
+        self._controller_log_id = controller_log_id
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale/client/openapi_client/models/train_worker.py

@@ -42,7 +42,8 @@ class TrainWorker(object):
         'pid': 'int',
         'gpu_ids': 'list[int]',
         'status': 'ActorStatus',
-        'resources': 'TrainResources'
+        'resources': 'TrainResources',
+        'log_id': 'str'
     }
 
     attribute_map = {
@@ -55,10 +56,11 @@ class TrainWorker(object):
         'pid': 'pid',
         'gpu_ids': 'gpu_ids',
         'status': 'status',
-        'resources': 'resources'
+        'resources': 'resources',
+        'log_id': 'log_id'
     }
 
-    def __init__(self, actor_id=None, world_rank=None, local_rank=None, node_rank=None, node_id=None, node_ip=None, pid=None, gpu_ids=None, status=None, resources=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, actor_id=None, world_rank=None, local_rank=None, node_rank=None, node_id=None, node_ip=None, pid=None, gpu_ids=None, status=None, resources=None, log_id=None, local_vars_configuration=None):  # noqa: E501
         """TrainWorker - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -74,6 +76,7 @@ class TrainWorker(object):
         self._gpu_ids = None
         self._status = None
         self._resources = None
+        self._log_id = None
         self.discriminator = None
 
         self.actor_id = actor_id
@@ -87,6 +90,8 @@ class TrainWorker(object):
         self.status = status
         if resources is not None:
             self.resources = resources
+        if log_id is not None:
+            self.log_id = log_id
 
     @property
     def actor_id(self):
@@ -316,6 +321,27 @@ class TrainWorker(object):
 
         self._resources = resources
 
+    @property
+    def log_id(self):
+        """Gets the log_id of this TrainWorker.  # noqa: E501
+
+
+        :return: The log_id of this TrainWorker.  # noqa: E501
+        :rtype: str
+        """
+        return self._log_id
+
+    @log_id.setter
+    def log_id(self, log_id):
+        """Sets the log_id of this TrainWorker.
+
+
+        :param log_id: The log_id of this TrainWorker.  # noqa: E501
+        :type: str
+        """
+
+        self._log_id = log_id
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

anyscale/cluster.py

@@ -121,10 +121,13 @@ def get_job_submission_client_cluster_info(
 
     if len(cluster_list) > 0:
         cluster = cluster_list[0]
-        if cluster.host_name and cluster.access_token:
+        access_token = api_client.get_cluster_access_token_api_v2_authentication_cluster_id_cluster_access_token_get(
+            cluster_id=cluster.id
+        )
+        if cluster.host_name and access_token:
             return ClusterInfo(
                 address=cluster.host_name,
-                cookies={"anyscale-token": cluster.access_token},
+                cookies={"anyscale-token": access_token},
                 metadata=metadata,
             )
         else:

anyscale/commands/anyscale_api/api_commands.py

@@ -4,7 +4,6 @@ Commands to interact with the Anyscale API
 
 import click
 
-from anyscale.commands.anyscale_api.session_commands_commands import session_commands
 from anyscale.commands.anyscale_api.session_operations_commands import (
     session_operations_commands,
 )
@@ -18,6 +17,5 @@ def anyscale_api() -> None:
     pass
 
 
-anyscale_api.add_command(session_commands)
 anyscale_api.add_command(sessions)
 anyscale_api.add_command(session_operations_commands)

anyscale/connect_utils/start_interactive_session.py

@@ -329,7 +329,10 @@ class StartInteractiveSessionBlock:
     ) -> Tuple[str, bool, Any]:
         """Get the params from the cluster needed to use Ray client."""
         connect_url = None
-        metadata = [("cookie", "anyscale-token=" + session_meta.access_token)]
+        access_token = self.api_client.get_cluster_access_token_api_v2_authentication_cluster_id_cluster_access_token_get(
+            cluster_id=session_meta.id
+        )
+        metadata = [("cookie", "anyscale-token=" + access_token)]
         if session_meta.connect_url:
             url_components = session_meta.connect_url.split("?port=")
             metadata += [("port", url_components[1])] if len(url_components) > 1 else []

anyscale/controllers/cluster_controller.py

@@ -358,22 +358,18 @@ class ClusterController(BaseController):
                         project_id = get_project_id(project_definition.root)
                     except click.ClickException:
                         parent_cloud_id = None
-                        feature_flag_on = self.api_client.check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get(
-                            "cloud-isolation-phase-1"
-                        ).result.is_on
                         log_msg = "No project context detected or `--project-id` provided. Continuing without a project."
-                        if feature_flag_on:
-                            if not (cloud_id or cloud_name):
-                                cloud_name = get_last_used_cloud(
-                                    project_id=None,
-                                    anyscale_api_client=self.anyscale_api_client,
-                                )
-                            parent_cloud_id, _ = get_cloud_id_and_name(
-                                api_client=self.api_client,
-                                cloud_id=cloud_id,
-                                cloud_name=cloud_name,
+                        if not (cloud_id or cloud_name):
+                            cloud_name = get_last_used_cloud(
+                                project_id=None,
+                                anyscale_api_client=self.anyscale_api_client,
                             )
-                            log_msg = f"No project context detected or `--project-id` provided. Continuing without a project assuming cloud {parent_cloud_id}."
+                        parent_cloud_id, _ = get_cloud_id_and_name(
+                            api_client=self.api_client,
+                            cloud_id=cloud_id,
+                            cloud_name=cloud_name,
+                        )
+                        log_msg = f"No project context detected or `--project-id` provided. Continuing without a project assuming cloud {parent_cloud_id}."
                         default_project = self.anyscale_api_client.get_default_project(
                             parent_cloud_id=parent_cloud_id
                         ).result
@@ -480,18 +476,11 @@ class ClusterController(BaseController):
                 "`--cloud-name` and `--cloud-id` cannot both be specified. Please only provide one "
                 "of these two arguments."
             )
-        feature_flag_on = self.api_client.check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get(
-            "cloud-isolation-phase-1"
-        ).result.is_on
-        if (
-            feature_flag_on
-            and cluster_name is not None
-            and (
-                project_id is None
-                and project_name is None
-                and cloud_id is None
-                and cloud_name is None
-            )
+        if cluster_name is not None and (
+            project_id is None
+            and project_name is None
+            and cloud_id is None
+            and cloud_name is None
         ):
             raise click.ClickException(
                 "Please specify the project of the cluster through `--project-id` or `--project-name`. If the cluster "

anyscale/controllers/project_controller.py

@@ -66,12 +66,7 @@ class ProjectController(BaseController):
         """
         Call API to create a new project given a project name.
         """
-        if not parent_cloud_id and (
-            self.api_client.check_is_feature_flag_on_api_v2_userinfo_check_is_feature_flag_on_get(
-                "cloud-isolation-phase-1"
-            ).result.is_on
-            is True
-        ):
+        if not parent_cloud_id:
             raise click.ClickException(
                 "Parent cloud id should be specified when creating a new project because "
                 "cloud isolation has been enabled."

anyscale/job/_private/job_sdk.py

@@ -67,6 +67,7 @@ class PrivateJobSDK(WorkloadSDK):
             cloud_id=cloud_id,
             autopopulate_in_workspace=autopopulate_in_workspace,
             additional_py_modules=config.py_modules,
+            py_executable_override=config.py_executable,
         )
         [runtime_env] = self.override_and_load_requirements_files(
             [runtime_env],
@@ -265,6 +266,9 @@ class PrivateJobSDK(WorkloadSDK):
             requirements=runtime_env_config.pip if runtime_env_config else None,
             working_dir=runtime_env_config.working_dir if runtime_env_config else None,
             env_vars=runtime_env_config.env_vars if runtime_env_config else None,
+            py_executable=runtime_env_config.py_executable
+            if runtime_env_config
+            else None,
             entrypoint=prod_job_config.entrypoint,
             cloud=compute_config.cloud
             if compute_config and isinstance(compute_config, ComputeConfig)
@@ -291,7 +295,12 @@ class PrivateJobSDK(WorkloadSDK):
         runs = [self._job_run_model_to_job_run_status(run) for run in runs]
 
         return JobStatus(
-            name=model.name, id=model.id, state=state, runs=runs, config=config
+            name=model.name,
+            id=model.id,
+            state=state,
+            runs=runs,
+            config=config,
+            creator_id=model.creator_id,
         )
 
     def _resolve_to_job_model(

anyscale/job/models.py

@@ -487,6 +487,14 @@ state: STARTING
             if not isinstance(run, JobRunStatus):
                 raise TypeError("Each run in 'runs' must be a JobRunStatus.")
 
+    creator_id: str = field(
+        metadata={"docstring": "ID of the user who created the job.",},
+    )
+
+    def _validate_creator_id(self, creator_id: str):
+        if creator_id is not None and not isinstance(creator_id, str):
+            raise TypeError("'creator_id' must be a string.")
+
 
 class JobLogMode(ModelEnum):
     """Mode to use for getting job logs."""