anyscale 0.24.44__tar.gz → 0.24.45__tar.gz

{anyscale-0.24.44 → anyscale-0.24.45}/PKG-INFO

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

{anyscale-0.24.44 → anyscale-0.24.45}/anyscale/client/openapi_client/models/decorated_job_queue.py

@@ -45,7 +45,11 @@ class DecoratedJobQueue(object):
         'creator_email': 'str',
         'compute_config_id': 'str',
         'current_cluster_state': 'SessionState',
-        'cluster_id': 'str'
+        'cluster_id': 'str',
+        'total_jobs': 'int',
+        'successful_jobs': 'int',
+        'failed_jobs': 'int',
+        'active_jobs': 'int'
     }
 
     attribute_map = {
@@ -61,10 +65,14 @@ class DecoratedJobQueue(object):
         'creator_email': 'creator_email',
         'compute_config_id': 'compute_config_id',
         'current_cluster_state': 'current_cluster_state',
-        'cluster_id': 'cluster_id'
+        'cluster_id': 'cluster_id',
+        'total_jobs': 'total_jobs',
+        'successful_jobs': 'successful_jobs',
+        'failed_jobs': 'failed_jobs',
+        'active_jobs': 'active_jobs'
     }
 
-    def __init__(self, id=None, user_provided_id=None, name=None, current_job_queue_state=None, execution_mode=None, max_concurrency=None, idle_timeout_sec=None, created_at=None, creator_id=None, creator_email=None, compute_config_id=None, current_cluster_state=None, cluster_id=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, id=None, user_provided_id=None, name=None, current_job_queue_state=None, execution_mode=None, max_concurrency=None, idle_timeout_sec=None, created_at=None, creator_id=None, creator_email=None, compute_config_id=None, current_cluster_state=None, cluster_id=None, total_jobs=None, successful_jobs=None, failed_jobs=None, active_jobs=None, local_vars_configuration=None):  # noqa: E501
         """DecoratedJobQueue - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -83,6 +91,10 @@ class DecoratedJobQueue(object):
         self._compute_config_id = None
         self._current_cluster_state = None
         self._cluster_id = None
+        self._total_jobs = None
+        self._successful_jobs = None
+        self._failed_jobs = None
+        self._active_jobs = None
         self.discriminator = None
 
         self.id = id
@@ -99,6 +111,14 @@ class DecoratedJobQueue(object):
         if current_cluster_state is not None:
             self.current_cluster_state = current_cluster_state
         self.cluster_id = cluster_id
+        if total_jobs is not None:
+            self.total_jobs = total_jobs
+        if successful_jobs is not None:
+            self.successful_jobs = successful_jobs
+        if failed_jobs is not None:
+            self.failed_jobs = failed_jobs
+        if active_jobs is not None:
+            self.active_jobs = active_jobs
 
     @property
     def id(self):
@@ -423,6 +443,98 @@ class DecoratedJobQueue(object):
 
         self._cluster_id = cluster_id
 
+    @property
+    def total_jobs(self):
+        """Gets the total_jobs of this DecoratedJobQueue.  # noqa: E501
+
+        Total number of jobs in the job queue.  # noqa: E501
+
+        :return: The total_jobs of this DecoratedJobQueue.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_jobs
+
+    @total_jobs.setter
+    def total_jobs(self, total_jobs):
+        """Sets the total_jobs of this DecoratedJobQueue.
+
+        Total number of jobs in the job queue.  # noqa: E501
+
+        :param total_jobs: The total_jobs of this DecoratedJobQueue.  # noqa: E501
+        :type: int
+        """
+
+        self._total_jobs = total_jobs
+
+    @property
+    def successful_jobs(self):
+        """Gets the successful_jobs of this DecoratedJobQueue.  # noqa: E501
+
+        Number of successful jobs in the job queue.  # noqa: E501
+
+        :return: The successful_jobs of this DecoratedJobQueue.  # noqa: E501
+        :rtype: int
+        """
+        return self._successful_jobs
+
+    @successful_jobs.setter
+    def successful_jobs(self, successful_jobs):
+        """Sets the successful_jobs of this DecoratedJobQueue.
+
+        Number of successful jobs in the job queue.  # noqa: E501
+
+        :param successful_jobs: The successful_jobs of this DecoratedJobQueue.  # noqa: E501
+        :type: int
+        """
+
+        self._successful_jobs = successful_jobs
+
+    @property
+    def failed_jobs(self):
+        """Gets the failed_jobs of this DecoratedJobQueue.  # noqa: E501
+
+        Number of failed jobs in the job queue.  # noqa: E501
+
+        :return: The failed_jobs of this DecoratedJobQueue.  # noqa: E501
+        :rtype: int
+        """
+        return self._failed_jobs
+
+    @failed_jobs.setter
+    def failed_jobs(self, failed_jobs):
+        """Sets the failed_jobs of this DecoratedJobQueue.
+
+        Number of failed jobs in the job queue.  # noqa: E501
+
+        :param failed_jobs: The failed_jobs of this DecoratedJobQueue.  # noqa: E501
+        :type: int
+        """
+
+        self._failed_jobs = failed_jobs
+
+    @property
+    def active_jobs(self):
+        """Gets the active_jobs of this DecoratedJobQueue.  # noqa: E501
+
+        Number of active jobs in the job queue.  # noqa: E501
+
+        :return: The active_jobs of this DecoratedJobQueue.  # noqa: E501
+        :rtype: int
+        """
+        return self._active_jobs
+
+    @active_jobs.setter
+    def active_jobs(self, active_jobs):
+        """Sets the active_jobs of this DecoratedJobQueue.
+
+        Number of active jobs in the job queue.  # noqa: E501
+
+        :param active_jobs: The active_jobs of this DecoratedJobQueue.  # noqa: E501
+        :type: int
+        """
+
+        self._active_jobs = active_jobs
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

