fix services build

Summary: Fixes an issue with some `services` builds. Previous diff attempted to simplify the codegen too much, not accounting for how `__make_instance` may be called by services, where it needs an import prefix. Reviewed By: Filip-F Differential Revision: D68185699 fbshipit-source-id: 4877d8f81ef2bc29d83867cf027e7949dc971fcb
facebook · Jan 15, 2025 · a5e3d04 · a5e3d04
1 parent 49d1b75
commit a5e3d04
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...hrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_item.mustache b/...hrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_item.mustache
@@ -52,6 +52,13 @@ key, include the parallel CythonPythonToCppKey file instead.
   }}python_to_cpp[{{> types/cython_cpp_basic_type}}](item){{!
   }}{{/program:auto_migrate?}}{{!
 }}{{/type:struct}}{{!
-}}{{#type:container?}}{{type:flat_name}}__make_instance(item){{/type:container?}}{{!
+}}{{#type:container?}}{{!
+  }}{{^program:auto_migrate?}}{{!
+    }}{{> types/container_to_cpp }}(item){{!
+  }}{{/program:auto_migrate?}}{{!
+  }}{{#program:auto_migrate?}}{{!
+    }}{{type:flat_name}}__make_instance(item){{!
+  }}{{/program:auto_migrate?}}{{!
+}}{{/type:container?}}{{!
 }}{{#type:enum?}}<{{> types/cython_cpp_type}}><int>item{{/type:enum?}}{{!
 }}{{/type:customBinaryType?}}
diff --git a/...thrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_key.mustache b/...thrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_key.mustache
@@ -43,6 +43,11 @@ keys (conventionally used for sets, lists, and map values).
   }}{{/program:auto_migrate?}}{{!
 }}{{/type:struct}}{{!
 }}{{#type:container?}}{{!
-  }}{{type:flat_name}}__make_instance(key){{!
+  }}{{^program:auto_migrate?}}{{!
+    }}{{> types/container_to_cpp }}(key){{!
+  }}{{/program:auto_migrate?}}{{!
+  }}{{#program:auto_migrate?}}{{!
+    }}{{type:flat_name}}__make_instance(key){{!
+  }}{{/program:auto_migrate?}}{{!
 }}{{/type:container?}}{{!
 }}{{#type:enum?}}<{{> types/cython_cpp_type}}><int>key{{/type:enum?}}