Use abstract Driver (#3281)

adap · Apr 22, 2024 · d22be5c · d22be5c
1 parent af1db12
commit d22be5c
Show file tree

Hide file tree

Showing 9 changed files with 335 additions and 396 deletions.
diff --git a/src/py/flwr/server/compat/app.py b/src/py/flwr/server/compat/app.py
@@ -29,7 +29,7 @@
 from flwr.server.server_config import ServerConfig
 from flwr.server.strategy import Strategy
 
-from ..driver import Driver
+from ..driver import Driver, GrpcDriver
 from .app_utils import start_update_client_manager_thread
 
 DEFAULT_SERVER_ADDRESS_DRIVER = "[::]:9091"
@@ -114,7 +114,7 @@ def start_driver(  # pylint: disable=too-many-arguments, too-many-locals
         # Create the Driver
         if isinstance(root_certificates, str):
             root_certificates = Path(root_certificates).read_bytes()
-        driver = Driver(
+        driver = GrpcDriver(
             driver_service_address=address, root_certificates=root_certificates
         )
 

diff --git a/src/py/flwr/server/compat/driver_client_proxy.py b/src/py/flwr/server/compat/driver_client_proxy.py
@@ -25,7 +25,7 @@
 from flwr.proto import driver_pb2, node_pb2, task_pb2  # pylint: disable=E0611
 from flwr.server.client_proxy import ClientProxy
 
-from ..driver.driver import GrpcDriverHelper
+from ..driver.grpc_driver import GrpcDriverHelper
 
 SLEEP_TIME = 1
 

diff --git a/src/py/flwr/server/driver/__init__.py b/src/py/flwr/server/driver/__init__.py
@@ -16,7 +16,10 @@
 
 
 from .driver import Driver
+from .grpc_driver import GrpcDriver, GrpcDriverHelper
 
 __all__ = [
     "Driver",
+    "GrpcDriver",
+    "GrpcDriverHelper",
 ]
diff --git a/src/py/flwr/server/driver/abc_driver.py b/src/py/flwr/server/driver/abc_driver.py