feat(framework:skip) Update the LegacyContext to align with `Contex…

…t` (#3858) Co-authored-by: Daniel J. Beutel <[email protected]>
adap · Jul 22, 2024 · df1084f · df1084f
1 parent fbb70c7
commit df1084f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/e2e/bare-client-auth/server.py b/e2e/bare-client-auth/server.py
@@ -9,7 +9,7 @@
 def main(driver, context):
     # Construct the LegacyContext
     context = fl.server.LegacyContext(
-        state=context.state,
+        context=context,
         config=fl.server.ServerConfig(num_rounds=3),
     )
 

diff --git a/e2e/bare-https/server.py b/e2e/bare-https/server.py
@@ -9,7 +9,7 @@
 def main(driver, context):
     # Construct the LegacyContext
     context = fl.server.LegacyContext(
-        state=context.state,
+        context=context,
         config=fl.server.ServerConfig(num_rounds=3),
     )
 

diff --git a/e2e/framework-pandas/server.py b/e2e/framework-pandas/server.py
@@ -9,7 +9,7 @@
 def main(driver, context):
     # Construct the LegacyContext
     context = fl.server.LegacyContext(
-        state=context.state,
+        context=context,
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=FedAnalytics(),
     )

diff --git a/e2e/server.py b/e2e/server.py
@@ -38,7 +38,7 @@ def record_state_metrics(metrics):
 def main(driver, context):
     # Construct the LegacyContext
     context = fl.server.LegacyContext(
-        state=context.state,
+        context=context,
         config=fl.server.ServerConfig(num_rounds=3),
     )
 

diff --git a/examples/app-pytorch/server_workflow.py b/examples/app-pytorch/server_workflow.py
@@ -51,7 +51,7 @@ def weighted_average(metrics: List[Tuple[int, Metrics]]) -> Metrics:
 def main(driver: Driver, context: Context) -> None:
     # Construct the LegacyContext
     context = LegacyContext(
-        state=context.state,
+        context=context,
         config=fl.server.ServerConfig(num_rounds=3),
         strategy=strategy,
     )

diff --git a/examples/app-secure-aggregation/server.py b/examples/app-secure-aggregation/server.py
@@ -22,7 +22,7 @@
 def main(driver: Driver, context: Context) -> None:
     # Construct the LegacyContext
     context = LegacyContext(
-        state=context.state,
+        context=context,
         config=ServerConfig(num_rounds=3),
         strategy=strategy,
     )

diff --git a/examples/fl-dp-sa/fl_dp_sa/server.py b/examples/fl-dp-sa/fl_dp_sa/server.py
@@ -60,7 +60,7 @@ def weighted_average(metrics: List[Tuple[int, Metrics]]) -> Metrics:
 def main(driver: Driver, context: Context) -> None:
     # Construct the LegacyContext
     context = LegacyContext(
-        state=context.state,
+        context=context,
         config=ServerConfig(num_rounds=3),
         strategy=strategy,
     )

diff --git a/src/py/flwr/server/compat/legacy_context.py b/src/py/flwr/server/compat/legacy_context.py
@@ -18,7 +18,7 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from flwr.common import Context, RecordSet
+from flwr.common import Context
 
 from ..client_manager import ClientManager, SimpleClientManager
 from ..history import History
@@ -35,9 +35,9 @@ class LegacyContext(Context):
     client_manager: ClientManager
     history: History
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-arguments
         self,
-        state: RecordSet,
+        context: Context,
         config: Optional[ServerConfig] = None,
         strategy: Optional[Strategy] = None,
         client_manager: Optional[ClientManager] = None,
@@ -52,4 +52,5 @@ def __init__(
         self.strategy = strategy
         self.client_manager = client_manager
         self.history = History()
-        super().__init__(node_id=0, node_config={}, state=state, run_config={})
+
+        super().__init__(**vars(context))