Merge branch 'main' into fds-rename-load-full-to-load-split

src/py/flwr/cli/new/new.py

@@ -81,7 +81,13 @@ def new(
     ] = None,
 ) -> None:
     """Create new Flower project."""
-    print(f"Creating Flower project {project_name}...")
+    print(
+        typer.style(
+            f"🔨 Creating Flower project {project_name}...",
+            fg=typer.colors.GREEN,
+            bold=True,
+        )
+    )
 
     if project_name is None:
         project_name = prompt_text("Please provide project name")
@@ -112,7 +118,7 @@ def new(
         "README.md": {"template": "app/README.md.tpl"},
         "requirements.txt": {"template": f"app/requirements.{framework_str}.txt.tpl"},
         "flower.toml": {"template": "app/flower.toml.tpl"},
-        "pyproject.toml": {"template": "app/pyproject.toml.tpl"},
+        "pyproject.toml": {"template": f"app/pyproject.{framework_str}.toml.tpl"},
         f"{pnl}/__init__.py": {"template": "app/code/__init__.py.tpl"},
         f"{pnl}/server.py": {"template": f"app/code/server.{framework_str}.py.tpl"},
         f"{pnl}/client.py": {"template": f"app/code/client.{framework_str}.py.tpl"},
@@ -131,4 +137,18 @@ def new(
             context=context,
         )
 
-    print("Project creation successful.")
+    print(
+        typer.style(
+            "🎊 Project creation successful.\n\n"
+            "Use the following command to run your project:\n",
+            fg=typer.colors.GREEN,
+            bold=True,
+        )
+    )
+    print(
+        typer.style(
+            f"	cd {project_name}\n" + "	pip install .\n	flwr run\n",
+            fg=typer.colors.BRIGHT_CYAN,
+            bold=True,
+        )
+    )

src/py/flwr/cli/new/templates/app/README.md.tpl

@@ -3,7 +3,11 @@
 ## Install dependencies
 
 ```bash
-pip install -r requirements.txt
+# Using pip
+pip install .
+
+# Or using Poetry
+poetry install
 ```
 
 ## Run (Simulation Engine)

src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -0,0 +1,19 @@
+[build-system]
+requires = ["poetry-core>=1.4.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry]
+name = "$project_name"
+version = "1.0.0"
+description = ""
+license = "Apache-2.0"
+authors = [
+    "The Flower Authors <hello@flower.ai>",
+]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.9"
+# Mandatory dependencies
+numpy = "^1.21.0"
+flwr = { version = "^1.8.0", extras = ["simulation"] }

src/py/flwr/cli/new/templates/app/pyproject.toml.tpl → src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -15,7 +15,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.9"
 # Mandatory dependencies
-flwr-nightly = { version = "1.8.0.dev20240309", extras = ["simulation"] }
+flwr = { version = "^1.8.0", extras = ["simulation"] }
 flwr-datasets = { version = "^0.0.2", extras = ["vision"] }
 torch = "2.2.1"
 torchvision = "0.17.1"

src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -0,0 +1,21 @@
+[build-system]
+requires = ["poetry-core>=1.4.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry]
+name = "$project_name"
+version = "1.0.0"
+description = ""
+license = "Apache-2.0"
+authors = [
+    "The Flower Authors <hello@flower.ai>",
+]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = ">=3.9,<3.11"
+# Mandatory dependencies
+flwr = { version = "^1.8.0", extras = ["simulation"] }
+flwr-datasets = { version = "^0.0.2", extras = ["vision"] }
+tensorflow-cpu = { version = ">=2.9.1,<2.11.1 || >2.11.1", markers = "platform_machine == \"x86_64\"" }
+tensorflow-macos = { version = ">=2.9.1,<2.11.1 || >2.11.1", markers = "sys_platform == \"darwin\" and platform_machine == \"arm64\"" }

src/py/flwr/server/compat/app.py

@@ -143,11 +143,8 @@ def start_driver(  # pylint: disable=too-many-arguments, too-many-locals
         config=initialized_config,
     )
 
+    # Terminate the thread
     f_stop.set()
-
-    # Stop the Driver API server and the thread
-    del driver
-
     thread.join()
 
     event(EventType.START_SERVER_LEAVE)

src/py/flwr/server/driver/driver.py

@@ -247,8 +247,8 @@ def send_and_receive(
             time.sleep(3)
         return ret
 
-    def __del__(self) -> None:
-        """Disconnect GrpcDriver if connected."""
+    def close(self) -> None:
+        """Disconnect from the SuperLink if connected."""
         # Check if GrpcDriver is initialized
         if self.grpc_driver is None:
             return

src/py/flwr/server/driver/driver_test.py

@@ -205,17 +205,15 @@ def test_del_with_initialized_driver(self) -> None:
         self.driver._get_grpc_driver_and_run_id()
 
         # Execute
-        # pylint: disable-next=unnecessary-dunder-call
-        self.driver.__del__()
+        self.driver.close()
 
         # Assert
         self.mock_grpc_driver.disconnect.assert_called_once()
 
     def test_del_with_uninitialized_driver(self) -> None:
         """Test cleanup behavior when Driver is not initialized."""
         # Execute
-        # pylint: disable-next=unnecessary-dunder-call
-        self.driver.__del__()
+        self.driver.close()
 
         # Assert
         self.mock_grpc_driver.disconnect.assert_not_called()

src/py/flwr/server/run_serverapp.py

@@ -138,7 +138,7 @@ def run_server_app() -> None:
     run(driver=driver, server_app_dir=server_app_dir, server_app_attr=server_app_attr)
 
     # Clean up
-    driver.__del__()  # pylint: disable=unnecessary-dunder-call
+    driver.close()
 
     event(EventType.RUN_SERVER_APP_LEAVE)
 

src/py/flwr/server/superlink/fleet/message_handler/message_handler.py

@@ -47,7 +47,7 @@ def create_node(
 def delete_node(request: DeleteNodeRequest, state: State) -> DeleteNodeResponse:
     """."""
     # Validate node_id
-    if request.node.anonymous or request.node.node_id <= 0:
+    if request.node.anonymous or request.node.node_id == 0:
         return DeleteNodeResponse()
 
     # Update state

src/py/flwr/server/workflow/default_workflows.py

@@ -98,7 +98,6 @@ def __call__(self, driver: Driver, context: Context) -> None:
 
         # Terminate the thread
         f_stop.set()
-        del driver
         thread.join()
 
 

src/py/flwr/simulation/run_simulation.py

@@ -240,7 +240,7 @@ def _main_loop(
     finally:
         # Stop Driver
         driver_server.stop(grace=0)
-        del driver
+        driver.close()
         # Trigger stop event
         f_stop.set()