flwr 1.24.0__py3-none-any.whl → 1.26.0__py3-none-any.whl

flwr/client/grpc_adapter_client/connection.py

@@ -45,7 +45,7 @@ def grpc_adapter(  # pylint: disable=R0913,too-many-positional-arguments
     tuple[
         int,
         Callable[[], tuple[Message, ObjectTree] | None],
-        Callable[[Message, ObjectTree], set[str]],
+        Callable[[Message, ObjectTree, float], set[str]],
         Callable[[int], Run],
         Callable[[str, int], Fab],
         Callable[[int, str], bytes],
@@ -81,7 +81,7 @@ def grpc_adapter(  # pylint: disable=R0913,too-many-positional-arguments
     -------
     node_id : int
     receive : Callable[[], Optional[tuple[Message, ObjectTree]]]
-    send : Callable[[Message, ObjectTree], set[str]]
+    send : Callable[[Message, ObjectTree, float], set[str]]
     get_run : Callable[[int], Run]
     get_fab : Callable[[str, int], Fab]
     pull_object : Callable[[str], bytes]

flwr/client/grpc_rere_client/connection.py

@@ -33,7 +33,7 @@ from flwr.common.inflatable_protobuf_utils import (
 )
 from flwr.common.logger import log
 from flwr.common.message import Message, remove_content_from_message
-from flwr.common.retry_invoker import RetryInvoker, _wrap_stub
+from flwr.common.retry_invoker import RetryInvoker, wrap_stub
 from flwr.common.serde import (
     fab_from_proto,
     message_from_proto,
@@ -83,7 +83,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     tuple[
         int,
         Callable[[], tuple[Message, ObjectTree] | None],
-        Callable[[Message, ObjectTree], set[str]],
+        Callable[[Message, ObjectTree, float], set[str]],
         Callable[[int], Run],
         Callable[[str, int], Fab],
         Callable[[int, str], bytes],
@@ -128,7 +128,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     -------
     node_id : int
     receive : Callable[[], Optional[tuple[Message, ObjectTree]]]
-    send : Callable[[Message, ObjectTree], set[str]]
+    send : Callable[[Message, ObjectTree, float], set[str]]
     get_run : Callable[[int], Run]
     get_fab : Callable[[str, int], Fab]
     pull_object : Callable[[str], bytes]
@@ -136,7 +136,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     confirm_message_received : Callable[[str], None]
     """
     if isinstance(root_certificates, str):
-        root_certificates = Path(root_certificates).read_bytes()
+        root_certificates = Path(root_certificates).expanduser().read_bytes()
 
     # Automatic node auth: generate keys if user didn't provide any
     self_registered = False
@@ -165,7 +165,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     node: Node | None = None
 
     # Wrap stub
-    _wrap_stub(stub, retry_invoker)
+    wrap_stub(stub, retry_invoker)
     ###########################################################################
     # SuperNode functions
     ###########################################################################
@@ -277,7 +277,9 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         # Return the Message and its object tree
         return in_message, object_tree
 
-    def send(message: Message, object_tree: ObjectTree) -> set[str]:
+    def send(
+        message: Message, object_tree: ObjectTree, clientapp_runtime: float
+    ) -> set[str]:
         """Send the message with its ObjectTree to SuperLink."""
         # Get Node
         if node is None:
@@ -293,6 +295,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             node=node,
             messages_list=[message_to_proto(message)],
             message_object_trees=[object_tree],
+            clientapp_runtime_list=[clientapp_runtime],
         )
         response: PushMessagesResponse = stub.PushMessages(request=request)
 

flwr/client/grpc_rere_client/grpc_adapter.py

@@ -32,7 +32,6 @@ from flwr.common.constant import (
     GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY,
     GRPC_ADAPTER_METADATA_SHOULD_EXIT_KEY,
 )
-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,
@@ -64,6 +63,7 @@ from flwr.proto.message_pb2 import (  # pylint: disable=E0611
 )
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
 from flwr.supercore.constant import FORCE_EXIT_TIMEOUT_SECONDS
+from flwr.supercore.version import package_name, package_version
 
 T = TypeVar("T", bound=GrpcMessage)
 

flwr/client/message_handler/message_handler.py

@@ -18,6 +18,7 @@
 from logging import WARN
 from typing import cast
 
+from flwr.app.message_type import MessageType
 from flwr.client.client import (
     maybe_call_evaluate,
     maybe_call_fit,
@@ -27,7 +28,7 @@ from flwr.client.client import (
 from flwr.client.numpy_client import NumPyClient
 from flwr.client.typing import ClientFnExt
 from flwr.common import ConfigRecord, Context, Message, Metadata, RecordDict, log
-from flwr.common.constant import MessageType, MessageTypeLegacy
+from flwr.common.constant import MessageTypeLegacy
 from flwr.common.recorddict_compat import (
     evaluateres_to_recorddict,
     fitres_to_recorddict,

flwr/client/mod/centraldp_mods.py

@@ -17,10 +17,10 @@
 
 from logging import INFO
 
+from flwr.app.message_type import MessageType
 from flwr.client.typing import ClientAppCallable
 from flwr.common import ndarrays_to_parameters, parameters_to_ndarrays
 from flwr.common import recorddict_compat as compat
-from flwr.common.constant import MessageType
 from flwr.common.context import Context
 from flwr.common.differential_privacy import (
     compute_adaptive_clip_model_update,

flwr/client/mod/localdp_mod.py

@@ -19,10 +19,10 @@ from logging import INFO
 
 import numpy as np
 
+from flwr.app.message_type import MessageType
 from flwr.client.typing import ClientAppCallable
 from flwr.common import ndarrays_to_parameters, parameters_to_ndarrays
 from flwr.common import recorddict_compat as compat
-from flwr.common.constant import MessageType
 from flwr.common.context import Context
 from flwr.common.differential_privacy import (
     add_localdp_gaussian_noise_to_params,

flwr/client/mod/secure_aggregation/secaggplus_mod.py

@@ -20,6 +20,7 @@ from dataclasses import dataclass, field
 from logging import DEBUG, WARNING
 from typing import Any, cast
 
+from flwr.app.message_type import MessageType
 from flwr.client.typing import ClientAppCallable
 from flwr.common import (
     ConfigRecord,
@@ -31,7 +32,6 @@ from flwr.common import (
     parameters_to_ndarrays,
 )
 from flwr.common import recorddict_compat as compat
-from flwr.common.constant import MessageType
 from flwr.common.logger import log
 from flwr.common.secure_aggregation.crypto.shamir import create_shares
 from flwr.common.secure_aggregation.crypto.symmetric_encryption import (

flwr/client/rest_client/connection.py

@@ -111,7 +111,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     tuple[
         int,
         Callable[[], tuple[Message, ObjectTree] | None],
-        Callable[[Message, ObjectTree], set[str]],
+        Callable[[Message, ObjectTree, float], set[str]],
         Callable[[int], Run],
         Callable[[str, int], Fab],
         Callable[[int, str], bytes],
@@ -149,7 +149,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     -------
     node_id : int
     receive : Callable[[], Optional[tuple[Message, ObjectTree]]]
-    send : Callable[[Message, ObjectTree], set[str]]
+    send : Callable[[Message, ObjectTree, float], set[str]]
     get_run : Callable[[int], Run]
     get_fab : Callable[[str, int], Fab]
     pull_object : Callable[[str], bytes]
@@ -393,12 +393,13 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         # Return the Message and its object tree
         return in_message, object_tree
 
-    def send(message: Message, object_tree: ObjectTree) -> set[str]:
+    def send(
+        message: Message, object_tree: ObjectTree, clientapp_runtime: float
+    ) -> set[str]:
         """Send the message with its ObjectTree to SuperLink."""
         # Get Node
         if node is None:
             raise RuntimeError("Node instance missing")
-
         # Remove the content from the message if it has
         if message.has_content():
             message = remove_content_from_message(message)
@@ -408,6 +409,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             node=node,
             messages_list=[message_to_proto(message)],
             message_object_trees=[object_tree],
+            clientapp_runtime_list=[clientapp_runtime],
         )
         res = _request(req, PushMessagesResponse, PATH_PUSH_MESSAGES)
         if res is None:

flwr/client/run_info_store.py

@@ -18,13 +18,14 @@
 from dataclasses import dataclass
 from pathlib import Path
 
+from flwr.app.user_config import UserConfig
 from flwr.common import Context, RecordDict
 from flwr.common.config import (
     get_fused_config,
     get_fused_config_from_dir,
     get_fused_config_from_fab,
 )
-from flwr.common.typing import Fab, Run, UserConfig
+from flwr.common.typing import Fab, Run
 
 
 @dataclass()

flwr/clientapp/client_app.py

@@ -19,6 +19,7 @@ import inspect
 from collections.abc import Callable, Iterator
 from contextlib import contextmanager
 
+from flwr.app.message_type import MessageType
 from flwr.app.metadata import validate_message_type
 from flwr.client.client import Client
 from flwr.client.message_handler.message_handler import (
@@ -26,7 +27,7 @@ from flwr.client.message_handler.message_handler import (
 )
 from flwr.client.mod.utils import make_ffn
 from flwr.client.typing import ClientFnExt, Mod
-from flwr.common import Context, Message, MessageType
+from flwr.common import Context, Message
 from flwr.common.logger import warn_deprecated_feature
 
 from .typing import ClientAppCallable

flwr/common/__init__.py

@@ -15,12 +15,13 @@
 """Common components shared between server and client."""
 
 
+from flwr.app.message_type import MessageType as MessageType
+
 from ..app.error import Error as Error
 from ..app.metadata import Metadata as Metadata
-from .constant import MessageType as MessageType
+from ..supercore.date import now as now
 from .constant import MessageTypeLegacy as MessageTypeLegacy
 from .context import Context as Context
-from .date import now as now
 from .grpc import GRPC_MAX_MESSAGE_LENGTH
 from .logger import configure as configure
 from .logger import log as log

flwr/common/args.py

@@ -89,13 +89,13 @@ def try_obtain_root_certificates(
     else:
         # Load the certificates if provided, or load the system certificates
         if root_cert_path is None:
-            log(INFO, "Using system certificates")
+            log(INFO, "Using system certificates for TLS connection")
             root_certificates = None
         elif not isfile(root_cert_path):
             log(ERROR, "Path argument `--root-certificates` does not point to a file.")
             sys.exit(1)
         else:
-            root_certificates = Path(root_cert_path).read_bytes()
+            root_certificates = Path(root_cert_path).expanduser().read_bytes()
         log(
             DEBUG,
             "Starting secure HTTPS channel to %s "
@@ -129,9 +129,9 @@ def try_obtain_server_certificates(
         if not isfile(args.ssl_keyfile):
             sys.exit("Path argument `--ssl-keyfile` does not point to a file.")
         certificates = (
-            Path(args.ssl_ca_certfile).read_bytes(),  # CA certificate
-            Path(args.ssl_certfile).read_bytes(),  # server certificate
-            Path(args.ssl_keyfile).read_bytes(),  # server private key
+            Path(args.ssl_ca_certfile).expanduser().read_bytes(),  # CA certificate
+            Path(args.ssl_certfile).expanduser().read_bytes(),  # server certificate
+            Path(args.ssl_keyfile).expanduser().read_bytes(),  # server private key
         )
         return certificates
     if args.ssl_certfile or args.ssl_keyfile or args.ssl_ca_certfile:

flwr/common/config.py

@@ -22,9 +22,10 @@ from io import BytesIO
 from pathlib import Path
 from typing import IO, Any, TypeVar, cast, get_args
 
+import click
 import tomli
-import typer
 
+from flwr.app.user_config import UserConfig, UserConfigValue
 from flwr.common.constant import (
     APP_DIR,
     FAB_CONFIG_FILE,
@@ -32,7 +33,7 @@ from flwr.common.constant import (
     FLWR_DIR,
     FLWR_HOME,
 )
-from flwr.common.typing import Run, UserConfig, UserConfigValue
+from flwr.common.typing import Run
 
 from . import ConfigRecord, object_ref
 
@@ -41,7 +42,7 @@ T_dict = TypeVar("T_dict", bound=dict[str, Any])  # pylint: disable=invalid-name
 
 def get_flwr_dir(provided_path: str | None = None) -> Path:
     """Return the Flower home directory based on env variables."""
-    if provided_path is None or not Path(provided_path).is_dir():
+    if provided_path is None or not Path(provided_path).expanduser().is_dir():
         return Path(
             os.getenv(
                 FLWR_HOME,
@@ -212,7 +213,7 @@ def parse_config_args(config: list[str] | None, flatten: bool = True) -> dict[st
 
     # Handle if .toml file is passed
     if len(config) == 1 and config[0].endswith(".toml"):
-        with Path(config[0]).open("rb") as config_file:
+        with Path(config[0]).expanduser().open("rb") as config_file:
             overrides = flatten_dict(tomli.load(config_file))
         return overrides
 
@@ -234,17 +235,13 @@ def parse_config_args(config: list[str] | None, flatten: bool = True) -> dict[st
                 overrides.update(tomli.loads(toml_str))
                 flat_overrides = flatten_dict(overrides) if flatten else overrides
             except tomli.TOMLDecodeError as err:
-                typer.secho(
-                    "❌ The provided configuration string is in an invalid format. "
+                raise click.ClickException(
+                    "The provided configuration string is in an invalid format. "
                     "The correct format should be, e.g., 'key1=123 key2=false "
                     'key3="string"\', where values must be of type bool, int, '
                     "string, or float. Ensure proper formatting with "
-                    "space-separated key-value pairs.",
-                    fg=typer.colors.RED,
-                    bold=True,
-                    err=True,
-                )
-                raise typer.Exit(code=1) from err
+                    "space-separated key-value pairs."
+                ) from err
 
     return flat_overrides
 
@@ -333,8 +330,6 @@ def validate_fields_in_config(
             warnings.append('Recommended property "description" missing in [project]')
         if "license" not in config["project"]:
             warnings.append('Recommended property "license" missing in [project]')
-        if "authors" not in config["project"]:
-            warnings.append('Recommended property "authors" missing in [project]')
 
     if (
         "tool" not in config
@@ -378,13 +373,13 @@ def validate_config(
     is_valid, reason = object_ref.validate(serverapp_ref, check_module, project_dir)
 
     if not is_valid and isinstance(reason, str):
-        return False, [reason], []
+        return False, [reason], warnings
 
     # Validate clientapp
     clientapp_ref = config["tool"]["flwr"]["app"]["components"]["clientapp"]
     is_valid, reason = object_ref.validate(clientapp_ref, check_module, project_dir)
 
     if not is_valid and isinstance(reason, str):
-        return False, [reason], []
+        return False, [reason], warnings
 
-    return True, [], []
+    return True, [], warnings

flwr/common/constant.py

@@ -19,13 +19,11 @@ from __future__ import annotations
 
 import os
 
-TRANSPORT_TYPE_GRPC_BIDI = "grpc-bidi"
 TRANSPORT_TYPE_GRPC_RERE = "grpc-rere"
 TRANSPORT_TYPE_GRPC_ADAPTER = "grpc-adapter"
 TRANSPORT_TYPE_REST = "rest"
 TRANSPORT_TYPE_VCE = "vce"
 TRANSPORT_TYPES = [
-    TRANSPORT_TYPE_GRPC_BIDI,
     TRANSPORT_TYPE_GRPC_RERE,
     TRANSPORT_TYPE_REST,
     TRANSPORT_TYPE_VCE,
@@ -182,19 +180,8 @@ SUPERNODE_NOT_CREATED_FROM_CLI_MESSAGE = "Invalid SuperNode credentials"
 PUBLIC_KEY_ALREADY_IN_USE_MESSAGE = "Public key already in use"
 PUBLIC_KEY_NOT_VALID = "The provided public key is not valid"
 NODE_NOT_FOUND_MESSAGE = "Node ID not found for account"
-
-
-class MessageType:
-    """Message type."""
-
-    TRAIN = "train"
-    EVALUATE = "evaluate"
-    QUERY = "query"
-    SYSTEM = "system"
-
-    def __new__(cls) -> MessageType:
-        """Prevent instantiation."""
-        raise TypeError(f"{cls.__name__} cannot be instantiated.")
+FEDERATION_NOT_SPECIFIED_MESSAGE = "No federation specified in the request"
+FEDERATION_NOT_FOUND_MESSAGE = "Federation '%s' does not exist"
 
 
 class MessageTypeLegacy:
@@ -323,4 +310,4 @@ class ExecPluginType:
 
 # Constants for No-op auth plugins
 NOOP_FLWR_AID = "<id:none>"
-NOOP_ACCOUNT_NAME = "<name:none>"
+NOOP_ACCOUNT_NAME = "none"

flwr/common/context.py

@@ -17,8 +17,9 @@
 
 from dataclasses import dataclass
 
+from flwr.app.user_config import UserConfig
+
 from .record import RecordDict
-from .typing import UserConfig
 
 
 @dataclass

flwr/common/exit/exit.py

@@ -23,8 +23,8 @@ from logging import ERROR, INFO
 from typing import Any, NoReturn
 
 from flwr.common import EventType, event
-from flwr.common.version import package_version
 from flwr.supercore.constant import FORCE_EXIT_TIMEOUT_SECONDS
+from flwr.supercore.version import package_version
 
 from ..logger import log
 from .exit_code import EXIT_CODE_HELP
@@ -87,9 +87,6 @@ def flwr_exit(
     # Log the exit message
     log(log_level, exit_message)
 
-    # Trigger exit handlers
-    trigger_exit_handlers()
-
     # Start a daemon thread to force exit if graceful exit fails
     def force_exit() -> None:
         time.sleep(FORCE_EXIT_TIMEOUT_SECONDS)
@@ -97,6 +94,9 @@ def flwr_exit(
 
     threading.Thread(target=force_exit, daemon=True).start()
 
+    # Trigger exit handlers
+    trigger_exit_handlers()
+
     # Exit
     sys.exit(sys_exit_code)
 

flwr/common/exit/exit_code.py

@@ -33,6 +33,7 @@ class ExitCode:
     SUPERLINK_LICENSE_MISSING = 102
     SUPERLINK_LICENSE_URL_INVALID = 103
     SUPERLINK_INVALID_ARGS = 104
+    SUPERLINK_DATABASE_SCHEMA_MISMATCH = 105
 
     # ServerApp-specific exit codes (200-299)
     SERVERAPP_STRATEGY_PRECONDITION_UNMET = 200
@@ -91,6 +92,11 @@ EXIT_CODE_HELP = {
         "Invalid arguments provided to SuperLink. Use `--help` check for the correct "
         "usage. Alternatively, check the documentation."
     ),
+    ExitCode.SUPERLINK_DATABASE_SCHEMA_MISMATCH: (
+        "The database schema does not match the expected schema for this version of "
+        "SuperLink. Please refer to the documentation for guidance on how to resolve "
+        "this issue."
+    ),
     # ServerApp-specific exit codes (200-299)
     ExitCode.SERVERAPP_STRATEGY_PRECONDITION_UNMET: (
         "The strategy received replies that cannot be aggregated. Please ensure all "

flwr/common/grpc.py

@@ -24,7 +24,8 @@ from typing import Any
 
 import grpc
 
-from .address import is_port_in_use
+from flwr.supercore.address import is_port_in_use
+
 from .logger import log
 
 GRPC_MAX_MESSAGE_LENGTH: int = 2_147_483_647  # == 2048 * 1024 * 1024 -1 (2GB)

flwr/common/logger.py

@@ -385,7 +385,7 @@ def start_log_uploader(
 ) -> threading.Thread:
     """Start the log uploader thread and return it."""
     thread = threading.Thread(
-        target=_log_uploader, args=(log_queue, node_id, run_id, stub)
+        target=_log_uploader, args=(log_queue, node_id, run_id, stub), daemon=True
     )
     thread.start()
     return thread

flwr/common/message.py

@@ -20,11 +20,11 @@ from __future__ import annotations
 from logging import WARNING
 from typing import Any, cast, overload
 
-from flwr.common.date import now
 from flwr.common.logger import warn_deprecated_feature
 from flwr.proto.message_pb2 import Message as ProtoMessage  # pylint: disable=E0611
 from flwr.proto.message_pb2 import Metadata as ProtoMetadata  # pylint: disable=E0611
 from flwr.proto.message_pb2 import ObjectIDs  # pylint: disable=E0611
+from flwr.supercore.date import now
 
 from ..app.error import Error
 from ..app.metadata import Metadata

flwr/common/retry_invoker.py

@@ -21,7 +21,7 @@ import threading
 import time
 from collections.abc import Callable, Generator, Iterable
 from dataclasses import dataclass
-from logging import INFO, WARN
+from logging import DEBUG, ERROR, INFO, WARN
 from typing import Any, cast
 
 import grpc
@@ -318,7 +318,7 @@ class RetryInvoker:
                 return ret
 
 
-def _make_simple_grpc_retry_invoker() -> RetryInvoker:
+def make_simple_grpc_retry_invoker() -> RetryInvoker:
     """Create a simple gRPC retry invoker."""
     lock = threading.Lock()
     system_healthy = threading.Event()
@@ -334,8 +334,11 @@ def _make_simple_grpc_retry_invoker() -> RetryInvoker:
                 retry_state.tries,
             )
 
-    def _on_backoff(_: RetryState) -> None:
+    def _on_backoff(retry_state: RetryState) -> None:
         system_healthy.clear()
+        log(
+            DEBUG, "Connection attempt failed with exception: %s", retry_state.exception
+        )
 
     def _on_giveup(retry_state: RetryState) -> None:
         system_healthy.clear()
@@ -351,7 +354,12 @@ def _make_simple_grpc_retry_invoker() -> RetryInvoker:
         if e.code() == grpc.StatusCode.PERMISSION_DENIED:  # type: ignore
             raise RunNotRunningException
         if e.code() == grpc.StatusCode.UNAVAILABLE:  # type: ignore
-            return False
+            # Check if this is an SSL handshake failure - these should fail fast
+            details = str(e.details() if hasattr(e, "details") else "").lower()
+            if "handshake failed" in details:
+                log(ERROR, "SSL/TLS handshake error detected.")
+                return True  # Give up on SSL/TLS handshake errors
+            return False  # Retry on other UNAVAILABLE errors (network issues)
         return True
 
     def _wait(wait_time: float) -> None:
@@ -386,7 +394,7 @@ def _make_simple_grpc_retry_invoker() -> RetryInvoker:
     )
 
 
-def _wrap_stub(
+def wrap_stub(
     stub: (
         ServerAppIoStub | ClientAppIoStub | SimulationIoStub | FleetStub | GrpcAdapter
     ),

flwr/common/secure_aggregation/ndarrays_arithmetic.py

@@ -18,7 +18,7 @@
 from typing import Any
 
 import numpy as np
-from numpy.typing import DTypeLike, NDArray
+from numpy.typing import NDArray
 
 
 def factor_combine(factor: int, parameters: list[NDArray[Any]]) -> list[NDArray[Any]]:
@@ -38,8 +38,11 @@ def get_parameters_shape(parameters: list[NDArray[Any]]) -> list[tuple[int, ...]
     return [arr.shape for arr in parameters]
 
 
+default_numpy_dtype = np.dtype(np.int64)
+
+
 def get_zero_parameters(
-    dimensions_list: list[tuple[int, ...]], dtype: DTypeLike = np.int64
+    dimensions_list: list[tuple[int, ...]], dtype: np.dtype[Any] = default_numpy_dtype
 ) -> list[NDArray[Any]]:
     """Generate zero parameters based on the dimensions list."""
     return [np.zeros(dimensions, dtype=dtype) for dimensions in dimensions_list]

flwr/common/serde.py

@@ -17,6 +17,8 @@
 
 from typing import Any, cast
 
+from flwr.app.user_config import UserConfig, UserConfigValue
+
 # pylint: disable=E0611
 from flwr.proto.fab_pb2 import Fab as ProtoFab
 from flwr.proto.message_pb2 import Context as ProtoContext
@@ -513,7 +515,7 @@ def fab_from_proto(fab: ProtoFab) -> typing.Fab:
 # === User configs ===
 
 
-def user_config_to_proto(user_config: typing.UserConfig) -> Any:
+def user_config_to_proto(user_config: UserConfig) -> Any:
     """Serialize `UserConfig` to ProtoBuf."""
     proto = {}
     for key, value in user_config.items():
@@ -521,7 +523,7 @@ def user_config_to_proto(user_config: typing.UserConfig) -> Any:
     return proto
 
 
-def user_config_from_proto(proto: Any) -> typing.UserConfig:
+def user_config_from_proto(proto: Any) -> UserConfig:
     """Deserialize `UserConfig` from ProtoBuf."""
     metrics = {}
     for key, value in proto.items():
@@ -529,7 +531,7 @@ def user_config_from_proto(proto: Any) -> typing.UserConfig:
     return metrics
 
 
-def user_config_value_to_proto(user_config_value: typing.UserConfigValue) -> Scalar:
+def user_config_value_to_proto(user_config_value: UserConfigValue) -> Scalar:
     """Serialize `UserConfigValue` to ProtoBuf."""
     if isinstance(user_config_value, bool):
         return Scalar(bool=user_config_value)
@@ -548,11 +550,11 @@ def user_config_value_to_proto(user_config_value: typing.UserConfigValue) -> Sca
     )
 
 
-def user_config_value_from_proto(scalar_msg: Scalar) -> typing.UserConfigValue:
+def user_config_value_from_proto(scalar_msg: Scalar) -> UserConfigValue:
     """Deserialize `UserConfigValue` from ProtoBuf."""
     scalar_field = scalar_msg.WhichOneof("scalar")
     scalar = getattr(scalar_msg, cast(str, scalar_field))
-    return cast(typing.UserConfigValue, scalar)
+    return cast(UserConfigValue, scalar)
 
 
 # === Message messages ===
@@ -632,6 +634,9 @@ def run_to_proto(run: typing.Run) -> ProtoRun:
         status=run_status_to_proto(run.status),
         flwr_aid=run.flwr_aid,
         federation=run.federation,
+        bytes_sent=run.bytes_sent,
+        bytes_recv=run.bytes_recv,
+        clientapp_runtime=run.clientapp_runtime,
     )
     return proto
 
@@ -651,6 +656,9 @@ def run_from_proto(run_proto: ProtoRun) -> typing.Run:
         status=run_status_from_proto(run_proto.status),
         flwr_aid=run_proto.flwr_aid,
         federation=run_proto.federation,
+        bytes_sent=run_proto.bytes_sent,
+        bytes_recv=run_proto.bytes_recv,
+        clientapp_runtime=run_proto.clientapp_runtime,
     )
     return run
 

flwr/common/telemetry.py

@@ -28,7 +28,7 @@ from pathlib import Path
 from typing import Any, cast
 
 from flwr.common.constant import FLWR_DIR
-from flwr.common.version import package_name, package_version
+from flwr.supercore.version import package_name, package_version
 
 FLWR_TELEMETRY_ENABLED = os.getenv("FLWR_TELEMETRY_ENABLED", "1")
 FLWR_TELEMETRY_LOGGING = os.getenv("FLWR_TELEMETRY_LOGGING", "0")