Delete thrift py3 services reflection

Summary: The ability to reflect on services is something that is no longer used, so deleting the relevant code that exposes it. There are some SvIf bindings in `services_reflection.pxd`, and those need to remain because they're needed in the services/clients files (I tried moving them into metadata but that broke for files that define types but not services, as you get a py3-types -> py3-metadata -> cpp2-services dependency chain), so renaming those files to services_interface to reflect what they actually mean and deleting `services_reflection.py`. #buildall Reviewed By: ahilger Differential Revision: D67328763 fbshipit-source-id: 332a2d4b8c8c25364b38d4c304c2b51b33f3345e
facebook · Dec 19, 2024 · 4c4ad3c · 4c4ad3c
1 parent 5c17f9e
commit 4c4ad3c
Show file tree

Hide file tree

Showing 105 changed files with 141 additions and 6,252 deletions.
diff --git a/thrift/compiler/generate/t_mstch_py3_generator.cc b/thrift/compiler/generate/t_mstch_py3_generator.cc
@@ -1609,8 +1609,7 @@ void t_mstch_py3_generator::generate_services() {
   std::vector<std::string> cythonFiles{
       "clients_wrapper.pxd",
       "services_wrapper.pxd",
-      "services_reflection.pxd",
-      "services_reflection.py",
+      "services_interface.pxd",
   };
 
   std::vector<std::string> cppFiles{

diff --git a/thrift/compiler/generate/templates/py3/clients.pyx.mustache b/thrift/compiler/generate/templates/py3/clients.pyx.mustache
@@ -87,8 +87,7 @@ import {{#includeNamespace}}{{value}}.{{/includeNamespace}}clients as _{{#includ
 {{/hasServices?}}
 {{/program:includeNamespaces}}
 
-import {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.services_reflection as _services_reflection
-cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.services_reflection as _services_reflection
+cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.services_interface as _fbthrift_services_interface
 
 {{#program:services}}
 from {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.clients_wrapper cimport c{{service:name}}AsyncClient, c{{service:name}}ClientWrapper
@@ -199,14 +198,10 @@ cdef class {{service:name}}({{#service:extends}}{{#service:externalProgram?}}{{!
         return self.create{{service:name}}()
 
 {{/service:supportedInteractions}}
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__{{service:name}}(for_clients=True)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.c{{service:cpp_name}}SvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.c{{service:cpp_name}}SvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod

diff --git a/thrift/compiler/generate/templates/py3/services.pyx.mustache b/thrift/compiler/generate/templates/py3/services.pyx.mustache
@@ -93,8 +93,7 @@ cimport {{#includeNamespace}}{{value}}.{{/includeNamespace}}cbindings as _{{#inc
 {{/hasTypes?}}
 {{/program:includeNamespaces}}
 
-import {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.services_reflection as _services_reflection
-cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.services_reflection as _services_reflection
+cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.services_interface as _fbthrift_services_interface
 
 import asyncio
 import functools
@@ -259,14 +258,10 @@ cdef class {{service:name}}Interface(
     {{/function:return_type}}
 {{/service:supportedFunctions}}
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__{{service:name}}(for_clients=False)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.c{{service:cpp_name}}SvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.c{{service:cpp_name}}SvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod

diff --git a/...ates/py3/services_reflection.pxd.mustache → ...lates/py3/services_interface.pxd.mustache b/...ates/py3/services_reflection.pxd.mustache → ...lates/py3/services_interface.pxd.mustache
diff --git a/thrift/compiler/generate/templates/py3/services_reflection.py.mustache b/thrift/compiler/generate/templates/py3/services_reflection.py.mustache
diff --git a/thrift/compiler/test/fixtures/basic-annotations/out/py3/gen-py3/module/clients.pyx b/thrift/compiler/test/fixtures/basic-annotations/out/py3/gen-py3/module/clients.pyx
@@ -53,8 +53,7 @@ cimport module.types as _module_types
 cimport module.cbindings as _module_cbindings
 import module.types as _module_types
 
-import module.services_reflection as _services_reflection
-cimport module.services_reflection as _services_reflection
+cimport module.services_interface as _fbthrift_services_interface
 
 from module.clients_wrapper cimport cMyServiceAsyncClient, cMyServiceClientWrapper
 from module.clients_wrapper cimport cMyServicePrioParentAsyncClient, cMyServicePrioParentClientWrapper
@@ -487,14 +486,10 @@ cdef class MyService(thrift.py3.client.Client):
         return asyncio_shield(__future)
 
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__MyService(for_clients=True)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cMyServiceSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cMyServiceSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod
@@ -568,14 +563,10 @@ cdef class MyServicePrioParent(thrift.py3.client.Client):
         return asyncio_shield(__future)
 
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__MyServicePrioParent(for_clients=True)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cMyServicePrioParentSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cMyServicePrioParentSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod
@@ -624,14 +615,10 @@ cdef class MyServicePrioChild(MyServicePrioParent):
         return asyncio_shield(__future)
 
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__MyServicePrioChild(for_clients=True)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cMyServicePrioChildSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cMyServicePrioChildSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod
@@ -697,14 +684,10 @@ cdef class BadService(thrift.py3.client.Client):
     ):
         return self.createBadInteraction()
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__BadService(for_clients=True)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cGoodServiceSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cGoodServiceSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod
@@ -826,14 +809,10 @@ cdef class FooBarBazService(thrift.py3.client.Client):
         return asyncio_shield(__future)
 
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__FooBarBazService(for_clients=True)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cFooBarBazServiceSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cFooBarBazServiceSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod

diff --git a/thrift/compiler/test/fixtures/basic-annotations/out/py3/gen-py3/module/services.pyx b/thrift/compiler/test/fixtures/basic-annotations/out/py3/gen-py3/module/services.pyx
@@ -57,8 +57,7 @@ cimport module.types as _module_types
 cimport module.cbindings as _module_cbindings
 import module.types as _module_types
 
-import module.services_reflection as _services_reflection
-cimport module.services_reflection as _services_reflection
+cimport module.services_interface as _fbthrift_services_interface
 
 import asyncio
 import functools
@@ -223,14 +222,10 @@ cdef class MyServiceInterface(
             self):
         raise NotImplementedError("async def doNothing is not implemented")
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__MyService(for_clients=False)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cMyServiceSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cMyServiceSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod
@@ -271,14 +266,10 @@ cdef class MyServicePrioParentInterface(
             self):
         raise NotImplementedError("async def pong is not implemented")
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__MyServicePrioParent(for_clients=False)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cMyServicePrioParentSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cMyServicePrioParentSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod
@@ -310,14 +301,10 @@ MyServicePrioParentInterface
             self):
         raise NotImplementedError("async def pang is not implemented")
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__MyServicePrioChild(for_clients=False)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cMyServicePrioChildSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cMyServicePrioChildSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod
@@ -349,14 +336,10 @@ cdef class BadServiceInterface(
             self):
         raise NotImplementedError("async def bar is not implemented")
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__BadService(for_clients=False)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cGoodServiceSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cGoodServiceSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod
@@ -406,14 +389,10 @@ cdef class FooBarBazServiceInterface(
             self):
         raise NotImplementedError("async def baz is not implemented")
 
-    @classmethod
-    def __get_reflection__(cls):
-        return _services_reflection.get_reflection__FooBarBazService(for_clients=False)
-
     @staticmethod
     def __get_metadata__():
         cdef __fbthrift_cThriftServiceMetadataResponse response
-        ServiceMetadata[_services_reflection.cFooBarBazServiceSvIf].gen(response)
+        ServiceMetadata[_fbthrift_services_interface.cFooBarBazServiceSvIf].gen(response)
         return __MetadataBox.box(cmove(deref(response.metadata_ref())))
 
     @staticmethod

diff --git a/...y3/gen-py3/module/services_reflection.pxd → ...py3/gen-py3/module/services_interface.pxd b/...y3/gen-py3/module/services_reflection.pxd → ...py3/gen-py3/module/services_interface.pxd