Merge branch 'main' into feat/update-docker-compose-complete

Signed-off-by: Robert Steiner <[email protected]>

e2e/e2e-bare/e2e_bare/server_app.py

@@ -61,7 +61,7 @@ def main(driver, context):
     )
 
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )

e2e/e2e-fastai/e2e_fastai/server_app.py

@@ -61,7 +61,7 @@ def main(driver, context):
     )
 
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )

e2e/e2e-jax/e2e_jax/server_app.py

@@ -61,7 +61,7 @@ def main(driver, context):
     )
 
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )

e2e/e2e-opacus/e2e_opacus/server_app.py

@@ -61,7 +61,7 @@ def main(driver, context):
     )
 
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )

e2e/e2e-pandas/e2e_pandas/server_app.py

@@ -49,7 +49,7 @@ def main(driver, context):
 
 if __name__ == "__main__":
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=1),
         strategy=FedAnalytics(),
     )

e2e/e2e-pytorch-lightning/e2e_pytorch_lightning/server_app.py

@@ -61,7 +61,7 @@ def main(driver, context):
     )
 
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )

e2e/e2e-pytorch/e2e_pytorch/server_app.py

@@ -61,7 +61,7 @@ def main(driver, context):
     )
 
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )
@@ -72,7 +72,7 @@ def main(driver, context):
     )
 
     if STATE_VAR in hist.metrics_distributed:
-        # The checks in record_state_metrics don't do anythinng if client's state has a single entry
+        # The checks in record_state_metrics don't do anything if client's state has a single entry
         state_metrics_last_round = hist.metrics_distributed[STATE_VAR][-1]
         assert (
             len(state_metrics_last_round[1][0]) == 2 * state_metrics_last_round[0]

e2e/e2e-pytorch/simulation.py

@@ -44,7 +44,7 @@ def record_state_metrics(metrics: List[Tuple[int, Metrics]]) -> Metrics:
     or (hist.losses_distributed[0][1] / hist.losses_distributed[-1][1]) >= 0.98
 )
 
-# The checks in record_state_metrics don't do anythinng if client's state has a single entry
+# The checks in record_state_metrics don't do anything if client's state has a single entry
 state_metrics_last_round = hist.metrics_distributed[STATE_VAR][-1]
 assert (
     len(state_metrics_last_round[1][0]) == 2 * state_metrics_last_round[0]

e2e/e2e-scikit-learn/e2e_scikit_learn/client_app.py

@@ -56,4 +56,4 @@ def client_fn(context: Context):
 
 if __name__ == "__main__":
     # Start Flower client
-    start_client(server_address="0.0.0.0:8080", client=FlowerClient().to_client())
+    start_client(server_address="127.0.0.1:8080", client=FlowerClient().to_client())

e2e/e2e-scikit-learn/e2e_scikit_learn/server_app.py

@@ -61,7 +61,7 @@ def main(driver, context):
     )
 
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )

e2e/e2e-tensorflow/e2e_tensorflow/server_app.py

@@ -61,7 +61,7 @@ def main(driver, context):
     )
 
     hist = fl.server.start_server(
-        server_address="0.0.0.0:8080",
+        server_address="127.0.0.1:8080",
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )

src/docker/complete/certs.yml

@@ -36,10 +36,6 @@ services:
         IP.2 = $${SUPERLINK_IP}
         EOF
 
-        ARG SUPEREXEC_IP=127.0.0.1
-
-
-
         COPY --chmod=744 <<-'EOF' generate.sh
         #!/bin/bash
         # This script will generate all certificates if ca.crt does not exist

src/proto/flwr/proto/driver.proto → src/proto/flwr/proto/serverappio.proto

@@ -24,7 +24,7 @@ import "flwr/proto/task.proto";
 import "flwr/proto/run.proto";
 import "flwr/proto/fab.proto";
 
-service Driver {
+service ServerAppIo {
   // Request run_id
   rpc CreateRun(CreateRunRequest) returns (CreateRunResponse) {}
 

src/py/flwr/client/clientapp/app.py

@@ -54,8 +54,6 @@
 
 def flwr_clientapp() -> None:
     """Run process-isolated Flower ClientApp."""
-    log(INFO, "Starting Flower ClientApp")
-
     parser = argparse.ArgumentParser(
         description="Run a Flower ClientApp",
     )
@@ -72,6 +70,7 @@ def flwr_clientapp() -> None:
     )
     args = parser.parse_args()
 
+    log(INFO, "Starting Flower ClientApp")
     log(
         DEBUG,
         "Staring isolated `ClientApp` connected to SuperNode ClientAppIo at %s "

src/py/flwr/common/constant.py

@@ -41,7 +41,7 @@
 # SuperNode
 CLIENTAPPIO_API_DEFAULT_ADDRESS = "0.0.0.0:9094"
 # SuperLink
-DRIVER_API_DEFAULT_ADDRESS = "0.0.0.0:9091"
+SERVERAPPIO_API_DEFAULT_ADDRESS = "0.0.0.0:9091"
 FLEET_API_GRPC_RERE_DEFAULT_ADDRESS = "0.0.0.0:9092"
 FLEET_API_GRPC_BIDI_DEFAULT_ADDRESS = (
     "[::]:8080"  # IPv6 to keep start_server compatible

src/py/flwr/common/logger.py

@@ -26,9 +26,9 @@
 
 import grpc
 
-from flwr.proto.driver_pb2_grpc import DriverStub  # pylint: disable=E0611
 from flwr.proto.log_pb2 import PushLogsRequest  # pylint: disable=E0611
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
+from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub  # pylint: disable=E0611
 
 from .constant import LOG_UPLOAD_INTERVAL
 
@@ -303,7 +303,7 @@ def restore_output() -> None:
 
 
 def _log_uploader(
-    log_queue: Queue[Optional[str]], node_id: int, run_id: int, stub: DriverStub
+    log_queue: Queue[Optional[str]], node_id: int, run_id: int, stub: ServerAppIoStub
 ) -> None:
     """Upload logs to the SuperLink."""
     exit_flag = False
@@ -346,7 +346,7 @@ def _log_uploader(
 
 
 def start_log_uploader(
-    log_queue: Queue[Optional[str]], node_id: int, run_id: int, stub: DriverStub
+    log_queue: Queue[Optional[str]], node_id: int, run_id: int, stub: ServerAppIoStub
 ) -> threading.Thread:
     """Start the log uploader thread and return it."""
     thread = threading.Thread(

src/py/flwr/common/telemetry.py

@@ -150,12 +150,6 @@ def _generate_next_value_(name: str, start: int, count: int, last_values: list[A
 
     # Not yet implemented
 
-    # --- SuperExec --------------------------------------------------------------------
-
-    # SuperExec
-    RUN_SUPEREXEC_ENTER = auto()
-    RUN_SUPEREXEC_LEAVE = auto()
-
     # --- Simulation Engine ------------------------------------------------------------
 
     # CLI: flower-simulation