skypilot-nightly 1.0.0.dev20250603__py3-none-any.whl → 1.0.0.dev20250605__py3-none-any.whl

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 = 'c571c1f931047cf26b3522d34b0fe1cc06749f3b'
+_SKYPILOT_COMMIT_SHA = '5042bb8db4809907ebb3271f1abdb96ab3ffffb1'
 
 
 def _get_git_commit():
@@ -35,7 +35,7 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev20250603'
+__version__ = '1.0.0.dev20250605'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -86,6 +86,7 @@ from sky import clouds
 from sky.admin_policy import AdminPolicy
 from sky.admin_policy import MutatedUserRequest
 from sky.admin_policy import UserRequest
+from sky.catalog import list_accelerators
 from sky.client.sdk import api_cancel
 from sky.client.sdk import api_info
 from sky.client.sdk import api_server_logs
@@ -110,7 +111,6 @@ from sky.client.sdk import storage_delete
 from sky.client.sdk import storage_ls
 from sky.client.sdk import stream_and_get
 from sky.client.sdk import tail_logs
-from sky.clouds.service_catalog import list_accelerators
 from sky.dag import Dag
 from sky.data import Storage
 from sky.data import StorageMode

sky/adaptors/kubernetes.py

@@ -1,6 +1,7 @@
 """Kubernetes adaptors"""
 import logging
 import os
+import platform
 from typing import Any, Callable, Optional, Set
 
 from sky import sky_logging
@@ -19,6 +20,13 @@ urllib3 = common.LazyImport('urllib3',
 # Timeout to use for API calls
 API_TIMEOUT = 5
 
+# Check if KUBECONFIG is set, and use it if it is.
+DEFAULT_KUBECONFIG_PATH = '~/.kube/config'
+# From kubernetes package, keep a copy here to avoid actually importing
+# kubernetes package when parsing the KUBECONFIG env var to do credential
+# file mounts.
+ENV_KUBECONFIG_PATH_SEPARATOR = ';' if platform.system() == 'Windows' else ':'
+
 DEFAULT_IN_CLUSTER_REGION = 'in-cluster'
 # The name for the environment variable that stores the in-cluster context name
 # for Kubernetes clusters. This is used to associate a name with the current

sky/admin_policy.py

@@ -21,6 +21,11 @@ class RequestOptions:
         dryrun: Is the request a dryrun?
     """
     cluster_name: Optional[str]
+    # Keep these two fields for backward compatibility. The values are copied
+    # from task.resources.autostop_config, so that legacy admin policy plugins
+    # can still read the correct autostop config from request options before
+    # we drop the compatibility.
+    # TODO(aylei): remove these fields after 0.12.0
     idle_minutes_to_autostop: Optional[int]
     down: bool
     dryrun: bool

sky/backends/backend_utils.py

@@ -2836,6 +2836,7 @@ def get_task_resources_str(task: 'task_lib.Task',
         if is_managed_job:
             if task.best_resources.use_spot:
                 spot_str = '[Spot]'
+            assert task.best_resources.cpus is not None
             task_cpu_demand = task.best_resources.cpus
         if accelerator_dict is None:
             resources_str = f'CPU:{task_cpu_demand}'

sky/backends/cloud_vm_ray_backend.py

@@ -24,6 +24,7 @@ import filelock
 
 import sky
 from sky import backends
+from sky import catalog
 from sky import check as sky_check
 from sky import cloud_stores
 from sky import clouds
@@ -39,7 +40,6 @@ 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
 from sky.data import storage as storage_lib
@@ -699,6 +699,10 @@ class RayCodeGen:
                 # 139 is the return code of SIGSEGV, i.e. Segmentation Fault.
                 if any(r == 139 for r in returncodes):
                     reason = '(likely due to Segmentation Fault)'
+                if any(r == 137 for r in returncodes):
+                    # Find the first non-137 return code
+                    non_137 = next(r for r in returncodes if r != 137)
+                    reason = f'(A Worker failed with return code {{non_137}}, SkyPilot cleaned up the processes on other nodes with return code 137)'
                 print('ERROR: {colorama.Fore.RED}Job {self.job_id} failed with '
                       'return code list:{colorama.Style.RESET_ALL}',
                       returncodes,
@@ -803,7 +807,7 @@ class FailoverCloudErrorHandlerV1:
         # Sometimes, SCPError will list available regions.
         for e in errors:
             if e.find('Regions with capacity available:') != -1:
-                for r in service_catalog.regions('scp'):
+                for r in catalog.regions('scp'):
                     if e.find(r.name) == -1:
                         _add_to_blocked_resources(
                             blocked_resources,
@@ -1088,7 +1092,7 @@ class FailoverCloudErrorHandlerV2:
         output = str(error)
         # Sometimes, lambda cloud error will list available regions.
         if output.find('Regions with capacity available:') != -1:
-            for r in service_catalog.regions('lambda'):
+            for r in catalog.regions('lambda'):
                 if output.find(r.name) == -1:
                     _add_to_blocked_resources(
                         blocked_resources,
@@ -2696,7 +2700,7 @@ class CloudVmRayBackend(backends.Backend['CloudVmRayResourceHandle']):
     NAME = 'cloudvmray'
 
     # Backward compatibility, with the old name of the handle.
-    ResourceHandle = CloudVmRayResourceHandle  # pylint: disable=invalid-name
+    ResourceHandle = CloudVmRayResourceHandle  # type: ignore
 
     def __init__(self):
         self.run_timestamp = sky_logging.get_run_timestamp()

sky/{clouds/service_catalog → catalog}/__init__.py

@@ -4,26 +4,21 @@ import importlib
 import typing
 from typing import Dict, List, Optional, Set, Tuple, Union
 
-from sky.clouds.service_catalog.config import fallback_to_default_catalog
-from sky.clouds.service_catalog.constants import ALL_CLOUDS
-from sky.clouds.service_catalog.constants import CATALOG_DIR
-from sky.clouds.service_catalog.constants import CATALOG_SCHEMA_VERSION
-from sky.clouds.service_catalog.constants import HOSTED_CATALOG_DIR_URL
-from sky.clouds.service_catalog.constants import (
-    HOSTED_CATALOG_DIR_URL_S3_MIRROR)
+from sky.catalog.config import fallback_to_default_catalog
+from sky.skylet import constants
 from sky.utils import resources_utils
 from sky.utils import subprocess_utils
 
 if typing.TYPE_CHECKING:
+    from sky.catalog import common
     from sky.clouds import cloud
-    from sky.clouds.service_catalog import common
 
 CloudFilter = Optional[Union[List[str], str]]
 
 
 def _map_clouds_catalog(clouds: CloudFilter, method_name: str, *args, **kwargs):
     if clouds is None:
-        clouds = list(ALL_CLOUDS)
+        clouds = list(constants.ALL_CLOUDS)
 
         # TODO(hemil): Remove this once the common service catalog
         # functions are refactored from clouds/kubernetes.py to
@@ -37,10 +32,10 @@ def _map_clouds_catalog(clouds: CloudFilter, method_name: str, *args, **kwargs):
     def _execute_catalog_method(cloud: str):
         try:
             cloud_module = importlib.import_module(
-                f'sky.clouds.service_catalog.{cloud.lower()}_catalog')
+                f'sky.catalog.{cloud.lower()}_catalog')
         except ModuleNotFoundError:
             raise ValueError(
-                'Cannot find module "sky.clouds.service_catalog'
+                'Cannot find module "sky.catalog'
                 f'.{cloud}_catalog" for cloud "{cloud}".') from None
         try:
             method = getattr(cloud_module, method_name)
@@ -382,10 +377,4 @@ __all__ = [
     'is_image_tag_valid',
     # Configuration
     'fallback_to_default_catalog',
-    # Constants
-    'ALL_CLOUDS',
-    'HOSTED_CATALOG_DIR_URL',
-    'HOSTED_CATALOG_DIR_URL_S3_MIRROR',
-    'CATALOG_SCHEMA_VERSION',
-    'CATALOG_DIR',
 ]

sky/{clouds/service_catalog → catalog}/aws_catalog.py

@@ -13,10 +13,10 @@ from typing import Dict, List, Optional, Tuple, Union
 from sky import exceptions
 from sky import sky_logging
 from sky.adaptors import common as adaptors_common
+from sky.catalog import common
+from sky.catalog import config
+from sky.catalog.data_fetchers import fetch_aws
 from sky.clouds import aws
-from sky.clouds.service_catalog import common
-from sky.clouds.service_catalog import config
-from sky.clouds.service_catalog.data_fetchers import fetch_aws
 from sky.utils import common_utils
 from sky.utils import resources_utils
 from sky.utils import rich_utils

sky/{clouds/service_catalog → catalog}/azure_catalog.py

@@ -8,8 +8,8 @@ from typing import Dict, List, Optional, Tuple, Union
 
 from sky import clouds as cloud_lib
 from sky import sky_logging
+from sky.catalog import common
 from sky.clouds import Azure
-from sky.clouds.service_catalog import common
 from sky.utils import resources_utils
 from sky.utils import ux_utils
 
@@ -17,7 +17,7 @@ logger = sky_logging.init_logger(__name__)
 
 # This list should match the list of regions in
 # skypilot image generation Packer script's replication_regions
-# sky/clouds/service_catalog/images/skypilot-azure-cpu-ubuntu.pkr.hcl
+# sky/clouds/catalog/images/skypilot-azure-cpu-ubuntu.pkr.hcl
 COMMUNITY_IMAGE_AVAILABLE_REGIONS = {
     'centralus',
     'eastus',

sky/{clouds/service_catalog → catalog}/common.py

@@ -12,7 +12,7 @@ import filelock
 from sky import sky_logging
 from sky.adaptors import common as adaptors_common
 from sky.clouds import cloud as cloud_lib
-from sky.clouds.service_catalog import constants
+from sky.skylet import constants
 from sky.utils import common_utils
 from sky.utils import registry
 from sky.utils import rich_utils
@@ -344,7 +344,7 @@ def get_hourly_cost_impl(
 ) -> float:
     """Returns the hourly price of a VM instance in the given region and zone.
 
-    Refer to get_hourly_cost in service_catalog/__init__.py for the docstring.
+    Refer to get_hourly_cost in catalog/__init__.py for the docstring.
     """
     df = _get_instance_type(df, instance_type, region, zone)
     if df.empty:

sky/{clouds/service_catalog → catalog}/cudo_catalog.py

@@ -3,7 +3,7 @@
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 import sky.provision.cudo.cudo_machine_type as cudo_mt
 from sky.utils import ux_utils
 

sky/{clouds/service_catalog → catalog}/data_fetchers/analyze.py

@@ -3,7 +3,7 @@ import typing
 from typing import List
 
 from sky.adaptors import common as adaptors_common
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 
 if typing.TYPE_CHECKING:
     import pandas as pd

sky/{clouds/service_catalog → catalog}/data_fetchers/fetch_aws.py

@@ -546,7 +546,7 @@ if __name__ == '__main__':
     print('AWS Service Catalog saved to aws/vms.csv')
 
     # Disable refreshing images.csv as we are using skypilot custom AMIs
-    # See sky/clouds/service_catalog/images/README.md for more details.
+    # See sky/clouds/catalog/images/README.md for more details.
     # image_df = get_all_regions_images_df(user_regions)
     # _check_regions_integrity(image_df, 'images')
 

sky/{clouds/service_catalog → catalog}/data_fetchers/fetch_vsphere.py

@@ -6,7 +6,7 @@ import typing
 
 from sky.adaptors import common as adaptors_common
 from sky.adaptors import vsphere as vsphere_adaptor
-from sky.clouds.service_catalog.common import get_catalog_path
+from sky.catalog.common import get_catalog_path
 from sky.provision.vsphere.common.cls_api_client import ClsApiClient
 
 if typing.TYPE_CHECKING:

sky/{clouds/service_catalog → catalog}/do_catalog.py

@@ -7,7 +7,7 @@ query instance types and pricing information for digital ocean.
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:

sky/{clouds/service_catalog → catalog}/fluidstack_catalog.py

@@ -6,7 +6,7 @@ instance types and pricing information for FluidStack.
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:

sky/{clouds/service_catalog → catalog}/gcp_catalog.py

@@ -9,8 +9,8 @@ from typing import Dict, List, Optional, Tuple
 from sky import exceptions
 from sky import sky_logging
 from sky.adaptors import common as adaptors_common
+from sky.catalog import common
 from sky.clouds import GCP
-from sky.clouds.service_catalog import common
 from sky.utils import resources_utils
 from sky.utils import ux_utils
 
@@ -125,7 +125,7 @@ GCP_ACC_INSTANCE_TYPES = list(_INSTANCE_TYPE_TO_ACC.keys())
 
 # Number of CPU cores per GPU based on the AWS setting.
 # GCP A100 has its own instance type mapping.
-# Refer to sky/clouds/service_catalog/gcp_catalog.py
+# Refer to sky/clouds/catalog/gcp_catalog.py
 _NUM_ACC_TO_NUM_CPU = {
     # Based on p2 on AWS.
     'K80': {

sky/{clouds/service_catalog → catalog}/ibm_catalog.py

@@ -8,8 +8,8 @@ from typing import Dict, List, Optional, Tuple, Union
 
 from sky import sky_logging
 from sky.adaptors import ibm
+from sky.catalog import common
 from sky.clouds import cloud
-from sky.clouds.service_catalog import common
 from sky.utils import resources_utils
 
 logger = sky_logging.init_logger(__name__)

sky/{clouds/service_catalog → catalog}/kubernetes_catalog.py

@@ -12,9 +12,9 @@ from sky import clouds as sky_clouds
 from sky import sky_logging
 from sky.adaptors import common as adaptors_common
 from sky.adaptors import kubernetes
+from sky.catalog import CloudFilter
+from sky.catalog import common
 from sky.clouds import cloud
-from sky.clouds.service_catalog import CloudFilter
-from sky.clouds.service_catalog import common
 from sky.provision.kubernetes import utils as kubernetes_utils
 
 logger = sky_logging.init_logger(__name__)

sky/{clouds/service_catalog → catalog}/lambda_catalog.py

@@ -6,7 +6,7 @@ instance types and pricing information for Lambda.
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 from sky.utils import resources_utils
 from sky.utils import ux_utils
 

sky/{clouds/service_catalog → catalog}/nebius_catalog.py

@@ -6,7 +6,7 @@ instance types and pricing information for Nebius.
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 from sky.utils import resources_utils
 from sky.utils import ux_utils
 

sky/{clouds/service_catalog → catalog}/oci_catalog.py

@@ -17,8 +17,8 @@ import typing
 from typing import Dict, List, Optional, Tuple, Union
 
 from sky.adaptors import oci as oci_adaptor
+from sky.catalog import common
 from sky.clouds import OCI
-from sky.clouds.service_catalog import common
 from sky.clouds.utils import oci_utils
 from sky.utils import resources_utils
 

sky/{clouds/service_catalog → catalog}/paperspace_catalog.py

@@ -7,7 +7,7 @@ query instance types and pricing information for Paperspace.
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:

sky/{clouds/service_catalog → catalog}/runpod_catalog.py

@@ -7,7 +7,7 @@ query instance types and pricing information for RunPod.
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 
 if typing.TYPE_CHECKING:
     from sky.clouds import cloud

sky/{clouds/service_catalog → catalog}/scp_catalog.py

@@ -7,7 +7,7 @@ instance types and pricing information for SCP.
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 from sky.utils import resources_utils
 from sky.utils import ux_utils
 

sky/{clouds/service_catalog → catalog}/ssh_catalog.py

@@ -7,10 +7,10 @@ import typing
 from typing import Dict, List, Optional, Tuple
 
 from sky import sky_logging
+from sky.catalog import CloudFilter
+from sky.catalog import common
+from sky.catalog import kubernetes_catalog
 from sky.clouds import ssh
-from sky.clouds.service_catalog import CloudFilter
-from sky.clouds.service_catalog import common
-from sky.clouds.service_catalog import kubernetes_catalog
 
 logger = sky_logging.init_logger(__name__)
 

sky/{clouds/service_catalog → catalog}/vast_catalog.py

@@ -7,7 +7,7 @@ query instance types and pricing information for Vast.ai.
 import typing
 from typing import Dict, List, Optional, Tuple, Union
 
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:

sky/{clouds/service_catalog → catalog}/vsphere_catalog.py

@@ -5,7 +5,7 @@ import typing
 from typing import Dict, List, Optional, Tuple, Union
 
 from sky.adaptors import common as adaptors_common
-from sky.clouds.service_catalog import common
+from sky.catalog import common
 
 if typing.TYPE_CHECKING:
     import pandas as pd

sky/cli.py

@@ -26,6 +26,7 @@ each other.
 import collections
 import copy
 import datetime
+import fnmatch
 import functools
 import getpass
 import os
@@ -49,6 +50,7 @@ import yaml
 
 import sky
 from sky import backends
+from sky import catalog
 from sky import clouds
 from sky import exceptions
 from sky import global_user_state
@@ -61,7 +63,6 @@ from sky.adaptors import common as adaptors_common
 from sky.benchmark import benchmark_state
 from sky.benchmark import benchmark_utils
 from sky.client import sdk
-from sky.clouds import service_catalog
 from sky.data import storage_utils
 from sky.provision.kubernetes import constants as kubernetes_constants
 from sky.provision.kubernetes import utils as kubernetes_utils
@@ -208,14 +209,14 @@ def _get_cluster_records_and_set_ssh_config(
     return cluster_records
 
 
-def _get_glob_storages(storages: List[str]) -> List[str]:
-    """Returns a list of storages that match the glob pattern."""
+def _get_glob_matches(candidate_names: List[str],
+                      glob_patterns: List[str]) -> List[str]:
+    """Returns a list of names that match the glob pattern."""
     glob_storages = []
-    for storage_object in storages:
-        # TODO(zhwu): client side should not rely on global_user_state.
-        glob_storage = global_user_state.get_glob_storage_name(storage_object)
+    for glob_pattern in glob_patterns:
+        glob_storage = fnmatch.filter(candidate_names, glob_pattern)
         if not glob_storage:
-            click.echo(f'Storage {storage_object} not found.')
+            click.echo(f'Storage {glob_pattern} not found.')
         glob_storages.extend(glob_storage)
     return list(set(glob_storages))
 
@@ -3455,7 +3456,7 @@ def check(infra_list: Tuple[str],
     default=False,
     help='Show pricing and instance details for a specified accelerator across '
     'all regions and clouds.')
-@service_catalog.fallback_to_default_catalog
+@catalog.fallback_to_default_catalog
 @usage_lib.entrypoint
 def show_gpus(
         accelerator_str: Optional[str],
@@ -3835,7 +3836,7 @@ def show_gpus(
         clouds_to_list: Union[Optional[str], List[str]] = cloud_name
         if cloud_name is None:
             clouds_to_list = [
-                c for c in service_catalog.ALL_CLOUDS
+                c for c in constants.ALL_CLOUDS
                 if c != 'kubernetes' and c != 'ssh'
             ]
 
@@ -3881,13 +3882,13 @@ def show_gpus(
                        f'Cloud GPUs{colorama.Style.RESET_ALL}\n')
 
             # "Common" GPUs
-            for gpu in service_catalog.get_common_gpus():
+            for gpu in catalog.get_common_gpus():
                 if gpu in result:
                     gpu_table.add_row([gpu, _list_to_str(result.pop(gpu))])
             yield from gpu_table.get_string()
 
             # Google TPUs
-            for tpu in service_catalog.get_tpus():
+            for tpu in catalog.get_tpus():
                 if tpu in result:
                     tpu_table.add_row([tpu, _list_to_str(result.pop(tpu))])
             if tpu_table.get_string():
@@ -3958,7 +3959,7 @@ def show_gpus(
                                   all_regions=all_regions))
         # Import here to save module load speed.
         # pylint: disable=import-outside-toplevel,line-too-long
-        from sky.clouds.service_catalog import common as catalog_common
+        from sky.catalog import common as catalog_common
 
         # For each gpu name (count not included):
         #   - Group by cloud
@@ -4134,7 +4135,9 @@ def storage_delete(names: List[str], all: bool, yes: bool, async_call: bool):  #
             return
         names = [storage['name'] for storage in storages]
     else:
-        names = _get_glob_storages(names)
+        storages = sdk.get(sdk.storage_ls())
+        existing_storage_names = [storage['name'] for storage in storages]
+        names = _get_glob_matches(existing_storage_names, names)
     if names:
         if not yes:
             storage_names = ', '.join(names)

sky/client/cli.py

@@ -26,6 +26,7 @@ each other.
 import collections
 import copy
 import datetime
+import fnmatch
 import functools
 import getpass
 import os
@@ -49,6 +50,7 @@ import yaml
 
 import sky
 from sky import backends
+from sky import catalog
 from sky import clouds
 from sky import exceptions
 from sky import global_user_state
@@ -61,7 +63,6 @@ from sky.adaptors import common as adaptors_common
 from sky.benchmark import benchmark_state
 from sky.benchmark import benchmark_utils
 from sky.client import sdk
-from sky.clouds import service_catalog
 from sky.data import storage_utils
 from sky.provision.kubernetes import constants as kubernetes_constants
 from sky.provision.kubernetes import utils as kubernetes_utils
@@ -208,14 +209,14 @@ def _get_cluster_records_and_set_ssh_config(
     return cluster_records
 
 
-def _get_glob_storages(storages: List[str]) -> List[str]:
-    """Returns a list of storages that match the glob pattern."""
+def _get_glob_matches(candidate_names: List[str],
+                      glob_patterns: List[str]) -> List[str]:
+    """Returns a list of names that match the glob pattern."""
     glob_storages = []
-    for storage_object in storages:
-        # TODO(zhwu): client side should not rely on global_user_state.
-        glob_storage = global_user_state.get_glob_storage_name(storage_object)
+    for glob_pattern in glob_patterns:
+        glob_storage = fnmatch.filter(candidate_names, glob_pattern)
         if not glob_storage:
-            click.echo(f'Storage {storage_object} not found.')
+            click.echo(f'Storage {glob_pattern} not found.')
         glob_storages.extend(glob_storage)
     return list(set(glob_storages))
 
@@ -3455,7 +3456,7 @@ def check(infra_list: Tuple[str],
     default=False,
     help='Show pricing and instance details for a specified accelerator across '
     'all regions and clouds.')
-@service_catalog.fallback_to_default_catalog
+@catalog.fallback_to_default_catalog
 @usage_lib.entrypoint
 def show_gpus(
         accelerator_str: Optional[str],
@@ -3835,7 +3836,7 @@ def show_gpus(
         clouds_to_list: Union[Optional[str], List[str]] = cloud_name
         if cloud_name is None:
             clouds_to_list = [
-                c for c in service_catalog.ALL_CLOUDS
+                c for c in constants.ALL_CLOUDS
                 if c != 'kubernetes' and c != 'ssh'
             ]
 
@@ -3881,13 +3882,13 @@ def show_gpus(
                        f'Cloud GPUs{colorama.Style.RESET_ALL}\n')
 
             # "Common" GPUs
-            for gpu in service_catalog.get_common_gpus():
+            for gpu in catalog.get_common_gpus():
                 if gpu in result:
                     gpu_table.add_row([gpu, _list_to_str(result.pop(gpu))])
             yield from gpu_table.get_string()
 
             # Google TPUs
-            for tpu in service_catalog.get_tpus():
+            for tpu in catalog.get_tpus():
                 if tpu in result:
                     tpu_table.add_row([tpu, _list_to_str(result.pop(tpu))])
             if tpu_table.get_string():
@@ -3958,7 +3959,7 @@ def show_gpus(
                                   all_regions=all_regions))
         # Import here to save module load speed.
         # pylint: disable=import-outside-toplevel,line-too-long
-        from sky.clouds.service_catalog import common as catalog_common
+        from sky.catalog import common as catalog_common
 
         # For each gpu name (count not included):
         #   - Group by cloud
@@ -4134,7 +4135,9 @@ def storage_delete(names: List[str], all: bool, yes: bool, async_call: bool):  #
             return
         names = [storage['name'] for storage in storages]
     else:
-        names = _get_glob_storages(names)
+        storages = sdk.get(sdk.storage_ls())
+        existing_storage_names = [storage['name'] for storage in storages]
+        names = _get_glob_matches(existing_storage_names, names)
     if names:
         if not yes:
             storage_names = ', '.join(names)