anyscale 0.24.43__tar.gz → 0.24.44__tar.gz

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

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

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale/__init__.py

@@ -4,6 +4,8 @@ import os
 from sys import path
 from typing import Any, Dict, List, Optional
 
+import click
+
 from anyscale import version
 
 
@@ -62,11 +64,23 @@ ANYSCALE_ENV = os.environ.copy()
 
 class Anyscale:
     def __init__(
-        self, *, auth_token: Optional[str] = None, _host: Optional[str] = None,
+        self,
+        *,
+        auth_token: Optional[str] = None,
+        _host: Optional[str] = None,
+        headers: Optional[Dict[str, str]] = None,
     ):
         auth_block = AuthenticationBlock(
             cli_token=auth_token, host=_host, raise_structured_exception=True,
         )
+
+        _validate_headers(headers)
+
+        if headers:
+            for k, v in headers.items():
+                auth_block.api_client.api_client.set_default_header(k, v)
+                auth_block.anyscale_api_client.api_client.set_default_header(k, v)
+
         self._anyscale_client = AnyscaleClient(
             api_clients=(auth_block.anyscale_api_client, auth_block.api_client),
             host=_host,
@@ -77,7 +91,7 @@ class Anyscale:
 
     @classmethod
     def _init_private(
-        cls, *, client: AnyscaleClientInterface, logger: BlockLogger, timer: Timer
+        cls, *, client: AnyscaleClientInterface, logger: BlockLogger, timer: Timer,
     ):
         # Private constructor used to inject fakes for testing.
         obj = cls.__new__(cls)
@@ -103,3 +117,14 @@ class Anyscale:
     @property
     def compute_config(self) -> ComputeConfigSDK:  # noqa: F811
         return self._compute_config_sdk
+
+
+def _validate_headers(headers: Optional[Dict[str, str]]):
+    if not headers:
+        return
+
+    for k, v in headers.items():
+        if isinstance(k, str) is False:
+            raise click.ClickException(f"The header {k} must be a string.")
+        if isinstance(v, str) is False:
+            raise click.ClickException(f"The value {v} to header {k} must be a string.")

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale/authenticate.py

@@ -40,6 +40,7 @@ class AuthenticationBlock:
 
     def __init__(
         self,
+        *,
         cli_token: Optional[str] = None,
         host: Optional[str] = None,
         use_asyncio: bool = False,
@@ -80,7 +81,7 @@ class AuthenticationBlock:
         if validate_credentials:
             self._validate_credentials_format(self.credentials)
 
-        self.api_client = self._instantiate_api_client(raise_structured_exception)
+        self.api_client = self._instantiate_api_client(raise_structured_exception,)
         self.anyscale_api_client = self._instantiate_anyscale_client(
             raise_structured_exception, use_asyncio=use_asyncio
         )
@@ -120,6 +121,7 @@ class AuthenticationBlock:
             cookie=cookie,
             raise_structured_exception=raise_structured_exception,
         )
+
         configure_open_api_client_headers(api_client, "CLI")
         configure_tcp_keepalive(api_client)
         api_instance = openapi_client.DefaultApi(api_client)
@@ -155,6 +157,7 @@ class AuthenticationBlock:
                 raise_structured_exception=raise_structured_exception,
             )
         )
+
         configure_open_api_client_headers(api_client, "CLI")
         configure_tcp_keepalive(api_client)
         api_instance = anyscale_client.DefaultApi(api_client)

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale/client/openapi_client/api/default_api.py

@@ -25267,6 +25267,7 @@ class DefaultApi(object):
         :param str project_id: Project to filter by. If absent, no filtering is done.
         :param str workspace_id: Workspace to filter by. If absent, no filtering is done.
         :param str cloud_id: Search for job with cloud_id
+        :param str job_queue_id: Job queue to filter by. If absent, no filtering is done.
         :param UnifiedJobSortField sort_field: If absent, jobs will be ordered by status (active first). See order declared in `UnifiedJobSortField`
         :param SortOrder sort_order: If sort_field is absent, this field is ignored.If sort_order is absent, this field defaults to descending.
         :param str paging_token:
