From 981c81a8fdbbc900ab6b08761931fd61727a3edb Mon Sep 17 00:00:00 2001 From: jafermarq Date: Sat, 27 Jan 2024 05:50:57 +0000 Subject: [PATCH 1/2] remove fwd/bwk --- src/py/flwr/client/typing.py | 19 ------------------- src/py/flwr/flower/__init__.py | 4 ---- 2 files changed, 23 deletions(-) diff --git a/src/py/flwr/client/typing.py b/src/py/flwr/client/typing.py index de8cabf83d65..18ddcb62f23f 100644 --- a/src/py/flwr/client/typing.py +++ b/src/py/flwr/client/typing.py @@ -14,32 +14,13 @@ # ============================================================================== """Custom types for Flower clients.""" -from dataclasses import dataclass from typing import Callable from flwr.common.context import Context from flwr.common.message import Message -from flwr.proto.task_pb2 import TaskIns, TaskRes # pylint: disable=E0611 from .client import Client as Client - -@dataclass -class Fwd: - """.""" - - task_ins: TaskIns - context: Context - - -@dataclass -class Bwd: - """.""" - - task_res: TaskRes - context: Context - - FlowerCallable = Callable[[Message, Context], Message] ClientFn = Callable[[str], Client] Layer = Callable[[Message, Context, FlowerCallable], Message] diff --git a/src/py/flwr/flower/__init__.py b/src/py/flwr/flower/__init__.py index 892a7ce5afdc..8b566981c77a 100644 --- a/src/py/flwr/flower/__init__.py +++ b/src/py/flwr/flower/__init__.py @@ -16,11 +16,7 @@ from flwr.client.flower import Flower as Flower -from flwr.client.typing import Bwd as Bwd -from flwr.client.typing import Fwd as Fwd __all__ = [ "Flower", - "Fwd", - "Bwd", ] From 1eadea684d442ec9e62edcf3c2828d66f90afc10 Mon Sep 17 00:00:00 2001 From: "Daniel J. Beutel" Date: Sat, 27 Jan 2024 09:54:08 +0100 Subject: [PATCH 2/2] Update src/py/flwr/client/middleware/utils_test.py --- src/py/flwr/client/middleware/utils_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/py/flwr/client/middleware/utils_test.py b/src/py/flwr/client/middleware/utils_test.py index 73abdbc61302..a4e1f6e87599 100644 --- a/src/py/flwr/client/middleware/utils_test.py +++ b/src/py/flwr/client/middleware/utils_test.py @@ -44,7 +44,7 @@ def make_mock_middleware(name: str, footprint: List[str]) -> Layer: def middleware(message: Message, context: Context, app: FlowerCallable) -> Message: footprint.append(name) - # add empty ConfigRegcord to in_message for this middleware layer + # add empty ConfigRecord to in_message for this middleware layer message.message.set_configs(name=name, record=ConfigsRecord()) _increment_context_counter(context) out_message: Message = app(message, context)