anyscale 0.26.49__py3-none-any.whl → 0.26.51__py3-none-any.whl

anyscale/client/README.md

@@ -210,6 +210,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**get_job_queue_api_v2_job_queues_job_queue_id_get**](docs/DefaultApi.md#get_job_queue_api_v2_job_queues_job_queue_id_get) | **GET** /api/v2/job_queues/{job_queue_id} | Get Job Queue
 *DefaultApi* | [**get_jobs_api_v2_dataset_runs_jobs_get**](docs/DefaultApi.md#get_jobs_api_v2_dataset_runs_jobs_get) | **GET** /api/v2/dataset_runs/jobs | Get Jobs
 *DefaultApi* | [**get_lb_resource_api_v2_clouds_with_cloud_resource_gcp_router_cloud_id_get_lb_resource_post**](docs/DefaultApi.md#get_lb_resource_api_v2_clouds_with_cloud_resource_gcp_router_cloud_id_get_lb_resource_post) | **POST** /api/v2/clouds_with_cloud_resource_gcp_router/{cloud_id}/get_lb_resource | Get Lb Resource
+*DefaultApi* | [**get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post**](docs/DefaultApi.md#get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post) | **POST** /api/v2/clouds_with_cloud_resource_router/{cloud_id}/get_lb_resource | Get Lb Resource
 *DefaultApi* | [**get_log_files_api_v2_logs_get_log_files_post**](docs/DefaultApi.md#get_log_files_api_v2_logs_get_log_files_post) | **POST** /api/v2/logs/get_log_files | Get Log Files
 *DefaultApi* | [**get_manage_billing_url_api_v2_organization_billing_manage_billing_url_get**](docs/DefaultApi.md#get_manage_billing_url_api_v2_organization_billing_manage_billing_url_get) | **GET** /api/v2/organization_billing/manage_billing_url | Get Manage Billing Url
 *DefaultApi* | [**get_metronome_customer_info_api_v2_metronome_customer_info_organization_id_get**](docs/DefaultApi.md#get_metronome_customer_info_api_v2_metronome_customer_info_organization_id_get) | **GET** /api/v2/metronome_customer_info/{organization_id} | Get Metronome Customer Info
@@ -308,6 +309,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**put_workspace_proxied_dataplane_artifacts_api_v2_experimental_workspaces_workspace_id_proxied_dataplane_artifacts_put**](docs/DefaultApi.md#put_workspace_proxied_dataplane_artifacts_api_v2_experimental_workspaces_workspace_id_proxied_dataplane_artifacts_put) | **PUT** /api/v2/experimental_workspaces/{workspace_id}/proxied_dataplane_artifacts | Put Workspace Proxied Dataplane Artifacts
 *DefaultApi* | [**put_workspace_wandb_run_details_api_v2_integrations_workspace_wandb_run_details_workspace_id_put**](docs/DefaultApi.md#put_workspace_wandb_run_details_api_v2_integrations_workspace_wandb_run_details_workspace_id_put) | **PUT** /api/v2/integrations/workspace_wandb_run_details/{workspace_id} | Put Workspace Wandb Run Details
 *DefaultApi* | [**query_aggregated_logs_api_v2_logs_query_aggregated_logs_get**](docs/DefaultApi.md#query_aggregated_logs_api_v2_logs_query_aggregated_logs_get) | **GET** /api/v2/logs/query_aggregated_logs | Query Aggregated Logs
+*DefaultApi* | [**query_api_v2_logs_query_get**](docs/DefaultApi.md#query_api_v2_logs_query_get) | **GET** /api/v2/logs/query | Query
 *DefaultApi* | [**query_api_v2_metrics_query_get**](docs/DefaultApi.md#query_api_v2_metrics_query_get) | **GET** /api/v2/metrics/query | Query
 *DefaultApi* | [**query_range_api_v2_metrics_query_range_get**](docs/DefaultApi.md#query_range_api_v2_metrics_query_range_get) | **GET** /api/v2/metrics/query_range | Query Range
 *DefaultApi* | [**receive_cli_usage_api_v2_cli_usage_post**](docs/DefaultApi.md#receive_cli_usage_api_v2_cli_usage_post) | **POST** /api/v2/cli_usage/ | Receive Cli Usage

anyscale/client/openapi_client/api/default_api.py

@@ -16013,6 +16013,120 @@ class DefaultApi(object):
             _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post(self, cloud_id, **kwargs):  # noqa: E501
+        """Get Lb Resource  # noqa: E501
+
+        Get lb resources for the cloud.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post(cloud_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str cloud_id: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: LbresourceResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        return self.get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post_with_http_info(cloud_id, **kwargs)  # noqa: E501
+
+    def get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post_with_http_info(self, cloud_id, **kwargs):  # noqa: E501
+        """Get Lb Resource  # noqa: E501
+
+        Get lb resources for the cloud.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post_with_http_info(cloud_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str cloud_id: (required)
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(LbresourceResponse, status_code(int), headers(HTTPHeaderDict))
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        local_var_params = locals()
+
+        all_params = [
+            'cloud_id'
+        ]
+        all_params.extend(
+            [
+                'async_req',
+                '_return_http_data_only',
+                '_preload_content',
+                '_request_timeout'
+            ]
+        )
+
+        for key, val in six.iteritems(local_var_params['kwargs']):
+            if key not in all_params:
+                raise ApiTypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post" % key
+                )
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+        # verify the required parameter 'cloud_id' is set
+        if self.api_client.client_side_validation and ('cloud_id' not in local_var_params or  # noqa: E501
+                                                        local_var_params['cloud_id'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `cloud_id` when calling `get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'cloud_id' in local_var_params:
+            path_params['cloud_id'] = local_var_params['cloud_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/clouds_with_cloud_resource_router/{cloud_id}/get_lb_resource', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='LbresourceResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_log_files_api_v2_logs_get_log_files_post(self, **kwargs):  # noqa: E501
         """Get Log Files  # noqa: E501
 
@@ -28219,6 +28333,181 @@ class DefaultApi(object):
             _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def query_api_v2_logs_query_get(self, logql_query, start, end, source_type, **kwargs):  # noqa: E501
+        """Query  # noqa: E501
+
+        Fetching logs using LogQL queries.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.query_api_v2_logs_query_get(logql_query, start, end, source_type, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str logql_query: LogQL query string to execute against the logs. This should be a valid Loki LogQL expression. (required)
+        :param float start: The start time for the query as a nanosecond Unix epoch. (required)
+        :param float end: The end time for the query as a nanosecond Unix epoch. (required)
+        :param str source_type: The type of logs to query. Must be one of \"application\" or \"system\". (required)
+        :param str cluster_id: The cluster id used to fetch logs. Exactly one of cluster_id, workspace_id, ha_job_id, or service_id must be set.
+        :param str workspace_id: The workspace id used to fetch logs. Exactly one of cluster_id, workspace_id, ha_job_id, or service_id must be set.
+        :param str ha_job_id: The production job id used to fetch logs. Exactly one of cluster_id, workspace_id, ha_job_id, or service_id must be set.
+        :param str service_id: The service id used to fetch logs. Exactly one of cluster_id, workspace_id, ha_job_id, or service_id must be set.
+        :param int page_size: Number of chunks to fetch. Defaults to 400. Max of 1000.
+        :param bool reverse_sort: Whether the result should be sorted by descending timestamp. Also determines the query direction. When false, it will start to query from the start and return results until it reaches the page_size or the end. When true, it will start to query from the end and return results until it reaches the page_size or the start. Default to false.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: LogitembatchResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        return self.query_api_v2_logs_query_get_with_http_info(logql_query, start, end, source_type, **kwargs)  # noqa: E501
+
+    def query_api_v2_logs_query_get_with_http_info(self, logql_query, start, end, source_type, **kwargs):  # noqa: E501
+        """Query  # noqa: E501
+
+        Fetching logs using LogQL queries.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.query_api_v2_logs_query_get_with_http_info(logql_query, start, end, source_type, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool: execute request asynchronously
+        :param str logql_query: LogQL query string to execute against the logs. This should be a valid Loki LogQL expression. (required)
+        :param float start: The start time for the query as a nanosecond Unix epoch. (required)
+        :param float end: The end time for the query as a nanosecond Unix epoch. (required)
+        :param str source_type: The type of logs to query. Must be one of \"application\" or \"system\". (required)
+        :param str cluster_id: The cluster id used to fetch logs. Exactly one of cluster_id, workspace_id, ha_job_id, or service_id must be set.
+        :param str workspace_id: The workspace id used to fetch logs. Exactly one of cluster_id, workspace_id, ha_job_id, or service_id must be set.
+        :param str ha_job_id: The production job id used to fetch logs. Exactly one of cluster_id, workspace_id, ha_job_id, or service_id must be set.
+        :param str service_id: The service id used to fetch logs. Exactly one of cluster_id, workspace_id, ha_job_id, or service_id must be set.
+        :param int page_size: Number of chunks to fetch. Defaults to 400. Max of 1000.
+        :param bool reverse_sort: Whether the result should be sorted by descending timestamp. Also determines the query direction. When false, it will start to query from the start and return results until it reaches the page_size or the end. When true, it will start to query from the end and return results until it reaches the page_size or the start. Default to false.
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(LogitembatchResponse, status_code(int), headers(HTTPHeaderDict))
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        local_var_params = locals()
+
+        all_params = [
+            'logql_query',
+            'start',
+            'end',
+            'source_type',
+            'cluster_id',
+            'workspace_id',
+            'ha_job_id',
+            'service_id',
+            'page_size',
+            'reverse_sort'
+        ]
+        all_params.extend(
+            [
+                'async_req',
+                '_return_http_data_only',
+                '_preload_content',
+                '_request_timeout'
+            ]
+        )
+
+        for key, val in six.iteritems(local_var_params['kwargs']):
+            if key not in all_params:
+                raise ApiTypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method query_api_v2_logs_query_get" % key
+                )
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+        # verify the required parameter 'logql_query' is set
+        if self.api_client.client_side_validation and ('logql_query' not in local_var_params or  # noqa: E501
+                                                        local_var_params['logql_query'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `logql_query` when calling `query_api_v2_logs_query_get`")  # noqa: E501
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in local_var_params or  # noqa: E501
+                                                        local_var_params['start'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `start` when calling `query_api_v2_logs_query_get`")  # noqa: E501
+        # verify the required parameter 'end' is set
+        if self.api_client.client_side_validation and ('end' not in local_var_params or  # noqa: E501
+                                                        local_var_params['end'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `end` when calling `query_api_v2_logs_query_get`")  # noqa: E501
+        # verify the required parameter 'source_type' is set
+        if self.api_client.client_side_validation and ('source_type' not in local_var_params or  # noqa: E501
+                                                        local_var_params['source_type'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `source_type` when calling `query_api_v2_logs_query_get`")  # noqa: E501
+
+        if self.api_client.client_side_validation and 'source_type' in local_var_params and not re.search(r'^(application|system)$', local_var_params['source_type']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `source_type` when calling `query_api_v2_logs_query_get`, must conform to the pattern `/^(application|system)$/`")  # noqa: E501
+        if self.api_client.client_side_validation and 'page_size' in local_var_params and local_var_params['page_size'] > 1000:  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `page_size` when calling `query_api_v2_logs_query_get`, must be a value less than or equal to `1000`")  # noqa: E501
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'logql_query' in local_var_params and local_var_params['logql_query'] is not None:  # noqa: E501
+            query_params.append(('logql_query', local_var_params['logql_query']))  # noqa: E501
+        if 'start' in local_var_params and local_var_params['start'] is not None:  # noqa: E501
+            query_params.append(('start', local_var_params['start']))  # noqa: E501
+        if 'end' in local_var_params and local_var_params['end'] is not None:  # noqa: E501
+            query_params.append(('end', local_var_params['end']))  # noqa: E501
+        if 'source_type' in local_var_params and local_var_params['source_type'] is not None:  # noqa: E501
+            query_params.append(('source_type', local_var_params['source_type']))  # noqa: E501
+        if 'cluster_id' in local_var_params and local_var_params['cluster_id'] is not None:  # noqa: E501
+            query_params.append(('cluster_id', local_var_params['cluster_id']))  # noqa: E501
+        if 'workspace_id' in local_var_params and local_var_params['workspace_id'] is not None:  # noqa: E501
+            query_params.append(('workspace_id', local_var_params['workspace_id']))  # noqa: E501
+        if 'ha_job_id' in local_var_params and local_var_params['ha_job_id'] is not None:  # noqa: E501
+            query_params.append(('ha_job_id', local_var_params['ha_job_id']))  # noqa: E501
+        if 'service_id' in local_var_params and local_var_params['service_id'] is not None:  # noqa: E501
+            query_params.append(('service_id', local_var_params['service_id']))  # noqa: E501
+        if 'page_size' in local_var_params and local_var_params['page_size'] is not None:  # noqa: E501
+            query_params.append(('page_size', local_var_params['page_size']))  # noqa: E501
+        if 'reverse_sort' in local_var_params and local_var_params['reverse_sort'] is not None:  # noqa: E501
+            query_params.append(('reverse_sort', local_var_params['reverse_sort']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/logs/query', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='LogitembatchResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def query_api_v2_metrics_query_get(self, promql_query, **kwargs):  # noqa: E501
         """Query  # noqa: E501
 

anyscale/commands/workspace_commands_v2.py

@@ -34,7 +34,7 @@ log = BlockLogger()  # CLI Logger
 
 # Constants for SSH configuration
 HTTPS_PORT = "443"
-SSH_TIMEOUT_SECONDS = 45
+SSH_TEST_TIMEOUT_SECONDS = 8
 WSS_PATH = "/sshws"
 PREFERRED_AUTH_METHOD = "PreferredAuthentications=publickey"
 
@@ -319,15 +319,10 @@ def _parse_user_args(user_args: List[str]) -> Tuple[List[str], List[str]]:
     return user_options, user_command
 
 
-def _try_https_connection(
-    workspace_obj: Workspace,
-    workspace_private_sdk,
-    host_name: str,
-    config_file: str,
-    ctx_args: List[str],
-    shell_command: str,
+def _test_https_connectivity(
+    workspace_obj: Workspace, workspace_private_sdk, host_name: str, config_file: str,
 ) -> bool:
-    """Attempt HTTPS SSH connection. Returns True if successful."""
+    """Test HTTPS SSH connectivity with a quick command. Returns True if available."""
     try:
         cluster = workspace_private_sdk.client.get_workspace_cluster(workspace_obj.id)
         if not cluster:
@@ -337,35 +332,62 @@ def _try_https_connection(
             workspace_obj, workspace_private_sdk, host_name, config_file
         )
 
-        ssh_cmd = _build_ssh_command(ssh_config, ctx_args, shell_command)
+        # Build a test command using the same logic as the actual connection
+        # but with a simple echo command that exits immediately
+        test_args = [
+            "-o",
+            "ConnectTimeout=5",
+            "-o",
+            "BatchMode=yes",
+            "echo",
+            "connectivity_test",
+        ]
+        test_cmd = _build_ssh_command(ssh_config, test_args, "")
 
-        # Try HTTPS connection with a timeout
+        # Run test with a timeout
         result = subprocess.run(
-            ssh_cmd,
+            test_cmd,
             check=False,
-            timeout=SSH_TIMEOUT_SECONDS,
-            stderr=subprocess.DEVNULL,
+            timeout=SSH_TEST_TIMEOUT_SECONDS,
+            capture_output=True,
+            text=True,
         )
 
-        return result.returncode == 0
+        # Check if we got the expected output
+        if result.returncode == 0 and "connectivity_test" in result.stdout:
+            return True
+
+        # Connection failed - no need to show error code to user
+        return False
 
     except subprocess.TimeoutExpired:
-        print(
-            "HTTPS connection timed out or failed (SSH proxy may not be available), "
-            "falling back to Legacy SSH connection..."
-        )
+        # Silent failure - the main code will show a user-friendly message
         return False
     except OSError:
-        print(
-            "HTTPS connection timed out or failed (SSH proxy may not be available), "
-            "falling back to Legacy SSH connection..."
-        )
+        # Silent failure
         return False
     except (click.ClickException, ValueError, AttributeError, KeyError, TypeError):
-        print("HTTPS setup failed, falling back to Legacy SSH connection...")
+        # Silent failure
         return False
 
 
+def _execute_https_ssh(
+    workspace_obj: Workspace,
+    workspace_private_sdk,
+    host_name: str,
+    config_file: str,
+    ctx_args: List[str],
+    shell_command: str,
+) -> None:
+    """Execute HTTPS SSH connection without timeout."""
+    ssh_config = _setup_https_connection(
+        workspace_obj, workspace_private_sdk, host_name, config_file
+    )
+    ssh_cmd = _build_ssh_command(ssh_config, ctx_args, shell_command)
+    # Run the actual SSH session without any timeout
+    subprocess.run(ssh_cmd, check=False)
+
+
 def _execute_legacy_ssh(
     ssh_target_host: str, config_file: str, ctx_args: List[str], shell_command: str,
 ) -> None:
@@ -857,21 +879,32 @@ id should be used, specifying both will result in an error.
                     )
 
                     if cluster:
-                        https_connection_successful = _try_https_connection(
+                        https_connection_successful = _test_https_connectivity(
                             workspace_obj,
                             workspace_private_sdk,
                             host_name,
                             config_file,
-                            ctx.args,
-                            shell_command,
                         )
 
                 except (ValueError, AttributeError, KeyError, TypeError):
                     # If we can't get workspace/cluster info, proceed with legacy SSH
                     pass
 
-            # Run legacy SSH command if HTTPS wasn't successful or --legacy was specified
-            if not https_connection_successful:
+            # Execute the appropriate SSH connection based on test results
+            if https_connection_successful:
+                # HTTPS connectivity test passed, run actual SSH session without timeout
+                _execute_https_ssh(
+                    workspace_obj,
+                    workspace_private_sdk,
+                    host_name,
+                    config_file,
+                    ctx.args,
+                    shell_command,
+                )
+            else:
+                # HTTPS test failed or --legacy was specified, use legacy SSH
+                if not legacy:  # Only show message if we tried HTTPS first
+                    print("Connecting via standard SSH...")
                 _execute_legacy_ssh(
                     ssh_target_host, config_file, ctx.args, shell_command
                 )

anyscale/controllers/cloud_controller.py

@@ -118,6 +118,7 @@ from anyscale.utils.cloud_utils import (
     modify_memorydb_parameter_group,
     validate_aws_credentials,
     verify_anyscale_access,
+    wait_for_aws_lb_resource_termination,
     wait_for_gcp_lb_resource_termination,
 )
 from anyscale.utils.imports.gcp import (
@@ -3525,6 +3526,15 @@ class CloudController(BaseController):
         # Clean up cloud resources
         try:
             if cloud_provider == CloudProviders.AWS:
+                if not (cloud.is_aioa or cloud.compute_stack == ComputeStack.K8S):
+                    # Delete services resources
+                    self.delete_aws_lb_cfn_stack(cloud=cloud)
+                    with self.log.spinner("Deleting load balancing resources..."):
+                        wait_for_aws_lb_resource_termination(
+                            api_client=self.api_client, cloud_id=cloud_id
+                        )
+                    self.delete_aws_tls_certificates(cloud=cloud)
+
                 self.delete_all_aws_resources(cloud)
             elif cloud_provider == CloudProviders.GCP:
                 with self.log.spinner("Deleting load balancing resources..."):
@@ -3585,10 +3595,6 @@ class CloudController(BaseController):
             # No resources to delete for hosted and k8s clouds
             return True
 
-        # Delete services resources
-        self.delete_aws_lb_cfn_stack(cloud=cloud)
-        self.delete_aws_tls_certificates(cloud=cloud)
-
         # Clean up cloud resources
         if cloud.is_bring_your_own_resource is False:  # managed cloud
             # Delete AWS cloud resources by deleting the cfn stack
@@ -3601,7 +3607,6 @@ class CloudController(BaseController):
         return True
 
     def delete_aws_lb_cfn_stack(self, cloud: CloudWithCloudResource) -> bool:
-
         tag_name = "anyscale-cloud-id"
         key_name = cloud.id
 

anyscale/utils/cloud_utils.py

@@ -137,6 +137,26 @@ def wait_for_gcp_lb_resource_termination(
         )
 
 
+def wait_for_aws_lb_resource_termination(
+    api_client: DefaultApi,
+    cloud_id: str,
+    timeout_s: int = 900,  # 15 minute timeout
+    poll_interval_s: int = 10,  # Poll every 10 seconds
+):
+    start = time.time()
+    while time.time() - start < timeout_s:
+        response = api_client.get_lb_resource_api_v2_clouds_with_cloud_resource_router_cloud_id_get_lb_resource_post(
+            cloud_id=cloud_id
+        ).result
+        if response.is_terminated:
+            break
+        time.sleep(poll_interval_s)
+    else:
+        raise ClickException(
+            f"LB resources and namespace termination timed out after {timeout_s} seconds."
+        )
+
+
 class CloudSetupError(str, Enum):
     ANYSCALE_ACCESS_DENIED = "ANYSCALE_ACCESS_DENIED"
     RESOURCE_NOT_FOUND = "RESOURCE_NOT_FOUND"

anyscale/version.py

@@ -1 +1 @@
-__version__ = "0.26.49"
+__version__ = "0.26.51"

{anyscale-0.26.49.dist-info → anyscale-0.26.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anyscale
-Version: 0.26.49
+Version: 0.26.51
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License

{anyscale-0.26.49.dist-info → anyscale-0.26.51.dist-info}/RECORD

@@ -28,7 +28,7 @@ anyscale/snapshot.py,sha256=UGJT5C1s_4xmQxjWODK5DFpGxHRBX5jOCdSCqXESH8E,1685
 anyscale/tables.py,sha256=TV4F2uLnwehvbkAfaP7iuLlT2wLIo6ORH2LVdRGXW5g,2840
 anyscale/telemetry.py,sha256=U90C2Vgx48z9PMTI6EbzHFbP3jWnDUutbIfMPBb8-SI,14711
 anyscale/util.py,sha256=0iSmKKsDFV0i2eRmVQ1W60Sgh2g-vPeBoBw3ra3m6eI,42782
-anyscale/version.py,sha256=vFxJ_KKIQ2jL69pJLX3oYkt-Bt_G2kmqY-WBfibLQa8,24
+anyscale/version.py,sha256=NqLTzru5GGXVWj7EBlduJ32JLhuH-lqYkV-B3wOrAH0,24
 anyscale/workspace_utils.py,sha256=OViE88CnIF5ruVxd3kazQ0Mf2BxqtMq6wx-XQ5A2cp8,1204
 anyscale/_private/anyscale_client/README.md,sha256=zKSxkDTTNjrty018PaCsV22LNYDk9AZ7j0JKxOLAxvE,3732
 anyscale/_private/anyscale_client/__init__.py,sha256=807Blx3RHQeS8BmKZcsOQQ4dYoKlCnpm6Bdsif2CrHg,337
@@ -106,7 +106,7 @@ anyscale/background/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 anyscale/background/job_runner.py,sha256=LTuv9JOahyv6C9i7DLQAONgQF6--FfYZEmJrKy-sUG8,2687
 anyscale/client/.gitignore,sha256=JZyvYEtT2DCSK9V5Joi6lQofhMik4PXiJRCWsg7SvqI,807
 anyscale/client/.openapi-generator-ignore,sha256=pu2PTide7pJtJ-DFLzDy0cTYQJRlrB-8RRH3zGLeUds,1040
-anyscale/client/README.md,sha256=st5IPaeuNGo81hxvz3o6bvjESLHlmrG0jayEy5gwbsc,115609
+anyscale/client/README.md,sha256=2mNo7LqoRCNdI7onaHVN4PHGW6xG6e7y2YpxMMV4NSE,116056
 anyscale/client/git_push.sh,sha256=EDCZOTTiLxbtPHmiU63qC99rGH67B7dhdPZdNUKivF0,1827
 anyscale/client/requirements.txt,sha256=dkVKYUStC5h_g_87SH7pRdhXCj7ySozAJMGAFEzGgFc,126
 anyscale/client/setup.cfg,sha256=l7bdKSIedeBhhoDtupsBwx1xPrlBf2yYeTH7a8kMga4,28
@@ -120,7 +120,7 @@ anyscale/client/openapi_client/configuration.py,sha256=Dd5XrlHwv-wxnf0C35PG_-HBQ
 anyscale/client/openapi_client/exceptions.py,sha256=3egwsXQG2j_vARbqgBxUO1xSltAhpfiHTYVP7VXTvU0,3792
 anyscale/client/openapi_client/rest.py,sha256=Ehj37v7GHW6SXV067Hze5HE42ayKaGi6a6ZlkR7u3Lg,12501
 anyscale/client/openapi_client/api/__init__.py,sha256=i8u7BI2xX1GrXTL3hN0pKpYIlnT-D_uDxH2ElOfYG1I,141
-anyscale/client/openapi_client/api/default_api.py,sha256=m2om4Ebc8EtVZJjZDO4BODx36JW042Ez1eevH-YoZi8,1864065
+anyscale/client/openapi_client/api/default_api.py,sha256=EGL7wCSGy8bh17Knxpzruk-TkRUCpQrsfqL6Clkdd_0,1881652
 anyscale/client/openapi_client/models/__init__.py,sha256=vPm7p-GuqxDksMCS-9oaTub5QDrx9-Wg16MYzOeTyiU,51580
 anyscale/client/openapi_client/models/access_config.py,sha256=b2mA0qtuTA5PFbp6C61Jc_T2zUMaojM1v32IhZo0MfY,3648
 anyscale/client/openapi_client/models/actor_status.py,sha256=6xyX_aIqURj2raBdY9DmBxsdDACFrqqYvElGiM6YG2E,2813
@@ -781,7 +781,7 @@ anyscale/commands/session_commands_hidden.py,sha256=APEypnUB1yV2Rr6wdSFWy1vQbAnn
 anyscale/commands/user_commands.py,sha256=C-i1dGpdhboywN_2XgPS2BekKx2y6LZq8c8gvS0S-tY,1259
 anyscale/commands/util.py,sha256=N8gkVv9LBr5QypBGm2e_Pw2F2e_tiiR4YNLmn8CtsK0,5124
 anyscale/commands/workspace_commands.py,sha256=RjK8rPlIPoReZBb7RPB6z9aFp7gSmnsxDge8d3uj9t8,15768
-anyscale/commands/workspace_commands_v2.py,sha256=D6YmcjD7Db7KK6adaGxiyiIdlCzMa4Y1v_xVT_cWmmI,43582
+anyscale/commands/workspace_commands_v2.py,sha256=vu8r2bNIFq88b594rGU82yW4o2rd_uCJnRO4lbSSHbI,44789
 anyscale/commands/anyscale_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anyscale/commands/anyscale_api/api_commands.py,sha256=Dze2wuzeZurlbxOu4YHZqln026yXgtWi_jxccyKANmw,473
 anyscale/commands/anyscale_api/session_operations_commands.py,sha256=LiavgWn2-F7b3GZD0ng_Q1HiEP4o32e8nO9yU92AgxI,803
@@ -797,7 +797,7 @@ anyscale/connect_utils/start_interactive_session.py,sha256=DbuIK2wuWofmbwJ9MLbsb
 anyscale/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anyscale/controllers/auth_controller.py,sha256=hDY2sPvUP8pvh8PnlDYH5rCHjQes2v3b_KBVjMbrzeE,5127
 anyscale/controllers/base_controller.py,sha256=1QFJoScFUV7YTzpKarhwPOc1SvI-xqX3TZmwxKonW6I,1998
-anyscale/controllers/cloud_controller.py,sha256=PWJzECBxeVnjDuP5G9ak5n06wjBiVrhzxeIjPS-M5w8,201250
+anyscale/controllers/cloud_controller.py,sha256=f7QX0YX_F_FJGy6ggN1ougFtKDK4CPX0eAgaGfd2Uuk,201655
 anyscale/controllers/cloud_file_storage_utils.py,sha256=ifaqClEybTgxhqGWHYoH1vrlbxwjRuO-De_3666R2O4,6987
 anyscale/controllers/cloud_functional_verification_controller.py,sha256=YsEfdHT9hPtxy_3a5Q62UlRXW0iFJ1lVS4IZ_NHoemE,33399
 anyscale/controllers/cluster_controller.py,sha256=Sb5wVjrjpycg5iqmENAVtZ4iy9Kr6kM97_ck-KH85LM,28745
@@ -1058,7 +1058,7 @@ anyscale/user/_private/user_sdk.py,sha256=scw1PN5VXBgjS6sgrFBGEIjc1LSV6Dy6v8Irzd
 anyscale/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anyscale/utils/cli_version_check_util.py,sha256=U2KU-NRf09pcs-ZZYUm1GQxs7Btp6N4Fv6CQeNoEeTM,2223
 anyscale/utils/cloud_update_utils.py,sha256=c53AQyg4OJBkNqTD-8hHvEpdTwtins1rTycifBbQbWI,34106
-anyscale/utils/cloud_utils.py,sha256=ww4to0gL7mq1ALuJfpJ6GZvE4Vxn2qTkH834YO7ARoQ,11569
+anyscale/utils/cloud_utils.py,sha256=DtUkaIvKeX64Scia62fjnK61_gNMJr_H2e73C-ywF7k,12228
 anyscale/utils/cluster_debug.py,sha256=P_-20L4Rt4LVAIGX-y9F61z5XYO5QbNtqf2MYJxuy_g,6391
 anyscale/utils/connect_helpers.py,sha256=hlTKnaL27pABWPoW5nA5dpJW2ZG_2k7dXjnqtdzoBjo,5956
 anyscale/utils/deprecation_util.py,sha256=2i1SNQIziOZXO24IuBZZUEi4ild1bqk0gfZWl2KgpXw,1160
@@ -1091,10 +1091,10 @@ anyscale/workspace/__init__.py,sha256=Innbm5ZhCyADEVBiYSo_vbpKwUNcMzVSAfxIGKOYe6
 anyscale/workspace/commands.py,sha256=b1sqNseoPj-1VXznqQOLe0V_a663bOTvJX-TaOMJa1Y,14590
 anyscale/workspace/models.py,sha256=N2vHfoKzqvx1kVvbMVMcn0tKAiRab52rp0aQACS0RvQ,10044
 anyscale/workspace/_private/workspace_sdk.py,sha256=2CMeYfJt0UtIFCocDn1ukw1iI5esKHdopLe6duEs-qE,27599
-anyscale-0.26.49.dist-info/licenses/LICENSE,sha256=UOPu974Wzsna6frFv1mu4VrZgNdZT7lbcNPzo5ue3qs,3494
-anyscale-0.26.49.dist-info/licenses/NOTICE,sha256=gHqDhSnUYlRXX-mDOL5FtE7774oiKyV_HO80qM3r9Xo,196
-anyscale-0.26.49.dist-info/METADATA,sha256=-DylcpFnALTEcq32zlMmahWkqBiA9OqWAiTisuUzawY,3231
-anyscale-0.26.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-anyscale-0.26.49.dist-info/entry_points.txt,sha256=NqO18sCZn6zG6J0S38itjcN00s7aE3C3v3k5lMAfCLk,51
-anyscale-0.26.49.dist-info/top_level.txt,sha256=g3NVNS8Oh0NZwbFFgeX696C5MZZkS5dqV2NqcsbDRJE,9
-anyscale-0.26.49.dist-info/RECORD,,
+anyscale-0.26.51.dist-info/licenses/LICENSE,sha256=UOPu974Wzsna6frFv1mu4VrZgNdZT7lbcNPzo5ue3qs,3494
+anyscale-0.26.51.dist-info/licenses/NOTICE,sha256=gHqDhSnUYlRXX-mDOL5FtE7774oiKyV_HO80qM3r9Xo,196
+anyscale-0.26.51.dist-info/METADATA,sha256=mANw_WHTludTuJwuxivjerG7TMJPhKUz8__CEhRKpWI,3231
+anyscale-0.26.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+anyscale-0.26.51.dist-info/entry_points.txt,sha256=NqO18sCZn6zG6J0S38itjcN00s7aE3C3v3k5lMAfCLk,51
+anyscale-0.26.51.dist-info/top_level.txt,sha256=g3NVNS8Oh0NZwbFFgeX696C5MZZkS5dqV2NqcsbDRJE,9
+anyscale-0.26.51.dist-info/RECORD,,