{anyscale-0.24.44 → anyscale-0.24.45}/anyscale/compute_config/_private/compute_config_sdk.py

@@ -84,6 +84,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                 # Let the backend populate the physical resources
                 # (regardless of what the default compute config says).
                 resources=None if schedulable_by_default else UNSCHEDULABLE_RESOURCES,
+                flags=default.flags,
             )
         else:
             # Make mypy happy.
@@ -95,6 +96,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                 resources=self._convert_resource_dict_to_api_model(config.resources)
                 if config.resources is not None or schedulable_by_default
                 else UNSCHEDULABLE_RESOURCES,
+                flags=config.flags,
             )
             self._populate_advanced_instance_config(
                 config, api_model, cloud=cloud,
@@ -125,6 +127,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                 use_spot=config.market_type
                 in {MarketType.SPOT, MarketType.PREFER_SPOT},
                 fallback_to_ondemand=config.market_type == MarketType.PREFER_SPOT,
+                flags=config.flags,
             )
             self._populate_advanced_instance_config(
                 config, api_model, cloud=cloud,
@@ -148,9 +151,10 @@ class PrivateComputeConfigSDK(BaseSDK):
                 "This should never happen; please reach out to Anyscale support."
             )
 
-        flags: Dict[str, Any] = {
-            "allow-cross-zone-autoscaling": compute_config.enable_cross_zone_scaling,
-        }
+        flags: Dict[str, Any] = deepcopy(
+            compute_config.flags
+        ) if compute_config.flags else {}
+        flags["allow-cross-zone-autoscaling"] = compute_config.enable_cross_zone_scaling
 
         # NOTE(edoakes): we currently only support CPU and GPU in `max_resources`.
         # This is validated in the model.
@@ -246,6 +250,7 @@ class PrivateComputeConfigSDK(BaseSDK):
             advanced_instance_config=self._convert_api_model_to_advanced_instance_config(
                 api_model, cloud=cloud,
             ),
+            flags=api_model.flags,
         )
 
     def _convert_api_models_to_worker_node_group_configs(
@@ -285,6 +290,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                     min_nodes=min_nodes,
                     max_nodes=max_nodes,
                     market_type=market_type,
+                    flags=api_model.flags,
                 )
             )
 
@@ -314,16 +320,14 @@ class PrivateComputeConfigSDK(BaseSDK):
 
         max_resources = {}
         enable_cross_zone_scaling = False
-        if api_model_config.flags is not None:
-            enable_cross_zone_scaling = api_model_config.flags.get(
-                "allow-cross-zone-autoscaling", False
-            )
-            max_cpus = api_model_config.flags.get("max-cpus", None)
-            if max_cpus is not None:
-                max_resources["CPU"] = max_cpus
-            max_gpus = api_model_config.flags.get("max-gpus", None)
-            if max_gpus is not None:
-                max_resources["GPU"] = max_gpus
+        flags: Dict[str, Any] = deepcopy(api_model_config.flags) or {}
+        enable_cross_zone_scaling = flags.pop("allow-cross-zone-autoscaling", False)
+        max_cpus = flags.pop("max-cpus", None)
+        if max_cpus is not None:
+            max_resources["CPU"] = max_cpus
+        max_gpus = flags.pop("max-gpus", None)
+        if max_gpus is not None:
+            max_resources["GPU"] = max_gpus
 
         return ComputeConfigVersion(
             name=f"{api_model.name}:{api_model.version}",
@@ -340,6 +344,7 @@ class PrivateComputeConfigSDK(BaseSDK):
                 ),
                 worker_nodes=worker_nodes,  # type: ignore
                 max_resources=max_resources or None,
+                flags=flags,
             ),
         )
 

{anyscale-0.24.44 → anyscale-0.24.45}/anyscale/compute_config/models.py

@@ -75,6 +75,22 @@ class _NodeConfig(ModelBase):
     ):
         _validate_advanced_instance_config_dict(advanced_instance_config)
 
+    flags: Optional[Dict[str, Any]] = field(
+        default=None,
+        repr=False,
+        metadata={
+            "docstring": "Node-level flags specifying advanced or experimental options.",
+            "customer_hosted_only": False,
+        },
+    )
+
+    def _validate_flags(self, flags: Optional[Dict[str, Any]]):
+        if flags is None:
+            return
+
+        if not isinstance(flags, dict):
+            raise TypeError("'flags' must be a dict")
+
 
 @dataclass(frozen=True)
 class HeadNodeConfig(_NodeConfig):
@@ -404,6 +420,22 @@ worker_nodes:
     ):
         _validate_advanced_instance_config_dict(advanced_instance_config)
 
+    flags: Optional[Dict[str, Any]] = field(
+        default=None,
+        repr=False,
+        metadata={
+            "docstring": "Cluster-level flags specifying advanced or experimental options.",
+            "customer_hosted_only": False,
+        },
+    )
+
+    def _validate_flags(self, flags: Optional[Dict[str, Any]]):
+        if flags is None:
+            return
+
+        if not isinstance(flags, dict):
+            raise TypeError("'flags' must be a dict")
+
 
 @dataclass(frozen=True)
 class ComputeConfigVersion(ModelBase):

anyscale-0.24.45/anyscale/version.py

@@ -0,0 +1 @@
+__version__ = "0.24.45"

{anyscale-0.24.44 → anyscale-0.24.45}/anyscale.egg-info/PKG-INFO

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

{anyscale-0.24.44 → anyscale-0.24.45}/tests/unit/test_anyscale_sdk.py

@@ -1,8 +1,8 @@
 import click
 import pytest
 
+from anyscale.__init__ import _validate_headers
 from anyscale.shared_anyscale_utils.headers import RequestHeaders
