skypilot-nightly 1.0.0.dev20250305__py3-none-any.whl → 1.0.0.dev20250306__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- sky/__init__.py +2 -2
- sky/cli.py +1 -1
- sky/client/cli.py +1 -1
- sky/clouds/service_catalog/data_fetchers/fetch_vast.py +14 -4
- sky/jobs/server/core.py +2 -0
- sky/jobs/utils.py +19 -6
- sky/server/server.py +5 -0
- {skypilot_nightly-1.0.0.dev20250305.dist-info → skypilot_nightly-1.0.0.dev20250306.dist-info}/METADATA +1 -1
- {skypilot_nightly-1.0.0.dev20250305.dist-info → skypilot_nightly-1.0.0.dev20250306.dist-info}/RECORD +13 -13
- {skypilot_nightly-1.0.0.dev20250305.dist-info → skypilot_nightly-1.0.0.dev20250306.dist-info}/LICENSE +0 -0
- {skypilot_nightly-1.0.0.dev20250305.dist-info → skypilot_nightly-1.0.0.dev20250306.dist-info}/WHEEL +0 -0
- {skypilot_nightly-1.0.0.dev20250305.dist-info → skypilot_nightly-1.0.0.dev20250306.dist-info}/entry_points.txt +0 -0
- {skypilot_nightly-1.0.0.dev20250305.dist-info → skypilot_nightly-1.0.0.dev20250306.dist-info}/top_level.txt +0 -0
sky/__init__.py
CHANGED
@@ -5,7 +5,7 @@ from typing import Optional
|
|
5
5
|
import urllib.request
|
6
6
|
|
7
7
|
# Replaced with the current commit when building the wheels.
|
8
|
-
_SKYPILOT_COMMIT_SHA = '
|
8
|
+
_SKYPILOT_COMMIT_SHA = 'db832e82e19faa3e428e946c74825a752ebb7402'
|
9
9
|
|
10
10
|
|
11
11
|
def _get_git_commit():
|
@@ -35,7 +35,7 @@ def _get_git_commit():
|
|
35
35
|
|
36
36
|
|
37
37
|
__commit__ = _get_git_commit()
|
38
|
-
__version__ = '1.0.0.
|
38
|
+
__version__ = '1.0.0.dev20250306'
|
39
39
|
__root_dir__ = os.path.dirname(os.path.abspath(__file__))
|
40
40
|
|
41
41
|
|
sky/cli.py
CHANGED
@@ -1874,7 +1874,7 @@ def status(verbose: bool, refresh: bool, ip: bool, endpoints: bool,
|
|
1874
1874
|
num_in_progress_jobs, msg = _handle_jobs_queue_request(
|
1875
1875
|
managed_jobs_queue_request_id,
|
1876
1876
|
show_all=False,
|
1877
|
-
show_user=
|
1877
|
+
show_user=all_users,
|
1878
1878
|
limit_num_jobs_to_show=not all,
|
1879
1879
|
is_called_by_user=False)
|
1880
1880
|
except KeyboardInterrupt:
|
sky/client/cli.py
CHANGED
@@ -1874,7 +1874,7 @@ def status(verbose: bool, refresh: bool, ip: bool, endpoints: bool,
|
|
1874
1874
|
num_in_progress_jobs, msg = _handle_jobs_queue_request(
|
1875
1875
|
managed_jobs_queue_request_id,
|
1876
1876
|
show_all=False,
|
1877
|
-
show_user=
|
1877
|
+
show_user=all_users,
|
1878
1878
|
limit_num_jobs_to_show=not all,
|
1879
1879
|
is_called_by_user=False)
|
1880
1880
|
except KeyboardInterrupt:
|
@@ -9,8 +9,8 @@ import collections
|
|
9
9
|
import csv
|
10
10
|
import json
|
11
11
|
import math
|
12
|
+
import os
|
12
13
|
import re
|
13
|
-
import sys
|
14
14
|
from typing import Any, Dict, List
|
15
15
|
|
16
16
|
from sky.adaptors import vast
|
@@ -38,6 +38,10 @@ def dot_get(d: dict, key: str) -> Any:
|
|
38
38
|
|
39
39
|
if __name__ == '__main__':
|
40
40
|
seen = set()
|
41
|
+
# InstanceList is the buffered list to emit to
|
42
|
+
# the CSV
|
43
|
+
csvList = []
|
44
|
+
|
41
45
|
# InstanceType and gpuInfo are basically just stubs
|
42
46
|
# so that the dictwriter is happy without weird
|
43
47
|
# code.
|
@@ -47,8 +51,6 @@ if __name__ == '__main__':
|
|
47
51
|
('cpu_ram', 'MemoryGiB'), ('gpu_name', 'GpuInfo'),
|
48
52
|
('search.totalHour', 'Price'), ('min_bid', 'SpotPrice'),
|
49
53
|
('geolocation', 'Region'))
|
50
|
-
writer = csv.DictWriter(sys.stdout, fieldnames=[x[1] for x in mapped_keys])
|
51
|
-
writer.writeheader()
|
52
54
|
|
53
55
|
# Vast has a wide variety of machines, some of
|
54
56
|
# which will have less diskspace and network
|
@@ -141,7 +143,15 @@ if __name__ == '__main__':
|
|
141
143
|
printstub = f'{stub}#print'
|
142
144
|
if printstub not in seen:
|
143
145
|
instance['SpotPrice'] = f'{maxBid:.2f}'
|
144
|
-
|
146
|
+
csvList.append(instance)
|
145
147
|
seen.add(printstub)
|
146
148
|
else:
|
147
149
|
seen.add(stub)
|
150
|
+
|
151
|
+
os.makedirs('vast', exist_ok=True)
|
152
|
+
with open('vast/vms.csv', 'w', newline='', encoding='utf-8') as csvfile:
|
153
|
+
writer = csv.DictWriter(csvfile, fieldnames=[x[1] for x in mapped_keys])
|
154
|
+
writer.writeheader()
|
155
|
+
|
156
|
+
for instance in csvList:
|
157
|
+
writer.writerow(instance)
|
sky/jobs/server/core.py
CHANGED
@@ -341,6 +341,8 @@ def queue(refresh: bool,
|
|
341
341
|
'status': (sky.jobs.ManagedJobStatus) of the job,
|
342
342
|
'cluster_resources': (str) resources of the cluster,
|
343
343
|
'region': (str) region of the cluster,
|
344
|
+
'user_name': (Optional[str]) job creator's user name,
|
345
|
+
'user_hash': (str) job creator's user hash,
|
344
346
|
}
|
345
347
|
]
|
346
348
|
Raises:
|
sky/jobs/utils.py
CHANGED
@@ -735,6 +735,10 @@ def stream_logs_by_id(job_id: int, follow: bool = True) -> Tuple[str, int]:
|
|
735
735
|
managed_job_status = managed_job_state.get_status(job_id)
|
736
736
|
assert managed_job_status is not None, job_id
|
737
737
|
|
738
|
+
if not follow and not managed_job_status.is_terminal():
|
739
|
+
# The job is not in terminal state and we are not following,
|
740
|
+
# just return.
|
741
|
+
return '', exceptions.JobExitCode.SUCCEEDED
|
738
742
|
logger.info(
|
739
743
|
ux_utils.finishing_message(f'Managed job finished: {job_id} '
|
740
744
|
f'(status: {managed_job_status.value}).'))
|
@@ -914,6 +918,10 @@ def load_managed_job_queue(payload: str) -> List[Dict[str, Any]]:
|
|
914
918
|
jobs = message_utils.decode_payload(payload)
|
915
919
|
for job in jobs:
|
916
920
|
job['status'] = managed_job_state.ManagedJobStatus(job['status'])
|
921
|
+
if 'user_hash' in job and job['user_hash'] is not None:
|
922
|
+
# Skip jobs that do not have user_hash info.
|
923
|
+
# TODO(cooperc): Remove check before 0.12.0.
|
924
|
+
job['user_name'] = global_user_state.get_user(job['user_hash']).name
|
917
925
|
return jobs
|
918
926
|
|
919
927
|
|
@@ -1043,16 +1051,21 @@ def format_job_table(
|
|
1043
1051
|
def get_user_column_values(task: Dict[str, Any]) -> List[str]:
|
1044
1052
|
user_values: List[str] = []
|
1045
1053
|
if show_user:
|
1054
|
+
user_name = '-' # default value
|
1055
|
+
|
1056
|
+
task_user_name = task.get('user_name', None)
|
1057
|
+
task_user_hash = task.get('user_hash', None)
|
1058
|
+
if task_user_name is not None:
|
1059
|
+
user_name = task_user_name
|
1060
|
+
elif task_user_hash is not None:
|
1061
|
+
# Fallback to the user hash if we are somehow missing the name.
|
1062
|
+
user_name = task_user_hash
|
1046
1063
|
|
1047
|
-
user_name = '-'
|
1048
|
-
user_hash = task.get('user_hash', None)
|
1049
|
-
if user_hash:
|
1050
|
-
user = global_user_state.get_user(user_hash)
|
1051
|
-
user_name = user.name if user.name else '-'
|
1052
1064
|
user_values = [user_name]
|
1053
1065
|
|
1054
1066
|
if show_all:
|
1055
|
-
user_values.append(
|
1067
|
+
user_values.append(
|
1068
|
+
task_user_hash if task_user_hash is not None else '-')
|
1056
1069
|
|
1057
1070
|
return user_values
|
1058
1071
|
|
sky/server/server.py
CHANGED
@@ -45,6 +45,7 @@ from sky.utils import admin_policy_utils
|
|
45
45
|
from sky.utils import common as common_lib
|
46
46
|
from sky.utils import common_utils
|
47
47
|
from sky.utils import dag_utils
|
48
|
+
from sky.utils import env_options
|
48
49
|
from sky.utils import status_lib
|
49
50
|
|
50
51
|
# pylint: disable=ungrouped-imports
|
@@ -65,6 +66,10 @@ def _add_timestamp_prefix_for_server_logs() -> None:
|
|
65
66
|
# Add date prefix to the log message printed by loggers under
|
66
67
|
# server.
|
67
68
|
stream_handler = logging.StreamHandler(sys.stdout)
|
69
|
+
if env_options.Options.SHOW_DEBUG_INFO.get():
|
70
|
+
stream_handler.setLevel(logging.DEBUG)
|
71
|
+
else:
|
72
|
+
stream_handler.setLevel(logging.INFO)
|
68
73
|
stream_handler.flush = sys.stdout.flush # type: ignore
|
69
74
|
stream_handler.setFormatter(sky_logging.FORMATTER)
|
70
75
|
server_logger.addHandler(stream_handler)
|
{skypilot_nightly-1.0.0.dev20250305.dist-info → skypilot_nightly-1.0.0.dev20250306.dist-info}/RECORD
RENAMED
@@ -1,8 +1,8 @@
|
|
1
|
-
sky/__init__.py,sha256=
|
1
|
+
sky/__init__.py,sha256=ak0AJnxWgEbgwgeX8-qC2zFNyTtXtDJ6l2P4Pdtzg5o,6428
|
2
2
|
sky/admin_policy.py,sha256=hPo02f_A32gCqhUueF0QYy1fMSSKqRwYEg_9FxScN_s,3248
|
3
3
|
sky/authentication.py,sha256=hCEqi77nprQEg3ktfRL51xiiw16zwZOmFEDB_Z7fWVU,22384
|
4
4
|
sky/check.py,sha256=NDKx_Zm7YRxPjMv82wz3ESLnGIPljaACyqVdVNM0PzY,11258
|
5
|
-
sky/cli.py,sha256=
|
5
|
+
sky/cli.py,sha256=qBRqtKVV_GurbCFZBHkF2UIahy3A7bsOsmfCNm6mZ54,221503
|
6
6
|
sky/cloud_stores.py,sha256=kEHXd2divyra-1c3EusHxKyM5yTQlTXc6cKVXofsefA,23978
|
7
7
|
sky/core.py,sha256=MU9hcTdh8baMGrr2ZXmbxx12vNlhajrkeyg5QtV717c,47609
|
8
8
|
sky/dag.py,sha256=Yl7Ry26Vql5cv4YMz8g9kOUgtoCihJnw7c8NgZYakMY,3242
|
@@ -43,7 +43,7 @@ sky/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
43
43
|
sky/benchmark/benchmark_state.py,sha256=X8CXmuU9KgsDRhKedhFgjeRMUFWtQsjFs1qECvPG2yg,8723
|
44
44
|
sky/benchmark/benchmark_utils.py,sha256=o4RymqSceq5mLEZL0upQM6NVEzJJQzj9s9tTm49uUTc,26365
|
45
45
|
sky/client/__init__.py,sha256=pz6xvVSd9X-gwqbsDL0E9QOojYqM0KAD0j-NCyCIF1k,38
|
46
|
-
sky/client/cli.py,sha256=
|
46
|
+
sky/client/cli.py,sha256=qBRqtKVV_GurbCFZBHkF2UIahy3A7bsOsmfCNm6mZ54,221503
|
47
47
|
sky/client/common.py,sha256=axDic7WOG1e78SdFm5XIwdhX7YNvf3g4k7INrsW3X4s,14611
|
48
48
|
sky/client/sdk.py,sha256=IRx72BXqOn_WVvtOuTXfgR5zcSm_lyoXeYxa5c_2_qk,68723
|
49
49
|
sky/clouds/__init__.py,sha256=OW6mJ-9hpJSBORCgt2LippLQEYZHNfnBW1mooRNNvxo,1416
|
@@ -92,7 +92,7 @@ sky/clouds/service_catalog/data_fetchers/fetch_cudo.py,sha256=52P48lvWN0s1ArjeLP
|
|
92
92
|
sky/clouds/service_catalog/data_fetchers/fetch_fluidstack.py,sha256=hsqpQi_YUI-qil3zLCEGatrR7BkWzywr4otRdHrd-4k,7350
|
93
93
|
sky/clouds/service_catalog/data_fetchers/fetch_gcp.py,sha256=JnugFifzHPQITlbDKoKexE8NqgagOEfQWTxon7P6vJ0,30935
|
94
94
|
sky/clouds/service_catalog/data_fetchers/fetch_lambda_cloud.py,sha256=MUzogyLruLQmIt-To6TsfnGPgv_nnlp49XYbeshsd7I,5003
|
95
|
-
sky/clouds/service_catalog/data_fetchers/fetch_vast.py,sha256=
|
95
|
+
sky/clouds/service_catalog/data_fetchers/fetch_vast.py,sha256=MRxk52FUeG-R2hPUbkH44HXRPou73dxXWYAHDEXg3xU,5016
|
96
96
|
sky/clouds/service_catalog/data_fetchers/fetch_vsphere.py,sha256=Opp2r3KSzXPtwk3lKNbO8IX9QzjoRSwy1kW3jPjtS1c,21453
|
97
97
|
sky/clouds/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
98
98
|
sky/clouds/utils/aws_utils.py,sha256=W5BRC-2F_VY4BymRA1kS6-MufsI3V8cfY_hv--4gJBU,1986
|
@@ -112,14 +112,14 @@ sky/jobs/controller.py,sha256=4G1CKI7M7D1BgJLbJMeqzg0iDDv7FR4ObB1BKZFFjhk,29585
|
|
112
112
|
sky/jobs/recovery_strategy.py,sha256=RLrqq8B1likxTknPzt3_BqO26sFVpoatxzUuGfwc18A,26170
|
113
113
|
sky/jobs/scheduler.py,sha256=8k2ieJ1TTvJ0TOalnklJtrMwFuatsh-ojoPMBgFRBlI,13119
|
114
114
|
sky/jobs/state.py,sha256=tDULLH6DVs4oKUIKhh0UAn3RzyVGuIUtEq5kW7K1Ojw,44585
|
115
|
-
sky/jobs/utils.py,sha256=
|
115
|
+
sky/jobs/utils.py,sha256=7CCrN5ByAG5FITXjcpA7n4ZS1xAnC6MKY-vfk-aF5Qg,56526
|
116
116
|
sky/jobs/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
117
117
|
sky/jobs/client/sdk.py,sha256=4STtriCWLUq1mm-tEsh_iXC7r-U7_PY0R9X6-DNpaXs,10122
|
118
118
|
sky/jobs/dashboard/dashboard.py,sha256=JKg8cCH_Y0sf3MoDTx85BghVEXWpp8ItPLshp09-_Js,7618
|
119
119
|
sky/jobs/dashboard/static/favicon.ico,sha256=uYlvgxSM7gjBmXpZ8wydvZUPAbJiiix-rc2Xe5mma9s,15086
|
120
120
|
sky/jobs/dashboard/templates/index.html,sha256=NrlTDiEHJDt7sViwWgXUSxVCyVl_IEukE5jdvN8WhtQ,33132
|
121
121
|
sky/jobs/server/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
122
|
-
sky/jobs/server/core.py,sha256=
|
122
|
+
sky/jobs/server/core.py,sha256=bXE92KhXjFPZFZrqlnrZhz8SYWXKCiu9goXtrkFUlNc,25243
|
123
123
|
sky/jobs/server/dashboard_utils.py,sha256=2Mbx40W1pQqPEPHsSDbHeaF0j5cgyKy-_A9Owdwp_AQ,2315
|
124
124
|
sky/jobs/server/server.py,sha256=vdVxl4ZkBRlfOdsUO5Ttxon_-NE9XoMVMSo8fJ-Y73Y,7803
|
125
125
|
sky/provision/__init__.py,sha256=LzOo5LjkRXwSf29dUqN14YbjzQu3liXLQcmweTeZ4dE,6457
|
@@ -230,7 +230,7 @@ sky/serve/server/server.py,sha256=gQGVU9nHYdGbaLhGjIUNIYn4xwKjRASRJkiiTL5AI1Y,32
|
|
230
230
|
sky/server/__init__.py,sha256=MPPBqFzXz6Jv5QSk6td_IcvnfXfNErDZVcizu4MLRow,27
|
231
231
|
sky/server/common.py,sha256=pEa-q3P5aOm6RMlit0pVzlDoJnZU_6zViO7aK_7htn0,17843
|
232
232
|
sky/server/constants.py,sha256=_ZNrxYh8vmgbf3DmkGDduxjvO2y43ZSPTkH5rCNsVjU,770
|
233
|
-
sky/server/server.py,sha256=
|
233
|
+
sky/server/server.py,sha256=ag2vXO3ESU2BYOMLRkgZhpYR_WrfDB0Zo6wMTnRuy5k,43458
|
234
234
|
sky/server/stream_utils.py,sha256=-3IX1YCgxAFfcvQIV0TCvOn1wbRLWovAx3ckCrsExWU,5651
|
235
235
|
sky/server/html/log.html,sha256=TSGZktua9Ysl_ysg3w60rjxAxhH61AJnsYDHdtqrjmI,6929
|
236
236
|
sky/server/requests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -344,9 +344,9 @@ sky/utils/kubernetes/k8s_gpu_labeler_setup.yaml,sha256=VLKT2KKimZu1GDg_4AIlIt488
|
|
344
344
|
sky/utils/kubernetes/kubernetes_deploy_utils.py,sha256=otzHzpliHDCpzYT-nU9Q0ZExbiFpDPWvhxwkvchZj7k,10073
|
345
345
|
sky/utils/kubernetes/rsync_helper.sh,sha256=h4YwrPFf9727CACnMJvF3EyK_0OeOYKKt4su_daKekw,1256
|
346
346
|
sky/utils/kubernetes/ssh_jump_lifecycle_manager.py,sha256=Kq1MDygF2IxFmu9FXpCxqucXLmeUrvs6OtRij6XTQbo,6554
|
347
|
-
skypilot_nightly-1.0.0.
|
348
|
-
skypilot_nightly-1.0.0.
|
349
|
-
skypilot_nightly-1.0.0.
|
350
|
-
skypilot_nightly-1.0.0.
|
351
|
-
skypilot_nightly-1.0.0.
|
352
|
-
skypilot_nightly-1.0.0.
|
347
|
+
skypilot_nightly-1.0.0.dev20250306.dist-info/LICENSE,sha256=emRJAvE7ngL6x0RhQvlns5wJzGI3NEQ_WMjNmd9TZc4,12170
|
348
|
+
skypilot_nightly-1.0.0.dev20250306.dist-info/METADATA,sha256=KMCEi2MMpS3c6PtW0hntDieMCbbRksyPtYoAFEcGSKI,18173
|
349
|
+
skypilot_nightly-1.0.0.dev20250306.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
|
350
|
+
skypilot_nightly-1.0.0.dev20250306.dist-info/entry_points.txt,sha256=StA6HYpuHj-Y61L2Ze-hK2IcLWgLZcML5gJu8cs6nU4,36
|
351
|
+
skypilot_nightly-1.0.0.dev20250306.dist-info/top_level.txt,sha256=qA8QuiNNb6Y1OF-pCUtPEr6sLEwy2xJX06Bd_CrtrHY,4
|
352
|
+
skypilot_nightly-1.0.0.dev20250306.dist-info/RECORD,,
|
File without changes
|
{skypilot_nightly-1.0.0.dev20250305.dist-info → skypilot_nightly-1.0.0.dev20250306.dist-info}/WHEEL
RENAMED
File without changes
|
File without changes
|
File without changes
|