@@ -25302,6 +25303,7 @@ class DefaultApi(object):
         :param str project_id: Project to filter by. If absent, no filtering is done.
         :param str workspace_id: Workspace to filter by. If absent, no filtering is done.
         :param str cloud_id: Search for job with cloud_id
+        :param str job_queue_id: Job queue to filter by. If absent, no filtering is done.
         :param UnifiedJobSortField sort_field: If absent, jobs will be ordered by status (active first). See order declared in `UnifiedJobSortField`
         :param SortOrder sort_order: If sort_field is absent, this field is ignored.If sort_order is absent, this field defaults to descending.
         :param str paging_token:
@@ -25330,6 +25332,7 @@ class DefaultApi(object):
             'project_id',
             'workspace_id',
             'cloud_id',
+            'job_queue_id',
             'sort_field',
             'sort_order',
             'paging_token',
@@ -25377,6 +25380,8 @@ class DefaultApi(object):
             query_params.append(('workspace_id', local_var_params['workspace_id']))  # noqa: E501
         if 'cloud_id' in local_var_params and local_var_params['cloud_id'] is not None:  # noqa: E501
             query_params.append(('cloud_id', local_var_params['cloud_id']))  # noqa: E501
+        if 'job_queue_id' in local_var_params and local_var_params['job_queue_id'] is not None:  # noqa: E501
+            query_params.append(('job_queue_id', local_var_params['job_queue_id']))  # noqa: E501
         if 'sort_field' in local_var_params and local_var_params['sort_field'] is not None:  # noqa: E501
             query_params.append(('sort_field', local_var_params['sort_field']))  # noqa: E501
         if 'sort_order' in local_var_params and local_var_params['sort_order'] is not None:  # noqa: E501

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale/client/openapi_client/models/decorated_unified_job.py

@@ -41,6 +41,7 @@ class DecoratedUnifiedJob(object):
         'archived_at': 'datetime',
         'status': 'UnifiedJobStatus',
         'cost': 'float',
+        'position_in_job_queue': 'int',
         'last_job_run_id': 'str',
         'project': 'MiniProject',
         'cluster': 'MiniCluster',
@@ -56,13 +57,14 @@ class DecoratedUnifiedJob(object):
         'archived_at': 'archived_at',
         'status': 'status',
         'cost': 'cost',
+        'position_in_job_queue': 'position_in_job_queue',
         'last_job_run_id': 'last_job_run_id',
         'project': 'project',
         'cluster': 'cluster',
         'creator': 'creator'
     }
 
-    def __init__(self, id=None, name=None, job_type=None, created_at=None, finished_at=None, archived_at=None, status=None, cost=None, last_job_run_id=None, project=None, cluster=None, creator=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, id=None, name=None, job_type=None, created_at=None, finished_at=None, archived_at=None, status=None, cost=None, position_in_job_queue=None, last_job_run_id=None, project=None, cluster=None, creator=None, local_vars_configuration=None):  # noqa: E501
         """DecoratedUnifiedJob - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -76,6 +78,7 @@ class DecoratedUnifiedJob(object):
         self._archived_at = None
         self._status = None
         self._cost = None
+        self._position_in_job_queue = None
         self._last_job_run_id = None
         self._project = None
         self._cluster = None
@@ -92,6 +95,8 @@ class DecoratedUnifiedJob(object):
             self.archived_at = archived_at
         self.status = status
         self.cost = cost
+        if position_in_job_queue is not None:
+            self.position_in_job_queue = position_in_job_queue
         if last_job_run_id is not None:
             self.last_job_run_id = last_job_run_id
         self.project = project
@@ -295,6 +300,29 @@ class DecoratedUnifiedJob(object):
 
         self._cost = cost
 
+    @property
+    def position_in_job_queue(self):
+        """Gets the position_in_job_queue of this DecoratedUnifiedJob.  # noqa: E501
+
+        The position of the job in the job queue. None for jobs not pending in a job queue.  # noqa: E501
+
+        :return: The position_in_job_queue of this DecoratedUnifiedJob.  # noqa: E501
+        :rtype: int
+        """
+        return self._position_in_job_queue
+
+    @position_in_job_queue.setter
+    def position_in_job_queue(self, position_in_job_queue):
+        """Sets the position_in_job_queue of this DecoratedUnifiedJob.
+
+        The position of the job in the job queue. None for jobs not pending in a job queue.  # noqa: E501
+
+        :param position_in_job_queue: The position_in_job_queue of this DecoratedUnifiedJob.  # noqa: E501
+        :type: int
+        """
+
+        self._position_in_job_queue = position_in_job_queue
+
     @property
     def last_job_run_id(self):
         """Gets the last_job_run_id of this DecoratedUnifiedJob.  # noqa: E501

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale/client/openapi_client/models/unified_job_sort_field.py

