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

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

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

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

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

{flwr_nightly-1.10.0.dev20240709 → flwr_nightly-1.10.0.dev20240710}/src/py/flwr/cli/new/new.py

@@ -264,9 +264,11 @@ def new(
             bold=True,
         )
     )
+
+    _add = "	huggingface-cli login\n" if framework_str == "flowertune" else ""
     print(
         typer.style(
-            f"	cd {package_name}\n" + "	pip install -e .\n	flwr run\n",
+            f"	cd {package_name}\n" + "	pip install -e .\n" + _add + "	flwr run\n",
             fg=typer.colors.BRIGHT_CYAN,
             bold=True,
         )

{flwr_nightly-1.10.0.dev20240709 → flwr_nightly-1.10.0.dev20240710}/src/py/flwr/client/supernode/app.py

@@ -178,7 +178,7 @@ def _get_load_client_app_fn(
         else:
             flwr_dir = Path(args.flwr_dir).absolute()
 
-    sys.path.insert(0, str(flwr_dir.absolute()))
+    inserted_path = None
 
     default_app_ref: str = getattr(args, "client-app")
 
@@ -188,6 +188,11 @@ def _get_load_client_app_fn(
             "Flower SuperNode will load and validate ClientApp `%s`",
             getattr(args, "client-app"),
         )
+        # Insert sys.path
+        dir_path = Path(args.dir).absolute()
+        sys.path.insert(0, str(dir_path))
+        inserted_path = str(dir_path)
+
         valid, error_msg = validate(default_app_ref)
         if not valid and error_msg:
             raise LoadClientAppError(error_msg) from None
@@ -196,7 +201,7 @@ def _get_load_client_app_fn(
         # If multi-app feature is disabled
         if not multi_app:
             # Get sys path to be inserted
-            sys_path = Path(args.dir).absolute()
+            dir_path = Path(args.dir).absolute()
 
             # Set app reference
             client_app_ref = default_app_ref
@@ -209,7 +214,7 @@ def _get_load_client_app_fn(
 
             log(WARN, "FAB ID is not provided; the default ClientApp will be loaded.")
             # Get sys path to be inserted
-            sys_path = Path(args.dir).absolute()
+            dir_path = Path(args.dir).absolute()
 
             # Set app reference
             client_app_ref = default_app_ref
@@ -222,13 +227,21 @@ def _get_load_client_app_fn(
                 raise LoadClientAppError("Failed to load ClientApp") from e
 
             # Get sys path to be inserted
-            sys_path = Path(project_dir).absolute()
+            dir_path = Path(project_dir).absolute()
 
             # Set app reference
             client_app_ref = config["flower"]["components"]["clientapp"]
 
         # Set sys.path
-        sys.path.insert(0, str(sys_path))
+        nonlocal inserted_path
+        if inserted_path != str(dir_path):
+            # Remove the previously inserted path
+            if inserted_path is not None:
+                sys.path.remove(inserted_path)
+            # Insert the new path
+            sys.path.insert(0, str(dir_path))
+
+        inserted_path = str(dir_path)
 
         # Load ClientApp
         log(
@@ -236,7 +249,7 @@ def _get_load_client_app_fn(
             "Loading ClientApp `%s`",
             client_app_ref,
         )
-        client_app = load_app(client_app_ref, LoadClientAppError, sys_path)
+        client_app = load_app(client_app_ref, LoadClientAppError, dir_path)
 
         if not isinstance(client_app, ClientApp):
             raise LoadClientAppError(

{flwr_nightly-1.10.0.dev20240709 → flwr_nightly-1.10.0.dev20240710}/src/py/flwr/server/superlink/fleet/vce/vce_api.py

@@ -30,7 +30,7 @@ from flwr.common.logger import log
 from flwr.common.message import Error
 from flwr.common.object_ref import load_app
 from flwr.common.serde import message_from_taskins, message_to_taskres
-from flwr.proto.task_pb2 import TaskIns  # pylint: disable=E0611
+from flwr.proto.task_pb2 import TaskIns, TaskRes  # pylint: disable=E0611
 from flwr.server.superlink.state import StateFactory
 
 from .backend import Backend, error_messages_backends, supported_backends
@@ -54,17 +54,16 @@ def _register_nodes(
 # pylint: disable=too-many-arguments,too-many-locals
 async def worker(
     app_fn: Callable[[], ClientApp],
-    queue: "asyncio.Queue[TaskIns]",
+    taskins_queue: "asyncio.Queue[TaskIns]",
+    taskres_queue: "asyncio.Queue[TaskRes]",
     node_states: Dict[int, NodeState],
-    state_factory: StateFactory,
     backend: Backend,
 ) -> None:
     """Get TaskIns from queue and pass it to an actor in the pool to execute it."""
-    state = state_factory.state()
     while True:
         out_mssg = None
         try:
-            task_ins: TaskIns = await queue.get()
+            task_ins: TaskIns = await taskins_queue.get()
             node_id = task_ins.task.consumer.node_id
 
             # Register and retrieve runstate
@@ -111,7 +110,7 @@ async def worker(
                 task_res = message_to_taskres(out_mssg)
                 # Store TaskRes in state
                 task_res.task.pushed_at = time.time()
-                state.store_task_res(task_res)
+                await taskres_queue.put(task_res)
 
 
 async def add_taskins_to_queue(
@@ -162,6 +161,21 @@ async def add_taskins_to_queue(
     log(DEBUG, "Async producer: Stopped pulling from StateFactory.")
 
 
+async def put_taskres_into_state(
+    queue: "asyncio.Queue[TaskRes]",
+    state_factory: StateFactory,
+    f_stop: asyncio.Event,
+) -> None:
+    """Remove TaskRes from queue and add into State."""
+    state = state_factory.state()
+    while not f_stop.is_set():
+        if queue.qsize():
+            task_res = await queue.get()
+            state.store_task_res(task_res)
+        else:
+            await asyncio.sleep(0.1)
+
+
 async def run(
     app_fn: Callable[[], ClientApp],
     backend_fn: Callable[[], Backend],
@@ -171,7 +185,8 @@ async def run(
     f_stop: asyncio.Event,
 ) -> None:
     """Run the VCE async."""
-    queue: "asyncio.Queue[TaskIns]" = asyncio.Queue(128)
+    taskins_queue: "asyncio.Queue[TaskIns]" = asyncio.Queue(128)
+    taskres_queue: "asyncio.Queue[TaskRes]" = asyncio.Queue(128)
 
     try:
 
@@ -184,22 +199,37 @@ async def run(
         # Add workers (they submit Messages to Backend)
         worker_tasks = [
             asyncio.create_task(
-                worker(app_fn, queue, node_states, state_factory, backend)
+                worker(
+                    app_fn,
+                    taskins_queue,
+                    taskres_queue,
+                    node_states,
+                    backend,
+                )
             )
             for _ in range(backend.num_workers)
         ]
         # Create producer (adds TaskIns into Queue)
-        producer = asyncio.create_task(
+        taskins_producer = asyncio.create_task(
             add_taskins_to_queue(
-                queue, state_factory, nodes_mapping, backend, worker_tasks, f_stop
+                taskins_queue,
+                state_factory,
+                nodes_mapping,
+                backend,
+                worker_tasks,
+                f_stop,
             )
         )
 
-        # Wait for producer to finish
-        # The producer runs forever until f_stop is set or until
+        taskres_consumer = asyncio.create_task(
+            put_taskres_into_state(taskres_queue, state_factory, f_stop)
+        )
+
+        # Wait for asyncio taks pulling/pushing TaskIns/TaskRes.
+        # These run forever until f_stop is set or until
         # all worker (consumer) coroutines are completed. Workers
         # also run forever and only end if an exception is raised.
-        await asyncio.gather(producer)
+        await asyncio.gather(*(taskins_producer, taskres_consumer))
 
     except Exception as ex: