[ray_client]: Move from experimental to util (#13176)

Change-Id: I9f054881f0429092d265cd6944d89804cce9d946

python/ray/_private/client_mode_hook.py

@@ -37,7 +37,7 @@ def client_mode_hook(func):
     """
     Decorator for ray module methods to delegate to ray client
     """
-    from ray.experimental.client import ray
+    from ray.util.client import ray
 
     @wraps(func)
     def wrapper(*args, **kwargs):

python/ray/_private/ray_client_microbenchmark.py

@@ -2,7 +2,7 @@ import inspect
 import logging
 import sys
 
-from ray.experimental.client.ray_client_helpers import ray_start_client_server
+from ray.util.client.ray_client_helpers import ray_start_client_server
 
 from ray._private.ray_microbenchmark_helpers import timeit
 from ray._private.ray_microbenchmark_helpers import ray_setup_and_teardown

python/ray/tests/BUILD

@@ -75,20 +75,20 @@ py_test_module_list(
   files = [
     "test_actor_pool.py",
     "test_args.py",
-    "test_asyncio.py",
     "test_asyncio_cluster.py",
+    "test_asyncio.py",
     "test_autoscaler.py",
     "test_autoscaler_yaml.py",
-    "test_component_failures.py",
+    "test_client_metadata.py",
+    "test_client.py",
+    "test_client_references.py",
+    "test_client_terminate.py",
     "test_command_runner.py",
+    "test_component_failures.py",
     "test_coordinator_server.py",
-    "test_dask_scheduler.py",
     "test_dask_callback.py",
+    "test_dask_scheduler.py",
     "test_debug_tools.py",
-    "test_experimental_client.py",
-    "test_experimental_client_metadata.py",
-    "test_experimental_client_references.py",
-    "test_experimental_client_terminate.py",
     "test_job.py",
     "test_memstat.py",
     "test_metrics_agent.py",

python/ray/tests/test_advanced.py

@@ -17,7 +17,7 @@ from ray.test_utils import client_test_enabled
 from ray.test_utils import RayTestTimeoutException
 
 if client_test_enabled():
-    from ray.experimental.client import ray
+    from ray.util.client import ray
 else:
     import ray
 

python/ray/tests/test_basic_2.py

@@ -16,7 +16,7 @@ from ray.exceptions import GetTimeoutError
 from ray.exceptions import RayTaskError
 
 if client_test_enabled():
-    from ray.experimental.client import ray
+    from ray.util.client import ray
 else:
     import ray
 

python/ray/tests/test_client.py

@@ -3,8 +3,8 @@ import time
 import sys
 import logging
 
-from ray.experimental.client.common import ClientObjectRef
-from ray.experimental.client.ray_client_helpers import ray_start_client_server
+from ray.util.client.common import ClientObjectRef
+from ray.util.client.ray_client_helpers import ray_start_client_server
 
 
 def test_real_ray_fallback(ray_start_regular_shared):
@@ -267,7 +267,7 @@ def test_create_remote_before_start(ray_start_regular_shared):
     """Creates remote objects (as though in a library) before
     starting the client.
     """
-    from ray.experimental.client import ray
+    from ray.util.client import ray
 
     @ray.remote
     class Returner:

python/ray/tests/test_client_metadata.py

@@ -1,4 +1,4 @@
-from ray.experimental.client.ray_client_helpers import ray_start_client_server
+from ray.util.client.ray_client_helpers import ray_start_client_server
 
 
 def test_get_ray_metadata(ray_start_regular_shared):

python/ray/tests/test_client_references.py

@@ -1,8 +1,8 @@
-from ray.experimental.client.ray_client_helpers import ray_start_client_server
+from ray.util.client.ray_client_helpers import ray_start_client_server
 from ray.test_utils import wait_for_condition
 import ray as real_ray
 from ray.core.generated.gcs_pb2 import ActorTableData
-from ray.experimental.client.server.server import _get_current_servicer
+from ray.util.client.server.server import _get_current_servicer
 
 
 def server_object_ref_count(n):

python/ray/tests/test_client_terminate.py

@@ -1,5 +1,5 @@
 import pytest
-from ray.experimental.client.ray_client_helpers import ray_start_client_server
+from ray.util.client.ray_client_helpers import ray_start_client_server
 from ray.tests.client_test_utils import create_remote_signal_actor
 from ray.test_utils import wait_for_condition
 from ray.exceptions import TaskCancelledError

python/ray/util/client/__init__.py

@@ -14,7 +14,7 @@ class RayAPIStub:
     """
 
     def __init__(self):
-        from ray.experimental.client.api import ClientAPI
+        from ray.util.client.api import ClientAPI
         self.api = ClientAPI()
         self.client_worker = None
         self._server = None
@@ -33,7 +33,7 @@ class RayAPIStub:
             metadata: gRPC metadata to send on connect
         """
         # Delay imports until connect to avoid circular imports.
-        from ray.experimental.client.worker import Worker
+        from ray.util.client.worker import Worker
         import ray._private.client_mode_hook
         if self.client_worker is not None:
             if self._connected_with_init:
@@ -80,7 +80,7 @@ class RayAPIStub:
     def init(self, *args, **kwargs):
         if self._server is not None:
             raise Exception("Trying to start two instances of ray via client")
-        import ray.experimental.client.server.server as ray_client_server
+        import ray.util.client.server.server as ray_client_server
         self._server, address_info = ray_client_server.init_and_serve(
             "localhost:50051", *args, **kwargs)
         self.connect("localhost:50051")
@@ -89,7 +89,7 @@ class RayAPIStub:
 
     def shutdown(self, _exiting_interpreter=False):
         self.disconnect()
-        import ray.experimental.client.server.server as ray_client_server
+        import ray.util.client.server.server as ray_client_server
         if self._server is None:
             return
         ray_client_server.shutdown_with_server(self._server,

python/ray/util/client/api.py

@@ -3,9 +3,9 @@ and the overall ray module API.
 """
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
-    from ray.experimental.client.common import ClientStub
-    from ray.experimental.client.common import ClientActorHandle
-    from ray.experimental.client.common import ClientObjectRef
+    from ray.util.client.common import ClientStub
+    from ray.util.client.common import ClientActorHandle
+    from ray.util.client.common import ClientObjectRef
 
 
 class ClientAPI:
@@ -55,7 +55,7 @@ class ClientAPI:
             kwargs: opaque keyword arguments
         """
         # Delayed import to avoid a cyclic import
-        from ray.experimental.client.common import remote_decorator
+        from ray.util.client.common import remote_decorator
         if len(args) == 1 and len(kwargs) == 0 and callable(args[0]):
             # This is the case where the decorator is just @ray.remote.
             return remote_decorator(options=None)(args[0])

python/ray/util/client/client_app.py

@@ -1,4 +1,4 @@
-from ray.experimental.client import ray
+from ray.util.client import ray
 from typing import Tuple
 
 ray.connect("localhost:50051")

python/ray/util/client/client_pickler.py

@@ -30,15 +30,15 @@ from typing import Any
 from typing import Dict
 from typing import Optional
 
-from ray.experimental.client import RayAPIStub
-from ray.experimental.client.common import ClientObjectRef
-from ray.experimental.client.common import ClientActorHandle
-from ray.experimental.client.common import ClientActorRef
-from ray.experimental.client.common import ClientActorClass
-from ray.experimental.client.common import ClientRemoteFunc
-from ray.experimental.client.common import ClientRemoteMethod
-from ray.experimental.client.common import OptionWrapper
-from ray.experimental.client.common import SelfReferenceSentinel
+from ray.util.client import RayAPIStub
+from ray.util.client.common import ClientObjectRef
+from ray.util.client.common import ClientActorHandle
+from ray.util.client.common import ClientActorRef
+from ray.util.client.common import ClientActorClass
+from ray.util.client.common import ClientRemoteFunc
+from ray.util.client.common import ClientRemoteMethod
+from ray.util.client.common import OptionWrapper
+from ray.util.client.common import SelfReferenceSentinel
 import ray.core.generated.ray_client_pb2 as ray_client_pb2
 from ray._private.client_mode_hook import disable_client_hook
 

python/ray/util/client/common.py

@@ -1,6 +1,6 @@
 import ray.core.generated.ray_client_pb2 as ray_client_pb2
-from ray.experimental.client import ray
-from ray.experimental.client.options import validate_options
+from ray.util.client import ray
+from ray.util.client.options import validate_options
 
 import inspect
 from ray.util.inspect import is_cython

python/ray/util/client/examples/run_tune.py

@@ -1,4 +1,4 @@
-from ray.experimental.client import ray
+from ray.util.client import ray
 
 from ray.tune import tune
 

python/ray/util/client/ray_client_helpers.py

@@ -1,7 +1,7 @@
 from contextlib import contextmanager
 
-import ray.experimental.client.server.server as ray_client_server
-from ray.experimental.client import ray
+import ray.util.client.server.server as ray_client_server
+from ray.util.client import ray
 
 
 @contextmanager

python/ray/util/client/server/dataservicer.py

@@ -7,7 +7,7 @@ import ray.core.generated.ray_client_pb2 as ray_client_pb2
 import ray.core.generated.ray_client_pb2_grpc as ray_client_pb2_grpc
 
 if TYPE_CHECKING:
-    from ray.experimental.client.server.server import RayletServicer
+    from ray.util.client.server.server import RayletServicer
 
 logger = logging.getLogger(__name__)
 

python/ray/util/client/server/server.py

@@ -17,12 +17,12 @@ import ray.core.generated.ray_client_pb2_grpc as ray_client_pb2_grpc
 import time
 import inspect
 import json
-from ray.experimental.client.server.server_pickler import convert_from_arg
-from ray.experimental.client.server.server_pickler import dumps_from_server
-from ray.experimental.client.server.server_pickler import loads_from_client
-from ray.experimental.client.server.dataservicer import DataServicer
-from ray.experimental.client.server.logservicer import LogstreamServicer
-from ray.experimental.client.server.server_stubs import current_remote
+from ray.util.client.server.server_pickler import convert_from_arg
+from ray.util.client.server.server_pickler import dumps_from_server
+from ray.util.client.server.server_pickler import loads_from_client
+from ray.util.client.server.dataservicer import DataServicer
+from ray.util.client.server.logservicer import LogstreamServicer
+from ray.util.client.server.server_stubs import current_remote
 from ray._private.client_mode_hook import disable_client_hook
 
 logger = logging.getLogger(__name__)

python/ray/util/client/server/server_pickler.py

@@ -5,7 +5,7 @@ references held for the client within the server.
 
 More discussion about the client/server pickling protocol can be found in:
 
-  ray/experimental/client/client_pickler.py
+  ray/util/client/client_pickler.py
 
 ServerPickler dumps ray objects from the server into the appropriate stubs.
 ClientUnpickler loads stubs from the client and finds their associated handle
@@ -20,12 +20,11 @@ from typing import Any
 from typing import TYPE_CHECKING
 
 from ray._private.client_mode_hook import disable_client_hook
-from ray.experimental.client.client_pickler import PickleStub
-from ray.experimental.client.server.server_stubs import (
-    ServerSelfReferenceSentinel)
+from ray.util.client.client_pickler import PickleStub
+from ray.util.client.server.server_stubs import ServerSelfReferenceSentinel
 
 if TYPE_CHECKING:
-    from ray.experimental.client.server.server import RayletServicer
+    from ray.util.client.server.server import RayletServicer
     import ray.core.generated.ray_client_pb2 as ray_client_pb2
 
 if sys.version_info < (3, 8):

python/ray/util/client/worker.py

@@ -18,14 +18,14 @@ import grpc
 import ray.cloudpickle as cloudpickle
 import ray.core.generated.ray_client_pb2 as ray_client_pb2
 import ray.core.generated.ray_client_pb2_grpc as ray_client_pb2_grpc
-from ray.experimental.client.client_pickler import convert_to_arg
-from ray.experimental.client.client_pickler import dumps_from_client
-from ray.experimental.client.client_pickler import loads_from_server
-from ray.experimental.client.common import ClientActorHandle
-from ray.experimental.client.common import ClientActorRef
-from ray.experimental.client.common import ClientObjectRef
-from ray.experimental.client.dataclient import DataClient
-from ray.experimental.client.logsclient import LogstreamClient
+from ray.util.client.client_pickler import convert_to_arg
+from ray.util.client.client_pickler import dumps_from_client
+from ray.util.client.client_pickler import loads_from_server
+from ray.util.client.common import ClientActorHandle
+from ray.util.client.common import ClientActorRef
+from ray.util.client.common import ClientObjectRef
+from ray.util.client.dataclient import DataClient
+from ray.util.client.logsclient import LogstreamClient
 
 logger = logging.getLogger(__name__)