@@ -32,8 +32,9 @@ class UnifiedJobSortField(object):
     FINISHED_AT = "FINISHED_AT"
     CREATED_AT = "CREATED_AT"
     COST = "COST"
+    POSITION_IN_JOB_QUEUE = "POSITION_IN_JOB_QUEUE"
 
-    allowable_values = [STATUS, FINISHED_AT, CREATED_AT, COST]  # noqa: E501
+    allowable_values = [STATUS, FINISHED_AT, CREATED_AT, COST, POSITION_IN_JOB_QUEUE]  # noqa: E501
 
     """
     Attributes:

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale/commands/compute_config_commands.py

@@ -75,7 +75,7 @@ def compute_config_cli() -> None:
 @click.option(
     "-n",
     "--name",
-    help="Name for the created compute config. This should *not* include a version tag. If a name is not provided, one will be automatically generated.",
+    help="Name for the created compute config. This should *not* include a version tag. If a name is not provided, an anonymous compute config is generated. Anonymous compute configs are not accessible in the UI and can only be referenced by their ID.",
     required=False,
     default=None,
     type=str,

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale/shared_anyscale_utils/headers.py

@@ -22,6 +22,9 @@ class RequestHeaders(str, Enum):
     # Identifies the version of the client
     CLIENT_VERSION = "X-Anyscale-Client-Version"
 
+    # Identifies the source of the client
+    SOURCE = "X-Anyscale-Source"
+
 
 class ResponseHeaders(str, Enum):
     """

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale/shared_anyscale_utils/utils/id_gen.py

@@ -115,6 +115,7 @@ class IDTypes(Enum):
     billing_versions = "billv"
     customer_aggregated_logs_configs = "calc"
     service_accounts = "sa"
+    organization_configurations = "orgconf"
 
 
 _default_id_length: int = 26

anyscale-0.24.44/anyscale/version.py

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

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

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

{anyscale-0.24.43 → anyscale-0.24.44}/anyscale.egg-info/SOURCES.txt

@@ -2012,6 +2012,7 @@ tests/unit/BUILD.bazel
 tests/unit/common.py
 tests/unit/conftest.py
 tests/unit/test_anyscale_client.py
+tests/unit/test_anyscale_sdk.py
 tests/unit/test_compute_config_cli.py
 tests/unit/test_compute_config_models.py
 tests/unit/test_compute_config_sdk.py

anyscale-0.24.44/tests/unit/test_anyscale_sdk.py

@@ -0,0 +1,24 @@
+import click
+import pytest
+
+from anyscale.shared_anyscale_utils.headers import RequestHeaders
+from frontend.cli.anyscale.__init__ import _validate_headers
+
+
+@pytest.mark.parametrize(
+    ("headers", "raise_exception"),
+    [
+        ({RequestHeaders.SOURCE: "astronomy-sdk"}, False),
+        ({RequestHeaders.SOURCE: 1}, True),
+    ],
+)
+def test_validate_api_client_headers(headers, raise_exception) -> None:
+    """
+    Test headers are validated correctly.
+    """
+    if raise_exception:
+        with pytest.raises(click.ClickException):
+            _validate_headers(headers=headers)
+
+    else:
+        _validate_headers(headers=headers)

anyscale-0.24.43/anyscale/version.py

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