skypilot-nightly 1.0.0.dev20250305__tar.gz → 1.0.0.dev20250306__tar.gz

{skypilot_nightly-1.0.0.dev20250305/skypilot_nightly.egg-info → skypilot_nightly-1.0.0.dev20250306}/PKG-INFO

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

{skypilot_nightly-1.0.0.dev20250305 → skypilot_nightly-1.0.0.dev20250306}/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 = '296a22e868b9bdf1faccbe3effbfb858a5a05905'
+_SKYPILOT_COMMIT_SHA = 'db832e82e19faa3e428e946c74825a752ebb7402'
 
 
 def _get_git_commit():
@@ -35,7 +35,7 @@ def _get_git_commit():
 
 
 __commit__ = _get_git_commit()
-__version__ = '1.0.0.dev20250305'
+__version__ = '1.0.0.dev20250306'
 __root_dir__ = os.path.dirname(os.path.abspath(__file__))
 
 

{skypilot_nightly-1.0.0.dev20250305 → skypilot_nightly-1.0.0.dev20250306}/sky/cli.py

@@ -1874,7 +1874,7 @@ def status(verbose: bool, refresh: bool, ip: bool, endpoints: bool,
                 num_in_progress_jobs, msg = _handle_jobs_queue_request(
                     managed_jobs_queue_request_id,
                     show_all=False,
-                    show_user=False,
+                    show_user=all_users,
                     limit_num_jobs_to_show=not all,
                     is_called_by_user=False)
             except KeyboardInterrupt:

{skypilot_nightly-1.0.0.dev20250305 → skypilot_nightly-1.0.0.dev20250306}/sky/client/cli.py

@@ -1874,7 +1874,7 @@ def status(verbose: bool, refresh: bool, ip: bool, endpoints: bool,
                 num_in_progress_jobs, msg = _handle_jobs_queue_request(
                     managed_jobs_queue_request_id,
                     show_all=False,
-                    show_user=False,
+                    show_user=all_users,
                     limit_num_jobs_to_show=not all,
                     is_called_by_user=False)
             except KeyboardInterrupt:

{skypilot_nightly-1.0.0.dev20250305 → skypilot_nightly-1.0.0.dev20250306}/sky/clouds/service_catalog/data_fetchers/fetch_vast.py

@@ -9,8 +9,8 @@ import collections
 import csv
 import json
 import math
+import os
 import re
-import sys
 from typing import Any, Dict, List
 
 from sky.adaptors import vast
@@ -38,6 +38,10 @@ def dot_get(d: dict, key: str) -> Any:
 
 if __name__ == '__main__':
     seen = set()
+    # InstanceList is the buffered list to emit to
+    # the CSV
+    csvList = []
+
     # InstanceType and gpuInfo are basically just stubs
     # so that the dictwriter is happy without weird
     # code.
@@ -47,8 +51,6 @@ if __name__ == '__main__':
                    ('cpu_ram', 'MemoryGiB'), ('gpu_name', 'GpuInfo'),
                    ('search.totalHour', 'Price'), ('min_bid', 'SpotPrice'),
                    ('geolocation', 'Region'))
-    writer = csv.DictWriter(sys.stdout, fieldnames=[x[1] for x in mapped_keys])
-    writer.writeheader()
 
     # Vast has a wide variety of machines, some of
     # which will have less diskspace and network
@@ -141,7 +143,15 @@ if __name__ == '__main__':
                 printstub = f'{stub}#print'
                 if printstub not in seen:
                     instance['SpotPrice'] = f'{maxBid:.2f}'
-                    writer.writerow(instance)
+                    csvList.append(instance)
                     seen.add(printstub)
             else:
                 seen.add(stub)
+
+    os.makedirs('vast', exist_ok=True)
+    with open('vast/vms.csv', 'w', newline='', encoding='utf-8') as csvfile:
+        writer = csv.DictWriter(csvfile, fieldnames=[x[1] for x in mapped_keys])
+        writer.writeheader()
+
+        for instance in csvList:
+            writer.writerow(instance)

{skypilot_nightly-1.0.0.dev20250305 → skypilot_nightly-1.0.0.dev20250306}/sky/jobs/server/core.py

@@ -341,6 +341,8 @@ def queue(refresh: bool,
                 'status': (sky.jobs.ManagedJobStatus) of the job,
                 'cluster_resources': (str) resources of the cluster,
                 'region': (str) region of the cluster,
+                'user_name': (Optional[str]) job creator's user name,
+                'user_hash': (str) job creator's user hash,
             }
         ]
     Raises:

{skypilot_nightly-1.0.0.dev20250305 → skypilot_nightly-1.0.0.dev20250306}/sky/jobs/utils.py

@@ -735,6 +735,10 @@ def stream_logs_by_id(job_id: int, follow: bool = True) -> Tuple[str, int]:
         managed_job_status = managed_job_state.get_status(job_id)
         assert managed_job_status is not None, job_id
 
+    if not follow and not managed_job_status.is_terminal():
+        # The job is not in terminal state and we are not following,
+        # just return.
+        return '', exceptions.JobExitCode.SUCCEEDED
     logger.info(
         ux_utils.finishing_message(f'Managed job finished: {job_id} '
                                    f'(status: {managed_job_status.value}).'))
@@ -914,6 +918,10 @@ def load_managed_job_queue(payload: str) -> List[Dict[str, Any]]:
     jobs = message_utils.decode_payload(payload)
     for job in jobs:
         job['status'] = managed_job_state.ManagedJobStatus(job['status'])
+        if 'user_hash' in job and job['user_hash'] is not None:
+            # Skip jobs that do not have user_hash info.
+            # TODO(cooperc): Remove check before 0.12.0.
+            job['user_name'] = global_user_state.get_user(job['user_hash']).name
     return jobs
 
 
@@ -1043,16 +1051,21 @@ def format_job_table(
     def get_user_column_values(task: Dict[str, Any]) -> List[str]:
         user_values: List[str] = []
         if show_user:
+            user_name = '-'  # default value
+
+            task_user_name = task.get('user_name', None)
+            task_user_hash = task.get('user_hash', None)
+            if task_user_name is not None:
+                user_name = task_user_name
+            elif task_user_hash is not None:
+                # Fallback to the user hash if we are somehow missing the name.
+                user_name = task_user_hash
 
-            user_name = '-'
-            user_hash = task.get('user_hash', None)
-            if user_hash:
-                user = global_user_state.get_user(user_hash)
-                user_name = user.name if user.name else '-'
             user_values = [user_name]
 
             if show_all:
-                user_values.append(user_hash if user_hash is not None else '-')
+                user_values.append(
+                    task_user_hash if task_user_hash is not None else '-')
 
         return user_values
 

{skypilot_nightly-1.0.0.dev20250305 → skypilot_nightly-1.0.0.dev20250306}/sky/server/server.py

@@ -45,6 +45,7 @@ from sky.utils import admin_policy_utils
 from sky.utils import common as common_lib
 from sky.utils import common_utils
 from sky.utils import dag_utils
+from sky.utils import env_options
 from sky.utils import status_lib
 
 # pylint: disable=ungrouped-imports
@@ -65,6 +66,10 @@ def _add_timestamp_prefix_for_server_logs() -> None:
     # Add date prefix to the log message printed by loggers under
     # server.
     stream_handler = logging.StreamHandler(sys.stdout)
+    if env_options.Options.SHOW_DEBUG_INFO.get():
+        stream_handler.setLevel(logging.DEBUG)
+    else:
+        stream_handler.setLevel(logging.INFO)
     stream_handler.flush = sys.stdout.flush  # type: ignore
     stream_handler.setFormatter(sky_logging.FORMATTER)
     server_logger.addHandler(stream_handler)

{skypilot_nightly-1.0.0.dev20250305 → skypilot_nightly-1.0.0.dev20250306/skypilot_nightly.egg-info}/PKG-INFO

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