skypilot-nightly 1.0.0.dev20241109__py3-none-any.whl → 1.0.0.dev20241110__py3-none-any.whl

{skypilot_nightly-1.0.0.dev20241109.dist-info → skypilot_nightly-1.0.0.dev20241110.dist-info}/RECORD

@@ -1,11 +1,11 @@
-sky/__init__.py,sha256=vuaxCFFtQHJTriSEGG_wKshl6nmhDcnt70q66x1rkvA,5882
+sky/__init__.py,sha256=j3vy9X4XOYIefQk15d_c6Q_mpDjII9Nltso4xgrFI1o,5882
 sky/admin_policy.py,sha256=hPo02f_A32gCqhUueF0QYy1fMSSKqRwYEg_9FxScN_s,3248
 sky/authentication.py,sha256=pAdCT60OxxiXI9KXDyP2lQ9u9vMc6aMtq5Xi2h_hbdw,20984
 sky/check.py,sha256=D3Y3saIFAYVvPxuBHnVgJEO0fUVDxgjwuMBaO-D778k,9472
 sky/cli.py,sha256=jEjXs5Z0u263eJIsTHoKyG9oOY6giqw19s2di9kEv1s,212088
 sky/cloud_stores.py,sha256=RjFgmRhUh1Kk__f6g3KxzLp9s7dA0pFK4W1AukEuUaw,21153
 sky/core.py,sha256=0-4W_DKJZgbwXuzNZKQ2R_qJxqxbqqNfyi0U0PQBKvQ,38230
-sky/dag.py,sha256=O9g8NnO8L1SGUEDyqW9W341AH4Wvd3nJs54niR-pkrk,2822
+sky/dag.py,sha256=f3sJlkH4bE6Uuz3ozNtsMhcBpRx7KmC9Sa4seDKt4hU,3104
 sky/exceptions.py,sha256=E3C2Ejcc8RUDAUQn7ar_Jr97C_AxD2rKKMmJOfLJ9d0,8965
 sky/execution.py,sha256=TwcorzFxR_0m8uazPdeKltU3g3ikgUSqqzcSBrHp7K4,26070
 sky/global_user_state.py,sha256=PywEmUutF97XBgRMClR6IS5_KM8JJC0oA1LsPUZebp0,28681
@@ -31,7 +31,7 @@ sky/adaptors/vsphere.py,sha256=zJP9SeObEoLrpgHW2VHvZE48EhgVf8GfAEIwBeaDMfM,2129
 sky/backends/__init__.py,sha256=UDjwbUgpTRApbPJnNfR786GadUuwgRk3vsWoVu5RB_c,536
 sky/backends/backend.py,sha256=wwfbrxPhjMPs6PSyy3tAHI8WJhl-xhgzWBsAZjmJJ6g,6249
 sky/backends/backend_utils.py,sha256=2myfryj1zG9xxPaX6XYYJruxAOGNGbpsy2ckT4A77sE,121813
-sky/backends/cloud_vm_ray_backend.py,sha256=6Ew9Ej92KGlumlCnyDcGSEbHInj7g2Shqwx4oxRkWVQ,233122
+sky/backends/cloud_vm_ray_backend.py,sha256=cL-IDyk9AOmHTAiQbXVwEr4dX6KPx4M-GiVEXxUYPWQ,232147
 sky/backends/docker_utils.py,sha256=Hyw1YY20EyghhEbYx6O2FIMDcGkNzBzV9TM7LFynei8,8358
 sky/backends/local_docker_backend.py,sha256=0JL5m0YUgOmOL4aWEUe4tmt89dsxjk4_WXkPwgEKEis,16801
 sky/backends/wheel_utils.py,sha256=CUVOwlBtQjOMv-RSDGx2jMQ0M1D0w9ZPm0TDafJwBDI,8180
@@ -50,7 +50,7 @@ sky/clouds/gcp.py,sha256=BjCehW3s0IYkRDdEEDm0vYWXQDpOV8KU98OMVRPnQNg,54676
 sky/clouds/ibm.py,sha256=w8bo1EIY_YWYNu0fy-OpAyr6DZviU0tpIXUsiV01rVE,21423
 sky/clouds/kubernetes.py,sha256=tYjQFatOQmgtRzMt3J54CxM0w2ZPQwAo5SyyYkBcW9Y,28657
 sky/clouds/lambda_cloud.py,sha256=ExL_uixdFrF9qSL5JYXpaOXCZ9_eOA2q444kcmBHBXQ,12644
-sky/clouds/oci.py,sha256=sHJrVhUhOKvJ-skbd2ZJ82IR63OXp43krmyPpM8BZqw,27084
+sky/clouds/oci.py,sha256=NOH-yYi1fbMkjqoz39zVXUEexE9MjE1c7YTvGtUgKzQ,26663
 sky/clouds/paperspace.py,sha256=4cjNua6jpuxmfidvLY4tSRX1oj_QaaHDinPMunGplyU,10868
 sky/clouds/runpod.py,sha256=_4myVdGIvQshkka8fn6mBXHgz5TZqhrNhAEM2_HrCT8,11487
 sky/clouds/scp.py,sha256=NivPvzQxA90R37QR3fgTup8ScGfxKsXAhH0xklAj5QU,15817
@@ -67,7 +67,7 @@ sky/clouds/service_catalog/gcp_catalog.py,sha256=v_5fsB3dB9oD8U7lBKnCe5ii6AUWEOi
 sky/clouds/service_catalog/ibm_catalog.py,sha256=1iK0KvbI82U7sySb7chr-qm_16x3tTnZ6nIo7o76ouc,4493
 sky/clouds/service_catalog/kubernetes_catalog.py,sha256=5ilQ-JK1ZS2EZp8GpCKok0H3S1fdI_aAznzIDWCY1NY,9110
 sky/clouds/service_catalog/lambda_catalog.py,sha256=2R-ccu63BbdvO6X80MtxiniA-jLewXb6I0Ye1rYD9fY,5302
-sky/clouds/service_catalog/oci_catalog.py,sha256=DQaP0iQlxZEHWJs862ilynUfUEQDIjCGltS7kSadgYo,8572
+sky/clouds/service_catalog/oci_catalog.py,sha256=cyA6ZqwHGOKuPxUl_dKmFGdeWdQGMrvl_-o2MtyF998,8580
 sky/clouds/service_catalog/paperspace_catalog.py,sha256=MOlfoGRChjEwMzu4nRAho8DrIwwUJ3QlRzrMA1RLqvE,3789
 sky/clouds/service_catalog/runpod_catalog.py,sha256=oWYVgSMiK3DxBE5AgROyExIq9kCTaOr3hDLSc31kqTU,4205
 sky/clouds/service_catalog/scp_catalog.py,sha256=nrtD0hAZd1rUDsFuHI1hrBgAVSE5YprdWoYSXQooIqU,5195
@@ -85,7 +85,7 @@ sky/clouds/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 sky/clouds/utils/aws_utils.py,sha256=W5BRC-2F_VY4BymRA1kS6-MufsI3V8cfY_hv--4gJBU,1986
 sky/clouds/utils/azure_utils.py,sha256=NToRBnhEyuUvb-nBnsKTxjhOBRkMcrelL8LK4w6s4t8,3555
 sky/clouds/utils/gcp_utils.py,sha256=QejfgXOIVRv5-fv3Soi96VeVNVyquwVwy3M58N3YfNs,6633
-sky/clouds/utils/oci_utils.py,sha256=t-5QEQEs8swN683AAp-oDD6yQJOQqVBbsVcHkNyqnbU,4968
+sky/clouds/utils/oci_utils.py,sha256=LILpS38_exeMjmJdNpzwDR8hfGSpWjaRKl1CWKA-zHs,5579
 sky/clouds/utils/scp_utils.py,sha256=RUp7NwyhKygOoVOwvdAOGdoQNSJjryOG6WSExCf-yas,15812
 sky/data/__init__.py,sha256=Nhaf1NURisXpZuwWANa2IuCyppIuc720FRwqSE2oEwY,184
 sky/data/data_transfer.py,sha256=MBmjey9_p2L3IKNKTi8um09SlZe32n4wK3CkVnlTVvo,7346
@@ -103,7 +103,7 @@ sky/jobs/utils.py,sha256=Ff3TttIEdVeM1_kOVkviqIDjeVfBPIXVE8i-yP1VDM8,37976
 sky/jobs/dashboard/dashboard.py,sha256=KMSarpVcfnc-ELPFvy1M9_I1k4kSeXubTk3ibQC67Tg,3219
 sky/jobs/dashboard/static/favicon.ico,sha256=uYlvgxSM7gjBmXpZ8wydvZUPAbJiiix-rc2Xe5mma9s,15086
 sky/jobs/dashboard/templates/index.html,sha256=su1tqgcsXNl1lGl9hfIR6ig1f531OO57x1Tc2mNDK7U,11139
-sky/provision/__init__.py,sha256=UhYsGRribEyK1--PPT0Dom9051jlpdn8UCNhO8qpPOc,6262
+sky/provision/__init__.py,sha256=llAtnAAzx0TKT17B0JL_2ZiKea9RRQRxSzkWHQYqWTo,6292
 sky/provision/common.py,sha256=E8AlSUFcn0FYQq1erNmoVfMAdsF9tP2yxfyk-9PLvQU,10286
 sky/provision/constants.py,sha256=oc_XDUkcoLQ_lwDy5yMeMSWviKS0j0s1c0pjlvpNeWY,800
 sky/provision/docker_utils.py,sha256=cKYasCwbMf6C2_0vTxg2GvbrnhFvko-xDl1frfm7wxc,19199
@@ -147,6 +147,10 @@ sky/provision/lambda_cloud/__init__.py,sha256=6EEvSgtUeEiup9ivIFevHmgv0GqleroO2X
 sky/provision/lambda_cloud/config.py,sha256=jq1iLzp4Up61r4JGxvtpVbJlgXnea3LHYQhCQyyl7ik,272
 sky/provision/lambda_cloud/instance.py,sha256=5-XuX-KwlRq8y62NXNzY_p6aJs4iCPGBf5U4pIR4liI,8975
 sky/provision/lambda_cloud/lambda_utils.py,sha256=wIXV1Qe362f8Q9u8DSx2e9IJs4CF03Jr3idHCzhlRz4,9879