-from frontend.cli.anyscale.__init__ import _validate_headers
 
 
 @pytest.mark.parametrize(

{anyscale-0.24.44 → anyscale-0.24.45}/tests/unit/test_compute_config_sdk.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 import uuid
 
 from common import OPENAPI_NO_VALIDATION, TestLogger
@@ -354,13 +354,23 @@ class TestCreateComputeConfig:
     @pytest.mark.parametrize("enable_cross_zone_scaling", [False, True])
     @pytest.mark.parametrize("zones", [None, ["zone1", "zone2"]])
     @pytest.mark.parametrize("max_resources", [None, {"CPU": 10, "GPU": 5}])
-    def test_top_level_flags(
+    @pytest.mark.parametrize(
+        "cluster_flags",
+        [None, {"fake-cluster-feature-1": True, "fake-cluster-feature-2": "yes"}],
+    )
+    @pytest.mark.parametrize(
+        "head_node_flags",
+        [None, {"fake-head-node-feature-1": False, "fake-head-node-feature-2": "no"}],
+    )
+    def test_flags(  # noqa: PLR0913
         self,
         compute_config_sdk_with_fakes: Tuple[ComputeConfigSDK, FakeAnyscaleClient],
         use_custom_cloud: bool,
         enable_cross_zone_scaling: bool,
         zones: Optional[List[str]],
         max_resources: Optional[Dict[str, float]],
+        cluster_flags: Optional[Dict[str, Any]],
+        head_node_flags: Optional[Dict[str, Any]],
     ):
         sdk, fake_client = compute_config_sdk_with_fakes
 
@@ -375,13 +385,18 @@ class TestCreateComputeConfig:
         custom_cloud_id = fake_client.get_cloud_id(cloud_name=custom_cloud_name)
 
         head_node_config = HeadNodeConfig(instance_type="head-node-instance-type",)
+        if head_node_flags:
+            head_node_config = head_node_config.options(flags=head_node_flags)
+
         config = ComputeConfig(
-            head_node=head_node_config, zones=zones, max_resources=max_resources
+            head_node=head_node_config, zones=zones, max_resources=max_resources,
         )
         if use_custom_cloud:
             config = config.options(cloud=custom_cloud_name)
         if enable_cross_zone_scaling:
             config = config.options(enable_cross_zone_scaling=True)
+        if cluster_flags:
+            config = config.options(flags=cluster_flags)
 
         full_name = sdk.create(config, name="test123")
         compute_config_id = sdk.get(full_name).id
@@ -395,6 +410,10 @@ class TestCreateComputeConfig:
             assert created.cloud_id == fake_client.DEFAULT_CLOUD_ID
 
         assert created.head_node_type.instance_type == "head-node-instance-type"
+        if head_node_flags:
+            for key, value in head_node_flags.items():
+                assert created.head_node_type.flags[key] == value
+
         assert (
             created.flags["allow-cross-zone-autoscaling"] == enable_cross_zone_scaling
         )
@@ -406,6 +425,9 @@ class TestCreateComputeConfig:
         else:
             assert created.flags["max-cpus"] == max_resources["CPU"]
             assert created.flags["max-gpus"] == max_resources["GPU"]
+        if cluster_flags:
+            for key, value in cluster_flags.items():
+                assert created.flags[key] == value
 
     def test_custom_worker_nodes(
         self,
@@ -429,6 +451,10 @@ class TestCreateComputeConfig:
                     max_nodes=100,
                     resources={"CPU": 1000, "custom": 1},
                     market_type=MarketType.PREFER_SPOT,
+                    flags={
+                        "fake-worker-node-feature-1": False,
+                        "fake-worker-node-feature-2": "no",
+                    },
                 ),
             ],
         )
@@ -469,6 +495,9 @@ class TestCreateComputeConfig:
         assert created.worker_node_types[2].use_spot is True
         assert created.worker_node_types[2].fallback_to_ondemand is True
 
+        assert created.worker_node_types[2].flags["fake-worker-node-feature-1"] is False
+        assert created.worker_node_types[2].flags["fake-worker-node-feature-2"] == "no"
+
 
 @dataclass
 class ResourcesTestCase:

{anyscale-0.24.44 → anyscale-0.24.45}/tests/unit/test_service_sdk.py

@@ -1908,10 +1908,13 @@ class TestStatus:
                 config=ComputeTemplateConfig(
                     cloud_id=fake_client.DEFAULT_CLOUD_ID,
                     head_node_type=ComputeNodeType(
-                        name="head-node", instance_type="head-node-instance-type",
+                        name="head-node",
+                        instance_type="head-node-instance-type",
+                        flags={},
                     ),
                     worker_node_types=[],
                     auto_select_worker_config=True,
+                    flags={},
                     local_vars_configuration=OPENAPI_NO_VALIDATION,
                 ),
                 local_vars_configuration=OPENAPI_NO_VALIDATION,
@@ -1936,8 +1939,9 @@ class TestStatus:
                         compute_config=ComputeConfig(
                             cloud=fake_client.DEFAULT_CLOUD_NAME,
                             head_node=HeadNodeConfig(
-                                instance_type="head-node-instance-type"
+                                instance_type="head-node-instance-type", flags={},
                             ),
+                            flags={},
                         ),
                         cloud=fake_client.DEFAULT_CLOUD_NAME,
                         query_auth_token_enabled=False,

anyscale-0.24.44/anyscale/version.py

@@ -1 +0,0 @@
-__version__ = "0.24.44"