Make reflection work on thrift-py3 container flatnames when auto-migrate is enabled

Summary:
Reflection has to work on container flatnames in py3 because they're used recursively by the reflection library, so anything that expects to be able to recurse through a thrift python struct (eg. the py3 converter) will error out upon hitting a list.

This makes it so that the special py3 flatnames correctly generate reflection information, and also changes the converter to check for thrift python list types correctly.

Reviewed By: ahilger

Differential Revision: D68822077

fbshipit-source-id: 3844d11f476a902f230e1809d4d82de70ad6a1dc

Author: Filip Francetic

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

@@ -36,6 +36,7 @@ want to include.
 {{#program:auto_migrate?}}
 from {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.thrift_types import *
 {{#program:hasContainerTypes}}
+import importlib
 import thrift.python.types as _fbthrift_python_types
 import {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.thrift_types as {{!
 }}_{{#program:py3Namespaces}}{{value}}_{{/program:py3Namespaces}}{{program:name}}_thrift_types
@@ -49,6 +50,12 @@ import {{#includeNamespace}}{{value}}.{{/includeNamespace}}thrift_types as _{{#i
 py3-container "flat name" name aliases for backwards-compatibility
 
 }}
+{{#program:hasContainerTypes}}
+def get_types_reflection():
+    return importlib.import_module(
+        "{{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.types_reflection"
+    )
+{{/program:hasContainerTypes}}
 {{#program:containerTypes}}
 {{#type:container?}}
 class {{type:flat_name}}__Meta(type):
@@ -80,6 +87,10 @@ class {{type:flat_name}}(_fbthrift_python_types.{{> types/container_base}}, meta
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__{{type:flat_name}}()
+
 {{/type:container?}}
 {{/program:containerTypes}}
 {{/program:auto_migrate?}}

third-party/thrift/src/thrift/compiler/generate/templates/py3/types_reflection.py.mustache

@@ -107,7 +107,6 @@ def get_reflection__{{struct:name}}() -> __StructSpec:
 {{/struct:py3_fields}}
     return spec
 {{/program:filtered_structs}}
-{{^program:auto_migrate?}}
 {{#program:containerTypes}}
 {{#type:list?}}
 def get_reflection__{{type:flat_name}}() -> __ListSpec :
@@ -138,4 +137,3 @@ def get_reflection__{{type:flat_name}}() -> __MapSpec:
 {{/type:map?}}
 
 {{/program:containerTypes}}
-{{/program:auto_migrate?}}

third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_auto_migrate/gen-py3/module/types.py

@@ -5,8 +5,13 @@
 #  @generated
 #
 from module.thrift_types import *
+import importlib
 import thrift.python.types as _fbthrift_python_types
 import module.thrift_types as _module_thrift_types
+def get_types_reflection():
+    return importlib.import_module(
+        "module.types_reflection"
+    )
 class List__i16__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -27,6 +32,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__i16()
+
 class List__i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -47,6 +56,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__i32()
+
 class List__i64__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -67,6 +80,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__i64()
+
 class List__string__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -87,6 +104,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__string()
+
 class List__SimpleStruct__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -107,6 +128,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__SimpleStruct()
+
 class Set__i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -127,6 +152,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Set__i32()
+
 class Set__string__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -147,6 +176,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Set__string()
+
 class Map__string_string__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -168,6 +201,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Map__string_string()
+
 class Map__string_SimpleStruct__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -189,6 +226,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Map__string_SimpleStruct()
+
 class Map__string_i16__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -210,6 +251,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Map__string_i16()
+
 class List__List__i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -230,6 +275,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__List__i32()
+
 class Map__string_i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -251,6 +300,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Map__string_i32()
+
 class Map__string_Map__string_i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -272,6 +325,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Map__string_Map__string_i32()
+
 class List__Set__string__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -292,6 +349,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__Set__string()
+
 class Map__string_List__SimpleStruct__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -313,6 +374,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Map__string_List__SimpleStruct()
+
 class List__List__string__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -333,6 +398,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__List__string()
+
 class List__Set__i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -353,6 +422,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__Set__i32()
+
 class List__Map__string_string__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -373,6 +446,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__Map__string_string()
+
 class List__binary__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -393,6 +470,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__binary()
+
 class Set__binary__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -413,6 +494,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Set__binary()
+
 class List__AnEnum__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -433,6 +518,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__AnEnum()
+
 class _std_unordered_map__Map__i32_i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -454,6 +543,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection___std_unordered_map__Map__i32_i32()
+
 class _MyType__List__i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -474,6 +567,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection___MyType__List__i32()
+
 class _MyType__Set__i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -494,6 +591,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection___MyType__Set__i32()
+
 class _MyType__Map__i32_i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -515,6 +616,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection___MyType__Map__i32_i32()
+
 class _py3_simple_AdaptedList__List__i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -535,6 +640,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection___py3_simple_AdaptedList__List__i32()
+
 class _py3_simple_AdaptedSet__Set__i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -555,6 +664,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection___py3_simple_AdaptedSet__Set__i32()
+
 class _py3_simple_AdaptedMap__Map__i32_i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -576,6 +689,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection___py3_simple_AdaptedMap__Map__i32_i32()
+
 class Map__i32_double__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -597,6 +714,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Map__i32_double()
+
 class List__Map__i32_double__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -617,6 +738,10 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__List__Map__i32_double()
+
 class Map__AnEnumRenamed_i32__Meta(type):
     def _fbthrift_type_info(cls):
         return (
@@ -638,3 +763,7 @@ def __init__(self, *args, **kwargs):
             **kwargs,
         )
 
+    @staticmethod
+    def __get_reflection__():
+        return get_types_reflection().get_reflection__Map__AnEnumRenamed_i32()
+