skypilot-nightly 1.0.0.dev20250319__tar.gz → 1.0.0.dev20250321__tar.gz

{skypilot_nightly-1.0.0.dev20250319/skypilot_nightly.egg-info → skypilot_nightly-1.0.0.dev20250321}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: skypilot-nightly
-Version: 1.0.0.dev20250319
+Version: 1.0.0.dev20250321
 Summary: SkyPilot: An intercloud broker for the clouds
 Author: SkyPilot Team
 License: Apache 2.0
@@ -108,6 +108,11 @@ Provides-Extra: vsphere
 Requires-Dist: pyvmomi==8.0.1.0.2; extra == "vsphere"
 Provides-Extra: nebius
 Requires-Dist: nebius>=0.2.0; extra == "nebius"
+Requires-Dist: urllib3<2; extra == "nebius"
+Requires-Dist: awscli>=1.27.10; extra == "nebius"
+Requires-Dist: botocore>=1.29.10; extra == "nebius"
+Requires-Dist: boto3>=1.26.1; extra == "nebius"
+Requires-Dist: colorama<0.4.5; extra == "nebius"
 Provides-Extra: all
 Requires-Dist: urllib3<2; extra == "all"
 Requires-Dist: awscli>=1.27.10; extra == "all"
@@ -151,11 +156,17 @@ Requires-Dist: azure-common; extra == "all"
 Requires-Dist: vastai-sdk>=0.1.12; extra == "all"
 Requires-Dist: pyvmomi==8.0.1.0.2; extra == "all"
 Requires-Dist: nebius>=0.2.0; extra == "all"
+Requires-Dist: urllib3<2; extra == "all"
+Requires-Dist: awscli>=1.27.10; extra == "all"
+Requires-Dist: botocore>=1.29.10; extra == "all"
+Requires-Dist: boto3>=1.26.1; extra == "all"
+Requires-Dist: colorama<0.4.5; extra == "all"
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: provides-extra
 Dynamic: requires-dist

{skypilot_nightly-1.0.0.dev20250319 → skypilot_nightly-1.0.0.dev20250321}/sky/__init__.py

@@ -5,7 +5,7 @@ from typing import Optional
 import urllib.request
 
 # Replaced with the current commit when building the wheels.
-_SKYPILOT_COMMIT_SHA = '246e69ba16705c31b69143bfe76efcee17b6407f'
+_SKYPILOT_COMMIT_SHA = 'a7f92951b96fdca825348d8291d01bd88f6f9dfe'
 
 
 def _get_git_commit():
@@ -35,7 +35,7 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev20250319'
+__version__ = '1.0.0.dev20250321'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))
 
 

{skypilot_nightly-1.0.0.dev20250319 → skypilot_nightly-1.0.0.dev20250321}/sky/adaptors/cloudflare.py

@@ -6,7 +6,9 @@ import os
 import threading
 from typing import Dict, Optional, Tuple
 
+from sky import exceptions
 from sky.adaptors import common
+from sky.clouds import cloud
 from sky.utils import annotations
 from sky.utils import ux_utils
 
@@ -130,8 +132,8 @@ def client(service_name: str, region):
 @common.load_lazy_modules(_LAZY_MODULES)
 def botocore_exceptions():
     """AWS botocore exception."""
-    from botocore import exceptions
-    return exceptions
+    from botocore import exceptions as boto_exceptions
+    return boto_exceptions
 
 
 def create_endpoint():
@@ -148,7 +150,21 @@ def create_endpoint():
     return endpoint
 
 