+sky/provision/oci/__init__.py,sha256=5E6EUtTK3mqGVREw5TuVl5DxteBYTZigIii7c8gHExU,612
+sky/provision/oci/config.py,sha256=diSDTyHLokcuXGB2XgZCHFvsXa8bah1PP2XuMouW_UU,1650
+sky/provision/oci/instance.py,sha256=Y7z7N8sTpnzznL_GAtBeErzrF7r-zd9BZ7ZnC9DjFQg,16649
+sky/provision/oci/query_utils.py,sha256=SUVOVRawFslEfkIRPqe8_pLYJRiGQvKpQ77-LRf9kgI,20304
 sky/provision/paperspace/__init__.py,sha256=1nbUPWio7UA5gCQkO_rfEDfgXT17u5OtuByxQx4Ez6g,598
 sky/provision/paperspace/config.py,sha256=oNmffSt-V466pE0DmML8hOCX1CiA24jAqE5JEKuqpyI,1541
 sky/provision/paperspace/constants.py,sha256=NcLJGivJxshJwhR28yVHysWQ2gtMAkTVmHC91d3kyKM,957
@@ -183,7 +187,7 @@ sky/serve/serve_state.py,sha256=Q7De4GoBEPxlN_t1Lpn-Y1fd94SeHZ3E-94f1OTuhpc,1908
 sky/serve/serve_utils.py,sha256=wqBxChpJylZ_qHWyFmMBJqrG8_7xTIOr9nlOeyHs9P8,39431
 sky/serve/service.py,sha256=fkfJvNJ2BO6rfV0TblZG-QkOXaCyZlpkwbGgrsTzf2w,11872
 sky/serve/service_spec.py,sha256=1aS6b-ku7W4CjyekXKDxjZsDdt-O8ygos-jFeXu31cA,13766
-sky/setup_files/MANIFEST.in,sha256=CXz8lIJMgWlH9TvYgzIL3vPFtSDoQq-UMfD9K62rtH4,590
+sky/setup_files/MANIFEST.in,sha256=WF0T89NLichHxZDDSQzvSpiONtAEFyur2MPmGczgTIo,555
 sky/setup_files/setup.py,sha256=G767GNB-jXqyC8MR-IdiojnnI2E6tP4gMYenKU14ZGA,12156
 sky/skylet/LICENSE,sha256=BnFrJSvUFpMUoH5mOpWnEvaC5R6Uux8W6WXgrte8iYg,12381
 sky/skylet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -192,7 +196,7 @@ sky/skylet/autostop_lib.py,sha256=JPDHmByuhoNYXSUHl-OnyeJUkOFWn7gDM1FrS7Kr3E8,44
 sky/skylet/configs.py,sha256=UtnpmEL0F9hH6PSjhsps7xgjGZ6qzPOfW1p2yj9tSng,1887
 sky/skylet/constants.py,sha256=w05Enrg9RhGp99P1WDYMKK_ki0M-e0bS8Wr-VZR0Vn8,14468
 sky/skylet/events.py,sha256=A09E7LmmwzcGrSG0n8K7d3EZ1ZJr1mmmzoGyhnArYJA,12303
-sky/skylet/job_lib.py,sha256=FD1n9vE0daOEUKSH3lnccfBh7Vs81R8s4ILZyKu2o7M,37275
+sky/skylet/job_lib.py,sha256=aY2qqZGA59hVTp6FtP3N_Wkrl8wzO8XFOOjhODpQGZg,37737
 sky/skylet/log_lib.py,sha256=BmhAgcLvlin3szhj33IH0kbdCALacVisF2x61BQpZdY,21888
 sky/skylet/log_lib.pyi,sha256=AHMkW2DGK2erFovb3ToZWxRiYaATlzkxKb5J9pkgF2Y,4295
 sky/skylet/skylet.py,sha256=U9plr5hmhD9-Nyy0LMCymlE8DWtRXTFXQvfbFsS746Y,1153
@@ -203,10 +207,6 @@ sky/skylet/providers/ibm/__init__.py,sha256=GXo5F9ztvs0qMDI_G9wM5KvzySfYugslJMHH
 sky/skylet/providers/ibm/node_provider.py,sha256=olNtCoCxjXTT-C_youwdQ9UF1DPgO8OVwDueotGFaJI,38280
 sky/skylet/providers/ibm/utils.py,sha256=63vhKqLLOhAZdibSp8VWWONeyCER9F6U2VLrSpzlizk,1292
 sky/skylet/providers/ibm/vpc_provider.py,sha256=GiOGlWYqqeBETfAeKqVj2-9shsMSP7z1WnO8UP5JTNo,34630
