[serve] Serve client refactor (#10409)

python/ray/serve/router.py

@@ -9,7 +9,6 @@ from dataclasses import dataclass
 from ray.exceptions import RayTaskError
 
 import ray
-from ray import serve
 from ray.experimental import metrics
 from ray.serve.context import TaskContext
 from ray.serve.endpoint_policy import RandomEndpointPolicy
@@ -53,7 +52,7 @@ class Query:
 class Router:
     """A router that routes request to available workers."""
 
-    async def setup(self, name, instance_name=None):
+    async def setup(self, name, controller_name):
         # Note: Several queues are used in the router
         # - When a request come in, it's placed inside its corresponding
         #   endpoint_queue.
@@ -104,8 +103,7 @@ class Router:
         # the controller. We use a "pull-based" approach instead of pushing
         # them from the controller so that the router can transparently recover
         # from failure.
-        serve.init(name=instance_name)
-        self.controller = serve.api._get_controller()
+        self.controller = ray.get_actor(controller_name)
 
         traffic_policies = ray.get(
             self.controller.get_traffic_policies.remote())