skypilot-nightly 1.0.0.dev20241113__py3-none-any.whl → 1.0.0.dev20241114__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 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 = 'eea13cc624a10bd4319eace0f48dcceb9d0287cd'
8
+ _SKYPILOT_COMMIT_SHA = 'a2e670d347b666f40edb7f675af87c86faec3971'
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.dev20241113'
38
+ __version__ = '1.0.0.dev20241114'
39
39
  __root_dir__ = os.path.dirname(os.path.abspath(__file__))
40
40
 
41
41
 
@@ -203,7 +203,8 @@ def read_catalog(filename: str,
203
203
  f'Updating {cloud} catalog: {filename}') +
204
204
  f'{update_frequency_str}'):
205
205
  try:
206
- r = requests.get(url)
206
+ r = requests.get(url=url,
207
+ headers={'User-Agent': 'SkyPilot/0.7'})
207
208
  r.raise_for_status()
208
209
  except requests.exceptions.RequestException as e:
209
210
  error_str = (f'Failed to fetch {cloud} catalog '
@@ -380,7 +380,7 @@ def get_vm_df(skus: List[Dict[str, Any]], region_prefix: str) -> 'pd.DataFrame':
380
380
  df = df[~df['AvailabilityZone'].str.startswith(tuple(TPU_V4_ZONES))]
381
381
 
382
382
  # TODO(woosuk): Make this more efficient.
383
- def get_vm_price(row: pd.Series, spot: bool) -> float:
383
+ def get_vm_price(row: pd.Series, spot: bool) -> Optional[float]:
384
384
  series = row['InstanceType'].split('-')[0].lower()
385
385
 
386
386
  ondemand_or_spot = 'OnDemand' if not spot else 'Preemptible'
@@ -431,12 +431,26 @@ def get_vm_df(skus: List[Dict[str, Any]], region_prefix: str) -> 'pd.DataFrame':
431
431
  if series in ['f1', 'g1']:
432
432
  memory_price = 0.0
433
433
 
434
- assert cpu_price is not None, row
435
- assert memory_price is not None, row
434
+ # TODO(tian): (2024/11/10) Some SKUs are missing in the SKUs API. We
435
+ # skip them in the catalog for now. We should investigate why they are
436
+ # missing and add them back.
437
+ if cpu_price is None or memory_price is None:
438
+ return None
436
439
  return cpu_price + memory_price
437
440
 
438
441
  df['Price'] = df.apply(lambda row: get_vm_price(row, spot=False), axis=1)
439
442
  df['SpotPrice'] = df.apply(lambda row: get_vm_price(row, spot=True), axis=1)
443
+ dropped_rows = df[df['Price'].isna() & df['SpotPrice'].isna()]
444
+ dropped_info = (dropped_rows[['InstanceType',
445
+ 'AvailabilityZone']].drop_duplicates())
446
+ az2missing = dropped_info.groupby('AvailabilityZone').apply(
447
+ lambda x: x['InstanceType'].tolist())
448
+ print('Price not found for the following zones and instance types. '
449
+ 'Dropping them.')
450
+ for az, instances in az2missing.items():
451
+ print('-' * 30, az, '-' * 30)
452
+ print(', '.join(instances))
453
+ df = df.dropna(subset=['Price', 'SpotPrice'], how='all')
440
454
  df = df.reset_index(drop=True)
441
455
  df = df.sort_values(['InstanceType', 'Region', 'AvailabilityZone'])
442
456
  return df
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: skypilot-nightly
3
- Version: 1.0.0.dev20241113
3
+ Version: 1.0.0.dev20241114
4
4
  Summary: SkyPilot: An intercloud broker for the clouds
5
5
  Author: SkyPilot Team
6
6
  License: Apache 2.0
@@ -1,4 +1,4 @@
1
- sky/__init__.py,sha256=IquLJLfu65jmWJdveTrz1ZfMnTqlLTEAAFhTJXJavR0,5882
1
+ sky/__init__.py,sha256=2baJpZXeB_2V5O1WBqblKmcizmJiqRD61hWFQhOaQXM,5882
2
2
  sky/admin_policy.py,sha256=hPo02f_A32gCqhUueF0QYy1fMSSKqRwYEg_9FxScN_s,3248
3
3
  sky/authentication.py,sha256=pAdCT60OxxiXI9KXDyP2lQ9u9vMc6aMtq5Xi2h_hbdw,20984
4
4
  sky/check.py,sha256=D3Y3saIFAYVvPxuBHnVgJEO0fUVDxgjwuMBaO-D778k,9472
@@ -58,7 +58,7 @@ sky/clouds/vsphere.py,sha256=ZzlcQBzv0aaRYXwZOrdKIGFK94LaOfDSV3lJBg9xyc4,12256
58
58
  sky/clouds/service_catalog/__init__.py,sha256=cFZ3HLdQVa42xOhK2XxuB_xPIX4X1UR89InR4y2y_78,14757
59
59
  sky/clouds/service_catalog/aws_catalog.py,sha256=vTI7h5bjZg3lItT9RBaSwY1Fl0vX5UN1CgMDM6-C1pw,13059
60
60
  sky/clouds/service_catalog/azure_catalog.py,sha256=5Q51x_WEKvQ2YSgJvZHRH3URlbwIstYuwpjaWW_wJlw,8149
61
- sky/clouds/service_catalog/common.py,sha256=GcKjtJTuPbpHoqh6CKoTfDJ2EWB9yFiIRmRUgr6oJI4,27615
61
+ sky/clouds/service_catalog/common.py,sha256=qHNLzh59W34CSSCCztu75n69TuGyDQ310SQc_P-t544,27700
62
62
  sky/clouds/service_catalog/config.py,sha256=ylzqewdEBjDg4awvFek6ldYmFrnvD2bVGLZuLPvEVYA,1793
63
63
  sky/clouds/service_catalog/constants.py,sha256=ai2yOlsVqBnEpbxaEHXt61COsHBLwOfw6GZXntEPj7k,411
64
64
  sky/clouds/service_catalog/cudo_catalog.py,sha256=V_takvL6dWTGQaTLCEvjKIotCDPnMujiNUZ87kZKGVI,4673
@@ -78,7 +78,7 @@ sky/clouds/service_catalog/data_fetchers/fetch_aws.py,sha256=ro2zazdkDF6z9bE7QFy
78
78
  sky/clouds/service_catalog/data_fetchers/fetch_azure.py,sha256=L1JsX1YrhpyI7ylzEPBBNE9XOZM0K0FIXbBUMj9h0MQ,12803
79
79
  sky/clouds/service_catalog/data_fetchers/fetch_cudo.py,sha256=52P48lvWN0s1ArjeLPeLemPRpxjSRcHincRle0nqdm4,3440
80
80
  sky/clouds/service_catalog/data_fetchers/fetch_fluidstack.py,sha256=35nO_VaDOgp5W13kt_lIANSk_CNf7gBiZGJ5fGyZu6o,6808
81
- sky/clouds/service_catalog/data_fetchers/fetch_gcp.py,sha256=mDAN98T58h1g_LLyppSEUVDlsbLhk2454Nhmg5-aw0Q,32670
81
+ sky/clouds/service_catalog/data_fetchers/fetch_gcp.py,sha256=VrTTkMF5AjiplfDmvPBW-otR3oXGU3-oFouVMfIua4Q,33447
82
82
  sky/clouds/service_catalog/data_fetchers/fetch_lambda_cloud.py,sha256=yOPmmckiQ0HU6bKXWd7YdTrsF2sql3Bs_jYNpuxlo0I,4942
83
83
  sky/clouds/service_catalog/data_fetchers/fetch_vsphere.py,sha256=SF_gTU74qg6L-DSWneCAbqP0lwZXaaDi5otiMIJbrw0,21462
84
84
  sky/clouds/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -275,9 +275,9 @@ sky/utils/kubernetes/k8s_gpu_labeler_job.yaml,sha256=k0TBoQ4zgf79-sVkixKSGYFHQ7Z
275
275
  sky/utils/kubernetes/k8s_gpu_labeler_setup.yaml,sha256=VLKT2KKimZu1GDg_4AIlIt488oMQvhRZWwsj9vBbPUg,3812
276
276
  sky/utils/kubernetes/rsync_helper.sh,sha256=hyYDaYSNxYaNvzUQBzC8AidB7nDeojizjkzc_CTxycY,1077
277
277
  sky/utils/kubernetes/ssh_jump_lifecycle_manager.py,sha256=RFLJ3k7MR5UN4SKHykQ0lV9SgXumoULpKYIAt1vh-HU,6560
278
- skypilot_nightly-1.0.0.dev20241113.dist-info/LICENSE,sha256=emRJAvE7ngL6x0RhQvlns5wJzGI3NEQ_WMjNmd9TZc4,12170
279
- skypilot_nightly-1.0.0.dev20241113.dist-info/METADATA,sha256=psS5Zx9UaBaT4ifNVk35T4Ks42puqoGYkG5uE_-RBrQ,19699
280
- skypilot_nightly-1.0.0.dev20241113.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
281
- skypilot_nightly-1.0.0.dev20241113.dist-info/entry_points.txt,sha256=StA6HYpuHj-Y61L2Ze-hK2IcLWgLZcML5gJu8cs6nU4,36
282
- skypilot_nightly-1.0.0.dev20241113.dist-info/top_level.txt,sha256=qA8QuiNNb6Y1OF-pCUtPEr6sLEwy2xJX06Bd_CrtrHY,4
283
- skypilot_nightly-1.0.0.dev20241113.dist-info/RECORD,,
278
+ skypilot_nightly-1.0.0.dev20241114.dist-info/LICENSE,sha256=emRJAvE7ngL6x0RhQvlns5wJzGI3NEQ_WMjNmd9TZc4,12170
279
+ skypilot_nightly-1.0.0.dev20241114.dist-info/METADATA,sha256=upLxuBm3j_q8aMS6Gin0gbuz_cJ6u5eSKBxyTJo1xwM,19699
280
+ skypilot_nightly-1.0.0.dev20241114.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
281
+ skypilot_nightly-1.0.0.dev20241114.dist-info/entry_points.txt,sha256=StA6HYpuHj-Y61L2Ze-hK2IcLWgLZcML5gJu8cs6nU4,36
282
+ skypilot_nightly-1.0.0.dev20241114.dist-info/top_level.txt,sha256=qA8QuiNNb6Y1OF-pCUtPEr6sLEwy2xJX06Bd_CrtrHY,4
283
+ skypilot_nightly-1.0.0.dev20241114.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (75.4.0)
2
+ Generator: setuptools (75.5.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5