skypilot-nightly 1.0.0.dev20241012__tar.gz → 1.0.0.dev20241014__tar.gz

{skypilot_nightly-1.0.0.dev20241012/skypilot_nightly.egg-info → skypilot_nightly-1.0.0.dev20241014}/PKG-INFO

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

{skypilot_nightly-1.0.0.dev20241012 → skypilot_nightly-1.0.0.dev20241014}/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 = 'fdd68b209ee74f9282fac5c6834907d5fe72d255'
+_SKYPILOT_COMMIT_SHA = '340f38404fe5d3ebe35ea430a67cb3377241d1f3'
 
 
 def _get_git_commit():
@@ -35,7 +35,7 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev20241012'
+__version__ = '1.0.0.dev20241014'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))
 
 

{skypilot_nightly-1.0.0.dev20241012 → skypilot_nightly-1.0.0.dev20241014}/sky/adaptors/azure.py

@@ -20,7 +20,9 @@ from sky.utils import ux_utils
 azure = common.LazyImport(
     'azure',
     import_error_message=('Failed to import dependencies for Azure.'
-                          'Try pip install "skypilot[azure]"'))
+                          'Try pip install "skypilot[azure]"'),
+    set_loggers=lambda: logging.getLogger('azure.identity').setLevel(logging.
+                                                                     ERROR))
 Client = Any
 sky_logger = sky_logging.init_logger(__name__)
 

{skypilot_nightly-1.0.0.dev20241012 → skypilot_nightly-1.0.0.dev20241014}/sky/adaptors/common.py

@@ -1,7 +1,7 @@
 """Lazy import for modules to avoid import error when not used."""
 import functools
 import importlib
-from typing import Any, Optional, Tuple
+from typing import Any, Callable, Optional, Tuple
 
 
 class LazyImport:
@@ -18,15 +18,19 @@ class LazyImport:
 
     def __init__(self,
                  module_name: str,
-                 import_error_message: Optional[str] = None):
+                 import_error_message: Optional[str] = None,
+                 set_loggers: Optional[Callable] = None):
         self._module_name = module_name
         self._module = None
         self._import_error_message = import_error_message
+        self._set_loggers = set_loggers
 
     def load_module(self):
         if self._module is None:
             try:
                 self._module = importlib.import_module(self._module_name)
+                if self._set_loggers is not None:
+                    self._set_loggers()
             except ImportError as e:
                 if self._import_error_message is not None:
                     raise ImportError(self._import_error_message) from e

{skypilot_nightly-1.0.0.dev20241012 → skypilot_nightly-1.0.0.dev20241014}/sky/backends/backend.py

@@ -4,7 +4,9 @@ from typing import Dict, Generic, Optional
 
 import sky
 from sky.usage import usage_lib
+from sky.utils import rich_utils
 from sky.utils import timeline
+from sky.utils import ux_utils
 
 if typing.TYPE_CHECKING:
     from sky import resources
@@ -54,8 +56,9 @@ class Backend(Generic[_ResourceHandleType]):
             cluster_name = sky.backends.backend_utils.generate_cluster_name()
         usage_lib.record_cluster_name_for_current_operation(cluster_name)
         usage_lib.messages.usage.update_actual_task(task)
-        return self._provision(task, to_provision, dryrun, stream_logs,
-                               cluster_name, retry_until_up)
+        with rich_utils.safe_status(ux_utils.spinner_message('Launching')):
+            return self._provision(task, to_provision, dryrun, stream_logs,
+                                   cluster_name, retry_until_up)
 
     @timeline.event
     @usage_lib.messages.usage.update_runtime('sync_workdir')
@@ -76,7 +79,8 @@ class Backend(Generic[_ResourceHandleType]):
     @usage_lib.messages.usage.update_runtime('setup')
     def setup(self, handle: _ResourceHandleType, task: 'task_lib.Task',
               detach_setup: bool) -> None:
-        return self._setup(handle, task, detach_setup)
+        with rich_utils.safe_status(ux_utils.spinner_message('Running setup')):
+            return self._setup(handle, task, detach_setup)
 
     def add_storage_objects(self, task: 'task_lib.Task') -> None:
         raise NotImplementedError