-def check_credentials() -> Tuple[bool, Optional[str]]:
+def check_credentials(
+        cloud_capability: cloud.CloudCapability) -> Tuple[bool, Optional[str]]:
+    if cloud_capability == cloud.CloudCapability.COMPUTE:
+        # for backward compatibility,
+        # we check storage credentials for compute.
+        # TODO(seungjin): properly return not supported error for compute.
+        return check_storage_credentials()
+    elif cloud_capability == cloud.CloudCapability.STORAGE:
+        return check_storage_credentials()
+    else:
+        raise exceptions.NotSupportedError(
+            f'{NAME} does not support {cloud_capability}.')
+
+
+def check_storage_credentials() -> Tuple[bool, Optional[str]]:
     """Checks if the user has access credentials to Cloudflare R2.
 
     Returns:

{skypilot_nightly-1.0.0.dev20250319 → skypilot_nightly-1.0.0.dev20250321}/sky/adaptors/kubernetes.py

@@ -79,10 +79,11 @@ def _load_config(context: Optional[str] = None):
                     '    If you were running a local Kubernetes '
                     'cluster, run `sky local up` to start the cluster.')
             else:
+                kubeconfig_path = os.environ.get('KUBECONFIG', '~/.kube/config')
                 err_str = (
                     f'Failed to load Kubernetes configuration for {context!r}. '
                     'Please check if your kubeconfig file exists at '
-                    f'~/.kube/config and is valid.\n{suffix}')
+                    f'{kubeconfig_path} and is valid.\n{suffix}')
             err_str += '\nTo disable Kubernetes for SkyPilot: run `sky check`.'
             with ux_utils.print_exception_no_traceback():
                 raise ValueError(err_str) from None

skypilot_nightly-1.0.0.dev20250321/sky/adaptors/nebius.py

@@ -0,0 +1,232 @@
+"""Nebius cloud adaptor."""
+import os
+import threading
+from typing import Optional
+
+from sky.adaptors import common
+from sky.utils import annotations
+from sky.utils import ux_utils
+
+NEBIUS_TENANT_ID_FILENAME = 'NEBIUS_TENANT_ID.txt'
+NEBIUS_IAM_TOKEN_FILENAME = 'NEBIUS_IAM_TOKEN.txt'
+NEBIUS_PROJECT_ID_FILENAME = 'NEBIUS_PROJECT_ID.txt'
+NEBIUS_CREDENTIALS_FILENAME = 'credentials.json'
+NEBIUS_TENANT_ID_PATH = '~/.nebius/' + NEBIUS_TENANT_ID_FILENAME
+NEBIUS_IAM_TOKEN_PATH = '~/.nebius/' + NEBIUS_IAM_TOKEN_FILENAME
+NEBIUS_PROJECT_ID_PATH = '~/.nebius/' + NEBIUS_PROJECT_ID_FILENAME
+NEBIUS_CREDENTIALS_PATH = '~/.nebius/' + NEBIUS_CREDENTIALS_FILENAME
+
+DEFAULT_REGION = 'eu-north1'
+
+NEBIUS_PROFILE_NAME = 'nebius'
+
+MAX_RETRIES_TO_DISK_CREATE = 120
+MAX_RETRIES_TO_INSTANCE_STOP = 120
+MAX_RETRIES_TO_INSTANCE_START = 120
+MAX_RETRIES_TO_INSTANCE_READY = 240
+
+MAX_RETRIES_TO_DISK_DELETE = 120
+MAX_RETRIES_TO_INSTANCE_WAIT = 120  # Maximum number of retries
+
+POLL_INTERVAL = 5
+
+_iam_token = None
+_sdk = None
+_tenant_id = None
+_project_id = None
+
+_IMPORT_ERROR_MESSAGE = ('Failed to import dependencies for Nebius AI Cloud.'
+                         'Try pip install "skypilot[nebius]"')
+
+nebius = common.LazyImport(
+    'nebius',
+    import_error_message=_IMPORT_ERROR_MESSAGE,
+    # https://github.com/grpc/grpc/issues/37642 to avoid spam in console
+    set_loggers=lambda: os.environ.update({'GRPC_VERBOSITY': 'NONE'}))
+boto3 = common.LazyImport('boto3', import_error_message=_IMPORT_ERROR_MESSAGE)
+botocore = common.LazyImport('botocore',
+                             import_error_message=_IMPORT_ERROR_MESSAGE)
+
+_LAZY_MODULES = (boto3, botocore, nebius)
+_session_creation_lock = threading.RLock()
+_INDENT_PREFIX = '    '
+NAME = 'Nebius'
+SKY_CHECK_NAME = 'Nebius (for Nebius Object Storae)'
+
+
+def request_error():
+    return nebius.aio.service_error.RequestError
+
+
+def compute():
+    # pylint: disable=import-outside-toplevel
+    from nebius.api.nebius.compute import v1 as compute_v1
+    return compute_v1
+
+
+def iam():
+    # pylint: disable=import-outside-toplevel
+    from nebius.api.nebius.iam import v1 as iam_v1
+    return iam_v1
+
+
+def nebius_common():
+    # pylint: disable=import-outside-toplevel
+    from nebius.api.nebius.common import v1 as common_v1
+    return common_v1
+
+
+def vpc():
+    # pylint: disable=import-outside-toplevel
+    from nebius.api.nebius.vpc import v1 as vpc_v1
+    return vpc_v1
+
+
+def get_iam_token():
+    global _iam_token
+    if _iam_token is None:
+        try:
+            with open(os.path.expanduser(NEBIUS_IAM_TOKEN_PATH),
+                      encoding='utf-8') as file:
+                _iam_token = file.read().strip()
+        except FileNotFoundError:
+            return None
+    return _iam_token
+
+
+def is_token_or_cred_file_exist():
+    return (os.path.exists(os.path.expanduser(NEBIUS_IAM_TOKEN_PATH)) or
+            os.path.exists(os.path.expanduser(NEBIUS_CREDENTIALS_PATH)))
+
+
+def get_project_id():
+    global _project_id
+    if _project_id is None:
+        try:
+            with open(os.path.expanduser(NEBIUS_PROJECT_ID_PATH),
+                      encoding='utf-8') as file:
+                _project_id = file.read().strip()
+        except FileNotFoundError:
+            return None
+    return _project_id
+
+
+def get_tenant_id():
+    global _tenant_id
+    if _tenant_id is None:
+        try:
+            with open(os.path.expanduser(NEBIUS_TENANT_ID_PATH),
+                      encoding='utf-8') as file:
+                _tenant_id = file.read().strip()
+        except FileNotFoundError:
+            return None
+    return _tenant_id
+
+
+def sdk():
+    global _sdk
+    if _sdk is None:
+        if get_iam_token() is not None:
+            _sdk = nebius.sdk.SDK(credentials=get_iam_token())
+            return _sdk
+        _sdk = nebius.sdk.SDK(
+            credentials_file_name=os.path.expanduser(NEBIUS_CREDENTIALS_PATH))
+    return _sdk
+
+
+def get_nebius_credentials(boto3_session):
+    """Gets the Nebius credentials from the boto3 session object.
+
+    Args:
+        boto3_session: The boto3 session object.
+    Returns:
+        botocore.credentials.ReadOnlyCredentials object with the R2 credentials.
+    """
+    nebius_credentials = boto3_session.get_credentials()
+    if nebius_credentials is None:
+        with ux_utils.print_exception_no_traceback():
+            raise ValueError('Nebius credentials not found. Run '
+                             '`sky check` to verify credentials are '
+                             'correctly set up.')
+    return nebius_credentials.get_frozen_credentials()
+
+
+# lru_cache() is thread-safe and it will return the same session object
+# for different threads.
+# Reference: https://docs.python.org/3/library/functools.html#functools.lru_cache # pylint: disable=line-too-long
+@annotations.lru_cache(scope='global')
+def session():
+    """Create an AWS session."""
+    # Creating the session object is not thread-safe for boto3,
+    # so we add a reentrant lock to synchronize the session creation.
+    # Reference: https://github.com/boto/boto3/issues/1592
+    # However, the session object itself is thread-safe, so we are
+    # able to use lru_cache() to cache the session object.
+    with _session_creation_lock:
+        session_ = boto3.session.Session(profile_name=NEBIUS_PROFILE_NAME)
+    return session_
+
+
+@annotations.lru_cache(scope='global')
+def resource(resource_name: str, region: str = DEFAULT_REGION, **kwargs):
+    """Create a Nebius resource.
+
+    Args:
+        resource_name: Nebius resource name (e.g., 's3').
+        kwargs: Other options.
+    """
+    # Need to use the resource retrieved from the per-thread session
+    # to avoid thread-safety issues (Directly creating the client
+    # with boto3.resource() is not thread-safe).
+    # Reference: https://stackoverflow.com/a/59635814
+
+    session_ = session()
+    nebius_credentials = get_nebius_credentials(session_)
+    endpoint = create_endpoint(region)
+
+    return session_.resource(
+        resource_name,
+        endpoint_url=endpoint,
+        aws_access_key_id=nebius_credentials.access_key,
+        aws_secret_access_key=nebius_credentials.secret_key,
+        region_name=region,
+        **kwargs)
+
+
+@annotations.lru_cache(scope='global')
+def client(service_name: str, region):
+    """Create an Nebius client of a certain service.
+
+    Args:
+        service_name: Nebius service name (e.g., 's3').
+        kwargs: Other options.
+    """
+    # Need to use the client retrieved from the per-thread session
+    # to avoid thread-safety issues (Directly creating the client
+    # with boto3.client() is not thread-safe).
+    # Reference: https://stackoverflow.com/a/59635814
+
+    session_ = session()
+    nebius_credentials = get_nebius_credentials(session_)
+    endpoint = create_endpoint(region)
+
+    return session_.client(service_name,
+                           endpoint_url=endpoint,
+                           aws_access_key_id=nebius_credentials.access_key,
+                           aws_secret_access_key=nebius_credentials.secret_key,
+                           region_name=region)
+
+
+@common.load_lazy_modules(_LAZY_MODULES)
+def botocore_exceptions():
+    """AWS botocore exception."""
+    # pylint: disable=import-outside-toplevel
+    from botocore import exceptions
+    return exceptions
+
+
+def create_endpoint(region: Optional[str] = DEFAULT_REGION) -> str:
+    """Reads accountid necessary to interact with Nebius Object Storage"""
+    if region is None:
+        region = DEFAULT_REGION
+    return f'https://storage.{region}.nebius.cloud:443'

{skypilot_nightly-1.0.0.dev20250319 → skypilot_nightly-1.0.0.dev20250321}/sky/backends/cloud_vm_ray_backend.py

@@ -38,6 +38,7 @@ from sky import sky_logging
 from sky import task as task_lib
 from sky.backends import backend_utils
 from sky.backends import wheel_utils
+from sky.clouds import cloud as sky_cloud
 from sky.clouds import service_catalog
 from sky.clouds.utils import gcp_utils
 from sky.data import data_utils
@@ -1981,7 +1982,8 @@ class RetryingVmProvisioner(object):
         # is running. Here we check the enabled clouds and expiring credentials
         # and raise a warning to the user.
         if task.is_controller_task():
-            enabled_clouds = sky_check.get_cached_enabled_clouds_or_refresh()
+            enabled_clouds = sky_check.get_cached_enabled_clouds_or_refresh(
+                sky_cloud.CloudCapability.COMPUTE)
             expirable_clouds = backend_utils.get_expirable_clouds(
                 enabled_clouds)
 

{skypilot_nightly-1.0.0.dev20250319 → skypilot_nightly-1.0.0.dev20250321}/sky/benchmark/benchmark_utils.py

@@ -172,8 +172,9 @@ def _create_benchmark_bucket() -> Tuple[str, str]:
     bucket_name = f'sky-bench-{uuid.uuid4().hex[:4]}-{getpass.getuser()}'
 
     # Select the bucket type.
-    enabled_clouds = storage_lib.get_cached_enabled_storage_clouds_or_refresh(
-        raise_if_no_cloud_access=True)
+    enabled_clouds = (
+        storage_lib.get_cached_enabled_storage_cloud_names_or_refresh(
+            raise_if_no_cloud_access=True))
     # Sky Benchmark only supports S3 (see _download_remote_dir and
     # _delete_remote_dir).
     enabled_clouds = [

{skypilot_nightly-1.0.0.dev20250319 → skypilot_nightly-1.0.0.dev20250321}/sky/check.py

@@ -2,7 +2,7 @@
 import os
 import traceback
 from types import ModuleType
-from typing import Dict, Iterable, List, Optional, Tuple, Union
+from typing import Dict, Iterable, List, Optional, Set, Tuple, Union
 
 import click
 import colorama
@@ -12,6 +12,7 @@ from sky import exceptions
 from sky import global_user_state
 from sky import skypilot_config
 from sky.adaptors import cloudflare
+from sky.clouds import cloud as sky_cloud
 from sky.utils import registry
 from sky.utils import rich_utils
 from sky.utils import ux_utils
@@ -20,44 +21,52 @@ CHECK_MARK_EMOJI = '\U00002714'  # Heavy check mark unicode
 PARTY_POPPER_EMOJI = '\U0001F389'  # Party popper unicode
 
 
-def check(
+def check_capabilities(
     quiet: bool = False,
     verbose: bool = False,
     clouds: Optional[Iterable[str]] = None,
-) -> List[str]:
+    capabilities: Optional[List[sky_cloud.CloudCapability]] = None,
+) -> Dict[str, List[sky_cloud.CloudCapability]]:
     echo = (lambda *_args, **_kwargs: None
            ) if quiet else lambda *args, **kwargs: click.echo(
                *args, **kwargs, color=True)
     echo('Checking credentials to enable clouds for SkyPilot.')
-    enabled_clouds = []
-    disabled_clouds = []
+    if capabilities is None:
+        capabilities = sky_cloud.ALL_CAPABILITIES
+    assert capabilities is not None
+    enabled_clouds: Dict[str, List[sky_cloud.CloudCapability]] = {}
+    disabled_clouds: Dict[str, List[sky_cloud.CloudCapability]] = {}
 
     def check_one_cloud(
             cloud_tuple: Tuple[str, Union[sky_clouds.Cloud,
                                           ModuleType]]) -> None:
         cloud_repr, cloud = cloud_tuple
-        with rich_utils.safe_status(f'Checking {cloud_repr}...'):
-            try:
-                ok, reason = cloud.check_credentials()
-            except Exception:  # pylint: disable=broad-except
-                # Catch all exceptions to prevent a single cloud from blocking
-                # the check for other clouds.
-                ok, reason = False, traceback.format_exc()
-        status_msg = 'enabled' if ok else 'disabled'
-        styles = {'fg': 'green', 'bold': False} if ok else {'dim': True}
-        echo('  ' + click.style(f'{cloud_repr}: {status_msg}', **styles) +
-             ' ' * 30)
-        if ok:
-            enabled_clouds.append(cloud_repr)
-            if verbose and cloud is not cloudflare:
-                activated_account = cloud.get_active_user_identity_str()
-                if activated_account is not None:
-                    echo(f'    Activated account: {activated_account}')
-            if reason is not None:
-                echo(f'    Hint: {reason}')
-        else:
-            disabled_clouds.append(cloud_repr)
-            echo(f'    Reason: {reason}')
+        assert capabilities is not None
+        for capability in capabilities:
+            with rich_utils.safe_status(f'Checking {cloud_repr}...'):
+                try:
+                    ok, reason = cloud.check_credentials(capability)
+                except exceptions.NotSupportedError:
+                    continue
+                except Exception:  # pylint: disable=broad-except
+                    # Catch all exceptions to prevent a single cloud
+                    # from blocking the check for other clouds.
+                    ok, reason = False, traceback.format_exc()
+            status_msg = ('enabled' if ok else 'disabled')
+            styles = {'fg': 'green', 'bold': False} if ok else {'dim': True}
+            echo('  ' + click.style(f'{cloud_repr}: {status_msg}', **styles) +
+                 ' ' * 30)
+            if ok:
+                enabled_clouds.setdefault(cloud_repr, []).append(capability)
+                if verbose and cloud is not cloudflare:
+                    activated_account = cloud.get_active_user_identity_str()
+                    if activated_account is not None:
+                        echo(f'    Activated account: {activated_account}')
+                if reason is not None:
+                    echo(f'    Hint: {reason}')
+            else:
+                disabled_clouds.setdefault(cloud_repr, []).append(capability)
+                echo(f'    Reason: {reason}')
 
     def get_cloud_tuple(
             cloud_name: str) -> Tuple[str, Union[sky_clouds.Cloud, ModuleType]]:
@@ -99,33 +108,39 @@ def check(
     for cloud_tuple in sorted(clouds_to_check):
         check_one_cloud(cloud_tuple)
 
-    # Cloudflare is not a real cloud in registry.CLOUD_REGISTRY, and should
-    # not be inserted into the DB (otherwise `sky launch` and other code would
-    # error out when it's trying to look it up in the registry).
-    enabled_clouds_set = {
-        cloud for cloud in enabled_clouds if not cloud.startswith('Cloudflare')
-    }
-    disabled_clouds_set = {
-        cloud for cloud in disabled_clouds if not cloud.startswith('Cloudflare')
-    }
-    config_allowed_clouds_set = {
-        cloud for cloud in config_allowed_cloud_names
-        if not cloud.startswith('Cloudflare')
-    }
-    previously_enabled_clouds_set = {
-        repr(cloud) for cloud in global_user_state.get_cached_enabled_clouds()
-    }
-
     # Determine the set of enabled clouds: (previously enabled clouds + newly
     # enabled clouds - newly disabled clouds) intersected with
     # config_allowed_clouds, if specified in config.yaml.
     # This means that if a cloud is already enabled and is not included in
     # allowed_clouds in config.yaml, it will be disabled.
-    all_enabled_clouds = (config_allowed_clouds_set & (
-        (previously_enabled_clouds_set | enabled_clouds_set) -
-        disabled_clouds_set))
-    global_user_state.set_enabled_clouds(list(all_enabled_clouds))
-
+    all_enabled_clouds: Set[str] = set()
+    for capability in capabilities:
+        # Cloudflare is not a real cloud in registry.CLOUD_REGISTRY, and should
+        # not be inserted into the DB (otherwise `sky launch` and other code
+        # would error out when it's trying to look it up in the registry).
+        enabled_clouds_set = {
+            cloud for cloud, capabilities in enabled_clouds.items()
+            if capability in capabilities and not cloud.startswith('Cloudflare')
+        }
+        disabled_clouds_set = {
+            cloud for cloud, capabilities in disabled_clouds.items()
+            if capability in capabilities and not cloud.startswith('Cloudflare')
+        }
+        config_allowed_clouds_set = {
+            cloud for cloud in config_allowed_cloud_names
+            if not cloud.startswith('Cloudflare')
+        }
+        previously_enabled_clouds_set = {
+            repr(cloud)
+            for cloud in global_user_state.get_cached_enabled_clouds(capability)
+        }
+        enabled_clouds_for_capability = (config_allowed_clouds_set & (
+            (previously_enabled_clouds_set | enabled_clouds_set) -
+            disabled_clouds_set))
+        global_user_state.set_enabled_clouds(
+            list(enabled_clouds_for_capability), capability)
+        all_enabled_clouds = all_enabled_clouds.union(
+            enabled_clouds_for_capability)
     disallowed_clouds_hint = None
     if disallowed_cloud_names:
         disallowed_clouds_hint = (
@@ -160,8 +175,7 @@ def check(
         # Pretty print for UX.
         if not quiet:
             enabled_clouds_str = '\n  ' + '\n  '.join([
-                _format_enabled_cloud(cloud)
-                for cloud in sorted(all_enabled_clouds)
+                _format_enabled_cloud(cloud) for cloud in sorted(enabled_clouds)
             ])
             echo(f'\n{colorama.Fore.GREEN}{PARTY_POPPER_EMOJI} '
                  f'Enabled clouds {PARTY_POPPER_EMOJI}'
@@ -169,7 +183,25 @@ def check(
     return enabled_clouds
 
 
+# 'sky check' command and associated '/check' server endpoint
+# only checks compute capability for backward compatibility.
+# This necessitates setting default capability to CloudCapability.COMPUTE.
+def check(
+    quiet: bool = False,
+    verbose: bool = False,
+    clouds: Optional[Iterable[str]] = None,
+    capability: sky_cloud.CloudCapability = sky_cloud.CloudCapability.COMPUTE,
+) -> List[str]:
+    clouds_with_capability = []
+    enabled_clouds = check_capabilities(quiet, verbose, clouds, [capability])
+    for cloud, capabilities in enabled_clouds.items():
+        if capability in capabilities:
+            clouds_with_capability.append(cloud)
+    return clouds_with_capability
+
+
 def get_cached_enabled_clouds_or_refresh(
+        capability: sky_cloud.CloudCapability,
         raise_if_no_cloud_access: bool = False) -> List[sky_clouds.Cloud]:
     """Returns cached enabled clouds and if no cloud is enabled, refresh.
 
@@ -183,16 +215,18 @@ def get_cached_enabled_clouds_or_refresh(
         exceptions.NoCloudAccessError: if no public cloud is enabled and
             raise_if_no_cloud_access is set to True.
     """
-    cached_enabled_clouds = global_user_state.get_cached_enabled_clouds()
+    cached_enabled_clouds = global_user_state.get_cached_enabled_clouds(
+        capability)
     if not cached_enabled_clouds:
         try:
-            check(quiet=True)
+            check(quiet=True, capability=capability)
         except SystemExit:
             # If no cloud is enabled, check() will raise SystemExit.
             # Here we catch it and raise the exception later only if
             # raise_if_no_cloud_access is set to True.
             pass
-        cached_enabled_clouds = global_user_state.get_cached_enabled_clouds()
+        cached_enabled_clouds = global_user_state.get_cached_enabled_clouds(
+            capability)
     if raise_if_no_cloud_access and not cached_enabled_clouds:
         with ux_utils.print_exception_no_traceback():
             raise exceptions.NoCloudAccessError(
@@ -226,7 +260,7 @@ def get_cloud_credential_file_mounts(
     # Currently, get_cached_enabled_clouds_or_refresh() does not support r2 as
     # only clouds with computing instances are marked as enabled by skypilot.
     # This will be removed when cloudflare/r2 is added as a 'cloud'.
-    r2_is_enabled, _ = cloudflare.check_credentials()
+    r2_is_enabled, _ = cloudflare.check_storage_credentials()
     if r2_is_enabled:
         r2_credential_mounts = cloudflare.get_credential_file_mounts()
         file_mounts.update(r2_credential_mounts)