flwr-nightly 1.20.0.dev20250618__tar.gz → 1.20.0.dev20250619__tar.gz

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.20.0.dev20250618
+Version: 1.20.0.dev20250619
 Summary: Flower: A Friendly Federated AI Framework
 License: Apache-2.0
 Keywords: Artificial Intelligence,Federated AI,Federated Analytics,Federated Evaluation,Federated Learning,Flower,Machine Learning

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/cli/build.py

@@ -25,7 +25,12 @@ import pathspec
 import tomli_w
 import typer
 
-from flwr.common.constant import FAB_ALLOWED_EXTENSIONS, FAB_DATE, FAB_HASH_TRUNCATION
+from flwr.common.constant import (
+    FAB_ALLOWED_EXTENSIONS,
+    FAB_DATE,
+    FAB_HASH_TRUNCATION,
+    FAB_MAX_SIZE,
+)
 
 from .config_utils import load as load_toml
 from .config_utils import load_and_validate
@@ -57,7 +62,7 @@ def build(
         Optional[Path],
         typer.Option(help="Path of the Flower App to bundle into a FAB"),
     ] = None,
-) -> tuple[str, str]:
+) -> None:
     """Build a Flower App into a Flower App Bundle (FAB).
 
     You can run ``flwr build`` without any arguments to bundle the app located in the
@@ -119,8 +124,6 @@ def build(
         f"🎊 Successfully built {fab_filename}", fg=typer.colors.GREEN, bold=True
     )
 
-    return fab_filename, fab_hash
-
 
 def build_fab(app: Path) -> tuple[bytes, str, dict[str, Any]]:
     """Build a FAB in memory and return the bytes, hash, and config.
@@ -193,6 +196,13 @@ def build_fab(app: Path) -> tuple[bytes, str, dict[str, Any]]:
         write_to_zip(fab_file, ".info/CONTENT", list_file_content)
 
     fab_bytes = fab_buffer.getvalue()
+    if len(fab_bytes) > FAB_MAX_SIZE:
+        raise ValueError(
+            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, fab_hash, config

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/client/grpc_rere_client/connection.py

@@ -17,7 +17,6 @@
 
 from collections.abc import Iterator, Sequence
 from contextlib import contextmanager
-from copy import copy
 from logging import DEBUG, ERROR
 from pathlib import Path
 from typing import Callable, Optional, Union, cast
@@ -25,8 +24,6 @@ from typing import Callable, Optional, Union, cast
 import grpc
 from cryptography.hazmat.primitives.asymmetric import ec
 
-from flwr.app.metadata import Metadata
-from flwr.client.message_handler.message_handler import validate_out_message
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH
 from flwr.common.constant import HEARTBEAT_CALL_TIMEOUT, HEARTBEAT_DEFAULT_INTERVAL
 from flwr.common.grpc import create_channel, on_channel_state_change
@@ -163,7 +160,6 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     if adapter_cls is None:
         adapter_cls = FleetStub
     stub = adapter_cls(channel)
-    metadata: Optional[Metadata] = None
     node: Optional[Node] = None
 
     def _should_giveup_fn(e: Exception) -> bool:
@@ -300,10 +296,6 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             # Inject
             in_message.metadata.__dict__["_message_id"] = msg_id
 
-        # Remember `metadata` of the in message
-        nonlocal metadata
-        metadata = copy(in_message.metadata) if in_message else None
-
         # Return the message if available
         return in_message
 
@@ -314,19 +306,6 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             log(ERROR, "Node instance missing")
             return
 
-        # Get the metadata of the incoming message
-        nonlocal metadata
-        if metadata is None:
-            log(ERROR, "No current message")
-            return
-
-        # Set message_id
-        message.metadata.__dict__["_message_id"] = message.object_id
-        # Validate out message
-        if not validate_out_message(message, metadata):
-            log(ERROR, "Invalid out message")
-            return
-
         with no_object_id_recompute():
             # Get all nested objects
             all_objects = get_all_nested_objects(message)
@@ -358,9 +337,6 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 )
                 log(DEBUG, "Pushed %s objects to servicer.", len(objs_to_push))
 
