Make --grpc-rere default for flower-server (#2581)

adap · Nov 8, 2023 · 69d1868 · 69d1868
1 parent 1088d72
commit 69d1868
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/py/flwr/server/app.py b/src/py/flwr/server/app.py
@@ -706,19 +706,12 @@ def _add_args_driver_api(parser: argparse.ArgumentParser) -> None:
 def _add_args_fleet_api(parser: argparse.ArgumentParser) -> None:
     # Fleet API transport layer type
     ex_group = parser.add_mutually_exclusive_group()
-    ex_group.add_argument(
-        "--grpc-bidi",
-        action="store_const",
-        dest="fleet_api_type",
-        const=TRANSPORT_TYPE_GRPC_BIDI,
-        default=TRANSPORT_TYPE_GRPC_BIDI,
-        help="Start a Fleet API server (gRPC-bidi)",
-    )
     ex_group.add_argument(
         "--grpc-rere",
         action="store_const",
         dest="fleet_api_type",
         const=TRANSPORT_TYPE_GRPC_RERE,
+        default=TRANSPORT_TYPE_GRPC_RERE,
         help="Start a Fleet API server (gRPC-rere)",
     )
     ex_group.add_argument(
@@ -728,15 +721,12 @@ def _add_args_fleet_api(parser: argparse.ArgumentParser) -> None:
         const=TRANSPORT_TYPE_REST,
         help="Start a Fleet API server (REST, experimental)",
     )
-
-    # Fleet API gRPC-bidi options
-    grpc_bidi_group = parser.add_argument_group(
-        "Fleet API (gRPC-bidi) server options", ""
-    )
-    grpc_bidi_group.add_argument(
-        "--grpc-bidi-fleet-api-address",
-        help="Fleet API (gRPC-bidi) server address (IPv4, IPv6, or a domain name)",
-        default=ADDRESS_FLEET_API_GRPC_RERE,
+    ex_group.add_argument(
+        "--grpc-bidi",
+        action="store_const",
+        dest="fleet_api_type",
+        const=TRANSPORT_TYPE_GRPC_BIDI,
+        help="Start a Fleet API server (gRPC-bidi)",
     )
 
     # Fleet API gRPC-rere options
@@ -774,3 +764,13 @@ def _add_args_fleet_api(parser: argparse.ArgumentParser) -> None:
         type=int,
         default=1,
     )
+
+    # Fleet API gRPC-bidi options
+    grpc_bidi_group = parser.add_argument_group(
+        "Fleet API (gRPC-bidi) server options", ""
+    )
+    grpc_bidi_group.add_argument(
+        "--grpc-bidi-fleet-api-address",
+        help="Fleet API (gRPC-bidi) server address (IPv4, IPv6, or a domain name)",
+        default=ADDRESS_FLEET_API_GRPC_RERE,
+    )