flwr 1.21.0__py3-none-any.whl → 1.23.0__py3-none-any.whl

flwr/common/inflatable_utils.py

@@ -25,10 +25,10 @@ from typing import Callable, Optional, TypeVar
 from flwr.proto.message_pb2 import ObjectTree  # pylint: disable=E0611
 
 from .constant import (
+    FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PULLS,
+    FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PUSHES,
     HEAD_BODY_DIVIDER,
     HEAD_VALUE_DIVIDER,
-    MAX_CONCURRENT_PULLS,
-    MAX_CONCURRENT_PUSHES,
     PULL_BACKOFF_CAP,
     PULL_INITIAL_BACKOFF,
     PULL_MAX_TIME,
@@ -118,7 +118,7 @@ def push_objects(
     *,
     object_ids_to_push: Optional[set[str]] = None,
     keep_objects: bool = False,
-    max_concurrent_pushes: int = MAX_CONCURRENT_PUSHES,
+    max_concurrent_pushes: int = FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PUSHES,
 ) -> None:
     """Push multiple objects to the servicer.
 
@@ -137,7 +137,7 @@ def push_objects(
         If `True`, the original objects will be kept in the `objects` dictionary
         after pushing. If `False`, they will be removed from the dictionary to avoid
         high memory usage.
-    max_concurrent_pushes : int (default: MAX_CONCURRENT_PUSHES)
+    max_concurrent_pushes : int (default: FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PUSHES)
         The maximum number of concurrent pushes to perform.
     """
     lock = threading.Lock()
@@ -168,7 +168,7 @@ def push_object_contents_from_iterable(
     object_contents: Iterable[tuple[str, bytes]],
     push_object_fn: Callable[[str, bytes], None],
     *,
-    max_concurrent_pushes: int = MAX_CONCURRENT_PUSHES,
+    max_concurrent_pushes: int = FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PUSHES,
 ) -> None:
     """Push multiple object contents to the servicer.
 
@@ -181,7 +181,7 @@ def push_object_contents_from_iterable(
         A function that takes an object ID and its content as bytes, and pushes
         it to the servicer. This function should raise `ObjectIdNotPreregisteredError`
         if the object ID is not pre-registered.
-    max_concurrent_pushes : int (default: MAX_CONCURRENT_PUSHES)
+    max_concurrent_pushes : int (default: FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PUSHES)
         The maximum number of concurrent pushes to perform.
     """
 
@@ -210,7 +210,7 @@ def pull_objects(  # pylint: disable=too-many-arguments,too-many-locals
     object_ids: list[str],
     pull_object_fn: Callable[[str], bytes],
     *,
-    max_concurrent_pulls: int = MAX_CONCURRENT_PULLS,
+    max_concurrent_pulls: int = FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PULLS,
     max_time: Optional[float] = PULL_MAX_TIME,
     max_tries_per_object: Optional[int] = PULL_MAX_TRIES_PER_OBJECT,
     initial_backoff: float = PULL_INITIAL_BACKOFF,
@@ -227,7 +227,7 @@ def pull_objects(  # pylint: disable=too-many-arguments,too-many-locals
         The function should raise `ObjectUnavailableError` if the object is not yet
         available, or `ObjectIdNotPreregisteredError` if the object ID is not
         pre-registered.
-    max_concurrent_pulls : int (default: MAX_CONCURRENT_PULLS)
+    max_concurrent_pulls : int (default: FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PULLS)
         The maximum number of concurrent pulls to perform.
     max_time : Optional[float] (default: PULL_MAX_TIME)
         The maximum time to wait for all pulls to complete. If `None`, waits
@@ -442,7 +442,7 @@ def pull_and_inflate_object_from_tree(  # pylint: disable=R0913
     confirm_object_received_fn: Callable[[str], None],
     *,
     return_type: type[T] = InflatableObject,  # type: ignore
-    max_concurrent_pulls: int = MAX_CONCURRENT_PULLS,
+    max_concurrent_pulls: int = FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PULLS,
     max_time: Optional[float] = PULL_MAX_TIME,
     max_tries_per_object: Optional[int] = PULL_MAX_TRIES_PER_OBJECT,
     initial_backoff: float = PULL_INITIAL_BACKOFF,
@@ -460,7 +460,7 @@ def pull_and_inflate_object_from_tree(  # pylint: disable=R0913
         A function to confirm that the object has been received.
     return_type : type[T] (default: InflatableObject)
         The type of the object to return. Must be a subclass of `InflatableObject`.
-    max_concurrent_pulls : int (default: MAX_CONCURRENT_PULLS)
+    max_concurrent_pulls : int (default: FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PULLS)
         The maximum number of concurrent pulls to perform.
     max_time : Optional[float] (default: PULL_MAX_TIME)
         The maximum time to wait for all pulls to complete. If `None`, waits

flwr/common/record/array.py

@@ -25,7 +25,7 @@ from typing import TYPE_CHECKING, Any, cast, overload
 
 import numpy as np
 
-from ..constant import MAX_ARRAY_CHUNK_SIZE, SType
+from ..constant import FLWR_PRIVATE_MAX_ARRAY_CHUNK_SIZE, SType
 from ..inflatable import (
     InflatableObject,
     add_header_to_object_body,
@@ -272,8 +272,8 @@ class Array(InflatableObject):
         chunks: list[tuple[str, InflatableObject]] = []
         # memoryview allows for zero-copy slicing
         data_view = memoryview(self.data)
-        for start in range(0, len(data_view), MAX_ARRAY_CHUNK_SIZE):
-            end = min(start + MAX_ARRAY_CHUNK_SIZE, len(data_view))
+        for start in range(0, len(data_view), FLWR_PRIVATE_MAX_ARRAY_CHUNK_SIZE):
+            end = min(start + FLWR_PRIVATE_MAX_ARRAY_CHUNK_SIZE, len(data_view))
             ac = ArrayChunk(data_view[start:end])
             chunks.append((ac.object_id, ac))
 

flwr/common/record/arrayrecord.py

@@ -147,11 +147,20 @@ class ArrayRecord(TypedDict[str, Array], InflatableObject):
         keep_input: bool = True,
     ) -> None: ...
 
+    # This is also required for PyTorch state dict because they are not strongly typed
+    @overload
+    def __init__(  # noqa: E704
+        self,
+        torch_state_dict: dict[str, Any],
+        *,
+        keep_input: bool = True,
+    ) -> None: ...
+
     def __init__(  # pylint: disable=too-many-arguments
         self,
         *args: Any,
         numpy_ndarrays: list[NDArray] | None = None,
-        torch_state_dict: OrderedDict[str, torch.Tensor] | None = None,
+        torch_state_dict: OrderedDict[str, torch.Tensor] | dict[str, Any] | None = None,
         array_dict: OrderedDict[str, Array] | None = None,
         keep_input: bool = True,
     ) -> None:

flwr/common/record/typeddict.py

@@ -18,6 +18,8 @@
 from collections.abc import ItemsView, Iterator, KeysView, MutableMapping, ValuesView
 from typing import Callable, Generic, TypeVar, cast
 
+from typing_extensions import Self
+
 K = TypeVar("K")  # Key type
 V = TypeVar("V")  # Value type
 
@@ -86,3 +88,13 @@ class TypedDict(MutableMapping[K, V], Generic[K, V]):
     def items(self) -> ItemsView[K, V]:
         """D.items() -> a set-like object providing a view on D's items."""
         return cast(dict[K, V], self.__dict__["_data"]).items()
+
+    def copy(self) -> Self:
+        """Return a shallow copy of the dictionary."""
+        # Allocate instance without going through __init__
+        new = self.__class__.__new__(type(self))
+        # Copy internal state
+        new.__dict__["_check_key_fn"] = self.__dict__["_check_key_fn"]
+        new.__dict__["_check_value_fn"] = self.__dict__["_check_value_fn"]
+        new.__dict__["_data"] = cast(dict[K, V], self.__dict__["_data"]).copy()
+        return new

flwr/common/secure_aggregation/crypto/symmetric_encryption.py

@@ -16,57 +16,14 @@
 
 
 import base64
-from typing import cast
 
 from cryptography.exceptions import InvalidSignature
 from cryptography.fernet import Fernet
-from cryptography.hazmat.primitives import hashes, hmac, serialization
+from cryptography.hazmat.primitives import hashes, hmac
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives.kdf.hkdf import HKDF
 
 
-def generate_key_pairs() -> (
-    tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
-):
-    """Generate private and public key pairs with Cryptography."""
-    private_key = ec.generate_private_key(ec.SECP384R1())
-    public_key = private_key.public_key()
-    return private_key, public_key
-
-
-def private_key_to_bytes(private_key: ec.EllipticCurvePrivateKey) -> bytes:
-    """Serialize private key to bytes."""
-    return private_key.private_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PrivateFormat.PKCS8,
-        encryption_algorithm=serialization.NoEncryption(),
-    )
-
-
-def bytes_to_private_key(private_key_bytes: bytes) -> ec.EllipticCurvePrivateKey:
-    """Deserialize private key from bytes."""
-    return cast(
-        ec.EllipticCurvePrivateKey,
-        serialization.load_pem_private_key(data=private_key_bytes, password=None),
-    )
-
-
-def public_key_to_bytes(public_key: ec.EllipticCurvePublicKey) -> bytes:
-    """Serialize public key to bytes."""
-    return public_key.public_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PublicFormat.SubjectPublicKeyInfo,
-    )
-
-
-def bytes_to_public_key(public_key_bytes: bytes) -> ec.EllipticCurvePublicKey:
-    """Deserialize public key from bytes."""
-    return cast(
-        ec.EllipticCurvePublicKey,
-        serialization.load_pem_public_key(data=public_key_bytes),
-    )
-
-
 def generate_shared_key(
     private_key: ec.EllipticCurvePrivateKey, public_key: ec.EllipticCurvePublicKey
 ) -> bytes:
@@ -117,48 +74,3 @@ def verify_hmac(key: bytes, message: bytes, hmac_value: bytes) -> bool:
         return True
     except InvalidSignature:
         return False
-
-
-def sign_message(private_key: ec.EllipticCurvePrivateKey, message: bytes) -> bytes:
-    """Sign a message using the provided EC private key.
-
-    Parameters
-    ----------
-    private_key : ec.EllipticCurvePrivateKey
-        The EC private key to sign the message with.
-    message : bytes
-        The message to be signed.
-
-    Returns
-    -------
-    bytes
-        The signature of the message.
-    """
-    signature = private_key.sign(message, ec.ECDSA(hashes.SHA256()))
-    return signature
-
-
-def verify_signature(
-    public_key: ec.EllipticCurvePublicKey, message: bytes, signature: bytes
-) -> bool:
-    """Verify a signature against a message using the provided EC public key.
-
-    Parameters
-    ----------
-    public_key : ec.EllipticCurvePublicKey
-        The EC public key to verify the signature.
-    message : bytes
-        The original message.
-    signature : bytes
-        The signature to verify.
-
-    Returns
-    -------
-    bool
-        True if the signature is valid, False otherwise.
-    """
-    try:
-        public_key.verify(signature, message, ec.ECDSA(hashes.SHA256()))
-        return True
-    except InvalidSignature:
-        return False

flwr/common/serde.py

@@ -501,12 +501,14 @@ def recorddict_from_proto(recorddict_proto: ProtoRecordDict) -> RecordDict:
 
 def fab_to_proto(fab: typing.Fab) -> ProtoFab:
     """Create a proto Fab object from a Python Fab."""
-    return ProtoFab(hash_str=fab.hash_str, content=fab.content)
+    return ProtoFab(
+        hash_str=fab.hash_str, content=fab.content, verifications=fab.verifications
+    )
 
 
 def fab_from_proto(fab: ProtoFab) -> typing.Fab:
     """Create a Python Fab object from a proto Fab."""
-    return typing.Fab(fab.hash_str, fab.content)
+    return typing.Fab(fab.hash_str, fab.content, dict(fab.verifications))
 
 
 # === User configs ===

flwr/common/typing.py

@@ -256,6 +256,7 @@ class Fab:
 
     hash_str: str
     content: bytes
+    verifications: dict[str, str]
 
 
 class RunNotRunningException(BaseException):
@@ -270,12 +271,12 @@ class InvalidRunStatusException(BaseException):
         self.message = message
 
 
-# OIDC user authentication types
+# OIDC account authentication types
 @dataclass
-class UserAuthLoginDetails:
-    """User authentication login details."""
+class AccountAuthLoginDetails:
+    """Account authentication login details."""
 
-    auth_type: str
+    authn_type: str
     device_code: str
     verification_uri_complete: str
     expires_in: int
@@ -283,8 +284,8 @@ class UserAuthLoginDetails:
 
 
 @dataclass
-class UserAuthCredentials:
-    """User authentication tokens."""
+class AccountAuthCredentials:
+    """Account authentication tokens."""
 
     access_token: str
     refresh_token: str

flwr/compat/client/app.py

@@ -28,11 +28,11 @@ from flwr.app.error import Error
 from flwr.cli.config_utils import get_fab_metadata
 from flwr.cli.install import install_from_fab
 from flwr.client.client import Client
-from flwr.client.client_app import ClientApp, LoadClientAppError
 from flwr.client.message_handler.message_handler import handle_control_message
 from flwr.client.numpy_client import NumPyClient
 from flwr.client.run_info_store import DeprecatedRunInfoStore
 from flwr.client.typing import ClientFnExt
+from flwr.clientapp.client_app import ClientApp, LoadClientAppError
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH, Context, EventType, Message, event
 from flwr.common.address import parse_address
 from flwr.common.constant import (

flwr/compat/client/grpc_client/connection.py

@@ -96,7 +96,7 @@ def grpc_connection(  # pylint: disable=R0913,R0915,too-many-positional-argument
         If provided, a secure connection using the certificates will be
         established to an SSL-enabled Flower server.
     authentication_keys : Optional[Tuple[PrivateKey, PublicKey]] (default: None)
-        Client authentication is not supported for this transport type.
+        SuperNode authentication is not supported for this transport type.
 
     Returns
     -------
@@ -120,7 +120,7 @@ def grpc_connection(  # pylint: disable=R0913,R0915,too-many-positional-argument
     if isinstance(root_certificates, str):
         root_certificates = Path(root_certificates).read_bytes()
     if authentication_keys is not None:
-        log(ERROR, "Client authentication is not supported for this transport type.")
+        log(ERROR, "SuperNode authentication is not supported for this transport type.")
 
     channel = create_channel(
         server_address=server_address,

flwr/proto/control_pb2.py

@@ -16,9 +16,10 @@ from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
 from flwr.proto import recorddict_pb2 as flwr_dot_proto_dot_recorddict__pb2
 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/control.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x14\x66lwr/proto/run.proto\"\xfa\x01\n\x0fStartRunRequest\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fab\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.OverrideConfigEntry\x12\x34\n\x12\x66\x65\x64\x65ration_options\x18\x03 \x01(\x0b\x32\x18.flwr.proto.ConfigRecord\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"2\n\x10StartRunResponse\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"<\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x17\n\x0f\x61\x66ter_timestamp\x18\x02 \x01(\x01\"B\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t\x12\x18\n\x10latest_timestamp\x18\x02 \x01(\x01\"1\n\x0fListRunsRequest\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"\x9d\x01\n\x10ListRunsResponse\x12;\n\x08run_dict\x18\x01 \x03(\x0b\x32).flwr.proto.ListRunsResponse.RunDictEntry\x12\x0b\n\x03now\x18\x02 \x01(\t\x1a?\n\x0cRunDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12\x1e\n\x05value\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run:\x02\x38\x01\"\x18\n\x16GetLoginDetailsRequest\"\x8a\x01\n\x17GetLoginDetailsResponse\x12\x11\n\tauth_type\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65vice_code\x18\x02 \x01(\t\x12!\n\x19verification_uri_complete\x18\x03 \x01(\t\x12\x12\n\nexpires_in\x18\x04 \x01(\x03\x12\x10\n\x08interval\x18\x05 \x01(\x03\"+\n\x14GetAuthTokensRequest\x12\x13\n\x0b\x64\x65vice_code\x18\x01 \x01(\t\"D\n\x15GetAuthTokensResponse\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x15\n\rrefresh_token\x18\x02 \x01(\t\" \n\x0eStopRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"\"\n\x0fStopRunResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\x32\xe8\x03\n\x07\x43ontrol\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12\x44\n\x07StopRun\x12\x1a.flwr.proto.StopRunRequest\x1a\x1b.flwr.proto.StopRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x12G\n\x08ListRuns\x12\x1b.flwr.proto.ListRunsRequest\x1a\x1c.flwr.proto.ListRunsResponse\"\x00\x12\\\n\x0fGetLoginDetails\x12\".flwr.proto.GetLoginDetailsRequest\x1a#.flwr.proto.GetLoginDetailsResponse\"\x00\x12V\n\rGetAuthTokens\x12 .flwr.proto.GetAuthTokensRequest\x1a!.flwr.proto.GetAuthTokensResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/control.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x15\x66lwr/proto/node.proto\"\x8a\x02\n\x0fStartRunRequest\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fab\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.OverrideConfigEntry\x12\x34\n\x12\x66\x65\x64\x65ration_options\x18\x03 \x01(\x0b\x32\x18.flwr.proto.ConfigRecord\x12\x0e\n\x06\x61pp_id\x18\x04 \x01(\t\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"2\n\x10StartRunResponse\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"<\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x17\n\x0f\x61\x66ter_timestamp\x18\x02 \x01(\x01\"B\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t\x12\x18\n\x10latest_timestamp\x18\x02 \x01(\x01\"1\n\x0fListRunsRequest\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"\x9d\x01\n\x10ListRunsResponse\x12;\n\x08run_dict\x18\x01 \x03(\x0b\x32).flwr.proto.ListRunsResponse.RunDictEntry\x12\x0b\n\x03now\x18\x02 \x01(\t\x1a?\n\x0cRunDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12\x1e\n\x05value\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run:\x02\x38\x01\"\x18\n\x16GetLoginDetailsRequest\"\x8b\x01\n\x17GetLoginDetailsResponse\x12\x12\n\nauthn_type\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65vice_code\x18\x02 \x01(\t\x12!\n\x19verification_uri_complete\x18\x03 \x01(\t\x12\x12\n\nexpires_in\x18\x04 \x01(\x03\x12\x10\n\x08interval\x18\x05 \x01(\x03\"+\n\x14GetAuthTokensRequest\x12\x13\n\x0b\x64\x65vice_code\x18\x01 \x01(\t\"D\n\x15GetAuthTokensResponse\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x15\n\rrefresh_token\x18\x02 \x01(\t\" \n\x0eStopRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"\"\n\x0fStopRunResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\"&\n\x14PullArtifactsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"1\n\x15PullArtifactsResponse\x12\x10\n\x03url\x18\x01 \x01(\tH\x00\x88\x01\x01\x42\x06\n\x04_url\")\n\x13RegisterNodeRequest\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\"8\n\x14RegisterNodeResponse\x12\x14\n\x07node_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\n\n\x08_node_id\"(\n\x15UnregisterNodeRequest\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"\x18\n\x16UnregisterNodeResponse\"\x12\n\x10ListNodesRequest\"J\n\x11ListNodesResponse\x12(\n\nnodes_info\x18\x01 \x03(\x0b\x32\x14.flwr.proto.NodeInfo\x12\x0b\n\x03now\x18\x02 \x01(\t2\xbc\x06\n\x07\x43ontrol\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12\x44\n\x07StopRun\x12\x1a.flwr.proto.StopRunRequest\x1a\x1b.flwr.proto.StopRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x12G\n\x08ListRuns\x12\x1b.flwr.proto.ListRunsRequest\x1a\x1c.flwr.proto.ListRunsResponse\"\x00\x12\\\n\x0fGetLoginDetails\x12\".flwr.proto.GetLoginDetailsRequest\x1a#.flwr.proto.GetLoginDetailsResponse\"\x00\x12V\n\rGetAuthTokens\x12 .flwr.proto.GetAuthTokensRequest\x1a!.flwr.proto.GetAuthTokensResponse\"\x00\x12V\n\rPullArtifacts\x12 .flwr.proto.PullArtifactsRequest\x1a!.flwr.proto.PullArtifactsResponse\"\x00\x12S\n\x0cRegisterNode\x12\x1f.flwr.proto.RegisterNodeRequest\x1a .flwr.proto.RegisterNodeResponse\"\x00\x12Y\n\x0eUnregisterNode\x12!.flwr.proto.UnregisterNodeRequest\x1a\".flwr.proto.UnregisterNodeResponse\"\x00\x12J\n\tListNodes\x12\x1c.flwr.proto.ListNodesRequest\x1a\x1d.flwr.proto.ListNodesResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -29,34 +30,50 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
   _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._options = None
   _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_options = b'8\001'
-  _globals['_STARTRUNREQUEST']._serialized_start=142
-  _globals['_STARTRUNREQUEST']._serialized_end=392
-  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=319
-  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=392
-  _globals['_STARTRUNRESPONSE']._serialized_start=394
-  _globals['_STARTRUNRESPONSE']._serialized_end=444
-  _globals['_STREAMLOGSREQUEST']._serialized_start=446
-  _globals['_STREAMLOGSREQUEST']._serialized_end=506
-  _globals['_STREAMLOGSRESPONSE']._serialized_start=508
-  _globals['_STREAMLOGSRESPONSE']._serialized_end=574
-  _globals['_LISTRUNSREQUEST']._serialized_start=576
-  _globals['_LISTRUNSREQUEST']._serialized_end=625
-  _globals['_LISTRUNSRESPONSE']._serialized_start=628
-  _globals['_LISTRUNSRESPONSE']._serialized_end=785
-  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_start=722
-  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_end=785
-  _globals['_GETLOGINDETAILSREQUEST']._serialized_start=787
-  _globals['_GETLOGINDETAILSREQUEST']._serialized_end=811
-  _globals['_GETLOGINDETAILSRESPONSE']._serialized_start=814
-  _globals['_GETLOGINDETAILSRESPONSE']._serialized_end=952
-  _globals['_GETAUTHTOKENSREQUEST']._serialized_start=954
-  _globals['_GETAUTHTOKENSREQUEST']._serialized_end=997
-  _globals['_GETAUTHTOKENSRESPONSE']._serialized_start=999
-  _globals['_GETAUTHTOKENSRESPONSE']._serialized_end=1067
-  _globals['_STOPRUNREQUEST']._serialized_start=1069
-  _globals['_STOPRUNREQUEST']._serialized_end=1101
-  _globals['_STOPRUNRESPONSE']._serialized_start=1103
-  _globals['_STOPRUNRESPONSE']._serialized_end=1137
-  _globals['_CONTROL']._serialized_start=1140
-  _globals['_CONTROL']._serialized_end=1628
+  _globals['_STARTRUNREQUEST']._serialized_start=165
+  _globals['_STARTRUNREQUEST']._serialized_end=431
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=358
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=431
+  _globals['_STARTRUNRESPONSE']._serialized_start=433
+  _globals['_STARTRUNRESPONSE']._serialized_end=483
+  _globals['_STREAMLOGSREQUEST']._serialized_start=485
+  _globals['_STREAMLOGSREQUEST']._serialized_end=545
+  _globals['_STREAMLOGSRESPONSE']._serialized_start=547
+  _globals['_STREAMLOGSRESPONSE']._serialized_end=613
+  _globals['_LISTRUNSREQUEST']._serialized_start=615
+  _globals['_LISTRUNSREQUEST']._serialized_end=664
+  _globals['_LISTRUNSRESPONSE']._serialized_start=667
+  _globals['_LISTRUNSRESPONSE']._serialized_end=824
+  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_start=761
+  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_end=824
+  _globals['_GETLOGINDETAILSREQUEST']._serialized_start=826
+  _globals['_GETLOGINDETAILSREQUEST']._serialized_end=850
+  _globals['_GETLOGINDETAILSRESPONSE']._serialized_start=853
+  _globals['_GETLOGINDETAILSRESPONSE']._serialized_end=992
+  _globals['_GETAUTHTOKENSREQUEST']._serialized_start=994
+  _globals['_GETAUTHTOKENSREQUEST']._serialized_end=1037
+  _globals['_GETAUTHTOKENSRESPONSE']._serialized_start=1039
+  _globals['_GETAUTHTOKENSRESPONSE']._serialized_end=1107
+  _globals['_STOPRUNREQUEST']._serialized_start=1109
+  _globals['_STOPRUNREQUEST']._serialized_end=1141
+  _globals['_STOPRUNRESPONSE']._serialized_start=1143
+  _globals['_STOPRUNRESPONSE']._serialized_end=1177
+  _globals['_PULLARTIFACTSREQUEST']._serialized_start=1179
+  _globals['_PULLARTIFACTSREQUEST']._serialized_end=1217
+  _globals['_PULLARTIFACTSRESPONSE']._serialized_start=1219
+  _globals['_PULLARTIFACTSRESPONSE']._serialized_end=1268
+  _globals['_REGISTERNODEREQUEST']._serialized_start=1270
+  _globals['_REGISTERNODEREQUEST']._serialized_end=1311
+  _globals['_REGISTERNODERESPONSE']._serialized_start=1313
+  _globals['_REGISTERNODERESPONSE']._serialized_end=1369
+  _globals['_UNREGISTERNODEREQUEST']._serialized_start=1371
+  _globals['_UNREGISTERNODEREQUEST']._serialized_end=1411
+  _globals['_UNREGISTERNODERESPONSE']._serialized_start=1413
+  _globals['_UNREGISTERNODERESPONSE']._serialized_end=1437
+  _globals['_LISTNODESREQUEST']._serialized_start=1439
+  _globals['_LISTNODESREQUEST']._serialized_end=1457
+  _globals['_LISTNODESRESPONSE']._serialized_start=1459
+  _globals['_LISTNODESRESPONSE']._serialized_end=1533
+  _globals['_CONTROL']._serialized_start=1536
+  _globals['_CONTROL']._serialized_end=2364
 # @@protoc_insertion_point(module_scope)

flwr/proto/control_pb2.pyi

@@ -4,6 +4,7 @@ isort:skip_file
 """
 import builtins
 import flwr.proto.fab_pb2
+import flwr.proto.node_pb2
 import flwr.proto.recorddict_pb2
 import flwr.proto.run_pb2
 import flwr.proto.transport_pb2
@@ -35,20 +36,23 @@ class StartRunRequest(google.protobuf.message.Message):
     FAB_FIELD_NUMBER: builtins.int
     OVERRIDE_CONFIG_FIELD_NUMBER: builtins.int
     FEDERATION_OPTIONS_FIELD_NUMBER: builtins.int
+    APP_ID_FIELD_NUMBER: builtins.int
     @property
     def fab(self) -> flwr.proto.fab_pb2.Fab: ...
     @property
     def override_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
     @property
     def federation_options(self) -> flwr.proto.recorddict_pb2.ConfigRecord: ...
+    app_id: typing.Text
     def __init__(self,
         *,
         fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
         override_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
         federation_options: typing.Optional[flwr.proto.recorddict_pb2.ConfigRecord] = ...,
+        app_id: typing.Text = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["fab",b"fab","federation_options",b"federation_options"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["fab",b"fab","federation_options",b"federation_options","override_config",b"override_config"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["app_id",b"app_id","fab",b"fab","federation_options",b"federation_options","override_config",b"override_config"]) -> None: ...
 global___StartRunRequest = StartRunRequest
 
 class StartRunResponse(google.protobuf.message.Message):
@@ -143,25 +147,25 @@ global___GetLoginDetailsRequest = GetLoginDetailsRequest
 
 class GetLoginDetailsResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    AUTH_TYPE_FIELD_NUMBER: builtins.int
+    AUTHN_TYPE_FIELD_NUMBER: builtins.int
     DEVICE_CODE_FIELD_NUMBER: builtins.int
     VERIFICATION_URI_COMPLETE_FIELD_NUMBER: builtins.int
     EXPIRES_IN_FIELD_NUMBER: builtins.int
     INTERVAL_FIELD_NUMBER: builtins.int
-    auth_type: typing.Text
+    authn_type: typing.Text
     device_code: typing.Text
     verification_uri_complete: typing.Text
     expires_in: builtins.int
     interval: builtins.int
     def __init__(self,
         *,
-        auth_type: typing.Text = ...,
+        authn_type: typing.Text = ...,
         device_code: typing.Text = ...,
         verification_uri_complete: typing.Text = ...,
         expires_in: builtins.int = ...,
         interval: builtins.int = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["auth_type",b"auth_type","device_code",b"device_code","expires_in",b"expires_in","interval",b"interval","verification_uri_complete",b"verification_uri_complete"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["authn_type",b"authn_type","device_code",b"device_code","expires_in",b"expires_in","interval",b"interval","verification_uri_complete",b"verification_uri_complete"]) -> None: ...
 global___GetLoginDetailsResponse = GetLoginDetailsResponse
 
 class GetAuthTokensRequest(google.protobuf.message.Message):
@@ -210,3 +214,89 @@ class StopRunResponse(google.protobuf.message.Message):
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions.Literal["success",b"success"]) -> None: ...
 global___StopRunResponse = StopRunResponse
+
+class PullArtifactsRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    RUN_ID_FIELD_NUMBER: builtins.int
+    run_id: builtins.int
+    def __init__(self,
+        *,
+        run_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id"]) -> None: ...
+global___PullArtifactsRequest = PullArtifactsRequest
+
+class PullArtifactsResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    URL_FIELD_NUMBER: builtins.int
+    url: typing.Text
+    def __init__(self,
+        *,
+        url: typing.Optional[typing.Text] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_url",b"_url","url",b"url"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_url",b"_url","url",b"url"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_url",b"_url"]) -> typing.Optional[typing_extensions.Literal["url"]]: ...
+global___PullArtifactsResponse = PullArtifactsResponse
+
+class RegisterNodeRequest(google.protobuf.message.Message):
+    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___RegisterNodeRequest = RegisterNodeRequest
+
+class RegisterNodeResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_ID_FIELD_NUMBER: builtins.int
+    node_id: builtins.int
+    def __init__(self,
+        *,
+        node_id: typing.Optional[builtins.int] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_node_id",b"_node_id","node_id",b"node_id"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_node_id",b"_node_id","node_id",b"node_id"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_node_id",b"_node_id"]) -> typing.Optional[typing_extensions.Literal["node_id"]]: ...
+global___RegisterNodeResponse = RegisterNodeResponse
+
+class UnregisterNodeRequest(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___UnregisterNodeRequest = UnregisterNodeRequest
+
+class UnregisterNodeResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___UnregisterNodeResponse = UnregisterNodeResponse
+
+class ListNodesRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___ListNodesRequest = ListNodesRequest
+
+class ListNodesResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODES_INFO_FIELD_NUMBER: builtins.int
+    NOW_FIELD_NUMBER: builtins.int
+    @property
+    def nodes_info(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.node_pb2.NodeInfo]: ...
+    now: typing.Text
+    def __init__(self,
+        *,
+        nodes_info: typing.Optional[typing.Iterable[flwr.proto.node_pb2.NodeInfo]] = ...,
+        now: typing.Text = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["nodes_info",b"nodes_info","now",b"now"]) -> None: ...
+global___ListNodesResponse = ListNodesResponse