Switching server codegen to dedent and clearer bindings

Author: blast-hardcheese

replit_river/codegen/server.py

@@ -228,6 +228,7 @@ def generate_river_module(
     chunks: list[str] = [
         dedent(
             f"""\
+        # ruff: noqa
         # Code generated by river.codegen. DO NOT EDIT.
         import datetime
         from typing import Any, Mapping, Tuple
@@ -257,22 +258,21 @@ def _remove_namespace(name: str) -> str:
         for service in pd.service:
             chunks.extend(
                 [
-                    f"""def add_{service.name}Servicer_to_server(
+                    dedent(
+                        f"""\
+                def add_{service.name}Servicer_to_server(
                     servicer: {pb_module_name}_pb2_grpc.{service.name}Servicer,
                     server: river.Server,
-                ) -> None:""",
-                    (
-                        "  rpc_method_handlers: Mapping[Tuple[str, str], "
-                        "Tuple[str, river.GenericRpcHandler]] = {"
+                ) -> None:
+                    rpc_method_handlers: Mapping[
+                        Tuple[str, str],
+                        Tuple[str, river.GenericRpcHandler]
+                    ] = {{
+                    """
                     ),
                 ]
             )
             for method in service.method:
-                descriptor = f"""('{
-                    ''.join([service.name[0].lower(), service.name[1:]])
-                    }', '{
-                    ''.join([method.name[0].lower(), method.name[1:]])
-                    }')"""
                 method_kind: str
                 handler_name: str
                 if method.client_streaming:
@@ -290,17 +290,30 @@ def _remove_namespace(name: str) -> str:
                         method_kind = "rpc"
                         handler_name = "rpc_method_handler"
 
+                descriptor = dedent(
+                    f"""\
+                (
+                    {repr(''.join([service.name[0].lower(), service.name[1:]]))},
+                    {repr(''.join([method.name[0].lower(), method.name[1:]]))}
+                )
+                """
+                )
+                decoder_term = f"_{_remove_namespace(method.input_type)}Decoder"
+                encoder_term = f"_{_remove_namespace(method.output_type)}Encoder"
                 chunks.extend(
                     [
-                        f"    {descriptor}: ('{method_kind}', river.{handler_name}(",
-                        f"      servicer.{method.name},",
-                        f"""      _{
-                            _remove_namespace(method.input_type)
-                        }Decoder,""",
-                        f"""      _{
-                            _remove_namespace(method.output_type)
-                        }Encoder,""",
-                        "    )),",
+                        dedent(
+                            f"""\
+                            {descriptor}: (
+                                {repr(method_kind)},
+                                river.{handler_name}(
+                                    servicer.{method.name},
+                                    {decoder_term},
+                                    {encoder_term},
+                                ),
+                            ),
+                        """
+                        ),
                     ]
                 )
             chunks.append("  }")