Move method body to async template

Author: AdrienVannson

src/betterproto2_compiler/templates/service_stub.py.j2

@@ -26,61 +26,6 @@ class {% block class_name %}{% endblock %}({% block inherit_from %}{% endblock %
         {% endif %}
         {% endblock %}
 
-        {% if method.server_streaming %}
-            {% if method.client_streaming %}
-        async for response in self._stream_stream(
-            "{{ method.route }}",
-            {{ method.py_input_message_param }}_iterator,
-            {{ method.py_input_message_type }},
-            {{ method.py_output_message_type }},
-            timeout=timeout,
-            deadline=deadline,
-            metadata=metadata,
-        ):
-            yield response
-            {% else %}{# i.e. not client streaming #}
-        {% if method.is_input_msg_empty %}
-        if {{ method.py_input_message_param }} is None:
-            {{ method.py_input_message_param }} = {{ method.py_input_message_type }}()
-
-        {% endif %}
-        async for response in self._unary_stream(
-            "{{ method.route }}",
-            {{ method.py_input_message_param }},
-            {{ method.py_output_message_type }},
-            timeout=timeout,
-            deadline=deadline,
-            metadata=metadata,
-        ):
-            yield response
-
-            {% endif %}{# if client streaming #}
-        {% else %}{# i.e. not server streaming #}
-            {% if method.client_streaming %}
-        return await self._stream_unary(
-            "{{ method.route }}",
-            {{ method.py_input_message_param }}_iterator,
-            {{ method.py_input_message_type }},
-            {{ method.py_output_message_type }},
-            timeout=timeout,
-            deadline=deadline,
-            metadata=metadata,
-        )
-            {% else %}{# i.e. not client streaming #}
-        {% if method.is_input_msg_empty %}
-        if {{ method.py_input_message_param }} is None:
-            {{ method.py_input_message_param }} = {{ method.py_input_message_type }}()
-
-        {% endif %}
-        return await self._unary_unary(
-            "{{ method.route }}",
-            {{ method.py_input_message_param }},
-            {{ method.py_output_message_type }},
-            timeout=timeout,
-            deadline=deadline,
-            metadata=metadata,
-        )
-            {% endif %}{# client streaming #}
-        {% endif %}
+        {% block method_body scoped required %}{% endblock %}
 
     {% endfor %}

src/betterproto2_compiler/templates/service_stub_async.py.j2

@@ -24,4 +24,63 @@
             , deadline: "{{ output_file.typing_compiler.optional("Deadline") }}" = None
             , metadata: "{{ output_file.typing_compiler.optional("MetadataLike") }}" = None
             ) -> "{% if method.server_streaming %}{{ output_file.typing_compiler.async_iterator(method.py_output_message_type ) }}{% else %}{{ method.py_output_message_type }}{% endif %}":
+{% endblock %}
+
+{% block method_body %}
+    {% if method.server_streaming %}
+      {% if method.client_streaming %}
+        async for response in self._stream_stream(
+            "{{ method.route }}",
+            {{ method.py_input_message_param }}_iterator,
+            {{ method.py_input_message_type }},
+            {{ method.py_output_message_type }},
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        ):
+            yield response
+      {% else %}
+        {% if method.is_input_msg_empty %}
+        if {{ method.py_input_message_param }} is None:
+            {{ method.py_input_message_param }} = {{ method.py_input_message_type }}()
+
+        {% endif %}
+        async for response in self._unary_stream(
+            "{{ method.route }}",
+            {{ method.py_input_message_param }},
+            {{ method.py_output_message_type }},
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        ):
+            yield response
+
+      {% endif %}
+    {% else %}
+      {% if method.client_streaming %}
+        return await self._stream_unary(
+            "{{ method.route }}",
+            {{ method.py_input_message_param }}_iterator,
+            {{ method.py_input_message_type }},
+            {{ method.py_output_message_type }},
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        )
+      {% else %}
+        {% if method.is_input_msg_empty %}
+        if {{ method.py_input_message_param }} is None:
+            {{ method.py_input_message_param }} = {{ method.py_input_message_type }}()
+
+        {% endif %}
+        return await self._unary_unary(
+            "{{ method.route }}",
+            {{ method.py_input_message_param }},
+            {{ method.py_output_message_type }},
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        )
+      {% endif %}
+    {% endif %}
 {% endblock %}

src/betterproto2_compiler/templates/service_stub_sync.py.j2

@@ -30,3 +30,7 @@
             , metadata: "{{ output_file.typing_compiler.optional("MetadataLike") }}" = None
             ) -> "{% if method.server_streaming %}{{ output_file.typing_compiler.sync_iterator(method.py_output_message_type ) }}{% else %}{{ method.py_output_message_type }}{% endif %}":
 {% endblock %}
+
+{% block method_body %}
+        pass
+{% endblock %}