flwr-nightly 1.10.0.dev20240708__tar.gz → 1.10.0.dev20240709__tar.gz

{flwr_nightly-1.10.0.dev20240708 → flwr_nightly-1.10.0.dev20240709}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.10.0.dev20240708
+Version: 1.10.0.dev20240709
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.10.0.dev20240708 → flwr_nightly-1.10.0.dev20240709}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.10.0.dev20240708"
+version = "1.10.0.dev20240709"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]

{flwr_nightly-1.10.0.dev20240708 → flwr_nightly-1.10.0.dev20240709}/src/py/flwr/client/node_state.py

@@ -32,7 +32,7 @@ class NodeState:
         """Register new run context for this node."""
         if run_id not in self.run_contexts:
             self.run_contexts[run_id] = Context(
-                state=RecordSet(), partition_id=self._partition_id
+                state=RecordSet(), run_config={}, partition_id=self._partition_id
             )
 
     def retrieve_context(self, run_id: int) -> Context:

{flwr_nightly-1.10.0.dev20240708 → flwr_nightly-1.10.0.dev20240709}/src/py/flwr/common/context.py

@@ -34,6 +34,10 @@ class Context:
         executing mods. It can also be used as a memory to access
         at different points during the lifecycle of this entity (e.g. across
         multiple rounds)
+    run_config : Dict[str, str]
+        A config (key/value mapping) held by the entity in a given run and that will
+        stay local. It can be used at any point during the lifecycle of this entity
+        (e.g. across multiple rounds)
     partition_id : Optional[int] (default: None)
         An index that specifies the data partition that the ClientApp using this Context
         object should make use of. Setting this attribute is better suited for
@@ -47,8 +51,9 @@ class Context:
     def __init__(
         self,
         state: RecordSet,
+        run_config: Dict[str, str],
         partition_id: Optional[int] = None,
     ) -> None:
         self.state = state
+        self.run_config = run_config
         self.partition_id = partition_id
-        self.run_config = {}

{flwr_nightly-1.10.0.dev20240708 → flwr_nightly-1.10.0.dev20240709}/src/py/flwr/server/compat/legacy_context.py

@@ -52,4 +52,4 @@ class LegacyContext(Context):
         self.strategy = strategy
         self.client_manager = client_manager
         self.history = History()
-        super().__init__(state)
+        super().__init__(state, run_config={})

{flwr_nightly-1.10.0.dev20240708 → flwr_nightly-1.10.0.dev20240709}/src/py/flwr/server/run_serverapp.py

@@ -19,10 +19,15 @@ import argparse
 import sys
 from logging import DEBUG, INFO, WARN
 from pathlib import Path
-from typing import Optional
+from typing import Dict, Optional
 
 from flwr.common import Context, EventType, RecordSet, event
-from flwr.common.config import get_flwr_dir, get_project_config, get_project_dir
+from flwr.common.config import (
+    get_flwr_dir,
+    get_fused_config,
+    get_project_config,
+    get_project_dir,
+)
 from flwr.common.logger import log, update_console_handler, warn_deprecated_feature
 from flwr.common.object_ref import load_app
 from flwr.proto.driver_pb2 import (  # pylint: disable=E0611
@@ -40,6 +45,7 @@ ADDRESS_DRIVER_API = "0.0.0.0:9091"
 def run(
     driver: Driver,
     server_app_dir: str,
+    server_app_run_config: Dict[str, str],
     server_app_attr: Optional[str] = None,
     loaded_server_app: Optional[ServerApp] = None,
 ) -> None:
@@ -72,7 +78,7 @@ def run(
     server_app = _load()
 
     # Initialize Context
-    context = Context(state=RecordSet())
+    context = Context(state=RecordSet(), run_config=server_app_run_config)
 
     # Call ServerApp
     server_app(driver=driver, context=context)
@@ -169,6 +175,8 @@ def run_server_app() -> None:  # pylint: disable=too-many-branches
         # Overwrite driver._run_id
         driver._run_id = res.run_id  # pylint: disable=W0212
 
+    server_app_run_config = {}
+
     # Dynamically obtain ServerApp path based on run_id
     if args.run_id is not None:
         # User provided `--run-id`, but not `server-app`
@@ -177,6 +185,7 @@ def run_server_app() -> None:  # pylint: disable=too-many-branches
         server_app_dir = str(get_project_dir(run_.fab_id, run_.fab_version, flwr_dir))
         config = get_project_config(server_app_dir)
         server_app_attr = config["flower"]["components"]["serverapp"]
+        server_app_run_config = get_fused_config(run_, flwr_dir)
     else:
         # User provided `server-app`, but not `--run-id`
         server_app_dir = str(Path(args.dir).absolute())
@@ -190,7 +199,12 @@ def run_server_app() -> None:  # pylint: disable=too-many-branches
     )
 
     # Run the ServerApp with the Driver
-    run(driver=driver, server_app_dir=server_app_dir, server_app_attr=server_app_attr)
+    run(
+        driver=driver,
+        server_app_dir=server_app_dir,
+        server_app_run_config=server_app_run_config,
+        server_app_attr=server_app_attr,
+    )
 
     # Clean up
     driver.close()

{flwr_nightly-1.10.0.dev20240708 → flwr_nightly-1.10.0.dev20240709}/src/py/flwr/server/server_app.py

@@ -80,7 +80,7 @@ class ServerApp:
             return
 
         # New execution mode
-        context = Context(state=RecordSet())
+        context = Context(state=RecordSet(), run_config={})
         self._main(driver, context)
 
     def main(self) -> Callable[[ServerAppCallable], ServerAppCallable]: