skypilot-nightly 1.0.0.dev20250217__tar.gz → 1.0.0.dev20250218__tar.gz

{skypilot_nightly-1.0.0.dev20250217/skypilot_nightly.egg-info → skypilot_nightly-1.0.0.dev20250218}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skypilot-nightly
-Version: 1.0.0.dev20250217
+Version: 1.0.0.dev20250218
 Summary: SkyPilot: An intercloud broker for the clouds
 Author: SkyPilot Team
 License: Apache 2.0

{skypilot_nightly-1.0.0.dev20250217 → skypilot_nightly-1.0.0.dev20250218}/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 = '7775d44c4c91d1474982fbdb3b1e03cfbbf2385e'
+_SKYPILOT_COMMIT_SHA = '912b8293b3ebeba84941c108dbede1e6dcbc9b6f'
 
 
 def _get_git_commit():
@@ -35,7 +35,7 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev20250217'
+__version__ = '1.0.0.dev20250218'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))
 
 

{skypilot_nightly-1.0.0.dev20250217 → skypilot_nightly-1.0.0.dev20250218}/sky/clouds/do.py

@@ -233,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]

{skypilot_nightly-1.0.0.dev20250217 → skypilot_nightly-1.0.0.dev20250218}/sky/clouds/service_catalog/data_fetchers/fetch_lambda_cloud.py

@@ -26,6 +26,7 @@ REGIONS = [
     'europe-south-1',
     'asia-northeast-1',
     'asia-northeast-2',
+    'australia-east-1',
     'us-east-1',
     'us-east-2',
     'us-east-3',

{skypilot_nightly-1.0.0.dev20250217 → skypilot_nightly-1.0.0.dev20250218}/sky/optimizer.py

@@ -285,8 +285,6 @@ class Optimizer:
 
             # Don't print for the last node, Sink.
             do_print = node_i != len(topo_order) - 1
-            if do_print:
-                logger.debug('#### {} ####'.format(node))
 
             fuzzy_candidates: List[str] = []
             if node_i < len(topo_order) - 1:
@@ -297,6 +295,10 @@ class Optimizer:
                         blocked_resources=blocked_resources,
                         quiet=quiet))
                 node_to_candidate_map[node] = cloud_candidates
