Replace type module path properties with program-based accessors

Summary:
Remove `modulePath`, `module_path_period_separated`, `cbinding_path`,
`capi_converter_path`, and `module_auto_migrate_path` properties from the
py3 generator's `t_type` prototype. These properties all resolved the
true type's program internally and formatted a module path string.

Replace all template usages with the equivalent expression using the
program's `module_path_for_alias` property accessed via
`type.true_type.program.module_path_for_alias` with the appropriate suffix
(`_types`, `_cbindings`, `_thrift_converter`, `_thrift_types`).

Reviewed By: iahs

Differential Revision: D96012491

fbshipit-source-id: 1e4a71c5eeb252101ec0458b1fac911d30d2df56

Author: hchokshi

third-party/thrift/src/thrift/compiler/generate/t_mstch_py3_generator.cc

@@ -862,9 +862,6 @@ class t_mstch_py3_generator : public t_whisker_generator {
       return fmt::format(
           "{}", fmt::join(cpp2::get_gen_namespace_components(self), "::"));
     });
-    def.property("py3Namespaces", [](const t_program& self) {
-      return to_whisker_string_array(get_py3_namespace(&self));
-    });
     def.property("module_path", [](const t_program& self) {
       std::vector<std::string> segments = get_py3_namespace_with_name(&self);
       assert(!segments.empty());
@@ -1043,6 +1040,15 @@ class t_mstch_py3_generator : public t_whisker_generator {
     auto base = t_whisker_generator::make_prototype_for_type(proto);
     auto def = whisker::dsl::prototype_builder<h_type>::extends(base);
 
+    // Override for base Whisker generator's `program` property, falling back to
+    // the current program for primitives/containers which have a `nullptr`
+    // program. This allows us to use the `t_program` module path properties
+    // without a mess of conditions in the template.
+    def.property("program", [&](const t_type& self) {
+      return proto.create<t_program>(
+          self.program() == nullptr ? *program_ : *self.program());
+    });
+
     // Overrides for `t_named` properties, resolving typedefs before computing
     // the value. This is necessary because the py3 generator previously used to
     // erase typedefs when initializing mstch_type, but still used the
@@ -1060,22 +1066,6 @@ class t_mstch_py3_generator : public t_whisker_generator {
     def.property("cpp_name", [](const t_type& self) {
       return cpp2::get_name(self.get_true_type());
     });
-    def.property("modulePath", [this](const t_type& self) {
-      const t_type* true_type = self.get_true_type();
-      const t_program* program = true_type->program() == nullptr
-          ? get_program()
-          : true_type->program();
-      return fmt::format(
-          "_{}_types", fmt::join(get_py3_namespace_with_name(program), "_"));
-    });
-    def.property("module_path_period_separated", [this](const t_type& self) {
-      const t_type* true_type = self.get_true_type();
-      const t_program* program = true_type->program() == nullptr
-          ? get_program()
-          : true_type->program();
-      return fmt::format(
-          "{}.types", fmt::join(get_py3_namespace_with_name(program), "."));
-    });
     def.property("need_module_path?", [this](const t_type& self) {
       return file_type_ == FileType::NotTypesFile ||
           get_true_type_program(self) != get_program();
@@ -1095,24 +1085,6 @@ class t_mstch_py3_generator : public t_whisker_generator {
       return file_type_ != FileType::CBindingsFile ||
           get_true_type_program(self) != get_program();
     });
-    def.property("cbinding_path", [this](const t_type& self) {
-      return fmt::format(
-          "_{}_cbindings",
-          fmt::join(
-              get_py3_namespace_with_name(get_true_type_program(self)), "_"));
-    });
-    def.property("capi_converter_path", [this](const t_type& self) {
-      return fmt::format(
-          "_{}_thrift_converter",
-          fmt::join(
-              get_py3_namespace_with_name(get_true_type_program(self)), "_"));
-    });
-    def.property("module_auto_migrate_path", [this](const t_type& self) {
-      return fmt::format(
-          "_{}_thrift_types",
-          fmt::join(
-              get_py3_namespace_with_name(get_true_type_program(self)), "_"));
-    });
     def.property("cppTemplate", [this](const t_type& self) {
       return context_->get_cached_type_props(&self).cpp_template();
     });

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

@@ -43,7 +43,7 @@ import {{include.program.module_path}}.types as {{include.program.module_path_fo
   {{/if include.program.has_types?}}
 {{/each}}
 
-import {{program.module_path}}.{{> common/auto_migrate_import_prefix }}types as {{program.module_path_for_alias}}_types
+import {{program.module_path}}.{{#if program.auto_migrate?}}thrift_{{/if}}types as {{program.module_path_for_alias}}_types
 
 
 {{#each program.py3_visible_structured_definitions as |struct|}}

third-party/thrift/src/thrift/compiler/generate/templates/py3/clients/callback_body.mustache

@@ -21,7 +21,7 @@ if {{#each function.exceptions as |exc|}}{{!
     try:
         exc = {{#if root_program.inplace_migrate?}}{{!
         }}{{#partial types.python_type type=exc.type}}.from_python({{!
-        }}{{exc.type.capi_converter_path}}.{{exc.type.true_type.name}}_from_cpp(
+        }}{{exc.type.true_type.program.module_path_for_alias}}_thrift_converter.{{exc.type.true_type.name}}_from_cpp(
             unwrap_exception[{{#partial types.cython_cpp_type type=exc.type}}](result.exception())
         ))
         {{#else}}

third-party/thrift/src/thrift/compiler/generate/templates/py3/clients/cython_cpp_value_to_return_value.mustache

@@ -35,7 +35,7 @@ to a python type.
 
   {{#else if (and function.return_type.structured? program.inplace_migrate?)}}
 {{#partial types.python_type type=function.return_type}}.from_python(
-{{function.return_type.capi_converter_path}}.{{function.return_type.true_type.name}}_from_cpp(
+{{function.return_type.true_type.program.module_path_for_alias}}_thrift_converter.{{function.return_type.true_type.name}}_from_cpp(
 __deref_const[{{#partial types.cython_cpp_type type=function.return_type}}](result.value())))
 
   {{#else if function.return_type.structured?}}

third-party/thrift/src/thrift/compiler/generate/templates/py3/clients/cython_python_to_cpp_arg.mustache

@@ -34,7 +34,7 @@ This template assumes that the Python object is in a variable named <field>.
 {{#else if param.type.container?}}{{#partial types.container_to_cpp type=param.type}}({{param.py_name}})
 {{#else if param.type.enum?}}<{{#partial types.cython_cpp_type type=param.type}}><int>{{param.py_name}}
   {{#else if (and param.type.structured? program.inplace_migrate?)}}
-{{param.type.capi_converter_path}}.{{param.type.true_type.name}}_convert_to_cpp({{param.py_name}}._to_python())
+{{param.type.true_type.program.module_path_for_alias}}_thrift_converter.{{param.type.true_type.name}}_convert_to_cpp({{param.py_name}}._to_python())
 
   {{#else if param.type.structured?}}
 deref((<{{#partial types.cython_python_type type=param.type}}>{{param.py_name}}).{{#partial types.cpp_obj}})

third-party/thrift/src/thrift/compiler/generate/templates/py3/common/auto_migrate_import_prefix.mustache

@@ -37,12 +37,12 @@ file.
 
   {{#else if value.enum?}}
 {{#if (not value.enum_value?)}}__BadEnum({{/if}}
-{{#if (and ttype.enum? ttype.need_module_path?)}}{{ttype.module_path_period_separated}}.{{/if}}
+{{#if (and ttype.enum? ttype.need_module_path?)}}{{ttype.program.module_path}}.types.{{/if}}
 {{value.enum_name}}{{#if value.enum_value?}}.{{value.py3_enum_value_name}}{{/if}}
 {{#if (not value.enum_value?)}}, {{value.integer_value}}){{/if}}
 
   {{#else if value.structured?}}
-{{#if ttype.need_module_path?}}{{ttype.module_path_period_separated}}.{{/if}}{{ttype.name}}
+{{#if ttype.need_module_path?}}{{ttype.program.module_path}}.types.{{/if}}{{ttype.name}}
 (
     {{#each (array.enumerate value.structured_elements with_last=true) as |i elem last?|}}
 {{elem.field.name}}={{#partial inplace_const_value value=elem.value}}{{#if (not last?)}}, {{/if}}
@@ -90,9 +90,9 @@ file.
   {{#else if value.enum?}}
     {{#let enum_type=value.type.true_type}}
     {{#if value.enum_value?}}
-{{#if enum_type.need_module_path?}}{{enum_type.modulePath}}.{{/if}}{{value.enum_name}}.{{value.py3_enum_value_name}}
+{{#if enum_type.need_module_path?}}{{enum_type.program.module_path_for_alias}}_types.{{/if}}{{value.enum_name}}.{{value.py3_enum_value_name}}
     {{#else}}
-__BadEnum({{#if enum_type.need_module_path?}}{{enum_type.modulePath}}.{{/if}}{{value.enum_name}}, {{value.integer_value}})
+__BadEnum({{#if enum_type.need_module_path?}}{{enum_type.program.module_path_for_alias}}_types.{{/if}}{{value.enum_name}}, {{value.integer_value}})
     {{/if value.enum_value?}}
   {{/if value.bool?}}
 {{/let partial}}

third-party/thrift/src/thrift/compiler/generate/templates/py3/common/constants.mustache

@@ -34,7 +34,7 @@ thrift-py3 specific container types.
 {{#else if type.string?}}str
 {{#else if type.void?}}None
 {{#else if type.binary?}}{{#if type.iobufWrapper?}}_fbthrift_iobuf.IOBuf{{#else}}bytes{{/if}}
-{{#else if (or type.structured? type.enum?)}}{{#if type.need_module_path?}}{{type.modulePath}}.{{/if}}{{type.true_type.name}}
+{{#else if (or type.structured? type.enum?)}}{{#if type.need_module_path?}}{{type.true_type.program.module_path_for_alias}}_types.{{/if}}{{type.true_type.name}}
 {{#else if type.list?}}_typing.Sequence[{{#partial type_name type=type.true_type.elem_type}}]
 {{#else if type.set?}}_typing.AbstractSet[{{#partial type_name type=type.true_type.elem_type}}]
 {{#else if type.map?}}_typing.Mapping[{{#partial type_name type=type.true_type.key_type}}, {{#partial type_name type=type.true_type.val_type}}]
@@ -45,7 +45,7 @@ thrift-py3 specific container types.
 {{! pep 484 typing but with period separated module path }}
 {{#let export partial type_period_separated |type| captures |type_name|}}
 {{#pragma ignore-newlines}}
-{{#if (or type.structured? type.enum?)}}{{#if type.need_module_path?}}{{type.module_path_period_separated}}.{{/if}}{{type.true_type.name}}
+{{#if (or type.structured? type.enum?)}}{{#if type.need_module_path?}}{{type.true_type.program.module_path}}.types.{{/if}}{{type.true_type.name}}
 {{#else if type.list?}}_typing.Sequence[{{#partial type_period_separated type=type.true_type.elem_type}}]
 {{#else if type.set?}}_typing.AbstractSet[{{#partial type_period_separated type=type.true_type.elem_type}}]
 {{#else if type.map?}}_typing.Mapping[{{#partial type_period_separated type=type.true_type.key_type}}, {{#partial type_period_separated type=type.true_type.val_type}}]

third-party/thrift/src/thrift/compiler/generate/templates/py3/common/pep484.mustache

@@ -31,7 +31,7 @@ __iobuf_cIOBuf
     {{#else if type.iobufRef?}}
 unique_ptr__iobuf_cIOBuf
     {{#else}}
-{{#if type.need_cbinding_path?}}{{type.cbinding_path}}_{{/if}}{{type.cythonCustomType}}
+{{#if type.need_cbinding_path?}}{{type.true_type.program.module_path_for_alias}}_cbindings_{{/if}}{{type.cythonCustomType}}
     {{/if type.iobuf?}}
 {{#else if type.bool?}}cbool
 {{#else if type.void?}}cFollyUnit
@@ -45,11 +45,11 @@ unique_ptr__iobuf_cIOBuf
 {{#else if type.binary?}}binary
   {{#else if (or type.structured? type.enum?)}}
     {{#let ttype = type.true_type}}
-{{#if ttype.need_cbinding_path?}}{{ttype.cbinding_path}}_{{/if}}{{!
+{{#if ttype.need_cbinding_path?}}{{ttype.program.module_path_for_alias}}_cbindings_{{/if}}{{!
 }}{{#partial types.c_binding node=ttype}}
   {{#else if type.container?}}
     {{#let ttype = type.true_type}}
-{{#if (and (not type.defaultTemplate?) type.need_cbinding_path?)}}{{type.cbinding_path}}_{{/if}}
+{{#if (and (not type.defaultTemplate?) type.need_cbinding_path?)}}{{ttype.program.module_path_for_alias}}_cbindings_{{/if}}
     {{#if type.map?}}
 {{type.cythonTemplate}}__{{#partial cython_cpp_type_ident type=ttype.key_type}}_{{#partial cython_cpp_type_ident type=ttype.val_type}}
     {{#else}}
@@ -133,7 +133,7 @@ cmove(deref((<ServerStream_{{#partial cython_cpp_type_ident type=function.stream
     {{#let ttype = type.true_type}}
 {{#if (not function.stack_arguments?)}}make_unique[{{#partial types.cython_cpp_type type=type}}]({{/if}}
     {{#if root_program.inplace_migrate?}}
-{{type.capi_converter_path}}.{{ttype.name}}_convert_to_cpp(result._to_python())
+{{ttype.program.module_path_for_alias}}_thrift_converter.{{ttype.name}}_convert_to_cpp(result._to_python())
     {{#else}}
 deref((<{{#partial types.cython_python_type type=type}}?> result).{{#partial types.cpp_obj}})
     {{/if root_program.inplace_migrate?}}

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

@@ -44,7 +44,7 @@ identification. Takes a function and produces
 {{#else if type.enum?}}{{#partial types.python_type type=type}}(<int> _value)
 {{#else if type.structured?}}
   {{#if root_program.inplace_migrate?}}
-{{#partial types.python_type type=type}}.from_python({{type.capi_converter_path}}.{{type.true_type.name}}_from_cpp(__deref_const[{{#partial types.cython_cpp_type type=type}}](_value)))
+{{#partial types.python_type type=type}}.from_python({{type.true_type.program.module_path_for_alias}}_thrift_converter.{{type.true_type.name}}_from_cpp(__deref_const[{{#partial types.cython_cpp_type type=type}}](_value)))
   {{#else}}
 {{#partial types.cython_python_type type=type}}._create_FBTHRIFT_ONLY_DO_NOT_USE(make_shared[{{#partial types.cython_cpp_type type=type}}](_value))
   {{/if root_program.inplace_migrate?}}