-sky/skylet/providers/oci/__init__.py,sha256=LRMTj6OhQoxiFJw4uNxG8cn6PllP8A-lGJL3Cs5DJok,91
-sky/skylet/providers/oci/node_provider.py,sha256=YPqiRag_cysvYMIMDGbMn6lOumvHad6FLJB5DGPr00Q,20492
-sky/skylet/providers/oci/query_helper.py,sha256=dUsvPGzWPNF5O2NjQvuC8tkilT4H11gMj6R7Qel2fDc,17202
-sky/skylet/providers/oci/utils.py,sha256=lCpdklxgSwK-hqErTicpIe_xkpSlIc8u943C-9_MJfU,508
 sky/skylet/providers/scp/__init__.py,sha256=15SiAh1YphXkZsHySaw_CeAmXRdoM4JtNIAt7SLbUvg,91
 sky/skylet/providers/scp/config.py,sha256=lhMXyG9btMlg59nmvtnMdIDN07jBbQOheAx-bHbGbhw,5077
 sky/skylet/providers/scp/node_provider.py,sha256=W5J-170JVIpwT9Fv20fJ_PpdAVsqx9pigE-RkkG_kQE,22459
@@ -232,7 +232,7 @@ sky/templates/kubernetes-ray.yml.j2,sha256=dsWlkX-0b1igeZI4c0u0Jzia5I_9gezCiewR6
 sky/templates/kubernetes-ssh-jump.yml.j2,sha256=k5W5sOIMppU7dDkJMwPlqsUcb92y7L5_TVG3hkgMy8M,2747
 sky/templates/lambda-ray.yml.j2,sha256=HyvO_tX2vxwSsc4IFVSqGuIbjLMk0bevP9bcxb8ZQII,4498
 sky/templates/local-ray.yml.j2,sha256=FNHeyHF6nW9nU9QLIZceUWfvrFTTcO51KqhTnYCEFaA,1185
-sky/templates/oci-ray.yml.j2,sha256=E-xnadts-x88vYRI1QGFzgfGGKFospmo2N9d_0cPN5I,7144
+sky/templates/oci-ray.yml.j2,sha256=92dvXGaUd2Kwep9fgTjOsAPJiBLr8GQTjy7pFvuPAyE,4562
 sky/templates/paperspace-ray.yml.j2,sha256=HQjZNamrB_a4fOMCxQXSVdV5JIHtbGtAE0JzEO8uuVQ,4021
 sky/templates/runpod-ray.yml.j2,sha256=p3BtYBHzROtNJqnjEo1xCmGSJQfCZYdarWszhDYyl0Q,3697
 sky/templates/scp-ray.yml.j2,sha256=I9u8Ax-lit-d6UrCC9BVU8avst8w1cwK6TrzZBcz_JM,5608
@@ -275,9 +275,9 @@ sky/utils/kubernetes/k8s_gpu_labeler_job.yaml,sha256=k0TBoQ4zgf79-sVkixKSGYFHQ7Z
 sky/utils/kubernetes/k8s_gpu_labeler_setup.yaml,sha256=VLKT2KKimZu1GDg_4AIlIt488oMQvhRZWwsj9vBbPUg,3812
 sky/utils/kubernetes/rsync_helper.sh,sha256=hyYDaYSNxYaNvzUQBzC8AidB7nDeojizjkzc_CTxycY,1077
 sky/utils/kubernetes/ssh_jump_lifecycle_manager.py,sha256=RFLJ3k7MR5UN4SKHykQ0lV9SgXumoULpKYIAt1vh-HU,6560
-skypilot_nightly-1.0.0.dev20241109.dist-info/LICENSE,sha256=emRJAvE7ngL6x0RhQvlns5wJzGI3NEQ_WMjNmd9TZc4,12170
-skypilot_nightly-1.0.0.dev20241109.dist-info/METADATA,sha256=YM8C71GXOj5CoHQlj5yNYhL8UkZ75DL-qMMTPXCOmXY,19708
-skypilot_nightly-1.0.0.dev20241109.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-skypilot_nightly-1.0.0.dev20241109.dist-info/entry_points.txt,sha256=StA6HYpuHj-Y61L2Ze-hK2IcLWgLZcML5gJu8cs6nU4,36
-skypilot_nightly-1.0.0.dev20241109.dist-info/top_level.txt,sha256=qA8QuiNNb6Y1OF-pCUtPEr6sLEwy2xJX06Bd_CrtrHY,4
-skypilot_nightly-1.0.0.dev20241109.dist-info/RECORD,,
+skypilot_nightly-1.0.0.dev20241110.dist-info/LICENSE,sha256=emRJAvE7ngL6x0RhQvlns5wJzGI3NEQ_WMjNmd9TZc4,12170
+skypilot_nightly-1.0.0.dev20241110.dist-info/METADATA,sha256=4ar4pUczmGqsEHMG-85ANcAB_ifYgIDJRr0BJfypruA,19708
+skypilot_nightly-1.0.0.dev20241110.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+skypilot_nightly-1.0.0.dev20241110.dist-info/entry_points.txt,sha256=StA6HYpuHj-Y61L2Ze-hK2IcLWgLZcML5gJu8cs6nU4,36
+skypilot_nightly-1.0.0.dev20241110.dist-info/top_level.txt,sha256=qA8QuiNNb6Y1OF-pCUtPEr6sLEwy2xJX06Bd_CrtrHY,4
+skypilot_nightly-1.0.0.dev20241110.dist-info/RECORD,,

sky/skylet/providers/oci/__init__.py

@@ -1,2 +0,0 @@
-"""OCI node provider"""
-from sky.skylet.providers.oci.node_provider import OCINodeProvider

sky/skylet/providers/oci/node_provider.py

@@ -1,488 +0,0 @@
-"""OCI Node Provider.
-
-Node provider is called by the Ray Autoscaler to provision new compute
-resources (head / worker nodes).
-
-To show debug messages, export SKYPILOT_DEBUG=1 
-
-History:
- - Hysun He (hysun.he@oracle.com) @ Apr, 2023: Initial implementation
- 
-"""
-
-import copy
-from datetime import datetime
-import logging
-import threading
-import time
-
-from ray.autoscaler.node_provider import NodeProvider
-from ray.autoscaler.tags import TAG_RAY_CLUSTER_NAME
-from ray.autoscaler.tags import TAG_RAY_LAUNCH_CONFIG
-from ray.autoscaler.tags import TAG_RAY_NODE_KIND
-from ray.autoscaler.tags import TAG_RAY_USER_NODE_TYPE
-
-from sky.adaptors import oci as oci_adaptor
-from sky.clouds.utils import oci_utils
-from sky.skylet.providers.oci import utils
-from sky.skylet.providers.oci.query_helper import oci_query_helper
-
-logger = logging.getLogger(__name__)
-
-
-def synchronized(f):
-
-    def wrapper(self, *args, **kwargs):
-        self.lock.acquire()
-        try:
-            return f(self, *args, **kwargs)
-        finally:
-            self.lock.release()
-
-    return wrapper
-
-
-class OCINodeProvider(NodeProvider):
-    """Node Provider for OracleCloud (OCI)."""
-
-    def __init__(self, provider_config, cluster_name):
-        NodeProvider.__init__(self, provider_config, cluster_name)
-        self.lock = threading.RLock()
-        self.cached_nodes = {}
-        self.cache_stopped_nodes = provider_config.get("cache_stopped_nodes",
-                                                       True)
-        self.region = provider_config["region"]
-
-        # Do a read-ahead cache loading to improve performance.
-        self._get_filtered_nodes({})
-
-    @synchronized
-    def _get_filtered_nodes(self, tag_filters, force=False):
-        # Make sure the cluster_name is always an criterion
-        tag_filters = {**tag_filters, TAG_RAY_CLUSTER_NAME: self.cluster_name}
-
-        return_nodes = {}
-        if not force:
-            # Query cache first to reduce API call.
-            cache_hit = False
-            for k, node in self.cached_nodes.items():
-                tags = node["tags"]
-                unmatched_tags = [
-                    k for k, v in tag_filters.items()
-                    if k not in tags or v != tags[k]
-                ]
-                if len(unmatched_tags) == 0:
-                    return_nodes[k] = node
-                    cache_hit |= True
-
-            if cache_hit:
-                return return_nodes
-
-        insts = oci_query_helper.query_instances_by_tags(
-            tag_filters, self.region)
-        for inst in insts:
-            inst_id = inst.identifier
-            if inst_id in self.cached_nodes:
-                del self.cached_nodes[inst_id]
-
-            item = self.get_inst_obj({
-                "inst_id": inst_id,
-                "ad": inst.availability_domain,
-                "compartment": inst.compartment_id,
-                "lifecycle_state": inst.lifecycle_state,
-                "oci_tags": inst.freeform_tags,
-            })
-            return_nodes[inst_id] = item
-            self.cached_nodes[inst_id] = item
-
-        return return_nodes
-
-    @utils.debug_enabled(logger=logger)
-    def non_terminated_nodes(self, tag_filters):
-        """Return a list of node ids filtered by the specified tags dict.
-
-        This list must not include terminated nodes. For performance reasons,
-        providers are allowed to cache the result of a call to
-        non_terminated_nodes() to serve single-node queries
-        (e.g. is_running(node_id)). This means that non_terminated_nodes()
-        must be called again to refresh results.
-        """
-        VALIDITY_TAGS = [
-            TAG_RAY_CLUSTER_NAME,
-            TAG_RAY_NODE_KIND,
-            TAG_RAY_USER_NODE_TYPE,
-            TAG_RAY_LAUNCH_CONFIG,
-        ]
-        filters = {
-            tag: tag_filters[tag] for tag in VALIDITY_TAGS if tag in tag_filters
-        }
-
-        nodes = self._get_filtered_nodes(tag_filters=filters)
-        return [k for k, v in nodes.items() if v["status"] == "RUNNING"]
-
-    @utils.debug_enabled(logger=logger)
-    def is_running(self, node_id):
-        """Return whether the specified node is running."""
-        node = self._get_cached_node(node_id=node_id)
-        check_result = node is None or node["status"] == "RUNNING"
-
-        return check_result
-
-    @utils.debug_enabled(logger=logger)
-    def is_terminated(self, node_id):
-        """Return whether the specified node is terminated."""
-        node = self._get_cached_node(node_id=node_id)
-        check_result = ((node is None) or (node["status"] == "TERMINATED") or
-                        (node["status"] == "TERMINATING"))
-
-        return check_result
-
-    @utils.debug_enabled(logger=logger)
-    def node_tags(self, node_id):
-        return self.cached_nodes[node_id]["tags"]
-
-    @utils.debug_enabled(logger=logger)
-    def external_ip(self, node_id):
-        """Returns the external ip of the given node."""
-        return self._get_cached_node(node_id=node_id)["external_ip"]
-
-    @utils.debug_enabled(logger=logger)
-    def internal_ip(self, node_id):
-        """Returns the internal ip (Ray ip) of the given node."""
-        return self._get_cached_node(node_id=node_id)["internal_ip"]
-
-    @synchronized
-    @utils.debug_enabled(logger=logger)
-    def create_node(self, node_config, tags, count):
-        """Creates a number of nodes within the namespace."""
-        start_time = round(time.time() * 1000)
-        starting_insts = []
-        # Check first if it neccessary to create new nodes / start stopped nodes
-        VALIDITY_TAGS = [
-            TAG_RAY_CLUSTER_NAME,
-            TAG_RAY_NODE_KIND,
-            TAG_RAY_USER_NODE_TYPE,
-        ]
-        filters = {tag: tags[tag] for tag in VALIDITY_TAGS if tag in tags}
-
-        # Starting stopped nodes if cache_stopped_nodes=True
-        if self.cache_stopped_nodes:
-            logger.debug("Checking existing stopped nodes.")
-
-            filters_with_launch_config = copy.copy(filters)
-            if TAG_RAY_LAUNCH_CONFIG in tags:
-                filters_with_launch_config[TAG_RAY_LAUNCH_CONFIG] = tags[
-                    TAG_RAY_LAUNCH_CONFIG]
-
-            nodes_matching_launch_config = self.stopped_nodes(
-                filters_with_launch_config)
-            logger.debug(f"Found stopped nodes (with same launch config): "
-                         f"{len(nodes_matching_launch_config)}")
-
-            reuse_nodes = []
-            if len(nodes_matching_launch_config) >= count:
-                reuse_nodes = nodes_matching_launch_config[:count]
-            else:
-                nodes_all = self.stopped_nodes(filters)
-                logger.debug(f"Found stopped nodes (regardless launch config): "
-                             f"{len(nodes_all)}")
-                nodes_matching_launch_config_ids = [
-                    n["id"] for n in nodes_matching_launch_config
-                ]
-                nodes_non_matching_launch_config = [
-                    n for n in nodes_all
-                    if n["id"] not in nodes_matching_launch_config_ids
-                ]
-                reuse_nodes = (nodes_matching_launch_config +
-                               nodes_non_matching_launch_config)
-                reuse_nodes = reuse_nodes[:count]
-
-            logger.info(
-                f"Reusing nodes {len(reuse_nodes)}: {list(reuse_nodes)}. "
-                "To disable reuse, set `cache_stopped_nodes: False` "
-                "under `provider` in the cluster configuration.",)
-
-            for reuse_node in reuse_nodes:
-                if reuse_node["status"] == "STOPPING":
-                    get_instance_response = oci_adaptor.get_core_client(
-                        self.region,
-                        oci_utils.oci_config.get_profile()).get_instance(
-                            instance_id=reuse_node["id"])
-                    oci_adaptor.oci.wait_until(
-                        oci_adaptor.get_core_client(
-                            self.region, oci_utils.oci_config.get_profile()),
-                        get_instance_response,
-                        "lifecycle_state",
-                        "STOPPED",
-                    )
-
-            start_time1 = round(time.time() * 1000)
-            for matched_node in reuse_nodes:
-                matched_node_id = matched_node["id"]
-                instance_action_response = oci_adaptor.get_core_client(
-                    self.region,
-                    oci_utils.oci_config.get_profile()).instance_action(
-                        instance_id=matched_node_id, action="START")
-
-                starting_inst = instance_action_response.data
-                starting_insts.append({
-                    "inst_id": starting_inst.id,
-                    "ad": starting_inst.availability_domain,
-                    "compartment": starting_inst.compartment_id,
-                    "lifecycle_state": starting_inst.lifecycle_state,
-                    "oci_tags": starting_inst.freeform_tags,
-                })
-            count -= len(reuse_nodes)
-
-            launch_stopped_time = round(time.time() * 1000) - start_time1
-            logger.debug(
-                "Time elapsed(Launch stopped): {0} milli-seconds.".format(
-                    launch_stopped_time))
-        # end if self.cache_stopped_nodes:...
-
-        # Let's create additional new nodes (if neccessary)
-        if count > 0:
-            compartment = oci_query_helper.find_compartment(self.region)
-            vcn = oci_query_helper.find_create_vcn_subnet(self.region)
-            if vcn is None:
-                raise RuntimeError("VcnSubnetNotFound Error!")
-
-            ocpu_count = 0
-            vcpu_str = node_config["VCPUs"]
-            instance_type_str = node_config["InstanceType"]
-
-            if vcpu_str is not None and vcpu_str != "None":
-                if instance_type_str.startswith(
-                        f"{oci_utils.oci_config.VM_PREFIX}.A"):
-                    # For ARM cpu, 1*ocpu = 1*vcpu
-                    ocpu_count = round(float(vcpu_str))
-                else:
-                    # For Intel / AMD cpu, 1*ocpu = 2*vcpu
-                    ocpu_count = round(float(vcpu_str) / 2)
-            ocpu_count = 1 if (ocpu_count > 0 and
-                               ocpu_count < 1) else ocpu_count
-
-            machine_shape_config = None
-            if ocpu_count > 0:
-                mem = node_config["MemoryInGbs"]
-                if mem is not None and mem != "None":
-                    machine_shape_config = (oci_adaptor.oci.core.models.
-                                            LaunchInstanceShapeConfigDetails(
-                                                ocpus=ocpu_count,
-                                                memory_in_gbs=mem))
-                else:
-                    machine_shape_config = (oci_adaptor.oci.core.models.
-                                            LaunchInstanceShapeConfigDetails(
-                                                ocpus=ocpu_count))
-
-            preempitible_config = (
-                oci_adaptor.oci.core.models.PreemptibleInstanceConfigDetails(
-                    preemption_action=oci_adaptor.oci.core.models.
-                    TerminatePreemptionAction(type="TERMINATE",
-                                              preserve_boot_volume=False))
-                if node_config["Preemptible"] else None)
-
-            logger.debug(f"Shape: {instance_type_str}, ocpu: {ocpu_count}")
-            logger.debug(f"Shape config is {machine_shape_config}")
-            logger.debug(f"Spot config is {preempitible_config}")
-
-            vm_tags = {
-                **tags,
-                TAG_RAY_CLUSTER_NAME: self.cluster_name,
-                "sky_spot_flag": str(node_config["Preemptible"]).lower(),
-            }
-            # Use UTC time so that header & worker nodes use same rule
-            batch_id = datetime.utcnow().strftime("%Y%m%d%H%M%S")
-            node_type = tags[TAG_RAY_NODE_KIND]
-
-            oci_query_helper.subscribe_image(
-                compartment_id=compartment,
-                listing_id=node_config["AppCatalogListingId"],
-                resource_version=node_config["ResourceVersion"],
-                region=self.region,
-            )
-
-            start_time1 = round(time.time() * 1000)
-            for seq in range(1, count + 1):
-                launch_instance_response = oci_adaptor.get_core_client(
-                    self.region, oci_utils.oci_config.get_profile()
-                ).launch_instance(
-                    launch_instance_details=oci_adaptor.oci.core.models.
-                    LaunchInstanceDetails(
-                        availability_domain=node_config["AvailabilityDomain"],
-                        compartment_id=compartment,
-                        shape=instance_type_str,
-                        display_name=
-                        f"{self.cluster_name}_{node_type}_{batch_id}_{seq}",
-                        freeform_tags=vm_tags,
-                        metadata={
-                            "ssh_authorized_keys": node_config["AuthorizedKey"]
-                        },
-                        source_details=oci_adaptor.oci.core.models.
-                        InstanceSourceViaImageDetails(
-                            source_type="image",
-                            image_id=node_config["ImageId"],
-                            boot_volume_size_in_gbs=node_config[
-                                "BootVolumeSize"],
-                            boot_volume_vpus_per_gb=int(
-                                node_config["BootVolumePerf"]),
-                        ),
-                        create_vnic_details=oci_adaptor.oci.core.models.
-                        CreateVnicDetails(
-                            assign_public_ip=True,
-                            subnet_id=vcn,
-                        ),
-                        shape_config=machine_shape_config,
-                        preemptible_instance_config=preempitible_config,
-                    ))
-
-                new_inst = launch_instance_response.data
-                starting_insts.append({
-                    "inst_id": new_inst.id,
-                    "ad": new_inst.availability_domain,
-                    "compartment": new_inst.compartment_id,
-                    "lifecycle_state": new_inst.lifecycle_state,
-                    "oci_tags": new_inst.freeform_tags,
-                })
-            # end for loop
-
-            launch_new_time = round(time.time() * 1000) - start_time1
-            logger.debug("Time elapsed(Launch): {0} milli-seconds.".format(
-                launch_new_time))
-        # end if count > 0:...
-
-        for ninst in starting_insts:
-            # Waiting for the instance to be RUNNING state
-            get_instance_response = oci_adaptor.get_core_client(
-                self.region, oci_utils.oci_config.get_profile()).get_instance(
-                    instance_id=ninst["inst_id"])
-            oci_adaptor.oci.wait_until(
-                oci_adaptor.get_core_client(self.region,
-                                            oci_utils.oci_config.get_profile()),
-                get_instance_response,
-                "lifecycle_state",
-                "RUNNING",
-            )
-            ninst["lifecycle_state"] = "RUNNING"
-            self.cached_nodes[ninst["inst_id"]] = self.get_inst_obj(ninst)
-
-        total_time = round(time.time() * 1000) - start_time
-        logger.debug(
-            "Total time elapsed: {0} milli-seconds.".format(total_time))
-
-    def get_inst_obj(self, inst_info):
-        list_vnic_attachments_response = oci_adaptor.get_core_client(
-            self.region,
-            oci_utils.oci_config.get_profile()).list_vnic_attachments(
-                availability_domain=inst_info["ad"],
-                compartment_id=inst_info["compartment"],
-                instance_id=inst_info["inst_id"],
-            )
-
-        vnic = list_vnic_attachments_response.data[0]
-        get_vnic_response = (oci_adaptor.get_net_client(
-            self.region, oci_utils.oci_config.get_profile()).get_vnic(
-                vnic_id=vnic.vnic_id).data)
-
-        internal_ip = get_vnic_response.private_ip
-        external_ip = get_vnic_response.public_ip
-        if external_ip is None:
-            external_ip = internal_ip
-
-        return {
-            "id": inst_info["inst_id"],
-            "external_ip": external_ip,
-            "internal_ip": internal_ip,
-            "tags": inst_info["oci_tags"],
-            "status": inst_info["lifecycle_state"],
-        }
-
-    @synchronized
-    @utils.debug_enabled(logger=logger)
-    def set_node_tags(self, node_id, tags):
-        existing_tags = self._get_cached_node(node_id)["tags"]
-        combined_tags = dict(existing_tags, **tags)
-
-        self.cached_nodes[node_id]["tags"] = combined_tags
-        retry_count = 0
-        while retry_count < oci_utils.oci_config.MAX_RETRY_COUNT:
-            try:
-                oci_adaptor.get_core_client(
-                    self.region,
-                    oci_utils.oci_config.get_profile()).update_instance(
-                        instance_id=node_id,
-                        update_instance_details=oci_adaptor.oci.core.models.
-                        UpdateInstanceDetails(freeform_tags=combined_tags),
-                    )
-                logger.info(f"Tags are well set for node {node_id}")
-                break
-            except Exception as e:
-                retry_count = retry_count + 1
-                wait_seconds = oci_utils.oci_config.RETRY_INTERVAL_BASE_SECONDS * retry_count
-                logger.warn(
-                    f"Not ready yet, wait {wait_seconds} seconds & retry!")
-                logger.warn(f"Exception message is {str(e)}")
-                time.sleep(wait_seconds)
-
-    @synchronized
-    def terminate_node(self, node_id):
-        """Terminates the specified node."""
-        logger.info(f"terminate_node {node_id}...")
-        node = self._get_cached_node(node_id)
-        if node is None:
-            logger.info(f"The node is not existed: {node_id}..")
-            return  # Node not exists yet.
-
-        logger.debug(f"sky_spot_flag: {node['tags']['sky_spot_flag']}")
-        preemptibleFlag = (True if node and
-                           (str(node["tags"]["sky_spot_flag"]) == "true") else
-                           False)
-
-        if self.cache_stopped_nodes and not preemptibleFlag:
-            logger.info(f"Stopping instance {node_id}"
-                        "(to fully terminate instead, "
-                        "set `cache_stopped_nodes: False` "
-                        "under `provider` in the cluster configuration)")
-            instance_action_response = oci_adaptor.get_core_client(
-                self.region,
-                oci_utils.oci_config.get_profile()).instance_action(
-                    instance_id=node_id, action="STOP")
-            logger.info(
-                f"Stopped the instance {instance_action_response.data.id}")
-            if node_id in self.cached_nodes:
-                self.cached_nodes[node_id]["status"] = "STOPPED"
-            state_word = "Stopped"
-        else:
-            terminate_instance_response = oci_adaptor.get_core_client(
-                self.region,
-                oci_utils.oci_config.get_profile()).terminate_instance(node_id)
-            logger.debug(terminate_instance_response.data)
-            if node_id in self.cached_nodes:
-                del self.cached_nodes[node_id]
-            state_word = "Terminated"
-
-        logger.info(
-            f"{state_word} {node_id} w/ sky_spot_flag: {preemptibleFlag}.")
-
-    def _get_node(self, node_id):
-        self._get_filtered_nodes({},
-                                 force=True)  # All except for those terminated.
-        return self.cached_nodes.get(node_id, None)
-
-    def _get_cached_node(self, node_id):
-        if node_id in self.cached_nodes:
-            return self.cached_nodes[node_id]
-        return self._get_node(node_id=node_id)
-
-    def stopped_nodes(self, tag_filters):
-        """Return a list of stopped nodes filtered by the specified tags dict."""
-        nodes = self._get_filtered_nodes(tag_filters=tag_filters, force=True)
-        return [
-            v for _, v in nodes.items()
-            if v["status"] in ("STOPPED", "STOPPING")
-        ]
-
-    def running_nodes(self, tag_filters):
-        """Return a list of running node ids filtered by the specified tags dict."""
-        nodes = self._get_filtered_nodes(tag_filters=tag_filters)
-        return [k for k, v in nodes.items() if v["status"] == "RUNNING"]

sky/skylet/providers/oci/utils.py

@@ -1,21 +0,0 @@
-from datetime import datetime
-import functools
-from logging import Logger
-
-
-def debug_enabled(logger: Logger):
-
-    def decorate(f):
-
-        @functools.wraps(f)
-        def wrapper(*args, **kwargs):
-            dt_str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-            logger.debug(f"{dt_str} Enter {f}, {args}, {kwargs}")
-            try:
-                return f(*args, **kwargs)
-            finally:
-                logger.debug(f"{dt_str} Exit {f}")
-
-        return wrapper
-
-    return decorate