+                # Has to call the printing after the launchable resources are
+                # computed, because the missing fields of the resources are
+                # inferred in the _fill_in_launchable_resources function.
+                logger.debug('#### {} ####'.format(node))
             else:
                 # Dummy sink node.
                 launchable_resources = {
@@ -1324,17 +1326,17 @@ def _fill_in_launchable_resources(
                                 f'{colorama.Fore.CYAN}'
                                 f'{sorted(all_fuzzy_candidates)}'
                                 f'{colorama.Style.RESET_ALL}')
+                else:
+                    if resources.cpus is not None:
+                        logger.info('Try specifying a different CPU count, '
+                                    'or add "+" to the end of the CPU count '
+                                    'to allow for larger instances.')
+                    if resources.memory is not None:
+                        logger.info('Try specifying a different memory size, '
+                                    'or add "+" to the end of the memory size '
+                                    'to allow for larger instances.')
                 for cloud, hint in hints.items():
                     logger.info(f'{repr(cloud)}: {hint}')
-            else:
-                if resources.cpus is not None:
-                    logger.info('Try specifying a different CPU count, '
-                                'or add "+" to the end of the CPU count '
-                                'to allow for larger instances.')
-                if resources.memory is not None:
-                    logger.info('Try specifying a different memory size, '
-                                'or add "+" to the end of the memory size '
-                                'to allow for larger instances.')
 
         launchable[resources] = _filter_out_blocked_launchable_resources(
             launchable[resources], blocked_resources)

{skypilot_nightly-1.0.0.dev20250217 → skypilot_nightly-1.0.0.dev20250218}/sky/resources.py

@@ -251,6 +251,7 @@ class Resources:
         self._set_accelerators(accelerators, accelerator_args)
 
     def validate(self):
+        """Validate the resources and infer the missing fields if possible."""
         self._try_canonicalize_accelerators()
         self._try_validate_and_set_region_zone()
         self._try_validate_instance_type()
@@ -1267,17 +1268,17 @@ class Resources:
     def is_empty(self) -> bool:
         """Is this Resources an empty request (all fields None)?"""
         return all([
-            self.cloud is None,
+            self._cloud is None,
             self._instance_type is None,
             self._cpus is None,
-            self.memory is None,
-            self.accelerators is None,
-            self.accelerator_args is None,
+            self._memory is None,
+            self._accelerators is None,
+            self._accelerator_args is None,
             not self._use_spot_specified,
-            self.disk_size == _DEFAULT_DISK_SIZE_GB,
-            self.disk_tier is None,
+            self._disk_size == _DEFAULT_DISK_SIZE_GB,
+            self._disk_tier is None,
             self._image_id is None,
-            self.ports is None,
+            self._ports is None,
             self._docker_login_config is None,
         ])
 

{skypilot_nightly-1.0.0.dev20250217 → skypilot_nightly-1.0.0.dev20250218}/sky/server/common.py

@@ -8,6 +8,7 @@ import json
 import os
 import pathlib
 import subprocess
+import sys
 import time
 import typing
 from typing import Any, Dict, Optional
@@ -42,7 +43,7 @@ AVAILABLE_LOCAL_API_SERVER_URLS = [
     f'http://{host}:46580' for host in AVAILBLE_LOCAL_API_SERVER_HOSTS
 ]
 
-API_SERVER_CMD = 'python -m sky.server.server'
+API_SERVER_CMD = '-m sky.server.server'
 # The client dir on the API server for storing user-specific data, such as file
 # mounts, logs, etc. This dir is empheral and will be cleaned up when the API
 # server is restarted.
@@ -172,7 +173,7 @@ def start_uvicorn_in_background(deploy: bool = False, host: str = '127.0.0.1'):
         api_server_cmd += ' --deploy'
     if host is not None:
         api_server_cmd += f' --host {host}'
-    cmd = f'{api_server_cmd} > {log_path} 2>&1'
+    cmd = f'{sys.executable} {api_server_cmd} > {log_path} 2>&1'
 
     # Start the uvicorn process in the background and don't wait for it.
     # If this is called from a CLI invocation, we need start_new_session=True so

{skypilot_nightly-1.0.0.dev20250217 → skypilot_nightly-1.0.0.dev20250218/skypilot_nightly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skypilot-nightly
-Version: 1.0.0.dev20250217
+Version: 1.0.0.dev20250218
 Summary: SkyPilot: An intercloud broker for the clouds
 Author: SkyPilot Team
 License: Apache 2.0

{skypilot_nightly-1.0.0.dev20250217 → skypilot_nightly-1.0.0.dev20250218}/tests/test_optimizer_dryruns.py

@@ -329,16 +329,19 @@ def test_invalid_instance_type(enable_all_clouds):
 
 def test_infer_cloud_from_instance_type(enable_all_clouds):
     # AWS instances
-    _test_resources(cloud=sky.AWS(),
-                    instance_type='m5.12xlarge',
-                    expected_cloud=sky.AWS())
+    _test_resources(instance_type='m5.12xlarge', expected_cloud=sky.AWS())
+    _test_resources_launch(instance_type='m5.12xlarge')
     _test_resources(instance_type='p3.8xlarge', expected_cloud=sky.AWS())
+    _test_resources_launch(instance_type='p3.8xlarge')
     _test_resources(instance_type='g4dn.2xlarge', expected_cloud=sky.AWS())
+    _test_resources_launch(instance_type='g4dn.2xlarge')
     # GCP instances
     _test_resources(instance_type='n1-standard-96', expected_cloud=sky.GCP())
+    _test_resources_launch(instance_type='n1-standard-96')
     #Azure instances
     _test_resources(instance_type='Standard_NC12s_v3',
                     expected_cloud=sky.Azure())
+    _test_resources_launch(instance_type='Standard_NC12s_v3')
 
 
 def test_invalid_cpus(enable_all_clouds):
@@ -725,3 +728,16 @@ def test_optimize_disk_tier(enable_all_clouds):
     ultra_tier_candidates = _get_all_candidate_cloud(ultra_tier_resources)
     assert ultra_tier_candidates == set(
         map(registry.CLOUD_REGISTRY.get, ['aws', 'gcp'])), ultra_tier_candidates
+
+
+def test_resource_hints_for_invalid_resources(capfd, enable_all_clouds):
+    """Tests that helpful hints are shown when no matching resources are found."""
+    # Test when there are no fuzzy candidates
+    with pytest.raises(exceptions.ResourcesUnavailableError):
+        _test_resources_launch(cloud=sky.AWS(), cpus=111, memory=999)
+    stdout, _ = capfd.readouterr()
+    assert 'Try specifying a different CPU count' in stdout
+    assert 'add "+" to the end of the CPU count' in stdout
+    assert 'Try specifying a different memory size' in stdout
+    assert 'add "+" to the end of the memory size' in stdout
+    assert 'Did you mean:' not in stdout  # No fuzzy candidates