fix(oss): Update cython to be compatible with OSS 3.1.3

Author: ben--

thrift/lib/python/server/python_async_processor.pxd

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cimport cython
 from cpython.ref cimport PyObject
 from libcpp cimport bool as cbool
 from libcpp.map cimport map as cmap
@@ -20,21 +21,40 @@ from libcpp.pair cimport pair
 from libcpp.string cimport string
 from libcpp.vector cimport vector as cvector
 
+from folly cimport cFollyPromise, cFollyUnit, c_unit
 from folly.executor cimport cAsyncioExecutor
 from folly.iobuf cimport cIOBuf
 
-from thrift.python.exceptions cimport cException
+from thrift.py3.stream cimport (
+    cResponseAndServerStream,
+    cServerStream,
+    ServerStream,
+)
+from thrift.python.exceptions cimport (
+    cException,
+    cTApplicationException,
+)
 from thrift.python.protocol cimport RpcKind
 from thrift.python.server_impl.async_processor cimport (
     cAsyncProcessorFactory,
     AsyncProcessorFactory,
 )
+from thrift.python.streaming.py_promise cimport Promise_Py
+from thrift.python.streaming.python_user_exception cimport cPythonUserException
+from thrift.python.streaming.sink cimport (
+    cResponseAndSinkConsumer,
+    cSinkConsumer,
+)
 from thrift.python.types cimport ServiceInterface as cServiceInterface
 
+
 # cython doesn't support * in template parameters
 # Make a typedef to workaround this.
 ctypedef PyObject* PyObjPtr
 
+ctypedef unique_ptr[cIOBuf] UniqueIOBuf
+ctypedef cResponseAndSinkConsumer[UniqueIOBuf, UniqueIOBuf, UniqueIOBuf] SinkResponse
+ctypedef cResponseAndServerStream[UniqueIOBuf, UniqueIOBuf] StreamResponse
 
 
 cdef extern from "thrift/lib/python/server/PythonAsyncProcessorFactory.h" namespace "::apache::thrift::python":
@@ -60,3 +80,58 @@ cdef class PythonAsyncProcessorFactory(AsyncProcessorFactory):
 
     @staticmethod
     cdef PythonAsyncProcessorFactory create(cServiceInterface server)
+
+cdef class Promise_cFollyUnit(Promise_Py):
+    cdef cFollyPromise[cFollyUnit]* cPromise
+
+    cdef error_ta(Promise_cFollyUnit self, cTApplicationException err)
+    cdef error_py(Promise_cFollyUnit self, cPythonUserException err)
+    cdef complete(Promise_cFollyUnit self, object _)
+
+    @staticmethod
+    cdef create(cFollyPromise[cFollyUnit] cPromise)
+
+cdef class Promise_Sink(Promise_Py):
+    cdef cFollyPromise[SinkResponse]* _cPromise
+
+    cdef error_ta(Promise_Sink self, cTApplicationException err)
+    cdef error_py(Promise_Sink self, cPythonUserException err)
+    cdef complete(Promise_Sink self, object pyobj)
+    
+    @staticmethod
+    cdef create(cFollyPromise[SinkResponse] promise)
+
+cdef class Promise_Stream(Promise_Py):
+    cdef cFollyPromise[StreamResponse]* cPromise
+
+    cdef error_ta(Promise_Stream self, cTApplicationException err)
+    cdef error_py(Promise_Stream self, cPythonUserException err)
+    cdef complete(Promise_Stream self, object pyobj)
+    
+    @staticmethod
+    cdef create(cFollyPromise[StreamResponse] cPromise)
+    
+cdef class ResponseAndServerStream:
+    cdef unique_ptr[StreamResponse] cResponseStream
+
+    @staticmethod
+    cdef _fbthrift_create(object val, object stream)
+
+cdef class ResponseAndSinkConsumer:
+    cdef unique_ptr[SinkResponse] _cResponseSink
+    
+    @staticmethod
+    cdef _fbthrift_create(object val, object sink)
+
+@cython.final
+cdef class ServerSink_IOBuf:
+    cdef unique_ptr[cSinkConsumer[UniqueIOBuf, UniqueIOBuf]] _cSink
+    
+    @staticmethod
+    cdef _fbthrift_create(object sink_callback)
+
+cdef class ServerStream_IOBuf(ServerStream):
+    cdef unique_ptr[cServerStream[UniqueIOBuf]] cStream
+
+    @staticmethod
+    cdef _fbthrift_create(object stream)

thrift/lib/python/server/python_async_processor.pyx

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from thrift.python.server_impl.python_async_processor cimport SerializedRequest
+
 import asyncio
 import sys
 import traceback
@@ -20,16 +22,17 @@ from cpython.ref cimport PyObject
 cimport cython
 from cython.operator cimport dereference
 from libcpp.map cimport map as cmap
-from libcpp.memory cimport make_unique, make_shared, static_pointer_cast
+from libcpp.memory cimport make_unique, make_shared, static_pointer_cast, unique_ptr
 from libcpp.optional cimport optional
 from libcpp.pair cimport pair
+from libcpp.string cimport string
 from libcpp.unordered_set cimport unordered_set
 from libcpp.utility cimport move as cmove
 from libcpp.vector cimport vector as cvector
 
 from folly cimport cFollyPromise, cFollyUnit, c_unit
 from folly.executor cimport get_executor
-from folly.iobuf cimport IOBuf, from_unique_ptr
+from folly.iobuf cimport IOBuf, cIOBuf, from_unique_ptr
 
 from thrift.py3.stream cimport (
     cServerStream,
@@ -43,13 +46,12 @@ from thrift.python.exceptions cimport (
     cTApplicationException,
     cTApplicationExceptionType__UNKNOWN,
 )
-from thrift.python.protocol cimport Protocol
+from thrift.python.protocol cimport Protocol, RpcKind
 from thrift.python.serializer import serialize_iobuf
 from thrift.python.server_impl.request_context cimport (
     Cpp2RequestContext,
     handleAddressCallback,
     RequestContext,
-    SocketAddress,
     THRIFT_REQUEST_CONTEXT,
 )
 from thrift.python.streaming.py_promise cimport (
@@ -71,14 +73,8 @@ from thrift.python.streaming.sink cimport (
 from thrift.python.types cimport ServiceInterface as cServiceInterface
 
 
-ctypedef unique_ptr[cIOBuf] UniqueIOBuf
-ctypedef cResponseAndServerStream[UniqueIOBuf, UniqueIOBuf] StreamResponse
-ctypedef cResponseAndSinkConsumer[UniqueIOBuf, UniqueIOBuf, UniqueIOBuf] SinkResponse
-
 @cython.final
 cdef class ServerSink_IOBuf:
-    cdef unique_ptr[cSinkConsumer[UniqueIOBuf, UniqueIOBuf]] _cSink
-
     @staticmethod
     cdef _fbthrift_create(object sink_callback):
         cdef ServerSink_IOBuf inst = ServerSink_IOBuf.__new__(ServerSink_IOBuf)
@@ -88,8 +84,6 @@ cdef class ServerSink_IOBuf:
         return inst
 
 cdef class ResponseAndSinkConsumer:
-    cdef unique_ptr[SinkResponse] _cResponseSink
-
     @staticmethod
     cdef _fbthrift_create(object val, object sink):
         cdef ResponseAndSinkConsumer inst = ResponseAndSinkConsumer.__new__(ResponseAndSinkConsumer)
@@ -103,8 +97,6 @@ cdef class ResponseAndSinkConsumer:
 
 
 cdef class Promise_Sink(Promise_Py):
-    cdef cFollyPromise[SinkResponse]* _cPromise
-
     def __cinit__(self):
         self._cPromise = new cFollyPromise[SinkResponse](cFollyPromise[SinkResponse].makeEmpty())
 
@@ -129,8 +121,6 @@ cdef class Promise_Sink(Promise_Py):
         return inst
 
 cdef class Promise_Stream(Promise_Py):
-    cdef cFollyPromise[StreamResponse]* cPromise
-
     def __cinit__(self):
         self.cPromise = new cFollyPromise[StreamResponse](cFollyPromise[StreamResponse].makeEmpty())
 
@@ -154,8 +144,6 @@ cdef class Promise_Stream(Promise_Py):
 
 
 cdef class Promise_cFollyUnit(Promise_Py):
-    cdef cFollyPromise[cFollyUnit]* cPromise
-
     def __cinit__(self):
         self.cPromise = new cFollyPromise[cFollyUnit](cFollyPromise[cFollyUnit].makeEmpty())
 
@@ -178,8 +166,6 @@ cdef class Promise_cFollyUnit(Promise_Py):
         return inst
 
 cdef class ServerStream_IOBuf(ServerStream):
-    cdef unique_ptr[cServerStream[UniqueIOBuf]] cStream
-
     @staticmethod
     cdef _fbthrift_create(object stream):
         cdef ServerStream_IOBuf inst = ServerStream_IOBuf.__new__(ServerStream_IOBuf)
@@ -193,8 +179,6 @@ cdef class ServerStream_IOBuf(ServerStream):
         return inst
 
 cdef class ResponseAndServerStream:
-    cdef unique_ptr[StreamResponse] cResponseStream
-
     @staticmethod
     cdef _fbthrift_create(object val, object stream):
         cdef ResponseAndServerStream inst = ResponseAndServerStream.__new__(ResponseAndServerStream)

thrift/lib/python/streaming/py_promise.pxd

@@ -49,4 +49,4 @@ cdef class Promise_IOBuf(Promise_Py):
 
 
 cdef void genNextStreamValue(object generator, cFollyPromise[optional[unique_ptr[cIOBuf]]] promise) noexcept
-cdef void genNextSinkValue(object generator, cFollyPromise[optional[unique_ptr[cIOBuf]]] promise) noexcept
+cdef api void genNextSinkValue(object generator, cFollyPromise[optional[unique_ptr[cIOBuf]]] promise) noexcept

thrift/lib/python/streaming/py_promise.pyx

@@ -18,15 +18,25 @@ import sys
 
 from cpython cimport bool as pbool
 from cython.operator cimport dereference
+from libcpp.memory cimport unique_ptr
+from libcpp.optional cimport optional
 from libcpp.utility cimport move as cmove
 
-from folly.iobuf cimport IOBuf
+from folly cimport cFollyPromise
+from folly.iobuf cimport (
+    IOBuf,
+    cIOBuf,
+)
 
 from thrift.python.exceptions cimport (
     ApplicationError,
+    cTApplicationException,
     cTApplicationExceptionType__UNKNOWN,
 )
-from thrift.python.streaming.python_user_exception cimport PythonUserException
+from thrift.python.streaming.python_user_exception cimport (
+    PythonUserException,
+    cPythonUserException,
+)
 
 
 cdef class Promise_Py:
@@ -146,7 +156,7 @@ cdef void genNextStreamValue(object generator, cFollyPromise[optional[unique_ptr
         )
     )
 
-cdef void genNextSinkValue(object generator, cFollyPromise[optional[unique_ptr[cIOBuf]]] promise) noexcept:
+cdef api void genNextSinkValue(object generator, cFollyPromise[optional[unique_ptr[cIOBuf]]] promise) noexcept:
     cdef Promise_Optional_IOBuf __promise = Promise_Optional_IOBuf.create(cmove(promise))
     asyncio.get_event_loop().create_task(
         runGenerator(

thrift/lib/python/streaming/python_user_exception.pyx

@@ -12,12 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from thrift.python.streaming.python_user_exception cimport cPythonUserException
+
 from cython.operator cimport dereference as deref
-from libcpp.memory cimport make_unique
+from libcpp.memory cimport make_unique, unique_ptr
 from libcpp.string cimport string
 from libcpp.utility cimport move as cmove
 
-from folly.iobuf cimport from_unique_ptr
+from folly cimport cFollyExceptionWrapper
+from folly.iobuf cimport IOBuf, cIOBuf, from_unique_ptr
 
 
 cdef class PythonUserException(Exception):

thrift/lib/python/streaming/sink.pxd

@@ -129,6 +129,16 @@ cdef class ResponseAndBidirectionalStream:
 cdef class ResponseAndClientSink:
     pass
 
+cdef class ServerSinkGenerator:
+    cdef cIOBufSinkGenerator _cpp_gen
+    cdef cFollyExecutor* _executor
+
+    @staticmethod
+    cdef _fbthrift_create(
+        cIOBufSinkGenerator cpp_gen,
+        cFollyExecutor* executor,
+    )
+
 cdef api void cancelAsyncGenerator(object generator)
 
 cdef api int invoke_server_sink_callback(

thrift/lib/python/streaming/sink.pyx

@@ -18,7 +18,7 @@ import traceback
 
 from cython.operator import dereference
 from cpython.ref cimport PyObject
-from libcpp.memory cimport make_shared, make_unique, shared_ptr
+from libcpp.memory cimport make_shared, make_unique, shared_ptr, unique_ptr
 from libcpp.utility cimport move as cmove
 
 from folly cimport cFollyPromise, cFollyTry
@@ -41,6 +41,7 @@ from thrift.python.mutable_serializer import (
     deserialize as deserialize_mutable,
 )
 from thrift.python.mutable_types import MutableStruct
+from thrift.python.protocol cimport Protocol
 from thrift.python.serializer import deserialize
 from thrift.python.streaming.py_promise cimport (
     genNextSinkValue,
@@ -51,10 +52,10 @@ from thrift.python.streaming.python_user_exception cimport (
     extractPyUserExceptionIOBuf,
     PythonUserException,
 )
+from thrift.python.streaming.sink cimport cIOBufClientSink, cIOBufSinkGenerator
 from thrift.python.streaming.stream cimport cIOBufClientBufferedStream
 from thrift.python.types import Struct
 
-
 cdef class ClientSink:
     @staticmethod
     cdef _fbthrift_create(
@@ -215,7 +216,7 @@ cdef raise_first_exception_field(response_struct):
 cdef void sink_final_resp_callback(
     cFollyTry[unique_ptr[cIOBuf]]&& res,
     PyObject* user_data,
-):
+) noexcept:
     future, final_resp_cls, sink_elem_cls, protocol = <object> user_data
     try:
         if res.hasException():
@@ -310,9 +311,6 @@ async def invokeCallbackWithGenerator(
 
 
 cdef class ServerSinkGenerator:
-    cdef cIOBufSinkGenerator _cpp_gen
-    cdef cFollyExecutor* _executor
-
     @staticmethod
     cdef _fbthrift_create(
         cIOBufSinkGenerator cpp_gen,

thrift/lib/python/streaming/stream.pyx

@@ -22,12 +22,15 @@ from libcpp.utility cimport move as cmove
 from folly cimport cFollyTry
 from folly.coro cimport bridgeCoroTaskWith
 from folly.executor cimport get_executor
-from folly.iobuf cimport from_unique_ptr
+from folly.iobuf cimport cIOBuf, from_unique_ptr
 from folly.optional cimport cOptional
 
 from thrift.python.exceptions cimport create_py_exception
+from thrift.python.protocol cimport Protocol
 from thrift.python.serializer import deserialize
 
+from thrift.python.streaming.stream cimport cIOBufClientBufferedStream
+
 
 cdef void client_stream_callback(
     cFollyTry[cOptional[unique_ptr[cIOBuf]]]&& result,