flwr-nightly 1.16.0.dev20250204__py3-none-any.whl → 1.16.0.dev20250205__py3-none-any.whl

flwr/common/exit_handlers.py

@@ -15,10 +15,10 @@
 """Common function to register exit handlers for server and client."""
 
 
-from signal import SIGINT, SIGQUIT, SIGTERM, signal
+import signal
 from threading import Thread
 from types import FrameType
-from typing import Optional
+from typing import Callable, Optional
 
 from grpc import Server
 
@@ -26,12 +26,15 @@ from flwr.common.telemetry import EventType
 
 from .exit import ExitCode, flwr_exit
 
-SIGNAL_TO_EXIT_CODE = {
-    SIGINT: ExitCode.GRACEFUL_EXIT_SIGINT,
-    SIGQUIT: ExitCode.GRACEFUL_EXIT_SIGQUIT,
-    SIGTERM: ExitCode.GRACEFUL_EXIT_SIGTERM,
+SIGNAL_TO_EXIT_CODE: dict[int, int] = {
+    signal.SIGINT: ExitCode.GRACEFUL_EXIT_SIGINT,
+    signal.SIGTERM: ExitCode.GRACEFUL_EXIT_SIGTERM,
 }
 
+# SIGQUIT is not available on Windows
+if hasattr(signal, "SIGQUIT"):
+    SIGNAL_TO_EXIT_CODE[signal.SIGQUIT] = ExitCode.GRACEFUL_EXIT_SIGQUIT
+
 
 def register_exit_handlers(
     event_type: EventType,
@@ -54,23 +57,16 @@ def register_exit_handlers(
         An optional list of threads that need to be gracefully
         terminated before exiting.
     """
-    default_handlers = {
-        SIGINT: None,
-        SIGQUIT: None,
-        SIGTERM: None,
-    }
-
-    def graceful_exit_handler(  # type: ignore
-        signalnum,
-        frame: FrameType,  # pylint: disable=unused-argument
-    ) -> None:
+    default_handlers: dict[int, Callable[[int, FrameType], None]] = {}
+
+    def graceful_exit_handler(signalnum: int, _frame: FrameType) -> None:
         """Exit handler to be registered with `signal.signal`.
 
         When called will reset signal handler to original signal handler from
         default_handlers.
         """
         # Reset to default handler
-        signal(signalnum, default_handlers[signalnum])
+        signal.signal(signalnum, default_handlers[signalnum])  # type: ignore
 
         if grpc_servers is not None:
             for grpc_server in grpc_servers:
@@ -87,15 +83,7 @@ def register_exit_handlers(
             event_type=event_type,
         )
 
-    default_handlers[SIGINT] = signal(  # type: ignore
-        SIGINT,
-        graceful_exit_handler,  # type: ignore
-    )
-    default_handlers[SIGQUIT] = signal(  # type: ignore
-        SIGQUIT,
-        graceful_exit_handler,  # type: ignore
-    )
-    default_handlers[SIGTERM] = signal(  # type: ignore
-        SIGTERM,
-        graceful_exit_handler,  # type: ignore
-    )
+    # Register signal handlers
+    for sig in SIGNAL_TO_EXIT_CODE:
+        default_handler = signal.signal(sig, graceful_exit_handler)  # type: ignore
+        default_handlers[sig] = default_handler  # type: ignore

flwr/server/superlink/fleet/grpc_rere/server_interceptor.py

@@ -43,9 +43,11 @@ MIN_TIMESTAMP_DIFF = -SYSTEM_TIME_TOLERANCE
 MAX_TIMESTAMP_DIFF = TIMESTAMP_TOLERANCE + SYSTEM_TIME_TOLERANCE
 
 
-def _unary_unary_rpc_terminator(message: str) -> grpc.RpcMethodHandler:
+def _unary_unary_rpc_terminator(
+    message: str, code: Any = grpc.StatusCode.UNAUTHENTICATED
+) -> grpc.RpcMethodHandler:
     def terminate(_request: GrpcMessage, context: grpc.ServicerContext) -> GrpcMessage:
-        context.abort(grpc.StatusCode.UNAUTHENTICATED, message)
+        context.abort(code, message)
         raise RuntimeError("Should not reach this point")  # Make mypy happy
 
     return grpc.unary_unary_rpc_method_handler(terminate)
@@ -68,7 +70,7 @@ class AuthenticateServerInterceptor(grpc.ServerInterceptor):  # type: ignore
         self.state_factory = state_factory
         self.auto_auth = auto_auth
 
-    def intercept_service(
+    def intercept_service(  # pylint: disable=too-many-return-statements
         self,
         continuation: Callable[[Any], Any],
         handler_call_details: grpc.HandlerCallDetails,
@@ -79,6 +81,13 @@ class AuthenticateServerInterceptor(grpc.ServerInterceptor):  # type: ignore
         metadata sent by the node. Continue RPC call if node is authenticated, else,
         terminate RPC call by setting context to abort.
         """
+        # Filter out non-Fleet service calls
+        if not handler_call_details.method.startswith("/flwr.proto.Fleet/"):
+            return _unary_unary_rpc_terminator(
+                "This request should be sent to a different service.",
+                grpc.StatusCode.FAILED_PRECONDITION,
+            )
+
         state = self.state_factory.state()
         metadata_dict = dict(handler_call_details.invocation_metadata)
 

{flwr_nightly-1.16.0.dev20250204.dist-info → flwr_nightly-1.16.0.dev20250205.dist-info}/METADATA

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

{flwr_nightly-1.16.0.dev20250204.dist-info → flwr_nightly-1.16.0.dev20250205.dist-info}/RECORD

@@ -126,7 +126,7 @@ flwr/common/dp.py,sha256=vddkvyjV2FhRoN4VuU2LeAM1UBn7dQB8_W-Qdiveal8,1978
 flwr/common/exit/__init__.py,sha256=-ZOJYLaNnR729a7VzZiFsLiqngzKQh3xc27svYStZ_Q,826
 flwr/common/exit/exit.py,sha256=DmZFyksp-w1sFDQekq5Z-qfnr-ivCAv78aQkqj-TDps,3458
 flwr/common/exit/exit_code.py,sha256=PNEnCrZfOILjfDAFu5m-2YWEJBrk97xglq4zCUlqV7E,3470
-flwr/common/exit_handlers.py,sha256=Dke87CC6d6b6kqkC2mF0I4JsP4mHhlQTFxkS4sKKgyw,3308
+flwr/common/exit_handlers.py,sha256=yclujry30954o0lI7vtknTajskPCvK8TXw2V3RdldXU,3174
 flwr/common/grpc.py,sha256=K60AIvIqH0CvkkiqBfw5HoxQfbFOL2DrhKPjbZ8raIE,9786
 flwr/common/logger.py,sha256=Hund1C6bEhMw3GemlzuFK22tXZ27YeHLrFB0b4LP5f8,13041
 flwr/common/message.py,sha256=Zv4ID2BLQsbff0F03DI_MeFoHbSqVZAdDD9NcKYv6Zo,13832
@@ -280,7 +280,7 @@ flwr/server/superlink/fleet/grpc_bidi/grpc_client_proxy.py,sha256=h3EhqgelegVC4E
 flwr/server/superlink/fleet/grpc_bidi/grpc_server.py,sha256=mxPxyEF0IW0vV41Bqk1zfKOdRDEvXPwzJyMiRMg7nTI,5173
 flwr/server/superlink/fleet/grpc_rere/__init__.py,sha256=j2hyC342am-_Hgp1g80Y3fGDzfTI6n8QOOn2PyWf4eg,758
 flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py,sha256=syWWZgsU3PHvIuvSoJxUTbEdkOtyV6psXAbRowNE_yY,5533
-flwr/server/superlink/fleet/grpc_rere/server_interceptor.py,sha256=K464S9UrV5NQVRgXwqQWCtoVnXBbOEWeRzkOJjeTC7o,6605
+flwr/server/superlink/fleet/grpc_rere/server_interceptor.py,sha256=KPgAcnYsKPPI7_iYNSnqGbyv4tsqZuBqrTiREwVBJiM,6984
 flwr/server/superlink/fleet/message_handler/__init__.py,sha256=h8oLD7uo5lKICPy0rRdKRjTYe62u8PKkT_fA4xF5JPA,731
 flwr/server/superlink/fleet/message_handler/message_handler.py,sha256=DM53K4yLOmzXikTe6i6KJ0v8IvlJKDifvFEV09GFKhI,5510
 flwr/server/superlink/fleet/rest_rere/__init__.py,sha256=5jbYbAn75sGv-gBwOPDySE0kz96F6dTYLeMrGqNi4lM,735
@@ -327,8 +327,8 @@ flwr/superexec/exec_servicer.py,sha256=X10ILT-AoGMrB3IgI2mBe9i-QcIVUAl9bucuqVOPY
 flwr/superexec/exec_user_auth_interceptor.py,sha256=K06OU-l4LnYhTDg071hGJuOaQWEJbZsYi5qxUmmtiG0,3704
 flwr/superexec/executor.py,sha256=_B55WW2TD1fBINpabSSDRenVHXYmvlfhv-k8hJKU4lQ,3115
 flwr/superexec/simulation.py,sha256=WQDon15oqpMopAZnwRZoTICYCfHqtkvFSqiTQ2hLD_g,4088
-flwr_nightly-1.16.0.dev20250204.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.16.0.dev20250204.dist-info/METADATA,sha256=T4A15Y7FEN90CKMRxjCRRDh8A6OVyNHsu_FIUYqSsrM,15873
-flwr_nightly-1.16.0.dev20250204.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.16.0.dev20250204.dist-info/entry_points.txt,sha256=JlNxX3qhaV18_2yj5a3kJW1ESxm31cal9iS_N_pf1Rk,538
-flwr_nightly-1.16.0.dev20250204.dist-info/RECORD,,
+flwr_nightly-1.16.0.dev20250205.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.16.0.dev20250205.dist-info/METADATA,sha256=WKm99h3uLWPbfmQCecvvugCPsm4Ukwm1Sx5kF4VTvzM,15873
+flwr_nightly-1.16.0.dev20250205.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.16.0.dev20250205.dist-info/entry_points.txt,sha256=JlNxX3qhaV18_2yj5a3kJW1ESxm31cal9iS_N_pf1Rk,538
+flwr_nightly-1.16.0.dev20250205.dist-info/RECORD,,