Updated ray to 2.8.0 and removed detached flag to avoid deprecation e…

…rror in future (kserve#3272) * Update ray serve version Update tests to remove detached=false parameter Signed-off-by: Andrews Arokiam <[email protected]> * Pinned `async-timeout` as direct dependency for python 3.11 Signed-off-by: Andrews Arokiam <[email protected]> --------- Signed-off-by: Andrews Arokiam <[email protected]>
vignesh-murugani2i · Dec 11, 2023 · c1c5efe · c1c5efe
1 parent d2e3784
commit c1c5efe
Show file tree

Hide file tree

Showing 16 changed files with 10,960 additions and 11,855 deletions.
diff --git a/python/aiffairness/poetry.lock b/python/aiffairness/poetry.lock
diff --git a/python/alibiexplainer/poetry.lock b/python/alibiexplainer/poetry.lock
diff --git a/python/artexplainer/poetry.lock b/python/artexplainer/poetry.lock
diff --git a/python/custom_model/poetry.lock b/python/custom_model/poetry.lock
diff --git a/python/custom_transformer/poetry.lock b/python/custom_transformer/poetry.lock
diff --git a/python/kserve/poetry.lock b/python/kserve/poetry.lock
diff --git a/python/kserve/pyproject.toml b/python/kserve/pyproject.toml
@@ -42,7 +42,8 @@ kubernetes = ">=23.3.0"
 python-dateutil = "^2.8.0"
 numpy = "^1.23.5"
 psutil = "^5.9.0"
-ray = { version = "^2.7.0", extras = ["serve"] }
+ray = { version = "^2.8.0", extras = ["serve"] }
+async-timeout = { version = "^4.0.3", python = "==3.11.*" }
 grpcio = "^1.49.1"
 protobuf = "^3.19.0"
 prometheus-client = "^0.13.1"

diff --git a/python/kserve/test/test_dataplane.py b/python/kserve/test/test_dataplane.py
@@ -50,9 +50,10 @@ def dataplane_with_model(self, request):  # pylint: disable=no-self-use
             dataplane._model_registry.update(model)
             yield dataplane
         else:  # request.param == "TEST_RAY_SERVE_MODEL"
-            serve.start(detached=False, http_options={"host": "0.0.0.0", "port": 9071})
-            DummyServeModel.deploy(self.MODEL_NAME)
-            handle = DummyServeModel.get_handle()
+            serve.start(http_options={"host": "0.0.0.0", "port": 9071})
+            # https://github.com/ray-project/ray/blob/releases/2.8.0/python/ray/serve/deployment.py#L256
+            application = DummyServeModel.bind("TestModel")
+            handle = serve.run(target=application)
             handle.load.remote()
             dataplane._model_registry.update_handle(self.MODEL_NAME, handle)
             yield dataplane

diff --git a/python/kserve/test/test_server.py b/python/kserve/test/test_server.py
@@ -304,10 +304,10 @@ def test_explain_v2(self, http_server_client):
 class TestRayServer:
     @pytest.fixture(scope="class")
     def app(self):  # pylint: disable=no-self-use
-        serve.start(detached=False, http_options={"host": "0.0.0.0", "port": 9071})
-
-        DummyServeModel.deploy("TestModel")
-        handle = DummyServeModel.get_handle()
+        serve.start(http_options={"host": "0.0.0.0", "port": 9071})
+        # https://github.com/ray-project/ray/blob/releases/2.8.0/python/ray/serve/deployment.py#L256
+        application = DummyServeModel.bind("TestModel")
+        handle = serve.run(target=application)
         handle.load.remote()
 
         server = ModelServer()

diff --git a/python/lgbserver/poetry.lock b/python/lgbserver/poetry.lock
diff --git a/python/paddleserver/poetry.lock b/python/paddleserver/poetry.lock
diff --git a/python/pmmlserver/poetry.lock b/python/pmmlserver/poetry.lock
diff --git a/python/sklearnserver/poetry.lock b/python/sklearnserver/poetry.lock
diff --git a/python/test_resources/graph/error_404_isvc/poetry.lock b/python/test_resources/graph/error_404_isvc/poetry.lock
diff --git a/python/test_resources/graph/success_200_isvc/poetry.lock b/python/test_resources/graph/success_200_isvc/poetry.lock
diff --git a/python/xgbserver/poetry.lock b/python/xgbserver/poetry.lock