[xlang] Cross language Python support (#6709)

streaming/python/includes/transfer.pxi

@@ -22,7 +22,7 @@ from ray._raylet cimport (
     CoreWorker,
     ActorID,
     ObjectID,
-    string_vector_from_list
+    FunctionDescriptor,
 )
 
 from ray.includes.libcoreworker cimport CCoreWorker
@@ -42,7 +42,6 @@ from ray.streaming.includes.libstreaming cimport (
 )
 
 import logging
-from ray.function_manager import FunctionDescriptor
 
 
 channel_logger = logging.getLogger(__name__)
@@ -54,16 +53,14 @@ cdef class ReaderClient:
 
     def __cinit__(self,
                   CoreWorker worker,
-                  async_func: FunctionDescriptor,
-                  sync_func: FunctionDescriptor):
+                  FunctionDescriptor async_func,
+                  FunctionDescriptor sync_func):
         cdef:
             CCoreWorker *core_worker = worker.core_worker.get()
             CRayFunction async_native_func
             CRayFunction sync_native_func
-        async_native_func = CRayFunction(
-            LANGUAGE_PYTHON, string_vector_from_list(async_func.get_function_descriptor_list()))
-        sync_native_func = CRayFunction(
-            LANGUAGE_PYTHON, string_vector_from_list(sync_func.get_function_descriptor_list()))
+        async_native_func = CRayFunction(LANGUAGE_PYTHON, async_func.descriptor)
+        sync_native_func = CRayFunction(LANGUAGE_PYTHON, sync_func.descriptor)
         self.client = new CReaderClient(core_worker, async_native_func, sync_native_func)
 
     def __dealloc__(self):
@@ -95,16 +92,14 @@ cdef class WriterClient:
 
     def __cinit__(self,
                   CoreWorker worker,
-                  async_func: FunctionDescriptor,
-                  sync_func: FunctionDescriptor):
+                  FunctionDescriptor async_func,
+                  FunctionDescriptor sync_func):
         cdef:
             CCoreWorker *core_worker = worker.core_worker.get()
             CRayFunction async_native_func
             CRayFunction sync_native_func
-        async_native_func = CRayFunction(
-            LANGUAGE_PYTHON, string_vector_from_list(async_func.get_function_descriptor_list()))
-        sync_native_func = CRayFunction(
-            LANGUAGE_PYTHON, string_vector_from_list(sync_func.get_function_descriptor_list()))
+        async_native_func = CRayFunction(LANGUAGE_PYTHON, async_func.descriptor)
+        sync_native_func = CRayFunction(LANGUAGE_PYTHON, sync_func.descriptor)
         self.client = new CWriterClient(core_worker, async_native_func, sync_native_func)
 
     def __dealloc__(self):

streaming/python/jobworker.py

@@ -5,7 +5,7 @@ import threading
 import ray
 import ray.streaming._streaming as _streaming
 from ray.streaming.config import Config
-from ray.function_manager import FunctionDescriptor
+from ray._raylet import PythonFunctionDescriptor
 from ray.streaming.communication import DataInput, DataOutput
 
 logger = logging.getLogger(__name__)
@@ -47,18 +47,18 @@ class JobWorker:
 
         if env.config.channel_type == Config.NATIVE_CHANNEL:
             core_worker = ray.worker.global_worker.core_worker
-            reader_async_func = FunctionDescriptor(
+            reader_async_func = PythonFunctionDescriptor(
                 __name__, self.on_reader_message.__name__,
                 self.__class__.__name__)
-            reader_sync_func = FunctionDescriptor(
+            reader_sync_func = PythonFunctionDescriptor(
                 __name__, self.on_reader_message_sync.__name__,
                 self.__class__.__name__)
             self.reader_client = _streaming.ReaderClient(
                 core_worker, reader_async_func, reader_sync_func)
-            writer_async_func = FunctionDescriptor(
+            writer_async_func = PythonFunctionDescriptor(
                 __name__, self.on_writer_message.__name__,
                 self.__class__.__name__)
-            writer_sync_func = FunctionDescriptor(
+            writer_sync_func = PythonFunctionDescriptor(
                 __name__, self.on_writer_message_sync.__name__,
                 self.__class__.__name__)
             self.writer_client = _streaming.WriterClient(

streaming/python/tests/test_direct_transfer.py

@@ -5,7 +5,7 @@ import time
 import ray
 import ray.streaming._streaming as _streaming
 import ray.streaming.runtime.transfer as transfer
-from ray.function_manager import FunctionDescriptor
+from ray._raylet import PythonFunctionDescriptor
 from ray.streaming.config import Config
 
 
@@ -13,16 +13,16 @@ from ray.streaming.config import Config
 class Worker:
     def __init__(self):
         core_worker = ray.worker.global_worker.core_worker
-        writer_async_func = FunctionDescriptor(
+        writer_async_func = PythonFunctionDescriptor(
             __name__, self.on_writer_message.__name__, self.__class__.__name__)
-        writer_sync_func = FunctionDescriptor(
+        writer_sync_func = PythonFunctionDescriptor(
             __name__, self.on_writer_message_sync.__name__,
             self.__class__.__name__)
         self.writer_client = _streaming.WriterClient(
             core_worker, writer_async_func, writer_sync_func)
-        reader_async_func = FunctionDescriptor(
+        reader_async_func = PythonFunctionDescriptor(
             __name__, self.on_reader_message.__name__, self.__class__.__name__)
-        reader_sync_func = FunctionDescriptor(
+        reader_sync_func = PythonFunctionDescriptor(
             __name__, self.on_reader_message_sync.__name__,
             self.__class__.__name__)
         self.reader_client = _streaming.ReaderClient(