flwr-nightly 1.9.0.dev20240529__tar.gz → 1.9.0.dev20240604__tar.gz

{flwr_nightly-1.9.0.dev20240529 → flwr_nightly-1.9.0.dev20240604}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.9.0.dev20240529
+Version: 1.9.0.dev20240604
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.9.0.dev20240529 → flwr_nightly-1.9.0.dev20240604}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.9.0.dev20240529"
+version = "1.9.0.dev20240604"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]

{flwr_nightly-1.9.0.dev20240529 → flwr_nightly-1.9.0.dev20240604}/src/py/flwr/client/client_app.py

@@ -221,7 +221,7 @@ def _registration_error(fn_name: str) -> ValueError:
         >>> def client_fn(cid) -> Client:
         >>>     return FlowerClient().to_client()
         >>>
-        >>> app = ClientApp()
+        >>> app = ClientApp(
         >>>     client_fn=client_fn,
         >>> )
 

{flwr_nightly-1.9.0.dev20240529 → flwr_nightly-1.9.0.dev20240604}/src/py/flwr/client/grpc_rere_client/connection.py

@@ -21,7 +21,7 @@ from contextlib import contextmanager
 from copy import copy
 from logging import DEBUG, ERROR
 from pathlib import Path
-from typing import Callable, Iterator, Optional, Sequence, Tuple, Union, cast
+from typing import Callable, Iterator, Optional, Sequence, Tuple, Type, Union, cast
 
 import grpc
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -73,6 +73,7 @@ def grpc_request_response(  # pylint: disable=R0913, R0914, R0915
     authentication_keys: Optional[
         Tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
     ] = None,
+    adapter_cls: Optional[Type[FleetStub]] = None,
 ) -> Iterator[
     Tuple[
         Callable[[], Optional[Message]],
@@ -133,7 +134,9 @@ def grpc_request_response(  # pylint: disable=R0913, R0914, R0915
     channel.subscribe(on_channel_state_change)
 
     # Shared variables for inner functions
-    stub = FleetStub(channel)
+    if adapter_cls is None:
+        adapter_cls = FleetStub
+    stub = adapter_cls(channel)
     metadata: Optional[Metadata] = None
     node: Optional[Node] = None
     ping_thread: Optional[threading.Thread] = None

flwr_nightly-1.9.0.dev20240604/src/py/flwr/proto/grpcadapter_pb2.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/grpcadapter.proto
+# Protobuf Python Version: 4.25.0
+"""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()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/grpcadapter.proto\x12\nflwr.proto\"\xba\x01\n\x10MessageContainer\x12<\n\x08metadata\x18\x01 \x03(\x0b\x32*.flwr.proto.MessageContainer.MetadataEntry\x12\x19\n\x11grpc_message_name\x18\x02 \x01(\t\x12\x1c\n\x14grpc_message_content\x18\x03 \x01(\x0c\x1a/\n\rMetadataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x32Z\n\x0bGrpcAdapter\x12K\n\x0bSendReceive\x12\x1c.flwr.proto.MessageContainer\x1a\x1c.flwr.proto.MessageContainer\"\x00\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.grpcadapter_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_MESSAGECONTAINER_METADATAENTRY']._options = None
+  _globals['_MESSAGECONTAINER_METADATAENTRY']._serialized_options = b'8\001'
+  _globals['_MESSAGECONTAINER']._serialized_start=45
+  _globals['_MESSAGECONTAINER']._serialized_end=231
+  _globals['_MESSAGECONTAINER_METADATAENTRY']._serialized_start=184
+  _globals['_MESSAGECONTAINER_METADATAENTRY']._serialized_end=231
+  _globals['_GRPCADAPTER']._serialized_start=233
+  _globals['_GRPCADAPTER']._serialized_end=323
+# @@protoc_insertion_point(module_scope)

flwr_nightly-1.9.0.dev20240604/src/py/flwr/proto/grpcadapter_pb2.pyi

@@ -0,0 +1,43 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""
+import builtins
+import google.protobuf.descriptor
+import google.protobuf.internal.containers
+import google.protobuf.message
+import typing
+import typing_extensions
+
+DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+
+class MessageContainer(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    class MetadataEntry(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        KEY_FIELD_NUMBER: builtins.int
+        VALUE_FIELD_NUMBER: builtins.int
+        key: typing.Text
+        value: typing.Text
+        def __init__(self,
+            *,
+            key: typing.Text = ...,
+            value: typing.Text = ...,
+            ) -> None: ...
+        def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
+
+    METADATA_FIELD_NUMBER: builtins.int
+    GRPC_MESSAGE_NAME_FIELD_NUMBER: builtins.int
+    GRPC_MESSAGE_CONTENT_FIELD_NUMBER: builtins.int
+    @property
+    def metadata(self) -> google.protobuf.internal.containers.ScalarMap[typing.Text, typing.Text]: ...
+    grpc_message_name: typing.Text
+    grpc_message_content: builtins.bytes
+    def __init__(self,
+        *,
+        metadata: typing.Optional[typing.Mapping[typing.Text, typing.Text]] = ...,
+        grpc_message_name: typing.Text = ...,
+        grpc_message_content: builtins.bytes = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["grpc_message_content",b"grpc_message_content","grpc_message_name",b"grpc_message_name","metadata",b"metadata"]) -> None: ...
+global___MessageContainer = MessageContainer

flwr_nightly-1.9.0.dev20240604/src/py/flwr/proto/grpcadapter_pb2_grpc.py

@@ -0,0 +1,66 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+
+from flwr.proto import grpcadapter_pb2 as flwr_dot_proto_dot_grpcadapter__pb2
+
+
+class GrpcAdapterStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.SendReceive = channel.unary_unary(
+                '/flwr.proto.GrpcAdapter/SendReceive',
+                request_serializer=flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.FromString,
+                )
+
+
+class GrpcAdapterServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def SendReceive(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_GrpcAdapterServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'SendReceive': grpc.unary_unary_rpc_method_handler(
+                    servicer.SendReceive,
+                    request_deserializer=flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.FromString,
+                    response_serializer=flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'flwr.proto.GrpcAdapter', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class GrpcAdapter(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def SendReceive(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.GrpcAdapter/SendReceive',
+            flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.SerializeToString,
+            flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr_nightly-1.9.0.dev20240604/src/py/flwr/proto/grpcadapter_pb2_grpc.pyi

@@ -0,0 +1,24 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""
+import abc
+import flwr.proto.grpcadapter_pb2
+import grpc
+
+class GrpcAdapterStub:
+    def __init__(self, channel: grpc.Channel) -> None: ...
+    SendReceive: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.grpcadapter_pb2.MessageContainer,
+        flwr.proto.grpcadapter_pb2.MessageContainer]
+
+
+class GrpcAdapterServicer(metaclass=abc.ABCMeta):
+    @abc.abstractmethod
+    def SendReceive(self,
+        request: flwr.proto.grpcadapter_pb2.MessageContainer,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.grpcadapter_pb2.MessageContainer: ...
+
+
+def add_GrpcAdapterServicer_to_server(servicer: GrpcAdapterServicer, server: grpc.Server) -> None: ...

{flwr_nightly-1.9.0.dev20240529 → flwr_nightly-1.9.0.dev20240604}/src/py/flwr/server/server_app.py

@@ -39,7 +39,7 @@ class ServerApp:
     >>> server_config = ServerConfig(num_rounds=3)
     >>> strategy = FedAvg()
     >>>
-    >>> app = ServerApp()
+    >>> app = ServerApp(
     >>>     server_config=server_config,
     >>>     strategy=strategy,
     >>> )
@@ -106,7 +106,7 @@ class ServerApp:
                     >>> server_config = ServerConfig(num_rounds=3)
                     >>> strategy = FedAvg()
                     >>>
-                    >>> app = ServerApp()
+                    >>> app = ServerApp(
                     >>>     server_config=server_config,
                     >>>     strategy=strategy,
                     >>> )