skypilot-nightly 1.0.0.dev20250216__py3-none-any.whl → 1.0.0.dev20250218__py3-none-any.whl

sky/cloud_stores.py

@@ -54,7 +54,8 @@ class S3CloudStorage(CloudStorage):
 
     # List of commands to install AWS CLI
     _GET_AWSCLI = [
-        'aws --version >/dev/null 2>&1 || pip3 install awscli',
+        'aws --version >/dev/null 2>&1 || '
+        f'{constants.SKY_UV_PIP_CMD} install awscli',
     ]
 
     def is_directory(self, url: str) -> bool:
@@ -84,7 +85,8 @@ class S3CloudStorage(CloudStorage):
         # AWS Sync by default uses 10 threads to upload files to the bucket.
         # To increase parallelism, modify max_concurrent_requests in your
         # aws config file (Default path: ~/.aws/config).
-        download_via_awscli = ('aws s3 sync --no-follow-symlinks '
+        download_via_awscli = (f'{constants.SKY_REMOTE_PYTHON_ENV}/bin/aws s3 '
+                               'sync --no-follow-symlinks '
                                f'{source} {destination}')
 
         all_commands = list(self._GET_AWSCLI)
@@ -93,7 +95,8 @@ class S3CloudStorage(CloudStorage):
 
     def make_sync_file_command(self, source: str, destination: str) -> str:
         """Downloads a file using AWS CLI."""
-        download_via_awscli = f'aws s3 cp {source} {destination}'
+        download_via_awscli = (f'{constants.SKY_REMOTE_PYTHON_ENV}/bin/aws s3 '
+                               f'cp {source} {destination}')
 
         all_commands = list(self._GET_AWSCLI)
         all_commands.append(download_via_awscli)
@@ -354,7 +357,8 @@ class R2CloudStorage(CloudStorage):
 
     # List of commands to install AWS CLI
     _GET_AWSCLI = [
-        'aws --version >/dev/null 2>&1 || pip3 install awscli',
+        'aws --version >/dev/null 2>&1 || '
+        f'{constants.SKY_UV_PIP_CMD} install awscli',
     ]
 
     def is_directory(self, url: str) -> bool:
@@ -389,7 +393,8 @@ class R2CloudStorage(CloudStorage):
             source = source.replace('r2://', 's3://')
         download_via_awscli = ('AWS_SHARED_CREDENTIALS_FILE='
                                f'{cloudflare.R2_CREDENTIALS_PATH} '
-                               'aws s3 sync --no-follow-symlinks '
+                               f'{constants.SKY_REMOTE_PYTHON_ENV}/bin/aws s3 '
+                               'sync --no-follow-symlinks '
                                f'{source} {destination} '
                                f'--endpoint {endpoint_url} '
                                f'--profile={cloudflare.R2_PROFILE_NAME}')
@@ -405,7 +410,8 @@ class R2CloudStorage(CloudStorage):
             source = source.replace('r2://', 's3://')
         download_via_awscli = ('AWS_SHARED_CREDENTIALS_FILE='
                                f'{cloudflare.R2_CREDENTIALS_PATH} '
-                               f'aws s3 cp {source} {destination} '
+                               f'{constants.SKY_REMOTE_PYTHON_ENV}/bin/aws s3 '
+                               f'cp {source} {destination} '
                                f'--endpoint {endpoint_url} '
                                f'--profile={cloudflare.R2_PROFILE_NAME}')
 

sky/clouds/__init__.py

@@ -8,7 +8,6 @@ from sky.clouds.cloud import ProvisionerVersion
 from sky.clouds.cloud import Region
 from sky.clouds.cloud import StatusVersion
 from sky.clouds.cloud import Zone
-from sky.clouds.cloud_registry import CLOUD_REGISTRY
 
 # NOTE: import the above first to avoid circular imports.
 # isort: split
@@ -47,7 +46,6 @@ __all__ = [
     'CloudImplementationFeatures',
     'Region',
     'Zone',
-    'CLOUD_REGISTRY',
     'ProvisionerVersion',
     'StatusVersion',
     'Fluidstack',

sky/clouds/aws.py

@@ -1,7 +1,6 @@
 """Amazon Web Services."""
 import enum
 import fnmatch
-import functools
 import hashlib
 import json
 import os
@@ -21,7 +20,9 @@ from sky.clouds import service_catalog
 from sky.clouds.service_catalog import common as catalog_common
 from sky.clouds.utils import aws_utils
 from sky.skylet import constants
+from sky.utils import annotations
 from sky.utils import common_utils
+from sky.utils import registry
 from sky.utils import resources_utils
 from sky.utils import rich_utils
 from sky.utils import subprocess_utils
@@ -30,7 +31,7 @@ from sky.utils import ux_utils
 if typing.TYPE_CHECKING:
     # renaming to avoid shadowing variables
     from sky import resources as resources_lib
-    from sky import status_lib
+    from sky.utils import status_lib
 
 logger = sky_logging.init_logger(__name__)
 
@@ -126,7 +127,7 @@ class AWSIdentityType(enum.Enum):
         return self in expirable_types
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class AWS(clouds.Cloud):
     """Amazon Web Services."""
 
@@ -558,7 +559,8 @@ class AWS(clouds.Cloud):
                                                  fuzzy_candidate_list, None)
 
     @classmethod
-    @functools.lru_cache(maxsize=1)  # Cache since getting identity is slow.
+    @annotations.lru_cache(scope='global',
+                           maxsize=1)  # Cache since getting identity is slow.
     def check_credentials(cls) -> Tuple[bool, Optional[str]]:
         """Checks if the user has access credentials to this cloud."""
 
@@ -696,7 +698,7 @@ class AWS(clouds.Cloud):
         return AWSIdentityType.SHARED_CREDENTIALS_FILE
 
     @classmethod
-    @functools.lru_cache(maxsize=1)
+    @annotations.lru_cache(scope='global', maxsize=1)
     def _aws_configure_list(cls) -> Optional[bytes]:
         proc = subprocess.run('aws configure list',
                               shell=True,
@@ -708,7 +710,8 @@ class AWS(clouds.Cloud):
         return proc.stdout
 
     @classmethod
-    @functools.lru_cache(maxsize=1)  # Cache since getting identity is slow.
+    @annotations.lru_cache(scope='global',
+                           maxsize=1)  # Cache since getting identity is slow.
     def _sts_get_caller_identity(cls) -> Optional[List[List[str]]]:
         try:
             sts = aws.client('sts', check_credentials=False)
@@ -789,7 +792,8 @@ class AWS(clouds.Cloud):
         return [user_ids]
 
     @classmethod
-    @functools.lru_cache(maxsize=1)  # Cache since getting identity is slow.
+    @annotations.lru_cache(scope='global',
+                           maxsize=1)  # Cache since getting identity is slow.
     def get_user_identities(cls) -> Optional[List[List[str]]]:
         """Returns a [UserId, Account] list that uniquely identifies the user.
 
@@ -893,11 +897,11 @@ class AWS(clouds.Cloud):
             if os.path.exists(os.path.expanduser(f'~/.aws/{filename}'))
         }
 
-    @functools.lru_cache(maxsize=1)
+    @annotations.lru_cache(scope='global', maxsize=1)
     def can_credential_expire(self) -> bool:
         identity_type = self._current_identity_type()
-        return identity_type is not None and identity_type.can_credential_expire(
-        )
+        return (identity_type is not None and
+                identity_type.can_credential_expire())
 
     def instance_type_exists(self, instance_type):
         return service_catalog.instance_type_exists(instance_type, clouds='aws')
@@ -945,7 +949,8 @@ class AWS(clouds.Cloud):
         Returns:
             False if the quota is found to be zero, and True otherwise.
         Raises:
-            ImportError: if the dependencies for AWS are not able to be installed.
+            ImportError: if the dependencies for AWS are not able to be
+                installed.
             botocore.exceptions.ClientError: error in Boto3 client request.
         """
 
@@ -959,7 +964,8 @@ class AWS(clouds.Cloud):
         quota_code = aws_catalog.get_quota_code(instance_type, use_spot)
 
         if quota_code is None:
-            # Quota code not found in the catalog for the chosen instance_type, try provisioning anyway
+            # Quota code not found in the catalog for the chosen instance_type,
+            # try provisioning anyway.
             return True
 
         if aws_utils.use_reservations():
@@ -973,7 +979,8 @@ class AWS(clouds.Cloud):
             response = client.get_service_quota(ServiceCode='ec2',
                                                 QuotaCode=quota_code)
         except aws.botocore_exceptions().ClientError:
-            # Botocore client connection not established, try provisioning anyways
+            # Botocore client connection not established, try provisioning
+            # anyways
             return True
 
         if response['Quota']['Value'] == 0:

sky/clouds/azure.py

@@ -1,5 +1,4 @@
 """Azure."""
-import functools
 import os
 import re
 import subprocess
@@ -17,7 +16,9 @@ from sky import skypilot_config
 from sky.adaptors import azure
 from sky.clouds import service_catalog
 from sky.clouds.utils import azure_utils
+from sky.utils import annotations
 from sky.utils import common_utils
+from sky.utils import registry
 from sky.utils import resources_utils
 from sky.utils import ux_utils
 
@@ -60,7 +61,7 @@ def _run_output(cmd):
     return proc.stdout.decode('ascii')
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class Azure(clouds.Cloud):
     """Azure."""
 
@@ -574,7 +575,8 @@ class Azure(clouds.Cloud):
                                                     clouds='azure')
 
     @classmethod
-    @functools.lru_cache(maxsize=1)  # Cache since getting identity is slow.
+    @annotations.lru_cache(scope='global',
+                           maxsize=1)  # Cache since getting identity is slow.
     def get_user_identities(cls) -> Optional[List[List[str]]]:
         """Returns the cloud user identity."""
         # This returns the user's email address + [subscription_id].

sky/clouds/cloud.py

@@ -23,7 +23,7 @@ from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:
     from sky import resources as resources_lib
-    from sky import status_lib
+    from sky.utils import status_lib
 
 
 class CloudImplementationFeatures(enum.Enum):

sky/clouds/cudo.py

@@ -6,6 +6,7 @@ from typing import Dict, Iterator, List, Optional, Tuple, Union
 from sky import clouds
 from sky.clouds import service_catalog
 from sky.utils import common_utils
+from sky.utils import registry
 from sky.utils import resources_utils
 
 if typing.TYPE_CHECKING:
@@ -27,7 +28,7 @@ def _run_output(cmd):
     return proc.stdout.decode('ascii')
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class Cudo(clouds.Cloud):
     """Cudo Compute"""
     _REPR = 'Cudo'

sky/clouds/do.py

@@ -8,6 +8,7 @@ from sky import clouds
 from sky.adaptors import do
 from sky.clouds import service_catalog
 from sky.provision.do import utils as do_utils
+from sky.utils import registry
 from sky.utils import resources_utils
 
 if typing.TYPE_CHECKING:
@@ -16,7 +17,7 @@ if typing.TYPE_CHECKING:
 _CREDENTIAL_FILE = 'config.yaml'
 
 
-@clouds.CLOUD_REGISTRY.register(aliases=['digitalocean'])
+@registry.CLOUD_REGISTRY.register(aliases=['digitalocean'])
 class DO(clouds.Cloud):
     """Digital Ocean Cloud"""
 
@@ -232,8 +233,11 @@ class DO(clouds.Cloud):
                 cpus=resources.cpus,
                 memory=resources.memory,
                 disk_tier=resources.disk_tier)
-            return resources_utils.FeasibleResources(
-                _make([default_instance_type]), [], None)
+            if default_instance_type is None:
+                return resources_utils.FeasibleResources([], [], None)
+            else:
+                return resources_utils.FeasibleResources(
+                    _make([default_instance_type]), [], None)
 
         assert len(accelerators) == 1, resources
         acc, acc_count = list(accelerators.items())[0]

sky/clouds/fluidstack.py

@@ -6,10 +6,11 @@ from typing import Dict, Iterator, List, Optional, Tuple, Union
 import requests
 
 from sky import clouds
-from sky import status_lib
 from sky.clouds import service_catalog
 from sky.provision.fluidstack import fluidstack_utils
+from sky.utils import registry
 from sky.utils import resources_utils
+from sky.utils import status_lib
 from sky.utils.resources_utils import DiskTier
 
 _CREDENTIAL_FILES = [
@@ -21,7 +22,7 @@ if typing.TYPE_CHECKING:
     from sky import resources as resources_lib
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class Fluidstack(clouds.Cloud):
     """FluidStack GPU Cloud."""
 

sky/clouds/gcp.py

@@ -1,6 +1,5 @@
 """Google Cloud Platform."""
 import enum
-import functools
 import json
 import os
 import re
@@ -18,14 +17,16 @@ from sky import skypilot_config
 from sky.adaptors import gcp
 from sky.clouds import service_catalog
 from sky.clouds.utils import gcp_utils
+from sky.utils import annotations
 from sky.utils import common_utils
+from sky.utils import registry
 from sky.utils import resources_utils
 from sky.utils import subprocess_utils
 from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:
     from sky import resources
-    from sky import status_lib
+    from sky.utils import status_lib
 
 logger = sky_logging.init_logger(__name__)
 
@@ -136,7 +137,7 @@ class GCPIdentityType(enum.Enum):
         return self == GCPIdentityType.SHARED_CREDENTIALS_FILE
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class GCP(clouds.Cloud):
     """Google Cloud Platform."""
 
@@ -348,7 +349,7 @@ class GCP(clouds.Cloud):
         return find_machine is not None
 
     @classmethod
-    @functools.lru_cache(maxsize=1)
+    @annotations.lru_cache(scope='global', maxsize=1)
     def _get_image_size(cls, image_id: str) -> float:
         if image_id.startswith('skypilot:'):
             return DEFAULT_GCP_IMAGE_GB
@@ -866,11 +867,11 @@ class GCP(clouds.Cloud):
             pass
         return credentials
 
-    @functools.lru_cache(maxsize=1)
+    @annotations.lru_cache(scope='global', maxsize=1)
     def can_credential_expire(self) -> bool:
         identity_type = self._get_identity_type()
-        return identity_type is not None and identity_type.can_credential_expire(
-        )
+        return (identity_type is not None and
+                identity_type.can_credential_expire())
 
     @classmethod
     def _get_identity_type(cls) -> Optional[GCPIdentityType]:
@@ -886,7 +887,8 @@ class GCP(clouds.Cloud):
         return GCPIdentityType.SHARED_CREDENTIALS_FILE
 
     @classmethod
-    @functools.lru_cache(maxsize=1)  # Cache since getting identity is slow.
+    @annotations.lru_cache(scope='request',
+                           maxsize=1)  # Cache since getting identity is slow.
     def get_user_identities(cls) -> List[List[str]]:
         """Returns the email address + project id of the active user."""
         try:

sky/clouds/ibm.py

@@ -7,11 +7,12 @@ import colorama
 
 from sky import clouds
 from sky import sky_logging
-from sky import status_lib
 from sky.adaptors import ibm
 from sky.adaptors.ibm import CREDENTIAL_FILE
 from sky.clouds import service_catalog
+from sky.utils import registry
 from sky.utils import resources_utils
+from sky.utils import status_lib
 from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:
@@ -21,7 +22,7 @@ if typing.TYPE_CHECKING:
 logger = sky_logging.init_logger(__name__)
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class IBM(clouds.Cloud):
     """IBM Web Services."""
 
@@ -167,7 +168,7 @@ class IBM(clouds.Cloud):
     def make_deploy_resources_variables(
         self,
         resources: 'resources_lib.Resources',
-        cluster_name: resources_utils.ClusterName,
+        cluster_name: 'resources_utils.ClusterName',
         region: 'clouds.Region',
         zones: Optional[List['clouds.Zone']],
         num_nodes: int,
@@ -252,10 +253,10 @@ class IBM(clouds.Cloud):
 
     @classmethod
     def get_default_instance_type(
-            cls,
-            cpus: Optional[str] = None,
-            memory: Optional[str] = None,
-            disk_tier: Optional[resources_utils.DiskTier] = None
+        cls,
+        cpus: Optional[str] = None,
+        memory: Optional[str] = None,
+        disk_tier: Optional['resources_utils.DiskTier'] = None
     ) -> Optional[str]:
         return service_catalog.get_default_instance_type(cpus=cpus,
                                                          memory=memory,

sky/clouds/kubernetes.py

@@ -1,5 +1,4 @@
 """Kubernetes."""
-import functools
 import os
 import re
 import typing
@@ -14,7 +13,9 @@ from sky.provision import instance_setup
 from sky.provision.kubernetes import network_utils
 from sky.provision.kubernetes import utils as kubernetes_utils
 from sky.skylet import constants
+from sky.utils import annotations
 from sky.utils import common_utils
+from sky.utils import registry
 from sky.utils import resources_utils
 from sky.utils import schemas
 
@@ -34,7 +35,7 @@ CREDENTIAL_PATH = os.environ.get('KUBECONFIG', DEFAULT_KUBECONFIG_PATH)
 _SKYPILOT_SYSTEM_NAMESPACE = 'skypilot-system'
 
 
-@clouds.CLOUD_REGISTRY.register(aliases=['k8s'])
+@registry.CLOUD_REGISTRY.register(aliases=['k8s'])
 class Kubernetes(clouds.Cloud):
     """Kubernetes."""
 
@@ -82,7 +83,7 @@ class Kubernetes(clouds.Cloud):
         # Use a fresh user hash to avoid conflicts in the secret object naming.
         # This can happen when the controller is reusing the same user hash
         # through USER_ID_ENV_VAR but has a different SSH key.
-        fresh_user_hash = common_utils.get_user_hash(force_fresh_hash=True)
+        fresh_user_hash = common_utils.generate_user_hash()
         return f'ssh-publickey-{fresh_user_hash}'
 
     @classmethod
@@ -116,7 +117,7 @@ class Kubernetes(clouds.Cloud):
         return cls._MAX_CLUSTER_NAME_LEN_LIMIT
 
     @classmethod
-    @functools.lru_cache(maxsize=1)
+    @annotations.lru_cache(scope='global', maxsize=1)
     def _log_skipped_contexts_once(cls, skipped_contexts: Tuple[str,
                                                                 ...]) -> None:
         """Log skipped contexts for only once.
@@ -240,7 +241,7 @@ class Kubernetes(clouds.Cloud):
             cls,
             cpus: Optional[str] = None,
             memory: Optional[str] = None,
-            disk_tier: Optional[resources_utils.DiskTier] = None) -> str:
+            disk_tier: Optional['resources_utils.DiskTier'] = None) -> str:
         # TODO(romilb): In the future, we may want to move the instance type
         #  selection + availability checking to a kubernetes_catalog module.
         del disk_tier  # Unused.
@@ -330,7 +331,7 @@ class Kubernetes(clouds.Cloud):
     def make_deploy_resources_variables(
             self,
             resources: 'resources_lib.Resources',
-            cluster_name: resources_utils.ClusterName,
+            cluster_name: 'resources_utils.ClusterName',
             region: Optional['clouds.Region'],
             zones: Optional[List['clouds.Zone']],
             num_nodes: int,

sky/clouds/lambda_cloud.py

@@ -5,10 +5,11 @@ from typing import Dict, Iterator, List, Optional, Tuple, Union
 import requests
 
 from sky import clouds
-from sky import status_lib
 from sky.clouds import service_catalog
 from sky.provision.lambda_cloud import lambda_utils
+from sky.utils import registry
 from sky.utils import resources_utils
+from sky.utils import status_lib
 
 if typing.TYPE_CHECKING:
     # Renaming to avoid shadowing variables.
@@ -20,7 +21,7 @@ _CREDENTIAL_FILES = [
 ]
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class Lambda(clouds.Cloud):
     """Lambda Labs GPU Cloud."""
 
@@ -121,10 +122,10 @@ class Lambda(clouds.Cloud):
 
     @classmethod
     def get_default_instance_type(
-            cls,
-            cpus: Optional[str] = None,
-            memory: Optional[str] = None,
-            disk_tier: Optional[resources_utils.DiskTier] = None
+        cls,
+        cpus: Optional[str] = None,
+        memory: Optional[str] = None,
+        disk_tier: Optional['resources_utils.DiskTier'] = None
     ) -> Optional[str]:
         return service_catalog.get_default_instance_type(cpus=cpus,
                                                          memory=memory,
@@ -154,7 +155,7 @@ class Lambda(clouds.Cloud):
     def make_deploy_resources_variables(
             self,
             resources: 'resources_lib.Resources',
-            cluster_name: resources_utils.ClusterName,
+            cluster_name: 'resources_utils.ClusterName',
             region: 'clouds.Region',
             zones: Optional[List['clouds.Zone']],
             num_nodes: int,

sky/clouds/oci.py

@@ -9,7 +9,7 @@ History:
    file path resolution (by os.path.expanduser) when construct the file
    mounts. This bug will cause the created workder nodes located in different
    compartment and VCN than the header node if user specifies compartment_id
-   in the sky config file, because the ~/.sky/config is not sync-ed to the
+   in the sky config file, because the ~/.sky/config.yaml is not sync-ed to the
    remote machine.
    The workaround is set the sky config file path using ENV before running
    the sky launch: export SKYPILOT_CONFIG=/home/ubuntu/.sky/config.yaml
@@ -27,13 +27,14 @@ from typing import Dict, Iterator, List, Optional, Tuple, Union
 
 from sky import clouds
 from sky import exceptions
-from sky import status_lib
 from sky.adaptors import oci as oci_adaptor
 from sky.clouds import service_catalog
 from sky.clouds.utils import oci_utils
 from sky.provision.oci.query_utils import query_helper
 from sky.utils import common_utils
+from sky.utils import registry
 from sky.utils import resources_utils
+from sky.utils import status_lib
 from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:
@@ -45,7 +46,7 @@ logger = logging.getLogger(__name__)
 _tenancy_prefix: Optional[str] = None
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class OCI(clouds.Cloud):
     """OCI: Oracle Cloud Infrastructure """
 

sky/clouds/paperspace.py

@@ -8,6 +8,7 @@ import requests
 from sky import clouds
 from sky.clouds import service_catalog
 from sky.provision.paperspace import utils
+from sky.utils import registry
 from sky.utils import resources_utils
 
 if typing.TYPE_CHECKING:
@@ -19,7 +20,7 @@ _CREDENTIAL_FILES = [
 ]
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class Paperspace(clouds.Cloud):
     """Paperspace GPU Cloud"""
 

sky/clouds/runpod.py

@@ -5,6 +5,7 @@ from typing import Dict, Iterator, List, Optional, Tuple, Union
 
 from sky import clouds
 from sky.clouds import service_catalog
+from sky.utils import registry
 from sky.utils import resources_utils
 
 if typing.TYPE_CHECKING:
@@ -15,7 +16,7 @@ _CREDENTIAL_FILES = [
 ]
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class RunPod(clouds.Cloud):
     """ RunPod GPU Cloud
 

sky/clouds/scp.py

@@ -10,10 +10,11 @@ from typing import Dict, Iterator, List, Optional, Tuple, Union
 from sky import clouds
 from sky import exceptions
 from sky import sky_logging
-from sky import status_lib
 from sky.clouds import service_catalog
 from sky.clouds.utils import scp_utils
+from sky.utils import registry
 from sky.utils import resources_utils
+from sky.utils import status_lib
 
 if typing.TYPE_CHECKING:
     # Renaming to avoid shadowing variables.
@@ -29,7 +30,7 @@ _SCP_MIN_DISK_SIZE_GB = 100
 _SCP_MAX_DISK_SIZE_GB = 300
 
 
-@clouds.CLOUD_REGISTRY.register
+@registry.CLOUD_REGISTRY.register
 class SCP(clouds.Cloud):
     """SCP Cloud."""
 
@@ -145,10 +146,10 @@ class SCP(clouds.Cloud):
 
     @classmethod
     def get_default_instance_type(
-            cls,
-            cpus: Optional[str] = None,
-            memory: Optional[str] = None,
-            disk_tier: Optional[resources_utils.DiskTier] = None
+        cls,
+        cpus: Optional[str] = None,
+        memory: Optional[str] = None,
+        disk_tier: Optional['resources_utils.DiskTier'] = None
     ) -> Optional[str]:
         return service_catalog.get_default_instance_type(cpus=cpus,
                                                          memory=memory,
@@ -178,7 +179,7 @@ class SCP(clouds.Cloud):
     def make_deploy_resources_variables(
             self,
             resources: 'resources_lib.Resources',
-            cluster_name: resources_utils.ClusterName,
+            cluster_name: 'resources_utils.ClusterName',
             region: 'clouds.Region',
             zones: Optional[List['clouds.Zone']],
             num_nodes: int,

sky/clouds/service_catalog/__init__.py

@@ -67,7 +67,7 @@ def list_accelerators(
     all_regions: bool = False,
     require_price: bool = True,
 ) -> 'Dict[str, List[common.InstanceTypeInfo]]':
-    """List the names of all accelerators offered by Sky.
+    """Lists the names of all accelerators offered by Sky.
 
     This will include all accelerators offered by Sky, including those
     that may not be available in the user's account.
@@ -95,7 +95,7 @@ def list_accelerator_counts(
     quantity_filter: Optional[int] = None,
     clouds: CloudFilter = None,
 ) -> Dict[str, List[int]]:
-    """List all accelerators offered by Sky and available counts.
+    """Lists all accelerators offered by Sky and available counts.
 
     Returns: A dictionary of canonical accelerator names mapped to a list
     of available counts. See usage in cli.py.
@@ -129,7 +129,7 @@ def list_accelerator_realtime(
     clouds: CloudFilter = None,
     case_sensitive: bool = True,
 ) -> Tuple[Dict[str, List[int]], Dict[str, int], Dict[str, int]]:
-    """List all accelerators offered by Sky with their realtime availability.
+    """Lists all accelerators offered by Sky with their realtime availability.
 
     Realtime availability is the total number of accelerators in the cluster
     and number of accelerators available at the time of the call.