flwr-nightly 1.23.0.dev20251027__py3-none-any.whl → 1.23.0.dev20251029__py3-none-any.whl

flwr/cli/build.py

@@ -17,22 +17,25 @@
 
 import hashlib
 import zipfile
+from collections.abc import Iterable
 from io import BytesIO
 from pathlib import Path
 from typing import Annotated, Any, Optional, Union
 
 import pathspec
+import tomli
 import tomli_w
 import typer
 
 from flwr.common.constant import (
-    FAB_ALLOWED_EXTENSIONS,
+    FAB_CONFIG_FILE,
     FAB_DATE,
+    FAB_EXCLUDE_PATTERNS,
     FAB_HASH_TRUNCATION,
+    FAB_INCLUDE_PATTERNS,
     FAB_MAX_SIZE,
 )
 
-from .config_utils import load as load_toml
 from .config_utils import load_and_validate
 from .utils import is_valid_project_name
 
@@ -112,7 +115,10 @@ def build(
         )
 
     # Build FAB
-    fab_bytes, fab_hash, _ = build_fab(app)
+    fab_bytes = build_fab_from_disk(app)
+
+    # Calculate hash for filename
+    fab_hash = hashlib.sha256(fab_bytes).hexdigest()
 
     # Get the name of the zip file
     fab_filename = get_fab_filename(config, fab_hash)
@@ -125,11 +131,10 @@ def build(
     )
 
 
-def build_fab(app: Path) -> tuple[bytes, str, dict[str, Any]]:
-    """Build a FAB in memory and return the bytes, hash, and config.
+def build_fab_from_disk(app: Path) -> bytes:
+    """Build a FAB from files on disk and return the FAB as bytes.
 
-    This function assumes that the provided path points to a valid Flower app and
-    bundles it into a FAB without performing additional validation.
+    This function reads files from disk and bundles them into a FAB.
 
     Parameters
     ----------
@@ -138,18 +143,67 @@ def build_fab(app: Path) -> tuple[bytes, str, dict[str, Any]]:
 
     Returns
     -------
-    tuple[bytes, str, dict[str, Any]]
-        A tuple containing:
-        - the FAB as bytes
-        - the SHA256 hash of the FAB
-        - the project configuration (with the 'federations' field removed)
+    bytes
+        The FAB as bytes.
     """
     app = app.resolve()
 
-    # Load the pyproject.toml file
-    config = load_toml(app / "pyproject.toml")
-    if config is None:
-        raise ValueError("Project configuration could not be loaded.")
+    # Collect all files recursively (including pyproject.toml and .gitignore)
+    all_files = [f for f in app.rglob("*") if f.is_file()]
+
+    # Create dict mapping relative paths to Path objects
+    files_dict: dict[str, Union[bytes, Path]] = {
+        # Ensure consistent path separators across platforms
+        str(file_path.relative_to(app)).replace("\\", "/"): file_path
+        for file_path in all_files
+    }
+
+    # Build FAB from the files dict
+    return build_fab_from_files(files_dict)
+
+
+def build_fab_from_files(files: dict[str, Union[bytes, Path]]) -> bytes:
+    r"""Build a FAB from in-memory files and return the FAB as bytes.
+
+    This is the core FAB building function that works with in-memory data.
+    It accepts either bytes or Path objects as file contents, applies filtering
+    rules (include/exclude patterns), and builds the FAB.
+
+    Parameters
+    ----------
+    files : dict[str, Union[bytes, Path]]
+        Dictionary mapping relative file paths to their contents.
+        - Keys: Relative paths (strings)
+        - Values: Either bytes (file contents) or Path (will be read)
+        Must include "pyproject.toml" and optionally ".gitignore".
+
+    Returns
+    -------
+    bytes
+        The FAB as bytes.
+
+    Examples
+    --------
+    Build a FAB from in-memory files::
+
+        files = {
+            "pyproject.toml": b"[project]\nname = 'myapp'\n...",
+            ".gitignore": b"*.pyc\n__pycache__/\n",
+            "src/client.py": Path("/path/to/client.py"),
+            "src/server.py": b"print('hello')",
+            "README.md": b"# My App\n",
+        }
+        fab_bytes = build_fab_from_files(files)
+    """
+
+    def to_bytes(content: Union[bytes, Path]) -> bytes:
+        return content.read_bytes() if isinstance(content, Path) else content
+
+    # Extract, load, and parse pyproject.toml
+    if FAB_CONFIG_FILE not in files:
+        raise ValueError(f"{FAB_CONFIG_FILE} not found in files")
+    pyproject_content = to_bytes(files[FAB_CONFIG_FILE])
+    config = tomli.loads(pyproject_content.decode("utf-8"))
 
     # Remove the 'federations' field if it exists
     if (
@@ -159,18 +213,22 @@ def build_fab(app: Path) -> tuple[bytes, str, dict[str, Any]]:
     ):
         del config["tool"]["flwr"]["federations"]
 
-    # Load .gitignore rules if present
-    ignore_spec = _load_gitignore(app)
+    # Extract and load .gitignore if present
+    gitignore_content = None
+    if ".gitignore" in files:
+        gitignore_content = to_bytes(files[".gitignore"])
+
+    # Get exclude and include specs
+    exclude_spec = get_fab_exclude_pathspec(gitignore_content)
+    include_spec = get_fab_include_pathspec()
 
-    # Search for all files in the app directory
-    all_files = [
-        f
-        for f in app.rglob("*")
-        if not ignore_spec.match_file(f)
-        and f.suffix in FAB_ALLOWED_EXTENSIONS
-        and f.name != "pyproject.toml"  # Exclude the original pyproject.toml
+    # Filter files based on include/exclude specs
+    filtered_paths = [
+        path.replace("\\", "/")  # Ensure consistent path separators across platforms
+        for path in files.keys()
+        if include_spec.match_file(path) and not exclude_spec.match_file(path)
     ]
-    all_files.sort()
+    filtered_paths.sort()  # Sort for deterministic output
 
     # Create a zip file in memory
     list_file_content = ""
@@ -178,41 +236,54 @@ def build_fab(app: Path) -> tuple[bytes, str, dict[str, Any]]:
     fab_buffer = BytesIO()
     with zipfile.ZipFile(fab_buffer, "w", zipfile.ZIP_DEFLATED) as fab_file:
         # Add pyproject.toml
-        write_to_zip(fab_file, "pyproject.toml", tomli_w.dumps(config))
+        write_to_zip(fab_file, FAB_CONFIG_FILE, tomli_w.dumps(config))
 
-        for file_path in all_files:
-            # Read the file content manually
-            file_contents = file_path.read_bytes()
+        for file_path in filtered_paths:
 
-            archive_path = str(file_path.relative_to(app)).replace("\\", "/")
-            write_to_zip(fab_file, archive_path, file_contents)
+            # Get file contents as bytes
+            file_content = to_bytes(files[file_path])
 
-            # Calculate file info
-            sha256_hash = hashlib.sha256(file_contents).hexdigest()
-            file_size_bits = len(file_contents) * 8  # size in bits
-            list_file_content += f"{archive_path},{sha256_hash},{file_size_bits}\n"
+            # Write file to FAB
+            write_to_zip(fab_file, file_path, file_content)
 
-        # Add CONTENT and CONTENT.jwt to the zip file
+            # Calculate file info for CONTENT manifest
+            sha256_hash = hashlib.sha256(file_content).hexdigest()
+            file_size_bits = len(file_content) * 8  # size in bits
+            list_file_content += f"{file_path},{sha256_hash},{file_size_bits}\n"
+
+        # Add CONTENT manifest to the zip file
         write_to_zip(fab_file, ".info/CONTENT", list_file_content)
 
     fab_bytes = fab_buffer.getvalue()
+
+    # Validate FAB size
     if len(fab_bytes) > FAB_MAX_SIZE:
         raise ValueError(
-            f"FAB size exceeds maximum allowed size of {FAB_MAX_SIZE:,} bytes."
+            f"FAB size exceeds maximum allowed size of {FAB_MAX_SIZE:,} bytes. "
             "To reduce the package size, consider ignoring unnecessary files "
             "via your `.gitignore` file or excluding them from the build."
         )
 
-    fab_hash = hashlib.sha256(fab_bytes).hexdigest()
+    return fab_bytes
 
-    return fab_bytes, fab_hash, config
 
+def build_pathspec(patterns: Iterable[str]) -> pathspec.PathSpec:
+    """Build a PathSpec from a list of patterns."""
+    return pathspec.PathSpec.from_lines("gitwildmatch", patterns)
+
+
+def get_fab_include_pathspec() -> pathspec.PathSpec:
+    """Get the PathSpec for files to include in a FAB."""
+    return build_pathspec(FAB_INCLUDE_PATTERNS)
 
-def _load_gitignore(app: Path) -> pathspec.PathSpec:
-    """Load and parse .gitignore file, returning a pathspec."""
-    gitignore_path = app / ".gitignore"
-    patterns = ["__pycache__/"]  # Default pattern
-    if gitignore_path.exists():
-        with open(gitignore_path, encoding="UTF-8") as file:
-            patterns.extend(file.readlines())
+
+def get_fab_exclude_pathspec(gitignore_content: Optional[bytes]) -> pathspec.PathSpec:
+    """Get the PathSpec for files to exclude from a FAB.
+
+    If gitignore_content is provided, its patterns will be combined with the default
+    exclude patterns.
+    """
+    patterns = list(FAB_EXCLUDE_PATTERNS)
+    if gitignore_content:
+        patterns += gitignore_content.decode("UTF-8").splitlines()
     return pathspec.PathSpec.from_lines("gitwildmatch", patterns)

flwr/cli/run/run.py

@@ -15,16 +15,18 @@
 """Flower command line interface `run` command."""
 
 
+import hashlib
 import io
 import json
 import subprocess
 from pathlib import Path
-from typing import Annotated, Any, Optional
+from typing import Annotated, Any, Optional, cast
 
 import typer
 from rich.console import Console
 
-from flwr.cli.build import build_fab, get_fab_filename
+from flwr.cli.build import build_fab_from_disk, get_fab_filename
+from flwr.cli.config_utils import load as load_toml
 from flwr.cli.config_utils import (
     load_and_validate,
     process_loaded_project_config,
@@ -37,7 +39,7 @@ from flwr.common.config import (
     parse_config_args,
     user_config_to_configrecord,
 )
-from flwr.common.constant import CliOutputFormat
+from flwr.common.constant import FAB_CONFIG_FILE, CliOutputFormat
 from flwr.common.logger import print_json_error, redirect_output, restore_output
 from flwr.common.serde import config_record_to_proto, fab_to_proto, user_config_to_proto
 from flwr.common.typing import Fab
@@ -152,7 +154,9 @@ def _run_with_control_api(
         channel = init_channel(app, federation_config, auth_plugin)
         stub = ControlStub(channel)
 
-        fab_bytes, fab_hash, config = build_fab(app)
+        fab_bytes = build_fab_from_disk(app)
+        fab_hash = hashlib.sha256(fab_bytes).hexdigest()
+        config = cast(dict[str, Any], load_toml(app / FAB_CONFIG_FILE))
         fab_id, fab_version = get_metadata_from_config(config)
 
         fab = Fab(fab_hash, fab_bytes, {})

flwr/client/grpc_rere_client/grpc_adapter.py

@@ -34,14 +34,22 @@ from flwr.common.constant import (
 from flwr.common.version import package_name, package_version
 from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
 from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
+    ActivateNodeRequest,
+    ActivateNodeResponse,
     CreateNodeRequest,
     CreateNodeResponse,
+    DeactivateNodeRequest,
+    DeactivateNodeResponse,
     DeleteNodeRequest,
     DeleteNodeResponse,
     PullMessagesRequest,
     PullMessagesResponse,
     PushMessagesRequest,
     PushMessagesResponse,
+    RegisterNodeFleetRequest,
+    RegisterNodeFleetResponse,
+    UnregisterNodeFleetRequest,
+    UnregisterNodeFleetResponse,
 )
 from flwr.proto.grpcadapter_pb2 import MessageContainer  # pylint: disable=E0611
 from flwr.proto.grpcadapter_pb2_grpc import GrpcAdapterStub
@@ -130,6 +138,30 @@ class GrpcAdapter:
         """."""
         return self._send_and_receive(request, DeleteNodeResponse, **kwargs)
 
+    def RegisterNode(  # pylint: disable=C0103
+        self, request: RegisterNodeFleetRequest, **kwargs: Any
+    ) -> RegisterNodeFleetResponse:
+        """."""
+        return self._send_and_receive(request, RegisterNodeFleetResponse, **kwargs)
+
+    def ActivateNode(  # pylint: disable=C0103
+        self, request: ActivateNodeRequest, **kwargs: Any
+    ) -> ActivateNodeResponse:
+        """."""
+        return self._send_and_receive(request, ActivateNodeResponse, **kwargs)
+
+    def DeactivateNode(  # pylint: disable=C0103
+        self, request: DeactivateNodeRequest, **kwargs: Any
+    ) -> DeactivateNodeResponse:
+        """."""
+        return self._send_and_receive(request, DeactivateNodeResponse, **kwargs)
+
+    def UnregisterNode(  # pylint: disable=C0103
+        self, request: UnregisterNodeFleetRequest, **kwargs: Any
+    ) -> UnregisterNodeFleetResponse:
+        """."""
+        return self._send_and_receive(request, UnregisterNodeFleetResponse, **kwargs)
+
     def SendNodeHeartbeat(  # pylint: disable=C0103
         self, request: SendNodeHeartbeatRequest, **kwargs: Any
     ) -> SendNodeHeartbeatResponse:

flwr/common/constant.py

@@ -72,13 +72,23 @@ NODE_ID_NUM_BYTES = 8
 
 # Constants for FAB
 APP_DIR = "apps"
-FAB_ALLOWED_EXTENSIONS = {".py", ".toml", ".md"}
 FAB_CONFIG_FILE = "pyproject.toml"
 FAB_DATE = (2024, 10, 1, 0, 0, 0)
 FAB_HASH_TRUNCATION = 8
 FAB_MAX_SIZE = 10 * 1024 * 1024  # 10 MB
 FLWR_DIR = ".flwr"  # The default Flower directory: ~/.flwr/
 FLWR_HOME = "FLWR_HOME"  # If set, override the default Flower directory
+# FAB file include patterns (gitignore-style patterns)
+FAB_INCLUDE_PATTERNS = (
+    "**/*.py",
+    "**/*.toml",
+    "**/*.md",
+)
+# FAB file exclude patterns (gitignore-style patterns)
+FAB_EXCLUDE_PATTERNS = (
+    "**/__pycache__/**",
+    FAB_CONFIG_FILE,  # Exclude the original pyproject.toml
+)
 
 # Constant for SuperLink
 SUPERLINK_NODE_ID = 1

flwr/proto/fleet_pb2.py

@@ -19,7 +19,7 @@ from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/fleet.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/heartbeat.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x18\x66lwr/proto/message.proto\"C\n\x11\x43reateNodeRequest\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\x12\x1a\n\x12heartbeat_interval\x18\x02 \x01(\x01\"4\n\x12\x43reateNodeResponse\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"3\n\x11\x44\x65leteNodeRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"\x14\n\x12\x44\x65leteNodeResponse\"J\n\x13PullMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x13\n\x0bmessage_ids\x18\x02 \x03(\t\"\xa2\x01\n\x14PullMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x34\n\x14message_object_trees\x18\x03 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"\x97\x01\n\x13PushMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x34\n\x14message_object_trees\x18\x03 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"\xc9\x01\n\x14PushMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12>\n\x07results\x18\x02 \x03(\x0b\x32-.flwr.proto.PushMessagesResponse.ResultsEntry\x12\x17\n\x0fobjects_to_push\x18\x03 \x03(\t\x1a.\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\"\x1e\n\tReconnect\x12\x11\n\treconnect\x18\x01 \x01(\x04\x32\xca\x06\n\x05\x46leet\x12M\n\nCreateNode\x12\x1d.flwr.proto.CreateNodeRequest\x1a\x1e.flwr.proto.CreateNodeResponse\"\x00\x12M\n\nDeleteNode\x12\x1d.flwr.proto.DeleteNodeRequest\x1a\x1e.flwr.proto.DeleteNodeResponse\"\x00\x12\x62\n\x11SendNodeHeartbeat\x12$.flwr.proto.SendNodeHeartbeatRequest\x1a%.flwr.proto.SendNodeHeartbeatResponse\"\x00\x12S\n\x0cPullMessages\x12\x1f.flwr.proto.PullMessagesRequest\x1a .flwr.proto.PullMessagesResponse\"\x00\x12S\n\x0cPushMessages\x12\x1f.flwr.proto.PushMessagesRequest\x1a .flwr.proto.PushMessagesResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\x00\x12M\n\nPushObject\x12\x1d.flwr.proto.PushObjectRequest\x1a\x1e.flwr.proto.PushObjectResponse\"\x00\x12M\n\nPullObject\x12\x1d.flwr.proto.PullObjectRequest\x1a\x1e.flwr.proto.PullObjectResponse\"\x00\x12q\n\x16\x43onfirmMessageReceived\x12).flwr.proto.ConfirmMessageReceivedRequest\x1a*.flwr.proto.ConfirmMessageReceivedResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/fleet.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/heartbeat.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x18\x66lwr/proto/message.proto\"C\n\x11\x43reateNodeRequest\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\x12\x1a\n\x12heartbeat_interval\x18\x02 \x01(\x01\"4\n\x12\x43reateNodeResponse\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"3\n\x11\x44\x65leteNodeRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"\x14\n\x12\x44\x65leteNodeResponse\".\n\x18RegisterNodeFleetRequest\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\"\x1b\n\x19RegisterNodeFleetResponse\"E\n\x13\x41\x63tivateNodeRequest\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\x12\x1a\n\x12heartbeat_interval\x18\x02 \x01(\x01\"\'\n\x14\x41\x63tivateNodeResponse\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"(\n\x15\x44\x65\x61\x63tivateNodeRequest\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"\x18\n\x16\x44\x65\x61\x63tivateNodeResponse\"-\n\x1aUnregisterNodeFleetRequest\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"\x1d\n\x1bUnregisterNodeFleetResponse\"J\n\x13PullMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x13\n\x0bmessage_ids\x18\x02 \x03(\t\"\xa2\x01\n\x14PullMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x34\n\x14message_object_trees\x18\x03 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"\x97\x01\n\x13PushMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x34\n\x14message_object_trees\x18\x03 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"\xc9\x01\n\x14PushMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12>\n\x07results\x18\x02 \x03(\x0b\x32-.flwr.proto.PushMessagesResponse.ResultsEntry\x12\x17\n\x0fobjects_to_push\x18\x03 \x03(\t\x1a.\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\"\x1e\n\tReconnect\x12\x11\n\treconnect\x18\x01 \x01(\x04\x32\xbe\t\n\x05\x46leet\x12M\n\nCreateNode\x12\x1d.flwr.proto.CreateNodeRequest\x1a\x1e.flwr.proto.CreateNodeResponse\"\x00\x12M\n\nDeleteNode\x12\x1d.flwr.proto.DeleteNodeRequest\x1a\x1e.flwr.proto.DeleteNodeResponse\"\x00\x12]\n\x0cRegisterNode\x12$.flwr.proto.RegisterNodeFleetRequest\x1a%.flwr.proto.RegisterNodeFleetResponse\"\x00\x12S\n\x0c\x41\x63tivateNode\x12\x1f.flwr.proto.ActivateNodeRequest\x1a .flwr.proto.ActivateNodeResponse\"\x00\x12Y\n\x0e\x44\x65\x61\x63tivateNode\x12!.flwr.proto.DeactivateNodeRequest\x1a\".flwr.proto.DeactivateNodeResponse\"\x00\x12\x63\n\x0eUnregisterNode\x12&.flwr.proto.UnregisterNodeFleetRequest\x1a\'.flwr.proto.UnregisterNodeFleetResponse\"\x00\x12\x62\n\x11SendNodeHeartbeat\x12$.flwr.proto.SendNodeHeartbeatRequest\x1a%.flwr.proto.SendNodeHeartbeatResponse\"\x00\x12S\n\x0cPullMessages\x12\x1f.flwr.proto.PullMessagesRequest\x1a .flwr.proto.PullMessagesResponse\"\x00\x12S\n\x0cPushMessages\x12\x1f.flwr.proto.PushMessagesRequest\x1a .flwr.proto.PushMessagesResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\x00\x12M\n\nPushObject\x12\x1d.flwr.proto.PushObjectRequest\x1a\x1e.flwr.proto.PushObjectResponse\"\x00\x12M\n\nPullObject\x12\x1d.flwr.proto.PullObjectRequest\x1a\x1e.flwr.proto.PullObjectResponse\"\x00\x12q\n\x16\x43onfirmMessageReceived\x12).flwr.proto.ConfirmMessageReceivedRequest\x1a*.flwr.proto.ConfirmMessageReceivedResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -36,18 +36,34 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_DELETENODEREQUEST']._serialized_end=333
   _globals['_DELETENODERESPONSE']._serialized_start=335
   _globals['_DELETENODERESPONSE']._serialized_end=355
-  _globals['_PULLMESSAGESREQUEST']._serialized_start=357
-  _globals['_PULLMESSAGESREQUEST']._serialized_end=431
-  _globals['_PULLMESSAGESRESPONSE']._serialized_start=434
-  _globals['_PULLMESSAGESRESPONSE']._serialized_end=596
-  _globals['_PUSHMESSAGESREQUEST']._serialized_start=599
-  _globals['_PUSHMESSAGESREQUEST']._serialized_end=750
-  _globals['_PUSHMESSAGESRESPONSE']._serialized_start=753
-  _globals['_PUSHMESSAGESRESPONSE']._serialized_end=954
-  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_start=908
-  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_end=954
-  _globals['_RECONNECT']._serialized_start=956
-  _globals['_RECONNECT']._serialized_end=986
-  _globals['_FLEET']._serialized_start=989
-  _globals['_FLEET']._serialized_end=1831
+  _globals['_REGISTERNODEFLEETREQUEST']._serialized_start=357
+  _globals['_REGISTERNODEFLEETREQUEST']._serialized_end=403
+  _globals['_REGISTERNODEFLEETRESPONSE']._serialized_start=405
+  _globals['_REGISTERNODEFLEETRESPONSE']._serialized_end=432
+  _globals['_ACTIVATENODEREQUEST']._serialized_start=434
+  _globals['_ACTIVATENODEREQUEST']._serialized_end=503
+  _globals['_ACTIVATENODERESPONSE']._serialized_start=505
+  _globals['_ACTIVATENODERESPONSE']._serialized_end=544
+  _globals['_DEACTIVATENODEREQUEST']._serialized_start=546
+  _globals['_DEACTIVATENODEREQUEST']._serialized_end=586
+  _globals['_DEACTIVATENODERESPONSE']._serialized_start=588
+  _globals['_DEACTIVATENODERESPONSE']._serialized_end=612
+  _globals['_UNREGISTERNODEFLEETREQUEST']._serialized_start=614
+  _globals['_UNREGISTERNODEFLEETREQUEST']._serialized_end=659
+  _globals['_UNREGISTERNODEFLEETRESPONSE']._serialized_start=661
+  _globals['_UNREGISTERNODEFLEETRESPONSE']._serialized_end=690
+  _globals['_PULLMESSAGESREQUEST']._serialized_start=692
+  _globals['_PULLMESSAGESREQUEST']._serialized_end=766
+  _globals['_PULLMESSAGESRESPONSE']._serialized_start=769
+  _globals['_PULLMESSAGESRESPONSE']._serialized_end=931
+  _globals['_PUSHMESSAGESREQUEST']._serialized_start=934
+  _globals['_PUSHMESSAGESREQUEST']._serialized_end=1085
+  _globals['_PUSHMESSAGESRESPONSE']._serialized_start=1088
+  _globals['_PUSHMESSAGESRESPONSE']._serialized_end=1289
+  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_start=1243
+  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_end=1289
+  _globals['_RECONNECT']._serialized_start=1291
+  _globals['_RECONNECT']._serialized_end=1321
+  _globals['_FLEET']._serialized_start=1324
+  _globals['_FLEET']._serialized_end=2538
 # @@protoc_insertion_point(module_scope)

flwr/proto/fleet_pb2.pyi

@@ -61,6 +61,86 @@ class DeleteNodeResponse(google.protobuf.message.Message):
         ) -> None: ...
 global___DeleteNodeResponse = DeleteNodeResponse
 
+class RegisterNodeFleetRequest(google.protobuf.message.Message):
+    """RegisterNode messages (add prefix to avoid name clash)"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    PUBLIC_KEY_FIELD_NUMBER: builtins.int
+    public_key: builtins.bytes
+    def __init__(self,
+        *,
+        public_key: builtins.bytes = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["public_key",b"public_key"]) -> None: ...
+global___RegisterNodeFleetRequest = RegisterNodeFleetRequest
+
+class RegisterNodeFleetResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___RegisterNodeFleetResponse = RegisterNodeFleetResponse
+
+class ActivateNodeRequest(google.protobuf.message.Message):
+    """ActivateNode messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    PUBLIC_KEY_FIELD_NUMBER: builtins.int
+    HEARTBEAT_INTERVAL_FIELD_NUMBER: builtins.int
+    public_key: builtins.bytes
+    heartbeat_interval: builtins.float
+    def __init__(self,
+        *,
+        public_key: builtins.bytes = ...,
+        heartbeat_interval: builtins.float = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["heartbeat_interval",b"heartbeat_interval","public_key",b"public_key"]) -> None: ...
+global___ActivateNodeRequest = ActivateNodeRequest
+
+class ActivateNodeResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_ID_FIELD_NUMBER: builtins.int
+    node_id: builtins.int
+    def __init__(self,
+        *,
+        node_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["node_id",b"node_id"]) -> None: ...
+global___ActivateNodeResponse = ActivateNodeResponse
+
+class DeactivateNodeRequest(google.protobuf.message.Message):
+    """DeactivateNode messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_ID_FIELD_NUMBER: builtins.int
+    node_id: builtins.int
+    def __init__(self,
+        *,
+        node_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["node_id",b"node_id"]) -> None: ...
+global___DeactivateNodeRequest = DeactivateNodeRequest
+
+class DeactivateNodeResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___DeactivateNodeResponse = DeactivateNodeResponse
+
+class UnregisterNodeFleetRequest(google.protobuf.message.Message):
+    """UnregisterNode messages (add prefix to avoid name clash)"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_ID_FIELD_NUMBER: builtins.int
+    node_id: builtins.int
+    def __init__(self,
+        *,
+        node_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["node_id",b"node_id"]) -> None: ...
+global___UnregisterNodeFleetRequest = UnregisterNodeFleetRequest
+
+class UnregisterNodeFleetResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___UnregisterNodeFleetResponse = UnregisterNodeFleetResponse
+
 class PullMessagesRequest(google.protobuf.message.Message):
     """PullMessages messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor