fix bug where named exceptions translated to ApplicationError.UNKNOWN

Summary:
Tests were showing services throwing `ApplicationError.UNKNOWN` when a named thrift exception was expected.

This is a result of `types/cython_python_type` resolving to `object` when in-place migrate enabled. In the two places changed in this diff, the python type is needed, not the cython type.

For regular build, `types/cython_python_type` and `types/python_type` are equivalent, so there is no change to trunk behavior.

The other flavor of issues is being careful about py3 vs python type before/after thrift-python converter. The inter-conversion is cheap, but have to get it right.

Reviewed By: prakashgayasen

Differential Revision: D72479041

fbshipit-source-id: 21363b1c7ed2844a8ca5ed6210098eed51c8abaf

Author: ahilger

third-party/thrift/src/thrift/compiler/generate/templates/py3/services.pyx.mustache

@@ -167,10 +167,10 @@ async def runGenerator_{{service:name}}_{{function:name}}(object generator, Prom
         promise.cPromise.setValue(optional[{{> types/cython_cpp_type}}]())
     {{#function:stream_exceptions}}
     {{#field:type}}
-    except {{> types/cython_python_type}} as ex:
+    except {{> types/python_type}} as ex:
         promise.cPromise.setException({{!
         }}{{#program:inplace_migrate?}}{{#type:struct}}{{!
-          }}{{type:capi_converter_path}}.{{struct:name}}_convert_to_cpp(ex){{!
+          }}{{type:capi_converter_path}}.{{struct:name}}_convert_to_cpp(ex._to_python()){{!
         }}{{/type:struct}}{{/program:inplace_migrate?}}{{^program:inplace_migrate?}}{{!
           }}deref((<{{> types/cython_python_type}}> ex).{{> types/cpp_obj}}){{!
         }}{{/program:inplace_migrate?}})

third-party/thrift/src/thrift/compiler/generate/templates/py3/services/callback.mustache

@@ -111,7 +111,7 @@ async def {{service:name}}_{{function:name}}_coro(
         {{/function:return_type}}
     {{#function:exceptions}}
     {{#field:type}}
-    except {{> types/cython_python_type}} as ex:
+    except {{> types/python_type}} as ex:
         promise.cPromise.setException{{!
 }}{{^program:inplace_migrate?}}{{!
           }}(deref((<{{> types/cython_python_type}}> ex).{{> types/cpp_obj}})){{!

third-party/thrift/src/thrift/compiler/generate/templates/py3/stream/cython_cpp_value_to_python_value.mustache

@@ -40,8 +40,9 @@ to a python type.
 }}{{#type:binary?}}_value{{/type:binary?}}{{!
 }}{{#type:struct}}{{!
   }}{{#program:inplace_migrate?}}{{!
+    }}{{> types/python_type}}.from_python({{!
     }}{{type:capi_converter_path}}.{{struct:name}}_from_cpp({{!
-    }}__deref_const[{{> types/cython_cpp_type }}](_value)){{!
+    }}__deref_const[{{> types/cython_cpp_type }}](_value))){{!
   }}{{/program:inplace_migrate?}}{{^program:inplace_migrate?}}{{!
     }}{{> types/cython_python_type}}._create_FBTHRIFT_ONLY_DO_NOT_USE({{!
     }}make_shared[{{> types/cython_cpp_type}}](_value)){{!

third-party/thrift/src/thrift/compiler/generate/templates/py3/types.pyx.mustache

@@ -599,8 +599,9 @@ cdef class ClientBufferedStream__{{type:flat_name}}(ClientBufferedStream):
         }}result.hasException[{{> types/cython_cpp_type}}]():
             pyfuture.set_exception({{!
             }}{{#program:inplace_migrate?}}{{#type:struct}}{{!
+                }}{{> types/python_type}}.from_python({{!
                 }}{{type:capi_converter_path}}.{{struct:name}}_from_cpp({{!
-                }}thrift.py3.exceptions.unwrap_exception[{{> types/cython_cpp_type}}](result.exception())){{!
+                }}thrift.py3.exceptions.unwrap_exception[{{> types/cython_cpp_type}}](result.exception()))){{!
             }}{{/type:struct}}{{/program:inplace_migrate?}}{{^program:inplace_migrate?}}{{!
                 }}{{> types/cython_python_type}}._create_FBTHRIFT_ONLY_DO_NOT_USE({{!
                 }}thrift.py3.exceptions.try_make_shared_exception[{{> types/cython_cpp_type}}](result.exception())){{!

third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_inplace/gen-py3/module/services.pyx

@@ -1981,7 +1981,7 @@ async def SimpleService_expected_exception_coro(
 ):
     try:
         result = await self.expected_exception()
-    except object as ex:
+    except _module_types.SimpleException as ex:
         promise.cPromise.setException(_module_thrift_converter.SimpleException_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one

third-party/thrift/src/thrift/compiler/test/fixtures/stream/out/py3_inplace/gen-py3/module/services.pyx

@@ -139,8 +139,8 @@ async def runGenerator_PubSubStreamingService_streamthrows(object generator, Pro
         item = await generator.asend(None)
     except StopAsyncIteration:
         promise.cPromise.setValue(optional[cint32_t]())
-    except object as ex:
-        promise.cPromise.setException(_module_thrift_converter.FooStreamEx_convert_to_cpp(ex))
+    except _module_types.FooStreamEx as ex:
+        promise.cPromise.setException(_module_thrift_converter.FooStreamEx_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one
         promise.cPromise.setException(cTApplicationException(
@@ -246,8 +246,8 @@ async def runGenerator_PubSubStreamingService_boththrows(object generator, Promi
         item = await generator.asend(None)
     except StopAsyncIteration:
         promise.cPromise.setValue(optional[cint32_t]())
-    except object as ex:
-        promise.cPromise.setException(_module_thrift_converter.FooStreamEx_convert_to_cpp(ex))
+    except _module_types.FooStreamEx as ex:
+        promise.cPromise.setException(_module_thrift_converter.FooStreamEx_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one
         promise.cPromise.setException(cTApplicationException(
@@ -283,8 +283,8 @@ async def runGenerator_PubSubStreamingService_responseandstreamstreamthrows(obje
         item = await generator.asend(None)
     except StopAsyncIteration:
         promise.cPromise.setValue(optional[cint32_t]())
-    except object as ex:
-        promise.cPromise.setException(_module_thrift_converter.FooStreamEx_convert_to_cpp(ex))
+    except _module_types.FooStreamEx as ex:
+        promise.cPromise.setException(_module_thrift_converter.FooStreamEx_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one
         promise.cPromise.setException(cTApplicationException(
@@ -355,8 +355,8 @@ async def runGenerator_PubSubStreamingService_responseandstreamboththrows(object
         item = await generator.asend(None)
     except StopAsyncIteration:
         promise.cPromise.setValue(optional[cint32_t]())
-    except object as ex:
-        promise.cPromise.setException(_module_thrift_converter.FooStreamEx_convert_to_cpp(ex))
+    except _module_types.FooStreamEx as ex:
+        promise.cPromise.setException(_module_thrift_converter.FooStreamEx_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one
         promise.cPromise.setException(cTApplicationException(
@@ -928,7 +928,7 @@ async def PubSubStreamingService_servicethrows_coro(
             result = await result
         if isinstance(result, AsyncIterator):
             result = ServerStream_cint32_t._fbthrift_create(cmove(createAsyncIteratorFromPyIterator[cint32_t](result, get_executor(), &getNextGenerator_PubSubStreamingService_servicethrows)))
-    except object as ex:
+    except _module_types.FooEx as ex:
         promise.cPromise.setException(_module_thrift_converter.FooEx_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one
@@ -964,9 +964,9 @@ async def PubSubStreamingService_servicethrows2_coro(
             result = await result
         if isinstance(result, AsyncIterator):
             result = ServerStream_cint32_t._fbthrift_create(cmove(createAsyncIteratorFromPyIterator[cint32_t](result, get_executor(), &getNextGenerator_PubSubStreamingService_servicethrows2)))
-    except object as ex:
+    except _module_types.FooEx as ex:
         promise.cPromise.setException(_module_thrift_converter.FooEx_convert_to_cpp(ex._to_python()))
-    except object as ex:
+    except _module_types.FooEx2 as ex:
         promise.cPromise.setException(_module_thrift_converter.FooEx2_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one
@@ -1002,7 +1002,7 @@ async def PubSubStreamingService_boththrows_coro(
             result = await result
         if isinstance(result, AsyncIterator):
             result = ServerStream_cint32_t._fbthrift_create(cmove(createAsyncIteratorFromPyIterator[cint32_t](result, get_executor(), &getNextGenerator_PubSubStreamingService_boththrows)))
-    except object as ex:
+    except _module_types.FooEx as ex:
         promise.cPromise.setException(_module_thrift_converter.FooEx_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one
@@ -1076,7 +1076,7 @@ async def PubSubStreamingService_responseandstreamservicethrows_coro(
             result = await result
         if isinstance(result, AsyncIterator):
             result = ServerStream_cint32_t._fbthrift_create(cmove(createAsyncIteratorFromPyIterator[cint32_t](result, get_executor(), &getNextGenerator_PubSubStreamingService_responseandstreamservicethrows)))
-    except object as ex:
+    except _module_types.FooEx as ex:
         promise.cPromise.setException(_module_thrift_converter.FooEx_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one
@@ -1114,7 +1114,7 @@ async def PubSubStreamingService_responseandstreamboththrows_coro(
             result = await result
         if isinstance(result, AsyncIterator):
             result = ServerStream_cint32_t._fbthrift_create(cmove(createAsyncIteratorFromPyIterator[cint32_t](result, get_executor(), &getNextGenerator_PubSubStreamingService_responseandstreamboththrows)))
-    except object as ex:
+    except _module_types.FooEx as ex:
         promise.cPromise.setException(_module_thrift_converter.FooEx_convert_to_cpp(ex._to_python()))
     except __ApplicationError as ex:
         # If the handler raised an ApplicationError convert it to a C++ one

third-party/thrift/src/thrift/compiler/test/fixtures/stream/out/py3_inplace/gen-py3/module/types.pyx

@@ -79,7 +79,7 @@ cdef class ClientBufferedStream__i32(ClientBufferedStream):
         cdef cint32_t _value
         stream, pyfuture, rpc_options = <object> userdata
         if result.hasException[_module_cbindings.cFooStreamEx]():
-            pyfuture.set_exception(_module_thrift_converter.FooStreamEx_from_cpp(thrift.py3.exceptions.unwrap_exception[_module_cbindings.cFooStreamEx](result.exception())))
+            pyfuture.set_exception(FooStreamEx.from_python(_module_thrift_converter.FooStreamEx_from_cpp(thrift.py3.exceptions.unwrap_exception[_module_cbindings.cFooStreamEx](result.exception()))))
         elif result.hasException():
             pyfuture.set_exception(
                 thrift.python.exceptions.create_py_exception(result.exception(), <__RpcOptions>rpc_options)