anyscale 0.24.4__tar.gz → 0.24.5__tar.gz

{anyscale-0.24.4 → anyscale-0.24.5}/PKG-INFO

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

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/client/README.md

@@ -798,7 +798,7 @@ Class | Method | HTTP request | Description
  - [ServiceEventCurrentState](docs/ServiceEventCurrentState.md)
  - [ServiceEventLevel](docs/ServiceEventLevel.md)
  - [ServiceEventOrigin](docs/ServiceEventOrigin.md)
- - [ServiceEventScope](docs/ServiceEventScope.md)
+ - [ServiceEventScopeFilter](docs/ServiceEventScopeFilter.md)
  - [ServiceEventType](docs/ServiceEventType.md)
  - [ServiceGoalStates](docs/ServiceGoalStates.md)
  - [ServiceObservabilityUrls](docs/ServiceObservabilityUrls.md)

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/client/openapi_client/__init__.py

@@ -459,7 +459,7 @@ from openapi_client.models.service_config import ServiceConfig
 from openapi_client.models.service_event_current_state import ServiceEventCurrentState
 from openapi_client.models.service_event_level import ServiceEventLevel
 from openapi_client.models.service_event_origin import ServiceEventOrigin
-from openapi_client.models.service_event_scope import ServiceEventScope
+from openapi_client.models.service_event_scope_filter import ServiceEventScopeFilter
 from openapi_client.models.service_event_type import ServiceEventType
 from openapi_client.models.service_goal_states import ServiceGoalStates
 from openapi_client.models.service_observability_urls import ServiceObservabilityUrls

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/client/openapi_client/api/default_api.py

@@ -17585,11 +17585,13 @@ class DefaultApi(object):
 
         :param async_req bool: execute request asynchronously
         :param str service_id: (required)
+        :param list[ServiceEventScopeFilter] origin: Filter if origin of event is included in this list. If \"\" in this list, no origin will be included in filter, so no results will be returned. Default behavior is to include all origin values in filter.
+        :param ServiceEventLevel level: Filter by level of event
+        :param str message: Filter by message of event
+        :param datetime start_time: The start time for the query. If  start_time is not set, the query will use beginning of time.
+        :param datetime end_time: The end time for the query. If end_time is not set, the query will use the time now.
         :param str paging_token:
         :param int count:
-        :param ServiceEventScope origin:
-        :param ServiceEventLevel level:
-        :param str message:
         :param _preload_content: if False, the urllib3.HTTPResponse object will
                                  be returned without reading/decoding response
                                  data. Default is True.
@@ -17615,11 +17617,13 @@ class DefaultApi(object):
 
         :param async_req bool: execute request asynchronously
         :param str service_id: (required)
+        :param list[ServiceEventScopeFilter] origin: Filter if origin of event is included in this list. If \"\" in this list, no origin will be included in filter, so no results will be returned. Default behavior is to include all origin values in filter.
+        :param ServiceEventLevel level: Filter by level of event
+        :param str message: Filter by message of event
+        :param datetime start_time: The start time for the query. If  start_time is not set, the query will use beginning of time.
+        :param datetime end_time: The end time for the query. If end_time is not set, the query will use the time now.
         :param str paging_token:
         :param int count:
-        :param ServiceEventScope origin:
-        :param ServiceEventLevel level:
-        :param str message:
         :param _return_http_data_only: response data without head status code
                                        and headers
         :param _preload_content: if False, the urllib3.HTTPResponse object will