-        # Cleanup
-        metadata = None
-
     def get_run(run_id: int) -> Run:
         # Call FleetAPI
         get_run_request = GetRunRequest(node=node, run_id=run_id)

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/client/rest_client/connection.py

@@ -16,7 +16,6 @@
 
 from collections.abc import Iterator
 from contextlib import contextmanager
-from copy import copy
 from logging import DEBUG, ERROR, INFO, WARN
 from typing import Callable, Optional, TypeVar, Union, cast
 
@@ -24,8 +23,6 @@ from cryptography.hazmat.primitives.asymmetric import ec
 from google.protobuf.message import Message as GrpcMessage
 from requests.exceptions import ConnectionError as RequestsConnectionError
 
-from flwr.app.metadata import Metadata
-from flwr.client.message_handler.message_handler import validate_out_message
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH
 from flwr.common.constant import HEARTBEAT_DEFAULT_INTERVAL
 from flwr.common.exit import ExitCode, flwr_exit
@@ -178,7 +175,6 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         log(ERROR, "Client authentication is not supported for this transport type.")
 
     # Shared variables for inner functions
-    metadata: Optional[Metadata] = None
     node: Optional[Node] = None
 
     ###########################################################################
@@ -367,10 +363,6 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             # Inject
             in_message.metadata.__dict__["_message_id"] = msg_id
 
-        # Remember `metadata` of the in message
-        nonlocal metadata
-        metadata = copy(in_message.metadata) if in_message else None
-
         return in_message
 
     def send(message: Message) -> None:
@@ -380,19 +372,6 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             log(ERROR, "Node instance missing")
             return
 
-        # Get incoming message
-        nonlocal metadata
-        if metadata is None:
-            log(ERROR, "No current message")
-            return
-
-        # Set message_id
-        message.metadata.__dict__["_message_id"] = message.object_id
-        # Validate out message
-        if not validate_out_message(message, metadata):
-            log(ERROR, "Invalid out message")
-            return
-
         with no_object_id_recompute():
             # Get all nested objects
             all_objects = get_all_nested_objects(message)
@@ -450,9 +429,6 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                     )
                     log(ERROR, str(e))
 
-        # Cleanup
-        metadata = None
-
     def get_run(run_id: int) -> Run:
         # Construct the request
         req = GetRunRequest(node=node, run_id=run_id)

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/common/constant.py

@@ -74,6 +74,7 @@ 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
 

