flwr-nightly 1.17.0.dev20250311__py3-none-any.whl → 1.17.0.dev20250312__py3-none-any.whl

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/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/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)

{flwr_nightly-1.17.0.dev20250311.dist-info → flwr_nightly-1.17.0.dev20250312.dist-info}/METADATA

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

{flwr_nightly-1.17.0.dev20250311.dist-info → flwr_nightly-1.17.0.dev20250312.dist-info}/RECORD

@@ -35,7 +35,7 @@ flwr/cli/new/templates/app/code/client.sklearn.py.tpl,sha256=MfhMN-hayGCc3cZ1XpN
 flwr/cli/new/templates/app/code/client.tensorflow.py.tpl,sha256=yBiiU7B9Kf70U52cPkNs_dUpYrrTwbUi2os-PAyheaM,1680
 flwr/cli/new/templates/app/code/dataset.baseline.py.tpl,sha256=jbd_exHAk2-Blu_kVutjPO6a_dkJQWb232zxSeXIZ1k,1453
 flwr/cli/new/templates/app/code/flwr_tune/__init__.py,sha256=JgNgBtKdm1jKM9625WxappCAVUGtYAmcjKSsXJ1u3ZQ,748
-flwr/cli/new/templates/app/code/flwr_tune/client_app.py.tpl,sha256=Zgr_DwzP518E0lcGjs_togOeksdTVjwGU8sK6g8Wd0U,3765
+flwr/cli/new/templates/app/code/flwr_tune/client_app.py.tpl,sha256=tUyEAmkuUYop7teKNUO2NVbEB7-sXZBNLks8s6Wedws,3759
 flwr/cli/new/templates/app/code/flwr_tune/dataset.py.tpl,sha256=1NA2Sf-EviNtOaYN4dnFk6v2tcZVsY3-eXY84wOXVng,3059
 flwr/cli/new/templates/app/code/flwr_tune/models.py.tpl,sha256=ONJw_BgBWEofVNGRDu8KAIThb8saRQlUEK4uS2u_6To,2449
 flwr/cli/new/templates/app/code/flwr_tune/server_app.py.tpl,sha256=xkmmBKr0oGmewP56SP3s_6FG6JOVlGlquhg3a9nYMis,3270
@@ -319,13 +319,14 @@ flwr/simulation/simulationio_connection.py,sha256=lcbEmdjb9RVEF2W5vSbf_J1zlTuv_Z
 flwr/superexec/__init__.py,sha256=fcj366jh4RFby_vDwLroU4kepzqbnJgseZD_jUr_Mko,715
 flwr/superexec/app.py,sha256=C0T2LMjuyF__I5V1FKfjtWtbsQPxK_EgL4vuhWIwG8s,1465
 flwr/superexec/deployment.py,sha256=wZ9G42gGS91knfplswh95MnQ83Fzu-rs6wcuNgDmmvY,6735
+flwr/superexec/exec_event_log_interceptor.py,sha256=zFu1MQu3XkWa9PUTQgt5wb3BL_eR2dFS5M3BR5hbX34,5805
 flwr/superexec/exec_grpc.py,sha256=ttA9qoZzSLF0Mfk1L4hzOkMSNuj5rR58_kKBYwcyrAg,2864
 flwr/superexec/exec_servicer.py,sha256=4UpzJqPUHkBG2PZNe2lrX7XFVDOL6yw_HcoBHxuXE9A,8349
-flwr/superexec/exec_user_auth_interceptor.py,sha256=YtvcjrD2hMVmZ3y9wHuGI6FwmG_Y__q112t4fFnypy0,3793
+flwr/superexec/exec_user_auth_interceptor.py,sha256=2kXjjJcrZyff893QTFLQD6zxC4pdVwtN4Rc66jHptfE,4440
 flwr/superexec/executor.py,sha256=_B55WW2TD1fBINpabSSDRenVHXYmvlfhv-k8hJKU4lQ,3115
 flwr/superexec/simulation.py,sha256=WQDon15oqpMopAZnwRZoTICYCfHqtkvFSqiTQ2hLD_g,4088
-flwr_nightly-1.17.0.dev20250311.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.17.0.dev20250311.dist-info/METADATA,sha256=M4N9VKRlrUXFQAfvVh0EiUex2xAtt0reR7k8Um00mQA,15877
-flwr_nightly-1.17.0.dev20250311.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.17.0.dev20250311.dist-info/entry_points.txt,sha256=2-1L-GNKhwGw2_7_RoH55vHw2SIHjdAQy3HAVAWl9PY,374
-flwr_nightly-1.17.0.dev20250311.dist-info/RECORD,,
+flwr_nightly-1.17.0.dev20250312.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.17.0.dev20250312.dist-info/METADATA,sha256=uOd2BEE053PBIRj-JOYG48jU4qASw1D_XJLThzPbnW4,15877
+flwr_nightly-1.17.0.dev20250312.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.17.0.dev20250312.dist-info/entry_points.txt,sha256=2-1L-GNKhwGw2_7_RoH55vHw2SIHjdAQy3HAVAWl9PY,374
+flwr_nightly-1.17.0.dev20250312.dist-info/RECORD,,