@@ -17638,11 +17642,13 @@ class DefaultApi(object):
 
         all_params = [
             'service_id',
-            'paging_token',
-            'count',
             'origin',
             'level',
-            'message'
+            'message',
+            'start_time',
+            'end_time',
+            'paging_token',
+            'count'
         ]
         all_params.extend(
             [
@@ -17677,16 +17683,21 @@ class DefaultApi(object):
             path_params['service_id'] = local_var_params['service_id']  # noqa: E501
 
         query_params = []
-        if 'paging_token' in local_var_params and local_var_params['paging_token'] is not None:  # noqa: E501
-            query_params.append(('paging_token', local_var_params['paging_token']))  # noqa: E501
-        if 'count' in local_var_params and local_var_params['count'] is not None:  # noqa: E501
-            query_params.append(('count', local_var_params['count']))  # noqa: E501
         if 'origin' in local_var_params and local_var_params['origin'] is not None:  # noqa: E501
             query_params.append(('origin', local_var_params['origin']))  # noqa: E501
+            collection_formats['origin'] = 'multi'  # noqa: E501
         if 'level' in local_var_params and local_var_params['level'] is not None:  # noqa: E501
             query_params.append(('level', local_var_params['level']))  # noqa: E501
         if 'message' in local_var_params and local_var_params['message'] is not None:  # noqa: E501
             query_params.append(('message', local_var_params['message']))  # noqa: E501
+        if 'start_time' in local_var_params and local_var_params['start_time'] is not None:  # noqa: E501
+            query_params.append(('start_time', local_var_params['start_time']))  # noqa: E501
+        if 'end_time' in local_var_params and local_var_params['end_time'] is not None:  # noqa: E501
+            query_params.append(('end_time', local_var_params['end_time']))  # noqa: E501
+        if 'paging_token' in local_var_params and local_var_params['paging_token'] is not None:  # noqa: E501
+            query_params.append(('paging_token', local_var_params['paging_token']))  # noqa: E501
+        if 'count' in local_var_params and local_var_params['count'] is not None:  # noqa: E501
+            query_params.append(('count', local_var_params['count']))  # noqa: E501
 
         header_params = {}
 
@@ -25581,7 +25592,6 @@ class DefaultApi(object):
     def login_user_api_v2_users_login_post(self, login_user_params, **kwargs):  # noqa: E501
         """Login User  # noqa: E501
 
-        Log a user in.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.login_user_api_v2_users_login_post(login_user_params, async_req=True)
@@ -25606,7 +25616,6 @@ class DefaultApi(object):
     def login_user_api_v2_users_login_post_with_http_info(self, login_user_params, **kwargs):  # noqa: E501
         """Login User  # noqa: E501
 
-        Log a user in.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.login_user_api_v2_users_login_post_with_http_info(login_user_params, async_req=True)
@@ -28745,6 +28754,8 @@ class DefaultApi(object):
 
         :param async_req bool: execute request asynchronously
         :param str email_address: (required)
+        :param str redirect_to: A path within Anyscale console to redirect to after the user logs in. This only supports paths and not full urls.
+        :param bool no_sso: If true, do not use SSO to log in.
         :param _preload_content: if False, the urllib3.HTTPResponse object will
                                  be returned without reading/decoding response
                                  data. Default is True.
@@ -28770,6 +28781,8 @@ class DefaultApi(object):
 
         :param async_req bool: execute request asynchronously
         :param str email_address: (required)
+        :param str redirect_to: A path within Anyscale console to redirect to after the user logs in. This only supports paths and not full urls.
+        :param bool no_sso: If true, do not use SSO to log in.
         :param _return_http_data_only: response data without head status code
                                        and headers
         :param _preload_content: if False, the urllib3.HTTPResponse object will
@@ -28787,7 +28800,9 @@ class DefaultApi(object):
         local_var_params = locals()
 
         all_params = [
-            'email_address'
+            'email_address',
+            'redirect_to',
+            'no_sso'
         ]
         all_params.extend(
             [
@@ -28818,6 +28833,10 @@ class DefaultApi(object):
         query_params = []
         if 'email_address' in local_var_params and local_var_params['email_address'] is not None:  # noqa: E501
             query_params.append(('email_address', local_var_params['email_address']))  # noqa: E501
+        if 'redirect_to' in local_var_params and local_var_params['redirect_to'] is not None:  # noqa: E501
+            query_params.append(('redirect_to', local_var_params['redirect_to']))  # noqa: E501
+        if 'no_sso' in local_var_params and local_var_params['no_sso'] is not None:  # noqa: E501
+            query_params.append(('no_sso', local_var_params['no_sso']))  # noqa: E501
 
         header_params = {}
 

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/client/openapi_client/models/__init__.py

@@ -445,7 +445,7 @@ from openapi_client.models.service_config import ServiceConfig
 from openapi_client.models.service_event_current_state import ServiceEventCurrentState
 from openapi_client.models.service_event_level import ServiceEventLevel
 from openapi_client.models.service_event_origin import ServiceEventOrigin
-from openapi_client.models.service_event_scope import ServiceEventScope
+from openapi_client.models.service_event_scope_filter import ServiceEventScopeFilter
 from openapi_client.models.service_event_type import ServiceEventType
 from openapi_client.models.service_goal_states import ServiceGoalStates
 from openapi_client.models.service_observability_urls import ServiceObservabilityUrls

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/client/openapi_client/models/login_user_params.py

@@ -35,16 +35,18 @@ class LoginUserParams(object):
     openapi_types = {
         'email': 'str',
         'password': 'str',
-        'organization_id': 'str'
+        'organization_id': 'str',
+        'magic_token': 'str'
     }
 
     attribute_map = {
         'email': 'email',
         'password': 'password',
-        'organization_id': 'organization_id'
+        'organization_id': 'organization_id',
+        'magic_token': 'magic_token'
     }
 
-    def __init__(self, email=None, password=None, organization_id=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, email=None, password=None, organization_id=None, magic_token=None, local_vars_configuration=None):  # noqa: E501
         """LoginUserParams - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -53,12 +55,16 @@ class LoginUserParams(object):
         self._email = None
         self._password = None
         self._organization_id = None
+        self._magic_token = None
         self.discriminator = None
 
         self.email = email
-        self.password = password
+        if password is not None:
+            self.password = password
         if organization_id is not None:
             self.organization_id = organization_id
+        if magic_token is not None:
+            self.magic_token = magic_token
 
     @property
     def email(self):
@@ -87,6 +93,7 @@ class LoginUserParams(object):
     def password(self):
         """Gets the password of this LoginUserParams.  # noqa: E501
 
+        Password to use for logging in as the user. At least one authentication method should be used. Either password or magic link.  # noqa: E501
 
         :return: The password of this LoginUserParams.  # noqa: E501
         :rtype: str
@@ -97,12 +104,11 @@ class LoginUserParams(object):
     def password(self, password):
         """Sets the password of this LoginUserParams.
 
+        Password to use for logging in as the user. At least one authentication method should be used. Either password or magic link.  # noqa: E501
 
         :param password: The password of this LoginUserParams.  # noqa: E501
         :type: str
         """
-        if self.local_vars_configuration.client_side_validation and password is None:  # noqa: E501
-            raise ValueError("Invalid value for `password`, must not be `None`")  # noqa: E501
 
         self._password = password
 
@@ -129,6 +135,29 @@ class LoginUserParams(object):
 
         self._organization_id = organization_id
 
+    @property
+    def magic_token(self):
+        """Gets the magic_token of this LoginUserParams.  # noqa: E501
+
+        Magic link token to authenticate ownership of an email address. At least one authentication method should be used. Either password or magic link.  # noqa: E501
+
+        :return: The magic_token of this LoginUserParams.  # noqa: E501
+        :rtype: str
+        """
+        return self._magic_token
+
+    @magic_token.setter
+    def magic_token(self, magic_token):
+        """Sets the magic_token of this LoginUserParams.
+
+        Magic link token to authenticate ownership of an email address. At least one authentication method should be used. Either password or magic link.  # noqa: E501
+
+        :param magic_token: The magic_token of this LoginUserParams.  # noqa: E501
+        :type: str
+        """
+
+        self._magic_token = magic_token
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/client/openapi_client/models/organization_summary.py

@@ -35,7 +35,7 @@ class OrganizationSummary(object):
     openapi_types = {
         'name': 'str',
         'id': 'str',
-        'public_identifer': 'str',
+        'public_identifier': 'str',
         'creator_email': 'str',
         'total_users': 'int'
     }
@@ -43,12 +43,12 @@ class OrganizationSummary(object):
     attribute_map = {
         'name': 'name',
         'id': 'id',
-        'public_identifer': 'public_identifer',
+        'public_identifier': 'public_identifier',
         'creator_email': 'creator_email',
         'total_users': 'total_users'
     }
 
-    def __init__(self, name=None, id=None, public_identifer=None, creator_email=None, total_users=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, name=None, id=None, public_identifier=None, creator_email=None, total_users=None, local_vars_configuration=None):  # noqa: E501
         """OrganizationSummary - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -56,14 +56,14 @@ class OrganizationSummary(object):
 
         self._name = None
         self._id = None
-        self._public_identifer = None
+        self._public_identifier = None
         self._creator_email = None
         self._total_users = None
         self.discriminator = None
 
         self.name = name
         self.id = id
-        self.public_identifer = public_identifer
+        self.public_identifier = public_identifier
         self.creator_email = creator_email
         self.total_users = total_users
 
@@ -114,27 +114,27 @@ class OrganizationSummary(object):
         self._id = id
 
     @property
-    def public_identifer(self):
-        """Gets the public_identifer of this OrganizationSummary.  # noqa: E501
+    def public_identifier(self):
+        """Gets the public_identifier of this OrganizationSummary.  # noqa: E501
 
 
-        :return: The public_identifer of this OrganizationSummary.  # noqa: E501
+        :return: The public_identifier of this OrganizationSummary.  # noqa: E501
         :rtype: str
         """
-        return self._public_identifer
+        return self._public_identifier
 
-    @public_identifer.setter
-    def public_identifer(self, public_identifer):
-        """Sets the public_identifer of this OrganizationSummary.
+    @public_identifier.setter
+    def public_identifier(self, public_identifier):
+        """Sets the public_identifier of this OrganizationSummary.
 
 
-        :param public_identifer: The public_identifer of this OrganizationSummary.  # noqa: E501
+        :param public_identifier: The public_identifier of this OrganizationSummary.  # noqa: E501
         :type: str
         """
-        if self.local_vars_configuration.client_side_validation and public_identifer is None:  # noqa: E501
-            raise ValueError("Invalid value for `public_identifer`, must not be `None`")  # noqa: E501
+        if self.local_vars_configuration.client_side_validation and public_identifier is None:  # noqa: E501
+            raise ValueError("Invalid value for `public_identifier`, must not be `None`")  # noqa: E501
 
-        self._public_identifer = public_identifer
+        self._public_identifier = public_identifier
 
     @property
     def creator_email(self):

anyscale-0.24.4/anyscale/client/openapi_client/models/service_event_scope.py → anyscale-0.24.5/anyscale/client/openapi_client/models/service_event_scope_filter.py

@@ -18,7 +18,7 @@ import six
 from openapi_client.configuration import Configuration
 
 
-class ServiceEventScope(object):
+class ServiceEventScopeFilter(object):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
@@ -33,8 +33,9 @@ class ServiceEventScope(object):
     ALB = "ALB"
     SERVE_DEPLOYMENT = "SERVE_DEPLOYMENT"
     CLUSTER = "CLUSTER"
+    EMPTY = ""
 
-    allowable_values = [SERVICE, SERVICE_VERSION, ALB, SERVE_DEPLOYMENT, CLUSTER]  # noqa: E501
+    allowable_values = [SERVICE, SERVICE_VERSION, ALB, SERVE_DEPLOYMENT, CLUSTER, EMPTY]  # noqa: E501
 
     """
     Attributes:
@@ -50,7 +51,7 @@ class ServiceEventScope(object):
     }
 
     def __init__(self, local_vars_configuration=None):  # noqa: E501
-        """ServiceEventScope - a model defined in OpenAPI"""  # noqa: E501
+        """ServiceEventScopeFilter - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
         self.local_vars_configuration = local_vars_configuration
@@ -90,14 +91,14 @@ class ServiceEventScope(object):
 
     def __eq__(self, other):
         """Returns true if both objects are equal"""
-        if not isinstance(other, ServiceEventScope):
+        if not isinstance(other, ServiceEventScopeFilter):
             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, ServiceEventScope):
+        if not isinstance(other, ServiceEventScopeFilter):
             return True
 
         return self.to_dict() != other.to_dict()

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/commands/compute_config_commands.py

@@ -209,7 +209,7 @@ def list(  # noqa: A001
     help=("Get details about compute configuration by this id."),
 )
 def get(
-    cluster_compute_name: Optional[str],
+    compute_config_name: Optional[str],
     cluster_compute_id: Optional[str],
     compute_config_id: Optional[str],
 ) -> None:
@@ -221,6 +221,6 @@ def get(
         )
 
     cluster_compute_controller.get(
-        cluster_compute_name=cluster_compute_name,
+        cluster_compute_name=compute_config_name,
         cluster_compute_id=compute_config_id or cluster_compute_id,
     )

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/controllers/workspace_controller.py

@@ -13,7 +13,7 @@ from anyscale.controllers.base_controller import BaseController
 from anyscale.feature_flags import FLAG_DEFAULT_WORKING_DIR_FOR_PROJ
 from anyscale.util import get_endpoint
 from anyscale.utils.workspace_utils import (
-    extract_workspace_parameters_from_cluster_config,
+    extract_workspace_parameters,
     WorkspaceCommandContext,
 )
 from anyscale.workspace import load_workspace_id_or_throw, write_workspace_id_to_disk
@@ -99,7 +99,7 @@ class WorkspaceController(BaseController):
         cluster_id = workspace.cluster_id
         project_id = workspace.project_id
 
-        return extract_workspace_parameters_from_cluster_config(
+        return extract_workspace_parameters(
             cluster_id,
             project_id,
             api_client=self.api_client,

{anyscale-0.24.4 → anyscale-0.24.5}/anyscale/service/_private/sdk.py

@@ -1,5 +1,5 @@
 import copy
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from anyscale.cli_logger import BlockLogger
 from anyscale.client.openapi_client.models import (
@@ -207,7 +207,7 @@ class ServiceSDK:
         logger.info(f"No name was specified, using default: '{name}'.")
         return name
 
-    def deploy(
+    def deploy(  # noqa: PLR0912
         self,
         config: ServiceConfig,
         *,
@@ -252,13 +252,16 @@ class ServiceSDK:
         config = self._override_and_upload_local_dirs(config, cloud_id=cloud_id)
         config = self._override_and_load_requirements_files(config)
 
+        ray_serve_config: Dict[str, Any] = {"applications": config.applications}
+        if config.http_options:
+            ray_serve_config["http_options"] = config.http_options
+        if config.grpc_options:
+            ray_serve_config["grpc_options"] = config.grpc_options
         service: ServiceModel = self._client.rollout_service(
             ApplyServiceModel(
                 name=name,
                 project_id=self._client.get_project_id(),
-                # TODO(edoakes): if this logic gets more complex, move this to a
-                # utility method and test it.
-                ray_serve_config={"applications": config.applications},
+                ray_serve_config=ray_serve_config,
                 build_id=build_id,
                 compute_config_id=compute_config_id,
                 canary_percent=canary_percent,
@@ -400,6 +403,8 @@ class ServiceSDK:
                     model.compute_config_id
                 ),
                 query_auth_token_enabled=query_auth_token_enabled,
+                http_options=model.ray_serve_config.get("http_options", None),
+                grpc_options=model.ray_serve_config.get("grpc_options", None),
             ),
         )
 
@@ -442,6 +447,7 @@ class ServiceSDK:
             )
 
         return ServiceStatus(
+            service_id=model.id,
             name=model.name,
             state=state,
             query_url=model.base_url,