flwr 1.15.2__py3-none-any.whl → 1.17.0__py3-none-any.whl

flwr/client/message_handler/message_handler.py

@@ -26,17 +26,17 @@ from flwr.client.client import (
 )
 from flwr.client.numpy_client import NumPyClient
 from flwr.client.typing import ClientFnExt
-from flwr.common import ConfigsRecord, Context, Message, Metadata, RecordSet, log
+from flwr.common import ConfigRecord, Context, Message, Metadata, RecordDict, log
 from flwr.common.constant import MessageType, MessageTypeLegacy
-from flwr.common.recordset_compat import (
-    evaluateres_to_recordset,
-    fitres_to_recordset,
-    getparametersres_to_recordset,
-    getpropertiesres_to_recordset,
-    recordset_to_evaluateins,
-    recordset_to_fitins,
-    recordset_to_getparametersins,
-    recordset_to_getpropertiesins,
+from flwr.common.recorddict_compat import (
+    evaluateres_to_recorddict,
+    fitres_to_recorddict,
+    getparametersres_to_recorddict,
+    getpropertiesres_to_recorddict,
+    recorddict_to_evaluateins,
+    recorddict_to_fitins,
+    recorddict_to_getparametersins,
+    recorddict_to_getpropertiesins,
 )
 from flwr.proto.transport_pb2 import (  # pylint: disable=E0611
     ClientMessage,
@@ -70,19 +70,19 @@ def handle_control_message(message: Message) -> tuple[Optional[Message], int]:
         Number of seconds that the client should disconnect from the server.
     """
     if message.metadata.message_type == "reconnect":
-        # Retrieve ReconnectIns from recordset
-        recordset = message.content
-        seconds = cast(int, recordset.configs_records["config"]["seconds"])
+        # Retrieve ReconnectIns from RecordDict
+        recorddict = message.content
+        seconds = cast(int, recorddict.config_records["config"]["seconds"])
         # Construct ReconnectIns and call _reconnect
         disconnect_msg, sleep_duration = _reconnect(
             ServerMessage.ReconnectIns(seconds=seconds)
         )
-        # Store DisconnectRes in recordset
+        # Store DisconnectRes in RecordDict
         reason = cast(int, disconnect_msg.disconnect_res.reason)
-        recordset = RecordSet()
-        recordset.configs_records["config"] = ConfigsRecord({"reason": reason})
-        out_message = message.create_reply(recordset)
-        # Return TaskRes and sleep duration
+        recorddict = RecordDict()
+        recorddict.config_records["config"] = ConfigRecord({"reason": reason})
+        out_message = Message(recorddict, reply_to=message)
+        # Return Message and sleep duration
         return out_message, sleep_duration
 
     # Any other message
@@ -111,37 +111,37 @@ def handle_legacy_message_from_msgtype(
     if message_type == MessageTypeLegacy.GET_PROPERTIES:
         get_properties_res = maybe_call_get_properties(
             client=client,
-            get_properties_ins=recordset_to_getpropertiesins(message.content),
+            get_properties_ins=recorddict_to_getpropertiesins(message.content),
         )
-        out_recordset = getpropertiesres_to_recordset(get_properties_res)
+        out_recorddict = getpropertiesres_to_recorddict(get_properties_res)
     # Handle GetParametersIns
     elif message_type == MessageTypeLegacy.GET_PARAMETERS:
         get_parameters_res = maybe_call_get_parameters(
             client=client,
-            get_parameters_ins=recordset_to_getparametersins(message.content),
+            get_parameters_ins=recorddict_to_getparametersins(message.content),
         )
-        out_recordset = getparametersres_to_recordset(
+        out_recorddict = getparametersres_to_recorddict(
             get_parameters_res, keep_input=False
         )
     # Handle FitIns
     elif message_type == MessageType.TRAIN:
         fit_res = maybe_call_fit(
             client=client,
-            fit_ins=recordset_to_fitins(message.content, keep_input=True),
+            fit_ins=recorddict_to_fitins(message.content, keep_input=True),
         )
-        out_recordset = fitres_to_recordset(fit_res, keep_input=False)
+        out_recorddict = fitres_to_recorddict(fit_res, keep_input=False)
     # Handle EvaluateIns
     elif message_type == MessageType.EVALUATE:
         evaluate_res = maybe_call_evaluate(
             client=client,
-            evaluate_ins=recordset_to_evaluateins(message.content, keep_input=True),
+            evaluate_ins=recorddict_to_evaluateins(message.content, keep_input=True),
         )
-        out_recordset = evaluateres_to_recordset(evaluate_res)
+        out_recorddict = evaluateres_to_recorddict(evaluate_res)
     else:
         raise ValueError(f"Invalid message type: {message_type}")
 
     # Return Message
-    return message.create_reply(out_recordset)
+    return Message(out_recorddict, reply_to=message)
 
 
 def _reconnect(
@@ -167,7 +167,7 @@ def validate_out_message(out_message: Message, in_message_metadata: Metadata) ->
         and out_meta.message_id == ""  # This will be generated by the server
         and out_meta.src_node_id == in_meta.dst_node_id
         and out_meta.dst_node_id == in_meta.src_node_id
-        and out_meta.reply_to_message == in_meta.message_id
+        and out_meta.reply_to_message_id == in_meta.message_id
         and out_meta.group_id == in_meta.group_id
         and out_meta.message_type == in_meta.message_type
         and out_meta.created_at > in_meta.created_at

flwr/client/mod/__init__.py

@@ -16,7 +16,7 @@
 
 
 from .centraldp_mods import adaptiveclipping_mod, fixedclipping_mod
-from .comms_mods import message_size_mod, parameters_size_mod
+from .comms_mods import arrays_size_mod, message_size_mod
 from .localdp_mod import LocalDpMod
 from .secure_aggregation import secagg_mod, secaggplus_mod
 from .utils import make_ffn
@@ -24,10 +24,10 @@ from .utils import make_ffn
 __all__ = [
     "LocalDpMod",
     "adaptiveclipping_mod",
+    "arrays_size_mod",
     "fixedclipping_mod",
     "make_ffn",
     "message_size_mod",
-    "parameters_size_mod",
     "secagg_mod",
     "secaggplus_mod",
 ]

flwr/client/mod/centraldp_mods.py

@@ -19,7 +19,7 @@ from logging import INFO
 
 from flwr.client.typing import ClientAppCallable
 from flwr.common import ndarrays_to_parameters, parameters_to_ndarrays
-from flwr.common import recordset_compat as compat
+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 (
@@ -53,7 +53,7 @@ def fixedclipping_mod(
     """
     if msg.metadata.message_type != MessageType.TRAIN:
         return call_next(msg, ctxt)
-    fit_ins = compat.recordset_to_fitins(msg.content, keep_input=True)
+    fit_ins = compat.recorddict_to_fitins(msg.content, keep_input=True)
     if KEY_CLIPPING_NORM not in fit_ins.config:
         raise KeyError(
             f"The {KEY_CLIPPING_NORM} value is not supplied by the "
@@ -71,7 +71,7 @@ def fixedclipping_mod(
     if out_msg.has_error():
         return out_msg
 
-    fit_res = compat.recordset_to_fitres(out_msg.content, keep_input=True)
+    fit_res = compat.recorddict_to_fitres(out_msg.content, keep_input=True)
 
     client_to_server_params = parameters_to_ndarrays(fit_res.parameters)
 
@@ -87,7 +87,7 @@ def fixedclipping_mod(
     )
 
     fit_res.parameters = ndarrays_to_parameters(client_to_server_params)
-    out_msg.content = compat.fitres_to_recordset(fit_res, keep_input=True)
+    out_msg.content = compat.fitres_to_recorddict(fit_res, keep_input=True)
     return out_msg
 
 
@@ -116,7 +116,7 @@ def adaptiveclipping_mod(
     if msg.metadata.message_type != MessageType.TRAIN:
         return call_next(msg, ctxt)
 
-    fit_ins = compat.recordset_to_fitins(msg.content, keep_input=True)
+    fit_ins = compat.recorddict_to_fitins(msg.content, keep_input=True)
 
     if KEY_CLIPPING_NORM not in fit_ins.config:
         raise KeyError(
@@ -136,7 +136,7 @@ def adaptiveclipping_mod(
     if out_msg.has_error():
         return out_msg
 
-    fit_res = compat.recordset_to_fitres(out_msg.content, keep_input=True)
+    fit_res = compat.recorddict_to_fitres(out_msg.content, keep_input=True)
 
     client_to_server_params = parameters_to_ndarrays(fit_res.parameters)
 
@@ -155,5 +155,5 @@ def adaptiveclipping_mod(
     fit_res.parameters = ndarrays_to_parameters(client_to_server_params)
 
     fit_res.metrics[KEY_NORM_BIT] = norm_bit
-    out_msg.content = compat.fitres_to_recordset(fit_res, keep_input=True)
+    out_msg.content = compat.fitres_to_recorddict(fit_res, keep_input=True)
     return out_msg

flwr/client/mod/comms_mods.py

@@ -34,47 +34,41 @@ def message_size_mod(
     """
     message_size_in_bytes = 0
 
-    for p_record in msg.content.parameters_records.values():
-        message_size_in_bytes += p_record.count_bytes()
-
-    for c_record in msg.content.configs_records.values():
-        message_size_in_bytes += c_record.count_bytes()
-
-    for m_record in msg.content.metrics_records.values():
-        message_size_in_bytes += m_record.count_bytes()
+    for record in msg.content.values():
+        message_size_in_bytes += record.count_bytes()
 
     log(INFO, "Message size: %i bytes", message_size_in_bytes)
 
     return call_next(msg, ctxt)
 
 
-def parameters_size_mod(
+def arrays_size_mod(
     msg: Message, ctxt: Context, call_next: ClientAppCallable
 ) -> Message:
-    """Parameters size mod.
+    """Arrays size mod.
 
-    This mod logs the number of parameters transmitted in the message as well as their
-    size in bytes.
+    This mod logs the number of array elements transmitted in ``ArrayRecord``s of
+    the message as well as their sizes in bytes.
     """
     model_size_stats = {}
-    parameters_size_in_bytes = 0
-    for record_name, p_record in msg.content.parameters_records.items():
-        p_record_bytes = p_record.count_bytes()
-        parameters_size_in_bytes += p_record_bytes
-        parameter_count = 0
-        for array in p_record.values():
-            parameter_count += (
+    arrays_size_in_bytes = 0
+    for record_name, arr_record in msg.content.array_records.items():
+        arr_record_bytes = arr_record.count_bytes()
+        arrays_size_in_bytes += arr_record_bytes
+        element_count = 0
+        for array in arr_record.values():
+            element_count += (
                 int(np.prod(array.shape)) if array.shape else array.numpy().size
             )
 
         model_size_stats[f"{record_name}"] = {
-            "parameters": parameter_count,
-            "bytes": p_record_bytes,
+            "elements": element_count,
+            "bytes": arr_record_bytes,
         }
 
     if model_size_stats:
         log(INFO, model_size_stats)
 
-    log(INFO, "Total parameters transmitted: %i bytes", parameters_size_in_bytes)
+    log(INFO, "Total array elements transmitted: %i bytes", arrays_size_in_bytes)
 
     return call_next(msg, ctxt)

flwr/client/mod/localdp_mod.py

@@ -21,7 +21,7 @@ import numpy as np
 
 from flwr.client.typing import ClientAppCallable
 from flwr.common import ndarrays_to_parameters, parameters_to_ndarrays
-from flwr.common import recordset_compat as compat
+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 (
@@ -107,7 +107,7 @@ class LocalDpMod:
         if msg.metadata.message_type != MessageType.TRAIN:
             return call_next(msg, ctxt)
 
-        fit_ins = compat.recordset_to_fitins(msg.content, keep_input=True)
+        fit_ins = compat.recorddict_to_fitins(msg.content, keep_input=True)
         server_to_client_params = parameters_to_ndarrays(fit_ins.parameters)
 
         # Call inner app
@@ -117,7 +117,7 @@ class LocalDpMod:
         if out_msg.has_error():
             return out_msg
 
-        fit_res = compat.recordset_to_fitres(out_msg.content, keep_input=True)
+        fit_res = compat.recorddict_to_fitres(out_msg.content, keep_input=True)
 
         client_to_server_params = parameters_to_ndarrays(fit_res.parameters)
 
@@ -149,5 +149,5 @@ class LocalDpMod:
             noise_value_sd,
         )
 
-        out_msg.content = compat.fitres_to_recordset(fit_res, keep_input=True)
+        out_msg.content = compat.fitres_to_recorddict(fit_res, keep_input=True)
         return out_msg

flwr/client/mod/secure_aggregation/secaggplus_mod.py

@@ -22,15 +22,15 @@ from typing import Any, cast
 
 from flwr.client.typing import ClientAppCallable
 from flwr.common import (
-    ConfigsRecord,
+    ConfigRecord,
     Context,
     Message,
     Parameters,
-    RecordSet,
+    RecordDict,
     ndarray_to_bytes,
     parameters_to_ndarrays,
 )
-from flwr.common import recordset_compat as compat
+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
@@ -63,7 +63,7 @@ from flwr.common.secure_aggregation.secaggplus_utils import (
     share_keys_plaintext_concat,
     share_keys_plaintext_separate,
 )
-from flwr.common.typing import ConfigsRecordValues
+from flwr.common.typing import ConfigRecordValues
 
 
 @dataclass
@@ -97,7 +97,7 @@ class SecAggPlusState:
     ss2_dict: dict[int, bytes] = field(default_factory=dict)
     public_keys_dict: dict[int, tuple[bytes, bytes]] = field(default_factory=dict)
 
-    def __init__(self, **kwargs: ConfigsRecordValues) -> None:
+    def __init__(self, **kwargs: ConfigRecordValues) -> None:
         for k, v in kwargs.items():
             if k.endswith(":V"):
                 continue
@@ -115,7 +115,7 @@ class SecAggPlusState:
                     new_v = dict(zip(keys, values))
             self.__setattr__(k, new_v)
 
-    def to_dict(self) -> dict[str, ConfigsRecordValues]:
+    def to_dict(self) -> dict[str, ConfigRecordValues]:
         """Convert the state to a dictionary."""
         ret = vars(self)
         for k in list(ret.keys()):
@@ -144,13 +144,13 @@ def secaggplus_mod(
         return call_next(msg, ctxt)
 
     # Retrieve local state
-    if RECORD_KEY_STATE not in ctxt.state.configs_records:
-        ctxt.state.configs_records[RECORD_KEY_STATE] = ConfigsRecord({})
-    state_dict = ctxt.state.configs_records[RECORD_KEY_STATE]
+    if RECORD_KEY_STATE not in ctxt.state.config_records:
+        ctxt.state.config_records[RECORD_KEY_STATE] = ConfigRecord({})
+    state_dict = ctxt.state.config_records[RECORD_KEY_STATE]
     state = SecAggPlusState(**state_dict)
 
     # Retrieve incoming configs
-    configs = msg.content.configs_records[RECORD_KEY_CONFIGS]
+    configs = msg.content.config_records[RECORD_KEY_CONFIGS]
 
     # Check the validity of the next stage
     check_stage(state.current_stage, configs)
@@ -162,7 +162,7 @@ def secaggplus_mod(
     check_configs(state.current_stage, configs)
 
     # Execute
-    out_content = RecordSet()
+    out_content = RecordDict()
     if state.current_stage == Stage.SETUP:
         state.nid = msg.metadata.dst_node_id
         res = _setup(state, configs)
@@ -171,31 +171,31 @@ def secaggplus_mod(
     elif state.current_stage == Stage.COLLECT_MASKED_VECTORS:
         out_msg = call_next(msg, ctxt)
         out_content = out_msg.content
-        fitres = compat.recordset_to_fitres(out_content, keep_input=True)
+        fitres = compat.recorddict_to_fitres(out_content, keep_input=True)
         res = _collect_masked_vectors(
             state, configs, fitres.num_examples, fitres.parameters
         )
-        for p_record in out_content.parameters_records.values():
-            p_record.clear()
+        for arr_record in out_content.array_records.values():
+            arr_record.clear()
     elif state.current_stage == Stage.UNMASK:
         res = _unmask(state, configs)
     else:
         raise ValueError(f"Unknown SecAgg/SecAgg+ stage: {state.current_stage}")
 
     # Save state
-    ctxt.state.configs_records[RECORD_KEY_STATE] = ConfigsRecord(state.to_dict())
+    ctxt.state.config_records[RECORD_KEY_STATE] = ConfigRecord(state.to_dict())
 
     # Return message
-    out_content.configs_records[RECORD_KEY_CONFIGS] = ConfigsRecord(res, False)
-    return msg.create_reply(out_content)
+    out_content.config_records[RECORD_KEY_CONFIGS] = ConfigRecord(res, False)
+    return Message(out_content, reply_to=msg)
 
 
-def check_stage(current_stage: str, configs: ConfigsRecord) -> None:
+def check_stage(current_stage: str, configs: ConfigRecord) -> None:
     """Check the validity of the next stage."""
     # Check the existence of Config.STAGE
     if Key.STAGE not in configs:
         raise KeyError(
-            f"The required key '{Key.STAGE}' is missing from the ConfigsRecord."
+            f"The required key '{Key.STAGE}' is missing from the ConfigRecord."
         )
 
     # Check the value type of the Config.STAGE
@@ -223,7 +223,7 @@ def check_stage(current_stage: str, configs: ConfigsRecord) -> None:
 
 
 # pylint: disable-next=too-many-branches
-def check_configs(stage: str, configs: ConfigsRecord) -> None:
+def check_configs(stage: str, configs: ConfigRecord) -> None:
     """Check the validity of the configs."""
     # Check configs for the setup stage
     if stage == Stage.SETUP:
@@ -239,7 +239,7 @@ def check_configs(stage: str, configs: ConfigsRecord) -> None:
             if key not in configs:
                 raise KeyError(
                     f"Stage {Stage.SETUP}: the required key '{key}' is "
-                    "missing from the ConfigsRecord."
+                    "missing from the ConfigRecord."
                 )
             # Bool is a subclass of int in Python,
             # so `isinstance(v, int)` will return True even if v is a boolean.
@@ -272,7 +272,7 @@ def check_configs(stage: str, configs: ConfigsRecord) -> None:
                 raise KeyError(
                     f"Stage {Stage.COLLECT_MASKED_VECTORS}: "
                     f"the required key '{key}' is "
-                    "missing from the ConfigsRecord."
+                    "missing from the ConfigRecord."
                 )
             if not isinstance(configs[key], list) or any(
                 elm
@@ -295,7 +295,7 @@ def check_configs(stage: str, configs: ConfigsRecord) -> None:
                 raise KeyError(
                     f"Stage {Stage.UNMASK}: "
                     f"the required key '{key}' is "
-                    "missing from the ConfigsRecord."
+                    "missing from the ConfigRecord."
                 )
             if not isinstance(configs[key], list) or any(
                 elm
@@ -313,8 +313,8 @@ def check_configs(stage: str, configs: ConfigsRecord) -> None:
 
 
 def _setup(
-    state: SecAggPlusState, configs: ConfigsRecord
-) -> dict[str, ConfigsRecordValues]:
+    state: SecAggPlusState, configs: ConfigRecord
+) -> dict[str, ConfigRecordValues]:
     # Assigning parameter values to object fields
     sec_agg_param_dict = configs
     state.sample_num = cast(int, sec_agg_param_dict[Key.SAMPLE_NUMBER])
@@ -349,8 +349,8 @@ def _setup(
 
 # pylint: disable-next=too-many-locals
 def _share_keys(
-    state: SecAggPlusState, configs: ConfigsRecord
-) -> dict[str, ConfigsRecordValues]:
+    state: SecAggPlusState, configs: ConfigRecord
+) -> dict[str, ConfigRecordValues]:
     named_bytes_tuples = cast(dict[str, tuple[bytes, bytes]], configs)
     key_dict = {int(sid): (pk1, pk2) for sid, (pk1, pk2) in named_bytes_tuples.items()}
     log(DEBUG, "Node %d: starting stage 1...", state.nid)
@@ -412,10 +412,10 @@ def _share_keys(
 # pylint: disable-next=too-many-locals
 def _collect_masked_vectors(
     state: SecAggPlusState,
-    configs: ConfigsRecord,
+    configs: ConfigRecord,
     num_examples: int,
     updated_parameters: Parameters,
-) -> dict[str, ConfigsRecordValues]:
+) -> dict[str, ConfigRecordValues]:
     log(DEBUG, "Node %d: starting stage 2...", state.nid)
     available_clients: list[int] = []
     ciphertexts = cast(list[bytes], configs[Key.CIPHERTEXT_LIST])
@@ -498,8 +498,8 @@ def _collect_masked_vectors(
 
 
 def _unmask(
-    state: SecAggPlusState, configs: ConfigsRecord
-) -> dict[str, ConfigsRecordValues]:
+    state: SecAggPlusState, configs: ConfigRecord
+) -> dict[str, ConfigRecordValues]:
     log(DEBUG, "Node %d: starting stage 3...", state.nid)
 
     active_nids = cast(list[int], configs[Key.ACTIVE_NODE_ID_LIST])

flwr/client/rest_client/connection.py

@@ -66,9 +66,7 @@ except ModuleNotFoundError:
 
 PATH_CREATE_NODE: str = "api/v0/fleet/create-node"
 PATH_DELETE_NODE: str = "api/v0/fleet/delete-node"
-PATH_PULL_TASK_INS: str = "api/v0/fleet/pull-task-ins"
 PATH_PULL_MESSAGES: str = "/api/v0/fleet/pull-messages"
-PATH_PUSH_TASK_RES: str = "api/v0/fleet/push-task-res"
 PATH_PUSH_MESSAGES: str = "/api/v0/fleet/push-messages"
 PATH_PING: str = "api/v0/fleet/ping"
 PATH_GET_RUN: str = "/api/v0/fleet/get-run"
@@ -280,7 +278,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         node = None
 
     def receive() -> Optional[Message]:
-        """Receive next task from server."""
+        """Receive next Message from server."""
         # Get Node
         if node is None:
             log(ERROR, "Node instance missing")
@@ -309,11 +307,11 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         if message_proto is not None:
             message = message_from_proto(message_proto)
             metadata = copy(message.metadata)
-            log(INFO, "[Node] POST /%s: success", PATH_PULL_TASK_INS)
+            log(INFO, "[Node] POST /%s: success", PATH_PULL_MESSAGES)
         return message
 
     def send(message: Message) -> None:
-        """Send task result back to server."""
+        """Send Message result back to server."""
         # Get Node
         if node is None:
             log(ERROR, "Node instance missing")
@@ -345,7 +343,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         log(
             INFO,
             "[Node] POST /%s: success, created result %s",
-            PATH_PUSH_TASK_RES,
+            PATH_PUSH_MESSAGES,
             res.results,  # pylint: disable=no-member
         )
 

flwr/client/run_info_store.py

@@ -19,7 +19,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Optional
 
-from flwr.common import Context, RecordSet
+from flwr.common import Context, RecordDict
 from flwr.common.config import (
     get_fused_config,
     get_fused_config_from_dir,
@@ -86,7 +86,7 @@ class DeprecatedRunInfoStore:
                     run_id=run_id,
                     node_id=self.node_id,
                     node_config=self.node_config,
-                    state=RecordSet(),
+                    state=RecordDict(),
                     run_config=initial_run_config.copy(),
                 ),
             )

flwr/client/supernode/__init__.py

@@ -15,10 +15,8 @@
 """Flower SuperNode."""
 
 
-from .app import run_client_app as run_client_app
 from .app import run_supernode as run_supernode
 
 __all__ = [
-    "run_client_app",
     "run_supernode",
 ]

flwr/client/supernode/app.py

@@ -16,7 +16,7 @@
 
 
 import argparse
-from logging import DEBUG, ERROR, INFO, WARN
+from logging import DEBUG, INFO, WARN
 from pathlib import Path
 from typing import Optional
 
@@ -98,16 +98,6 @@ def run_supernode() -> None:
     )
 
 
-def run_client_app() -> None:
-    """Run Flower client app."""
-    event(EventType.RUN_CLIENT_APP_ENTER)
-    log(
-        ERROR,
-        "The command `flower-client-app` has been replaced by `flwr run`.",
-    )
-    register_exit_handlers(event_type=EventType.RUN_CLIENT_APP_LEAVE)
-
-
 def _parse_args_run_supernode() -> argparse.ArgumentParser:
     """Parse flower-supernode command line arguments."""
     parser = argparse.ArgumentParser(

flwr/common/__init__.py

@@ -31,9 +31,13 @@ from .parameter import ndarray_to_bytes as ndarray_to_bytes
 from .parameter import ndarrays_to_parameters as ndarrays_to_parameters
 from .parameter import parameters_to_ndarrays as parameters_to_ndarrays
 from .record import Array as Array
+from .record import ArrayRecord as ArrayRecord
+from .record import ConfigRecord as ConfigRecord
 from .record import ConfigsRecord as ConfigsRecord
+from .record import MetricRecord as MetricRecord
 from .record import MetricsRecord as MetricsRecord
 from .record import ParametersRecord as ParametersRecord
+from .record import RecordDict as RecordDict
 from .record import RecordSet as RecordSet
 from .record import array_from_numpy as array_from_numpy
 from .telemetry import EventType as EventType
@@ -41,7 +45,7 @@ from .telemetry import event as event
 from .typing import ClientMessage as ClientMessage
 from .typing import Code as Code
 from .typing import Config as Config
-from .typing import ConfigsRecordValues as ConfigsRecordValues
+from .typing import ConfigRecordValues as ConfigRecordValues
 from .typing import DisconnectRes as DisconnectRes
 from .typing import EvaluateIns as EvaluateIns
 from .typing import EvaluateRes as EvaluateRes
@@ -51,9 +55,9 @@ from .typing import GetParametersIns as GetParametersIns
 from .typing import GetParametersRes as GetParametersRes
 from .typing import GetPropertiesIns as GetPropertiesIns
 from .typing import GetPropertiesRes as GetPropertiesRes
+from .typing import MetricRecordValues as MetricRecordValues
 from .typing import Metrics as Metrics
 from .typing import MetricsAggregationFn as MetricsAggregationFn
-from .typing import MetricsRecordValues as MetricsRecordValues
 from .typing import NDArray as NDArray
 from .typing import NDArrays as NDArrays
 from .typing import Parameters as Parameters
@@ -65,11 +69,13 @@ from .typing import Status as Status
 
 __all__ = [
     "Array",
+    "ArrayRecord",
     "ClientMessage",
     "Code",
     "Config",
+    "ConfigRecord",
+    "ConfigRecordValues",
     "ConfigsRecord",
-    "ConfigsRecordValues",
     "Context",
     "DEFAULT_TTL",
     "DisconnectRes",
@@ -88,16 +94,18 @@ __all__ = [
     "MessageType",
     "MessageTypeLegacy",
     "Metadata",
+    "MetricRecord",
+    "MetricRecordValues",
     "Metrics",
     "MetricsAggregationFn",
     "MetricsRecord",
-    "MetricsRecordValues",
     "NDArray",
     "NDArrays",
     "Parameters",
     "ParametersRecord",
     "Properties",
     "ReconnectIns",
+    "RecordDict",
     "RecordSet",
     "Scalar",
     "ServerMessage",