flwr_nightly-1.20.0.dev20250619/py/flwr/proto/clientappio_pb2.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/clientappio.proto
+# Protobuf Python Version: 4.25.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
+from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/clientappio.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\"%\n#GetRunIdsWithPendingMessagesRequest\"7\n$GetRunIdsWithPendingMessagesResponse\x12\x0f\n\x07run_ids\x18\x01 \x03(\x04\"%\n\x13RequestTokenRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"%\n\x14RequestTokenResponse\x12\r\n\x05token\x18\x01 \x01(\t\"W\n\x15\x43lientAppOutputStatus\x12-\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x1f.flwr.proto.ClientAppOutputCode\x12\x0f\n\x07message\x18\x02 \x01(\t\"+\n\x1aPullClientAppInputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\"\xa5\x01\n\x1bPullClientAppInputsResponse\x12$\n\x07message\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Message\x12$\n\x07\x63ontext\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Context\x12\x1c\n\x03run\x18\x03 \x01(\x0b\x32\x0f.flwr.proto.Run\x12\x1c\n\x03\x66\x61\x62\x18\x04 \x01(\x0b\x32\x0f.flwr.proto.Fab\"x\n\x1bPushClientAppOutputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12$\n\x07message\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Message\x12$\n\x07\x63ontext\x18\x03 \x01(\x0b\x32\x13.flwr.proto.Context\"Q\n\x1cPushClientAppOutputsResponse\x12\x31\n\x06status\x18\x01 \x01(\x0b\x32!.flwr.proto.ClientAppOutputStatus*L\n\x13\x43lientAppOutputCode\x12\x0b\n\x07SUCCESS\x10\x00\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x01\x12\x11\n\rUNKNOWN_ERROR\x10\x02\x32\xbf\x03\n\x0b\x43lientAppIo\x12\x83\x01\n\x1cGetRunIdsWithPendingMessages\x12/.flwr.proto.GetRunIdsWithPendingMessagesRequest\x1a\x30.flwr.proto.GetRunIdsWithPendingMessagesResponse\"\x00\x12S\n\x0cRequestToken\x12\x1f.flwr.proto.RequestTokenRequest\x1a .flwr.proto.RequestTokenResponse\"\x00\x12h\n\x13PullClientAppInputs\x12&.flwr.proto.PullClientAppInputsRequest\x1a\'.flwr.proto.PullClientAppInputsResponse\"\x00\x12k\n\x14PushClientAppOutputs\x12\'.flwr.proto.PushClientAppOutputsRequest\x1a(.flwr.proto.PushClientAppOutputsResponse\"\x00\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.clientappio_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_CLIENTAPPOUTPUTCODE']._serialized_start=795
+  _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=871
+  _globals['_GETRUNIDSWITHPENDINGMESSAGESREQUEST']._serialized_start=114
+  _globals['_GETRUNIDSWITHPENDINGMESSAGESREQUEST']._serialized_end=151
+  _globals['_GETRUNIDSWITHPENDINGMESSAGESRESPONSE']._serialized_start=153
+  _globals['_GETRUNIDSWITHPENDINGMESSAGESRESPONSE']._serialized_end=208
+  _globals['_REQUESTTOKENREQUEST']._serialized_start=210
+  _globals['_REQUESTTOKENREQUEST']._serialized_end=247
+  _globals['_REQUESTTOKENRESPONSE']._serialized_start=249
+  _globals['_REQUESTTOKENRESPONSE']._serialized_end=286
+  _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_start=288
+  _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_end=375
+  _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_start=377
+  _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_end=420
+  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_start=423
+  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_end=588
+  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_start=590
+  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_end=710
+  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_start=712
+  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_end=793
+  _globals['_CLIENTAPPIO']._serialized_start=874
+  _globals['_CLIENTAPPIO']._serialized_end=1321
+# @@protoc_insertion_point(module_scope)

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/proto/clientappio_pb2.pyi

@@ -88,23 +88,6 @@ class ClientAppOutputStatus(google.protobuf.message.Message):
     def ClearField(self, field_name: typing_extensions.Literal["code",b"code","message",b"message"]) -> None: ...
 global___ClientAppOutputStatus = ClientAppOutputStatus
 
-class GetTokenRequest(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    def __init__(self,
-        ) -> None: ...
-global___GetTokenRequest = GetTokenRequest
-
-class GetTokenResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    TOKEN_FIELD_NUMBER: builtins.int
-    token: builtins.int
-    def __init__(self,
-        *,
-        token: builtins.int = ...,
-        ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["token",b"token"]) -> None: ...
-global___GetTokenResponse = GetTokenResponse
-
 class PullClientAppInputsRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     TOKEN_FIELD_NUMBER: builtins.int

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/proto/clientappio_pb2_grpc.py

@@ -24,11 +24,6 @@ class ClientAppIoStub(object):
                 request_serializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenResponse.FromString,
                 )
-        self.GetToken = channel.unary_unary(
-                '/flwr.proto.ClientAppIo/GetToken',
-                request_serializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenResponse.FromString,
-                )
         self.PullClientAppInputs = channel.unary_unary(
                 '/flwr.proto.ClientAppIo/PullClientAppInputs',
                 request_serializer=flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsRequest.SerializeToString,
@@ -58,13 +53,6 @@ class ClientAppIoServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetToken(self, request, context):
-        """Get token
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def PullClientAppInputs(self, request, context):
         """Pull client app inputs
         """
@@ -92,11 +80,6 @@ def add_ClientAppIoServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenResponse.SerializeToString,
             ),
-            'GetToken': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetToken,
-                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenResponse.SerializeToString,
-            ),
             'PullClientAppInputs': grpc.unary_unary_rpc_method_handler(
                     servicer.PullClientAppInputs,
                     request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsRequest.FromString,
@@ -151,23 +134,6 @@ class ClientAppIo(object):
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
-    @staticmethod
-    def GetToken(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/GetToken',
-            flwr_dot_proto_dot_clientappio__pb2.GetTokenRequest.SerializeToString,
-            flwr_dot_proto_dot_clientappio__pb2.GetTokenResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
     @staticmethod
     def PullClientAppInputs(request,
             target,

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/proto/clientappio_pb2_grpc.pyi

@@ -18,11 +18,6 @@ class ClientAppIoStub:
         flwr.proto.clientappio_pb2.RequestTokenResponse]
     """Request token"""
 
-    GetToken: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.clientappio_pb2.GetTokenRequest,
-        flwr.proto.clientappio_pb2.GetTokenResponse]
-    """Get token"""
-
     PullClientAppInputs: grpc.UnaryUnaryMultiCallable[
         flwr.proto.clientappio_pb2.PullClientAppInputsRequest,
         flwr.proto.clientappio_pb2.PullClientAppInputsResponse]
@@ -51,14 +46,6 @@ class ClientAppIoServicer(metaclass=abc.ABCMeta):
         """Request token"""
         pass
 
-    @abc.abstractmethod
-    def GetToken(self,
-        request: flwr.proto.clientappio_pb2.GetTokenRequest,
-        context: grpc.ServicerContext,
-    ) -> flwr.proto.clientappio_pb2.GetTokenResponse:
-        """Get token"""
-        pass
-
     @abc.abstractmethod
     def PullClientAppInputs(self,
         request: flwr.proto.clientappio_pb2.PullClientAppInputsRequest,

flwr_nightly-1.20.0.dev20250619/py/flwr/supercore/utils.py

@@ -0,0 +1,32 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Utility functions for the infrastructure."""
+
+
+def mask_string(value: str, head: int = 4, tail: int = 4) -> str:
+    """Mask a string by preserving only the head and tail characters.
+
+    Mask a string for safe display by preserving the head and tail characters,
+    and replacing the middle with '...'. Useful for logging tokens, secrets,
+    or IDs without exposing sensitive data.
+
+    Notes
+    -----
+    If the string is shorter than the combined length of `head` and `tail`,
+    the original string is returned unchanged.
+    """
+    if len(value) <= head + tail:
+        return value
+    return f"{value[:head]}...{value[-tail:]}"

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/superexec/exec_servicer.py

@@ -25,6 +25,7 @@ import grpc
 from flwr.common import now
 from flwr.common.auth_plugin import ExecAuthPlugin
 from flwr.common.constant import (
+    FAB_MAX_SIZE,
     LOG_STREAM_INTERVAL,
     RUN_ID_NOT_FOUND_MESSAGE,
     Status,
@@ -84,6 +85,14 @@ class ExecServicer(exec_pb2_grpc.ExecServicer):
         """Create run ID."""
         log(INFO, "ExecServicer.StartRun")
 
+        if len(request.fab.content) > FAB_MAX_SIZE:
+            log(
+                ERROR,
+                "FAB size exceeds maximum allowed size of %d bytes.",
+                FAB_MAX_SIZE,
+            )
+            return StartRunResponse()
+
         flwr_aid = shared_account_info.get().flwr_aid if self.auth_plugin else None
         run_id = self.executor.start_run(
             request.fab.content,

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/supernode/cli/flower_supernode.py

@@ -40,7 +40,6 @@ from flwr.common.constant import (
     TRANSPORT_TYPE_REST,
 )
 from flwr.common.exit import ExitCode, flwr_exit
-from flwr.common.exit_handlers import register_exit_handlers
 from flwr.common.logger import log
 from flwr.supernode.start_client_internal import start_client_internal
 
@@ -66,12 +65,6 @@ def flower_supernode() -> None:
 
     log(DEBUG, "Isolation mode: %s", args.isolation)
 
-    # Register handlers for graceful shutdown
-    register_exit_handlers(
-        event_type=EventType.RUN_SUPERNODE_LEAVE,
-        exit_message="SuperNode terminated gracefully.",
-    )
-
     start_client_internal(
         server_address=args.superlink,
         transport=args.transport,

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/supernode/cli/flwr_clientapp.py

@@ -22,6 +22,7 @@ from flwr.common.args import add_args_flwr_app_common
 from flwr.common.constant import CLIENTAPPIO_API_DEFAULT_CLIENT_ADDRESS
 from flwr.common.exit import ExitCode, flwr_exit
 from flwr.common.logger import log
+from flwr.supercore.utils import mask_string
 from flwr.supernode.runtime.run_clientapp import run_clientapp
 
 
@@ -40,7 +41,7 @@ def flwr_clientapp() -> None:
         "`flwr-clientapp` will attempt to connect to SuperNode's "
         "ClientAppIo API at %s with token %s",
         args.clientappio_api_address,
-        args.token,
+        mask_string(args.token) if args.token else "None",
     )
     run_clientapp(
         clientappio_api_address=args.clientappio_api_address,

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/supernode/runtime/run_clientapp.py

@@ -56,6 +56,7 @@ from flwr.proto.clientappio_pb2 import (
     RequestTokenResponse,
 )
 from flwr.proto.clientappio_pb2_grpc import ClientAppIoStub
+from flwr.supercore.utils import mask_string
 
 
 def run_clientapp(  # pylint: disable=R0913, R0914, R0917
@@ -195,7 +196,8 @@ def pull_clientappinputs(
     stub: ClientAppIoStub, token: str
 ) -> tuple[Message, Context, Run, Optional[Fab]]:
     """Pull ClientAppInputs from SuperNode."""
-    log(INFO, "[flwr-clientapp] Pull `ClientAppInputs` for token %s", token)
+    masked_token = mask_string(token)
+    log(INFO, "[flwr-clientapp] Pull `ClientAppInputs` for token %s", masked_token)
     try:
         res: PullClientAppInputsResponse = stub.PullClientAppInputs(
             PullClientAppInputsRequest(token=token)
@@ -214,7 +216,10 @@ def push_clientappoutputs(
     stub: ClientAppIoStub, token: str, message: Message, context: Context
 ) -> PushClientAppOutputsResponse:
     """Push ClientAppOutputs to SuperNode."""
-    log(INFO, "[flwr-clientapp] Push `ClientAppOutputs` for token %s", token)
+    masked_token = mask_string(token)
+    log(INFO, "[flwr-clientapp] Push `ClientAppOutputs` for token %s", masked_token)
+    # Set message ID
+    message.metadata.__dict__["_message_id"] = message.object_id
     proto_message = message_to_proto(message)
     proto_context = context_to_proto(context)
 

flwr_nightly-1.20.0.dev20250619/py/flwr/supernode/servicer/clientappio/__init__.py

@@ -0,0 +1,22 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""ClientAppIo API Servicer."""
+
+
+from .clientappio_servicer import ClientAppIoServicer
+
+__all__ = [
+    "ClientAppIoServicer",
+]

{flwr_nightly-1.20.0.dev20250618 → flwr_nightly-1.20.0.dev20250619}/py/flwr/supernode/servicer/clientappio/clientappio_servicer.py

@@ -15,16 +15,14 @@
 """ClientAppIo API servicer."""
 
 
-from dataclasses import dataclass
-from logging import DEBUG, ERROR
-from typing import Optional, cast
+from logging import DEBUG
+from typing import cast
 
 import grpc
 
-from flwr.common import Context, Message, typing
+from flwr.common import Context
 from flwr.common.logger import log
 from flwr.common.serde import (
-    clientappstatus_to_proto,
     context_from_proto,
     context_to_proto,
     fab_to_proto,
@@ -39,8 +37,6 @@ from flwr.proto import clientappio_pb2_grpc
 from flwr.proto.clientappio_pb2 import (  # pylint: disable=E0401
     GetRunIdsWithPendingMessagesRequest,
     GetRunIdsWithPendingMessagesResponse,
-    GetTokenRequest,
-    GetTokenResponse,
     PullClientAppInputsRequest,
     PullClientAppInputsResponse,
     PushClientAppOutputsRequest,
@@ -53,24 +49,6 @@ from flwr.supercore.object_store import ObjectStoreFactory
 from flwr.supernode.nodestate import NodeStateFactory
 
 
-@dataclass
-class ClientAppInputs:
-    """Specify the inputs to the ClientApp."""
-
-    message: Message
-    context: Context
-    run: Run
-    fab: Optional[Fab]
-
-
-@dataclass
-class ClientAppOutputs:
-    """Specify the outputs from the ClientApp."""
-
-    message: Message
-    context: Context
-
-
 # pylint: disable=C0103,W0613,W0201
 class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
     """ClientAppIo API servicer."""
@@ -85,10 +63,6 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         self.ffs_factory = ffs_factory
         self.objectstore_factory = objectstore_factory
 
-        self.clientapp_input: Optional[ClientAppInputs] = None
-        self.clientapp_output: Optional[ClientAppOutputs] = None
-        self.token_returned: bool = False
-
     def GetRunIdsWithPendingMessages(
         self,
         request: GetRunIdsWithPendingMessagesRequest,
@@ -126,33 +100,6 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         # Return the token
         return RequestTokenResponse(token=token)
 
-    def GetToken(
-        self, request: GetTokenRequest, context: grpc.ServicerContext
-    ) -> GetTokenResponse:
-        """Get token."""
-        log(DEBUG, "ClientAppIo.GetToken")
-
-        # Fail if no ClientAppInputs are available
-        if self.clientapp_input is None:
-            context.abort(
-                grpc.StatusCode.FAILED_PRECONDITION,
-                "No inputs available.",
-            )
-
-        # Fail if token was already returned in a previous call
-        if self.token_returned:
-            context.abort(
-                grpc.StatusCode.FAILED_PRECONDITION,
-                "Token already returned. A token can be returned only once.",
-            )
-
-        # If
-        # - ClientAppInputs is set, and
-        # - token hasn't been returned before,
-        # return token
-        self.token_returned = True
-        return GetTokenResponse(token=123)  # To be deleted
-
     def PullClientAppInputs(
         self, request: PullClientAppInputsRequest, context: grpc.ServicerContext
     ) -> PullClientAppInputsResponse:
@@ -203,40 +150,12 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
             )
             raise RuntimeError("This line should never be reached.")
 
-        # Delete the token
-        state.delete_token(run_id)
-
-        # Preconditions met
-        try:
-            # Update Message and Context
-            self.clientapp_output = ClientAppOutputs(
-                message=message_from_proto(request.message),
-                context=context_from_proto(request.context),
-            )
-
-            # Set status
-            code = typing.ClientAppOutputCode.SUCCESS
-            status = typing.ClientAppOutputStatus(code=code, message="Success")
-        except Exception as e:  # pylint: disable=broad-exception-caught
-            log(ERROR, "ClientApp failed to push message to SuperNode, %s", e)
-            code = typing.ClientAppOutputCode.UNKNOWN_ERROR
-            status = typing.ClientAppOutputStatus(code=code, message="Unkonwn error")
-
-        # Return status to ClientApp process
-        proto_status = clientappstatus_to_proto(status=status)
-        return PushClientAppOutputsResponse(status=proto_status)
+        # Save the message and context to the state
+        state.store_message(message_from_proto(request.message))
+        state.store_context(context_from_proto(request.context))
 
-    def has_outputs(self) -> bool:
-        """Check if ClientAppOutputs are available."""
-        return self.clientapp_output is not None
-
-    def get_outputs(self) -> ClientAppOutputs:
-        """Get ClientApp outputs."""
-        if self.clientapp_output is None:
-            raise ValueError("ClientAppOutputs not set before calling `get_outputs`.")
-
-        # Set outputs to a local variable and clear state
-        output: ClientAppOutputs = self.clientapp_output
-        self.clientapp_output = None
+        # Remove the token to make the run eligible for processing
+        # A run associated with a token cannot be handled until its token is cleared
+        state.delete_token(run_id)
 
-        return output
+        return PushClientAppOutputsResponse()