skypilot-nightly 1.0.0.dev20250902__py3-none-any.whl → 1.0.0.dev20250903__py3-none-any.whl

sky/volumes/utils.py

@@ -13,6 +13,19 @@ from sky.utils import volume
 
 logger = sky_logging.init_logger(__name__)
 
+_BASIC_COLUMNS = [
+    'NAME',
+    'TYPE',
+    'INFRA',
+    'SIZE',
+    'USER',
+    'WORKSPACE',
+    'AGE',
+    'STATUS',
+    'LAST_USE',
+    'USED_BY',
+]
+
 
 def _get_infra_str(cloud: Optional[str], region: Optional[str],
                    zone: Optional[str]) -> str:
@@ -30,20 +43,71 @@ def _get_infra_str(cloud: Optional[str], region: Optional[str],
 class VolumeTable(abc.ABC):
     """The volume table."""
 
+    def __init__(self, volumes: List[Dict[str, Any]], show_all: bool = False):
+        super().__init__()
+        self.table = self._create_table(show_all)
+        self._add_rows(volumes, show_all)
+
+    def _get_row_base_columns(self,
+                              row: Dict[str, Any],
+                              show_all: bool = False) -> List[str]:
+        """Get the base columns for a row."""
+        # Convert last_attached_at timestamp to human readable string
+        last_attached_at = row.get('last_attached_at')
+        if last_attached_at is not None:
+            last_attached_at_str = datetime.fromtimestamp(
+                last_attached_at).strftime('%Y-%m-%d %H:%M:%S')
+        else:
+            last_attached_at_str = '-'
+        size = row.get('size', '')
+        if size:
+            size = f'{size}Gi'
+        usedby_str = '-'
+        usedby_clusters = row.get('usedby_clusters')
+        usedby_pods = row.get('usedby_pods')
+        if usedby_clusters:
+            usedby_str = f'{", ".join(usedby_clusters)}'
+        elif usedby_pods:
+            usedby_str = f'{", ".join(usedby_pods)}'
+        if show_all:
+            usedby = usedby_str
+        else:
+            usedby = common_utils.truncate_long_string(
+                usedby_str, constants.USED_BY_TRUNC_LENGTH)
+        infra = _get_infra_str(row.get('cloud'), row.get('region'),
+                               row.get('zone'))
+        return [
+            row.get('name', ''),
+            row.get('type', ''),
+            infra,
+            size,
+            row.get('user_name', '-'),
+            row.get('workspace', '-'),
+            log_utils.human_duration(row.get('launched_at', 0)),
+            row.get('status', ''),
+            last_attached_at_str,
+            usedby,
+        ]
+
+    def _create_table(self, show_all: bool = False) -> prettytable.PrettyTable:
+        """Create the volume table."""
+        raise NotImplementedError
+
+    def _add_rows(self,
+                  volumes: List[Dict[str, Any]],
+                  show_all: bool = False) -> None:
+        """Add rows to the volume table."""
+        raise NotImplementedError
+
     @abc.abstractmethod
     def format(self) -> str:
         """Format the volume table for display."""
-        pass
+        raise NotImplementedError
 
 
 class PVCVolumeTable(VolumeTable):
     """The PVC volume table."""
 
-    def __init__(self, volumes: List[Dict[str, Any]], show_all: bool = False):
-        super().__init__()
-        self.table = self._create_table(show_all)
-        self._add_rows(volumes, show_all)
-
     def _create_table(self, show_all: bool = False) -> prettytable.PrettyTable:
         """Create the PVC volume table."""
         #  If show_all is False, show the table with the columns:
@@ -55,34 +119,13 @@ class PVCVolumeTable(VolumeTable):
         #   STORAGE_CLASS, ACCESS_MODE
 
         if show_all:
-            columns = [
-                'NAME',
-                'TYPE',
-                'INFRA',
-                'SIZE',
-                'USER',
-                'WORKSPACE',
-                'AGE',
-                'STATUS',
-                'LAST_USE',
-                'USED_BY',
+            columns = _BASIC_COLUMNS + [
                 'NAME_ON_CLOUD',
                 'STORAGE_CLASS',
                 'ACCESS_MODE',
             ]
         else:
-            columns = [
-                'NAME',
-                'TYPE',
-                'INFRA',
-                'SIZE',
-                'USER',
-                'WORKSPACE',
-                'AGE',
-                'STATUS',
-                'LAST_USE',
-                'USED_BY',
-            ]
+            columns = _BASIC_COLUMNS
 
         table = log_utils.create_table(columns)
         return table
@@ -92,42 +135,7 @@ class PVCVolumeTable(VolumeTable):
                   show_all: bool = False) -> None:
         """Add rows to the PVC volume table."""
         for row in volumes:
-            # Convert last_attached_at timestamp to human readable string
-            last_attached_at = row.get('last_attached_at')
-            if last_attached_at is not None:
-                last_attached_at_str = datetime.fromtimestamp(
-                    last_attached_at).strftime('%Y-%m-%d %H:%M:%S')
-            else:
-                last_attached_at_str = '-'
-            size = row.get('size', '')
-            if size:
-                size = f'{size}Gi'
-            usedby_str = '-'
-            usedby_clusters = row.get('usedby_clusters')
-            usedby_pods = row.get('usedby_pods')
-            if usedby_clusters:
-                usedby_str = f'{", ".join(usedby_clusters)}'
-            elif usedby_pods:
-                usedby_str = f'{", ".join(usedby_pods)}'
-            if show_all:
-                usedby = usedby_str
-            else:
-                usedby = common_utils.truncate_long_string(
-                    usedby_str, constants.USED_BY_TRUNC_LENGTH)
-            infra = _get_infra_str(row.get('cloud'), row.get('region'),
-                                   row.get('zone'))
-            table_row = [
-                row.get('name', ''),
-                row.get('type', ''),
-                infra,
-                size,
-                row.get('user_name', '-'),
-                row.get('workspace', '-'),
-                log_utils.human_duration(row.get('launched_at', 0)),
-                row.get('status', ''),
-                last_attached_at_str,
-                usedby,
-            ]
+            table_row = self._get_row_base_columns(row, show_all)
             if show_all:
                 table_row.append(row.get('name_on_cloud', ''))
                 table_row.append(
@@ -138,7 +146,43 @@ class PVCVolumeTable(VolumeTable):
 
     def format(self) -> str:
         """Format the PVC volume table for display."""
-        return str(self.table)
+        return 'Kubernetes PVCs:\n' + str(self.table)
+
+
+class RunPodVolumeTable(VolumeTable):
+    """The RunPod volume table."""
+
+    def _create_table(self, show_all: bool = False) -> prettytable.PrettyTable:
+        """Create the RunPod volume table."""
+        #  If show_all is False, show the table with the columns:
+        #   NAME, TYPE, INFRA, SIZE, USER, WORKSPACE,
+        #   AGE, STATUS, LAST_USE, USED_BY
+        #  If show_all is True, show the table with the columns:
+        #   NAME, TYPE, INFRA, SIZE, USER, WORKSPACE,
+        #   AGE, STATUS, LAST_USE, USED_BY, NAME_ON_CLOUD
+
+        if show_all:
+            columns = _BASIC_COLUMNS + ['NAME_ON_CLOUD']
+        else:
+            columns = _BASIC_COLUMNS
+
+        table = log_utils.create_table(columns)
+        return table
+
+    def _add_rows(self,
+                  volumes: List[Dict[str, Any]],
+                  show_all: bool = False) -> None:
+        """Add rows to the RunPod volume table."""
+        for row in volumes:
+            table_row = self._get_row_base_columns(row, show_all)
+            if show_all:
+                table_row.append(row.get('name_on_cloud', ''))
+
+            self.table.add_row(table_row)
+
+    def format(self) -> str:
+        """Format the RunPod volume table for display."""
+        return 'RunPod Network Volumes:\n' + str(self.table)
 
 
 def format_volume_table(volumes: List[Dict[str, Any]],
@@ -166,9 +210,14 @@ def format_volume_table(volumes: List[Dict[str, Any]],
             continue
     table_str = ''
     for volume_type, volume_list in volumes_per_type.items():
+        if table_str:
+            table_str += '\n\n'
         if volume_type == volume.VolumeType.PVC.value:
-            table = PVCVolumeTable(volume_list, show_all)
-            table_str += table.format()
+            pvc_table = PVCVolumeTable(volume_list, show_all)
+            table_str += pvc_table.format()
+        elif volume_type == volume.VolumeType.RUNPOD_NETWORK_VOLUME.value:
+            runpod_table = RunPodVolumeTable(volume_list, show_all)
+            table_str += runpod_table.format()
     if table_str:
         return table_str
     else:

sky/volumes/volume.py

@@ -1,11 +1,18 @@
 """Volume types and access modes."""
 from typing import Any, Dict, Optional
 
+from sky import clouds
 from sky.utils import common_utils
 from sky.utils import infra_utils
 from sky.utils import registry
 from sky.utils import resources_utils
 from sky.utils import schemas
+from sky.utils import volume as volume_lib
+
+VOLUME_TYPE_TO_CLOUD = {
+    volume_lib.VolumeType.PVC: clouds.Kubernetes(),
+    volume_lib.VolumeType.RUNPOD_NETWORK_VOLUME: clouds.RunPod(),
+}
 
 
 class Volume:
@@ -42,18 +49,42 @@ class Volume:
         self.region: Optional[str] = None
         self.zone: Optional[str] = None
 
+        self._normalize_config()
+
     @classmethod
-    def from_dict(cls, config_dict: Dict[str, Any]) -> 'Volume':
-        """Create a Volume instance from a dictionary."""
-        return cls(name=config_dict.get('name'),
-                   type=config_dict.get('type'),
-                   infra=config_dict.get('infra'),
-                   size=config_dict.get('size'),
-                   labels=config_dict.get('labels'),
-                   resource_name=config_dict.get('resource_name'),
-                   config=config_dict.get('config', {}))
-
-    def to_dict(self) -> Dict[str, Any]:
+    def from_yaml_config(cls, config: Dict[str, Any]) -> 'Volume':
+        """Create a Volume subclass instance from a dictionary via factory."""
+        vol_type_val = config.get('type')
+        try:
+            vt = (volume_lib.VolumeType(vol_type_val)
+                  if vol_type_val is not None else None)
+        except Exception:  # pylint: disable=broad-except
+            vt = None
+
+        if vt is None:
+            raise ValueError(f'Invalid volume type: {vol_type_val}')
+
+        if vt == volume_lib.VolumeType.PVC:
+            return PVCVolume(name=config.get('name'),
+                             type=vol_type_val,
+                             infra=config.get('infra'),
+                             size=config.get('size'),
+                             labels=config.get('labels'),
+                             resource_name=config.get('resource_name'),
+                             config=config.get('config', {}))
+        if vt == volume_lib.VolumeType.RUNPOD_NETWORK_VOLUME:
+            return RunpodNetworkVolume(
+                name=config.get('name'),
+                type=vol_type_val,
+                infra=config.get('infra'),
+                size=config.get('size'),
+                labels=config.get('labels'),
+                resource_name=config.get('resource_name'),
+                config=config.get('config', {}))
+
+        raise ValueError(f'Invalid volume type: {vol_type_val}')
+
+    def to_yaml_config(self) -> Dict[str, Any]:
         """Convert the Volume to a dictionary."""
         return {
             'name': self.name,
@@ -68,32 +99,10 @@ class Volume:
             'zone': self.zone,
         }
 
-    def normalize_config(
-            self,
-            name: Optional[str] = None,
-            infra: Optional[str] = None,
-            type: Optional[str] = None,  # pylint: disable=redefined-builtin
-            size: Optional[str] = None) -> None:
-        """Override the volume config with CLI options,
-           adjust and validate the config.
-
-        Args:
-            name: Volume name to override
-            infra: Infrastructure to override
-            type: Volume type to override
-            size: Volume size to override
-        """
-        if name is not None:
-            self.name = name
-        if infra is not None:
-            self.infra = infra
-        if type is not None:
-            self.type = type
-        if size is not None:
-            self.size = size
-
+    def _normalize_config(self) -> None:
+        """Adjust and validate the config."""
         # Validate schema
-        common_utils.validate_schema(self.to_dict(),
+        common_utils.validate_schema(self.to_yaml_config(),
                                      schemas.get_volume_schema(),
                                      'Invalid volumes config: ')
 
@@ -125,9 +134,21 @@ class Volume:
 
     def _validate_config(self) -> None:
         """Validate the volume config."""
-        assert self.cloud is not None, 'Cloud must be specified'
-        cloud_obj = registry.CLOUD_REGISTRY.from_str(self.cloud)
-        assert cloud_obj is not None
+        cloud_obj_from_type = VOLUME_TYPE_TO_CLOUD.get(
+            volume_lib.VolumeType(self.type))
+        if self.cloud:
+            cloud_obj = registry.CLOUD_REGISTRY.from_str(self.cloud)
+            assert cloud_obj is not None
+            if not cloud_obj.is_same_cloud(cloud_obj_from_type):
+                raise ValueError(
+                    f'Invalid cloud {self.cloud} for volume type {self.type}')
+        else:
+            self.cloud = str(cloud_obj_from_type)
+            cloud_obj = cloud_obj_from_type
+            assert cloud_obj is not None
+
+        self.region, self.zone = cloud_obj.validate_region_zone(
+            self.region, self.zone)
 
         valid, err_msg = cloud_obj.is_volume_name_valid(self.name)
         if not valid:
@@ -142,3 +163,41 @@ class Volume:
                 valid, err_msg = cloud_obj.is_label_valid(key, value)
                 if not valid:
                     raise ValueError(f'{err_msg}')
+
+        # Extra, type-specific validations
+        self._validate_config_extra()
+
+    # Hook methods for subclasses
+    def _validate_config_extra(self) -> None:
+        """Additional type-specific validation.
+
+        Subclasses can override to enforce stricter rules.
+        """
+        return
+
+
+class PVCVolume(Volume):
+    """Kubernetes PVC-backed volume."""
+    pass
+
+
+class RunpodNetworkVolume(Volume):
+    """RunPod Network Volume."""
+
+    def _validate_config_extra(self) -> None:
+        if self.size is not None:
+            try:
+                size_int = int(self.size)
+                if size_int < volume_lib.MIN_RUNPOD_NETWORK_VOLUME_SIZE_GB:
+                    raise ValueError(
+                        f'RunPod network volume size must be at least '
+                        f'{volume_lib.MIN_RUNPOD_NETWORK_VOLUME_SIZE_GB}GB.')
+            except Exception as e:  # pylint: disable=broad-except
+                raise ValueError(f'Invalid volume size {self.size!r}: '
+                                 f'{e}') from e
+        if not self.zone:
+            raise ValueError(
+                'RunPod DataCenterId is required to create a network '
+                'volume. Set the zone in the infra field.')
+
+        return

{skypilot_nightly-1.0.0.dev20250902.dist-info → skypilot_nightly-1.0.0.dev20250903.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skypilot-nightly
-Version: 1.0.0.dev20250902
+Version: 1.0.0.dev20250903
 Summary: SkyPilot: Run AI on Any Infra — Unified, Faster, Cheaper.
 Author: SkyPilot Team
 License: Apache 2.0
@@ -145,48 +145,48 @@ Requires-Dist: grpcio>=1.63.0; extra == "server"
 Requires-Dist: protobuf<7.0.0,>=5.26.1; extra == "server"
 Requires-Dist: aiosqlite; extra == "server"
 Provides-Extra: all
-Requires-Dist: sqlalchemy_adapter; extra == "all"
+Requires-Dist: ibm-cos-sdk; extra == "all"
+Requires-Dist: ray[default]!=2.6.0,>=2.2.0; extra == "all"
+Requires-Dist: vastai-sdk>=0.1.12; extra == "all"
+Requires-Dist: aiohttp; extra == "all"
+Requires-Dist: google-cloud-storage; extra == "all"
+Requires-Dist: websockets; extra == "all"
+Requires-Dist: azure-mgmt-compute>=33.0.0; extra == "all"
+Requires-Dist: kubernetes!=32.0.0,>=20.0.0; extra == "all"
+Requires-Dist: msgraph-sdk; extra == "all"
+Requires-Dist: azure-storage-blob>=12.23.1; extra == "all"
+Requires-Dist: anyio; extra == "all"
+Requires-Dist: boto3>=1.26.1; extra == "all"
 Requires-Dist: google-api-python-client>=2.69.0; extra == "all"
-Requires-Dist: oci; extra == "all"
-Requires-Dist: azure-common; extra == "all"
+Requires-Dist: pyopenssl<24.3.0,>=23.2.0; extra == "all"
+Requires-Dist: cudo-compute>=0.1.10; extra == "all"
+Requires-Dist: azure-mgmt-network>=27.0.0; extra == "all"
 Requires-Dist: pyvmomi==8.0.1.0.2; extra == "all"
-Requires-Dist: azure-core>=1.31.0; extra == "all"
-Requires-Dist: colorama<0.4.5; extra == "all"
-Requires-Dist: azure-cli>=2.65.0; extra == "all"
-Requires-Dist: azure-storage-blob>=12.23.1; extra == "all"
-Requires-Dist: docker; extra == "all"
+Requires-Dist: passlib; extra == "all"
 Requires-Dist: azure-identity>=1.19.0; extra == "all"
 Requires-Dist: botocore>=1.29.10; extra == "all"
-Requires-Dist: casbin; extra == "all"
-Requires-Dist: runpod>=1.6.1; extra == "all"
-Requires-Dist: cudo-compute>=0.1.10; extra == "all"
-Requires-Dist: protobuf<7.0.0,>=5.26.1; extra == "all"
-Requires-Dist: ibm-vpc; extra == "all"
 Requires-Dist: awscli>=1.27.10; extra == "all"
+Requires-Dist: python-dateutil; extra == "all"
 Requires-Dist: pyjwt; extra == "all"
-Requires-Dist: anyio; extra == "all"
-Requires-Dist: boto3>=1.26.1; extra == "all"
-Requires-Dist: aiohttp; extra == "all"
-Requires-Dist: msrestazure; extra == "all"
-Requires-Dist: kubernetes!=32.0.0,>=20.0.0; extra == "all"
-Requires-Dist: vastai-sdk>=0.1.12; extra == "all"
+Requires-Dist: oci; extra == "all"
+Requires-Dist: ibm-cloud-sdk-core; extra == "all"
+Requires-Dist: azure-cli>=2.65.0; extra == "all"
+Requires-Dist: aiosqlite; extra == "all"
 Requires-Dist: pydo>=0.3.0; extra == "all"
-Requires-Dist: pyopenssl<24.3.0,>=23.2.0; extra == "all"
-Requires-Dist: nebius>=0.2.47; extra == "all"
-Requires-Dist: websockets; extra == "all"
+Requires-Dist: docker; extra == "all"
+Requires-Dist: azure-common; extra == "all"
+Requires-Dist: colorama<0.4.5; extra == "all"
+Requires-Dist: msrestazure; extra == "all"
+Requires-Dist: ibm-vpc; extra == "all"
 Requires-Dist: ibm-platform-services>=0.48.0; extra == "all"
-Requires-Dist: google-cloud-storage; extra == "all"
-Requires-Dist: ray[default]!=2.6.0,>=2.2.0; extra == "all"
-Requires-Dist: grpcio>=1.63.0; extra == "all"
-Requires-Dist: azure-mgmt-network>=27.0.0; extra == "all"
-Requires-Dist: azure-mgmt-compute>=33.0.0; extra == "all"
-Requires-Dist: python-dateutil; extra == "all"
-Requires-Dist: passlib; extra == "all"
 Requires-Dist: azure-core>=1.24.0; extra == "all"
-Requires-Dist: msgraph-sdk; extra == "all"
-Requires-Dist: aiosqlite; extra == "all"
-Requires-Dist: ibm-cloud-sdk-core; extra == "all"
-Requires-Dist: ibm-cos-sdk; extra == "all"
+Requires-Dist: sqlalchemy_adapter; extra == "all"
+Requires-Dist: azure-core>=1.31.0; extra == "all"
+Requires-Dist: nebius>=0.2.47; extra == "all"
+Requires-Dist: casbin; extra == "all"
+Requires-Dist: protobuf<7.0.0,>=5.26.1; extra == "all"
+Requires-Dist: grpcio>=1.63.0; extra == "all"
+Requires-Dist: runpod>=1.6.1; extra == "all"
 Dynamic: author
 Dynamic: classifier
 Dynamic: description