@@ -96,7 +100,8 @@ class Backend(Generic[_ResourceHandleType]):
         usage_lib.record_cluster_name_for_current_operation(
             handle.get_cluster_name())
         usage_lib.messages.usage.update_actual_task(task)
-        return self._execute(handle, task, detach_run, dryrun)
+        with rich_utils.safe_status(ux_utils.spinner_message('Submitting job')):
+            return self._execute(handle, task, detach_run, dryrun)
 
     @timeline.event
     def post_execute(self, handle: _ResourceHandleType, down: bool) -> None:

{skypilot_nightly-1.0.0.dev20241012 → skypilot_nightly-1.0.0.dev20241014}/sky/backends/backend_utils.py

@@ -70,9 +70,6 @@ IP_ADDR_REGEX = r'\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?!/\d{1,2})\b'
 SKY_REMOTE_PATH = '~/.sky/wheels'
 SKY_USER_FILE_PATH = '~/.sky/generated'
 
-BOLD = '\033[1m'
-RESET_BOLD = '\033[0m'
-
 # Do not use /tmp because it gets cleared on VM restart.
 _SKY_REMOTE_FILE_MOUNTS_DIR = '~/.sky/file_mounts/'
 
@@ -1171,7 +1168,8 @@ def wait_until_ray_cluster_ready(
     runner = command_runner.SSHCommandRunner(node=(head_ip, 22),
                                              **ssh_credentials)
     with rich_utils.safe_status(
-            '[bold cyan]Waiting for workers...') as worker_status:
+            ux_utils.spinner_message('Waiting for workers',
+                                     log_path=log_path)) as worker_status:
         while True:
             rc, output, stderr = runner.run(
                 instance_setup.RAY_STATUS_WITH_SKY_RAY_PORT_COMMAND,
@@ -1187,9 +1185,11 @@ def wait_until_ray_cluster_ready(
             ready_head, ready_workers = _count_healthy_nodes_from_ray(
                 output, is_local_cloud=is_local_cloud)
 
-            worker_status.update('[bold cyan]'
-                                 f'{ready_workers} out of {num_nodes - 1} '
-                                 'workers ready')
+            worker_status.update(
+                ux_utils.spinner_message(
+                    f'{ready_workers} out of {num_nodes - 1} '
+                    'workers ready',
+                    log_path=log_path))
 
             # In the local case, ready_head=0 and ready_workers=num_nodes. This
             # is because there is no matching regex for _LAUNCHED_HEAD_PATTERN.
@@ -1304,7 +1304,6 @@ def parallel_data_transfer_to_nodes(
         stream_logs: bool; Whether to stream logs to stdout
         source_bashrc: bool; Source bashrc before running the command.
     """
-    fore = colorama.Fore
     style = colorama.Style
 
     origin_source = source
@@ -1341,12 +1340,10 @@ def parallel_data_transfer_to_nodes(
 
     num_nodes = len(runners)
     plural = 's' if num_nodes > 1 else ''
-    message = (f'{fore.CYAN}{action_message} (to {num_nodes} node{plural})'
-               f': {style.BRIGHT}{origin_source}{style.RESET_ALL} -> '
-               f'{style.BRIGHT}{target}{style.RESET_ALL}')
+    message = (f'  {style.DIM}{action_message} (to {num_nodes} node{plural})'
+               f': {origin_source} -> {target}{style.RESET_ALL}')
     logger.info(message)
-    with rich_utils.safe_status(f'[bold cyan]{action_message}[/]'):
-        subprocess_utils.run_in_parallel(_sync_node, runners)
+    subprocess_utils.run_in_parallel(_sync_node, runners)
 
 
 def check_local_gpus() -> bool:
@@ -2488,9 +2485,9 @@ def get_clusters(
     progress = rich_progress.Progress(transient=True,
                                       redirect_stdout=False,
                                       redirect_stderr=False)
-    task = progress.add_task(
-        f'[bold cyan]Refreshing status for {len(records)} cluster{plural}[/]',
-        total=len(records))
+    task = progress.add_task(ux_utils.spinner_message(
+        f'Refreshing status for {len(records)} cluster{plural}'),
+                             total=len(records))
 
     def _refresh_cluster(cluster_name):
         try: