flwr-nightly 1.16.0.dev20250310__tar.gz → 1.17.0.dev20250312__tar.gz

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.16.0.dev20250310
+Version: 1.17.0.dev20250312
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.16.0.dev20250310"
+version = "1.17.0.dev20250312"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -51,8 +51,6 @@ exclude = ["src/py/**/*_test.py"]
 [tool.poetry.scripts]
 # `flwr` CLI
 flwr = "flwr.cli.app:app"
-# SuperExec (can run with either Deployment Engine or Simulation Engine)
-flower-superexec = "flwr.superexec.app:run_superexec" # Deprecated
 # Simulation Engine
 flwr-simulation = "flwr.simulation.app:flwr_simulation"
 flower-simulation = "flwr.simulation.run_simulation:run_simulation_from_cli"
@@ -60,9 +58,7 @@ flower-simulation = "flwr.simulation.run_simulation:run_simulation_from_cli"
 flower-superlink = "flwr.server.app:run_superlink"
 flower-supernode = "flwr.client.supernode.app:run_supernode"
 flwr-serverapp = "flwr.server.serverapp:flwr_serverapp"
-flower-server-app = "flwr.server.run_serverapp:run_server_app" # Deprecated
 flwr-clientapp = "flwr.client.clientapp:flwr_clientapp"
-flower-client-app = "flwr.client.supernode:run_client_app" # Deprecated
 
 [tool.poetry.dependencies]
 python = "^3.9.2"

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/code/flwr_tune/client_app.py.tpl

@@ -35,7 +35,7 @@ warnings.filterwarnings("ignore", category=UserWarning)
 # pylint: disable=too-many-arguments
 # pylint: disable=too-many-instance-attributes
 class FlowerClient(NumPyClient):
-    """Standard Flower client for CNN training."""
+    """Flower client for LLM fine-tuning."""
 
     def __init__(
         self,

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "flwr-datasets>=0.5.0",
     "torch==2.3.1",
     "trl==0.8.1",

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "flwr-datasets>=0.5.0",
     "torch==2.5.1",
     "transformers>=4.30.0,<5.0",

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "jax==0.4.30",
     "jaxlib==0.4.30",
     "scikit-learn==1.6.1",

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "flwr-datasets[vision]>=0.5.0",
     "mlx==0.21.1",
 ]

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "numpy>=2.0.2",
 ]
 

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "flwr-datasets[vision]>=0.5.0",
     "scikit-learn>=1.6.1",
 ]

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.16.0",
+    "flwr[simulation]>=1.17.0",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow>=2.11.1,<2.18.0",
 ]

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/client/client_app.py

@@ -102,15 +102,6 @@ class ClientApp:
     >>>    return FlowerClient().to_client()
     >>>
     >>> app = ClientApp(client_fn)
-
-    If the above code is in a Python module called `client`, it can be started as
-    follows:
-
-    >>> flower-client-app client:app --insecure
-
-    In this `client:app` example, `client` refers to the Python module `client.py` in
-    which the previous code lives in and `app` refers to the global attribute `app` that
-    points to an object of type `ClientApp`.
     """
 
     def __init__(

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/client/clientapp/app.py

@@ -16,6 +16,7 @@
 
 
 import argparse
+import gc
 import time
 from logging import DEBUG, ERROR, INFO
 from typing import Optional
@@ -160,6 +161,9 @@ def run_clientapp(  # pylint: disable=R0914
                 stub=stub, token=token, message=reply_message, context=context
             )
 
+            del client_app, message, context, run, fab, reply_message
+            gc.collect()
+
             # Reset token to `None` to prevent flwr-clientapp from trying to pull the
             # same inputs again
             token = None

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/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_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/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_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/common/telemetry.py

@@ -181,16 +181,6 @@ class EventType(str, Enum):
     RUN_SUPERNODE_ENTER = auto()
     RUN_SUPERNODE_LEAVE = auto()
 
-    # --- DEPRECATED -------------------------------------------------------------------
-
-    # [DEPRECATED] CLI: `flower-server-app`
-    RUN_SERVER_APP_ENTER = auto()
-    RUN_SERVER_APP_LEAVE = auto()
-
-    # [DEPRECATED] CLI: `flower-client-app`
-    RUN_CLIENT_APP_ENTER = auto()
-    RUN_CLIENT_APP_LEAVE = auto()
-
 
 # Use the ThreadPoolExecutor with max_workers=1 to have a queue
 # and also ensure that telemetry calls are not blocking.

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/server/run_serverapp.py

@@ -15,11 +15,10 @@
 """Run ServerApp."""
 
 
-from logging import DEBUG, ERROR
+from logging import DEBUG
 from typing import Optional
 
-from flwr.common import Context, EventType, event
-from flwr.common.exit_handlers import register_exit_handlers
+from flwr.common import Context
 from flwr.common.logger import log
 from flwr.common.object_ref import load_app
 
@@ -64,13 +63,3 @@ def run(
 
     log(DEBUG, "ServerApp finished running.")
     return context
-
-
-def run_server_app() -> None:
-    """Run Flower server app."""
-    event(EventType.RUN_SERVER_APP_ENTER)
-    log(
-        ERROR,
-        "The command `flower-server-app` has been replaced by `flwr run`.",
-    )
-    register_exit_handlers(event_type=EventType.RUN_SERVER_APP_LEAVE)

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/superexec/app.py

@@ -16,26 +16,12 @@
 
 
 import argparse
-import sys
-from logging import INFO
 
-from flwr.common import log
 from flwr.common.object_ref import load_app, validate
 
 from .executor import Executor
 
 
-def run_superexec() -> None:
-    """Run Flower SuperExec."""
-    log(INFO, "Starting Flower SuperExec")
-
-    sys.exit(
-        "Manually launching the SuperExec is deprecated. Since `flwr 1.13.0` "
-        "the executor service runs in the SuperLink. Launching it manually is not "
-        "recommended."
-    )
-
-
 def load_executor(
     args: argparse.Namespace,
 ) -> Executor:

flwr_nightly-1.17.0.dev20250312/src/py/flwr/superexec/exec_event_log_interceptor.py

@@ -0,0 +1,135 @@
+# 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.
+# ==============================================================================
+"""Flower Exec API event log interceptor."""
+
+
+from collections.abc import Iterator
+from typing import Any, Callable, Union, cast
+
+import grpc
+from google.protobuf.message import Message as GrpcMessage
+
+from flwr.common.event_log_plugin.event_log_plugin import EventLogWriterPlugin
+from flwr.common.typing import LogEntry
+
+from .exec_user_auth_interceptor import shared_user_info
+
+
+class ExecEventLogInterceptor(grpc.ServerInterceptor):  # type: ignore
+    """Exec API interceptor for logging events."""
+
+    def __init__(self, log_plugin: EventLogWriterPlugin) -> None:
+        self.log_plugin = log_plugin
+
+    def intercept_service(
+        self,
+        continuation: Callable[[Any], Any],
+        handler_call_details: grpc.HandlerCallDetails,
+    ) -> grpc.RpcMethodHandler:
+        """Flower server interceptor logging logic.
+
+        Intercept all unary-unary/unary-stream calls from users and log the event.
+        Continue RPC call if event logger is enabled on the SuperLink, else, terminate
+        RPC call by setting context to abort.
+        """
+        # One of the method handlers in
+        # `flwr.superexec.exec_servicer.ExecServicer`
+        method_handler: grpc.RpcMethodHandler = continuation(handler_call_details)
+        method_name: str = handler_call_details.method
+        return self._generic_event_log_unary_method_handler(method_handler, method_name)
+
+    def _generic_event_log_unary_method_handler(
+        self, method_handler: grpc.RpcMethodHandler, method_name: str
+    ) -> grpc.RpcMethodHandler:
+        def _generic_method_handler(
+            request: GrpcMessage,
+            context: grpc.ServicerContext,
+        ) -> Union[GrpcMessage, Iterator[GrpcMessage], Exception]:
+            log_entry: LogEntry
+            # Log before call
+            log_entry = self.log_plugin.compose_log_before_event(
+                request=request,
+                context=context,
+                user_info=shared_user_info.get(),
+                method_name=method_name,
+            )
+            self.log_plugin.write_log(log_entry)
+
+            # For unary-unary calls, log after the call immediately
+            if method_handler.unary_unary:
+                unary_response, error = None, None
+                try:
+                    unary_response = cast(
+                        GrpcMessage, method_handler.unary_unary(request, context)
+                    )
+                except Exception as e:  # pylint: disable=broad-except
+                    error = e
+                    raise
+                finally:
+                    log_entry = self.log_plugin.compose_log_after_event(
+                        request=request,
+                        context=context,
+                        user_info=shared_user_info.get(),
+                        method_name=method_name,
+                        response=unary_response or error,
+                    )
+                    self.log_plugin.write_log(log_entry)
+                return unary_response
+
+            # For unary-stream calls, wrap the response iterator and write the event log
+            # after iteration completes
+            if method_handler.unary_stream:
+                response_iterator = cast(
+                    Iterator[GrpcMessage],
+                    method_handler.unary_stream(request, context),
+                )
+
+                def response_wrapper() -> Iterator[GrpcMessage]:
+                    stream_response, error = None, None
+                    try:
+                        # pylint: disable=use-yield-from
+                        for stream_response in response_iterator:
+                            yield stream_response
+                    except Exception as e:  # pylint: disable=broad-except
+                        error = e
+                        raise
+                    finally:
+                        # This block is executed after the client has consumed
+                        # the entire stream, or if iteration is interrupted
+                        log_entry = self.log_plugin.compose_log_after_event(
+                            request=request,
+                            context=context,
+                            user_info=shared_user_info.get(),
+                            method_name=method_name,
+                            response=stream_response or error,
+                        )
+                        self.log_plugin.write_log(log_entry)
+
+                return response_wrapper()
+
+            raise RuntimeError()  # This line is unreachable
+
+        if method_handler.unary_unary:
+            message_handler = grpc.unary_unary_rpc_method_handler
+        elif method_handler.unary_stream:
+            message_handler = grpc.unary_stream_rpc_method_handler
+        else:
+            # If the method type is not `unary_unary` or `unary_stream`, raise an error
+            raise NotImplementedError("This RPC method type is not supported.")
+        return message_handler(
+            _generic_method_handler,
+            request_deserializer=method_handler.request_deserializer,
+            response_serializer=method_handler.response_serializer,
+        )

{flwr_nightly-1.16.0.dev20250310 → flwr_nightly-1.17.0.dev20250312}/src/py/flwr/superexec/exec_user_auth_interceptor.py

@@ -15,11 +15,13 @@
 """Flower Exec API interceptor."""
 
 
-from typing import Any, Callable, Union
+import contextvars
+from typing import Any, Callable, Union, cast
 
 import grpc
 
 from flwr.common.auth_plugin import ExecAuthPlugin
+from flwr.common.typing import UserInfo
 from flwr.proto.exec_pb2 import (  # pylint: disable=E0611
     GetAuthTokensRequest,
     GetAuthTokensResponse,
@@ -43,6 +45,11 @@ Response = Union[
 ]
 
 
+shared_user_info: contextvars.ContextVar[UserInfo] = contextvars.ContextVar(
+    "user_info", default=UserInfo(user_id=None, user_name=None)
+)
+
+
 class ExecUserAuthInterceptor(grpc.ServerInterceptor):  # type: ignore
     """Exec API interceptor for user authentication."""
 
@@ -77,13 +84,22 @@ class ExecUserAuthInterceptor(grpc.ServerInterceptor):  # type: ignore
         ) -> Response:
             call = method_handler.unary_unary or method_handler.unary_stream
             metadata = context.invocation_metadata()
+
+            # Intercept GetLoginDetails and GetAuthTokens requests, and return
+            # the response without authentication
             if isinstance(request, (GetLoginDetailsRequest, GetAuthTokensRequest)):
                 return call(request, context)  # type: ignore
 
-            valid_tokens, _ = self.auth_plugin.validate_tokens_in_metadata(metadata)
+            # For other requests, check if the user is authenticated
+            valid_tokens, user_info = self.auth_plugin.validate_tokens_in_metadata(
+                metadata
+            )
             if valid_tokens:
+                # Store user info in contextvars for authenticated users
+                shared_user_info.set(cast(UserInfo, user_info))
                 return call(request, context)  # type: ignore
 
+            # If the user is not authenticated, refresh tokens
             tokens = self.auth_plugin.refresh_tokens(context.invocation_metadata())
             if tokens is not None:
                 context.send_initial_metadata(tokens)