Export Driver from flwr.server (#2973)

src/py/flwr/server/__init__.py

@@ -15,14 +15,15 @@
 """Flower server."""
 
 
-from . import driver, strategy
+from . import strategy
 from .app import run_driver_api as run_driver_api
 from .app import run_fleet_api as run_fleet_api
 from .app import run_superlink as run_superlink
 from .app import start_server as start_server
 from .client_manager import ClientManager as ClientManager
 from .client_manager import SimpleClientManager as SimpleClientManager
 from .compat import start_driver as start_driver
+from .driver import Driver as Driver
 from .history import History as History
 from .run_serverapp import run_server_app as run_server_app
 from .server import Server as Server
@@ -31,7 +32,7 @@
 
 __all__ = [
     "ClientManager",
-    "driver",
+    "Driver",
     "History",
     "run_driver_api",
     "run_fleet_api",

src/py/flwr/server/driver/driver.py

@@ -25,7 +25,8 @@
 )
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from flwr.proto.task_pb2 import TaskIns, TaskRes  # pylint: disable=E0611
-from flwr.server.driver.grpc_driver import DEFAULT_SERVER_ADDRESS_DRIVER, GrpcDriver
+
+from .grpc_driver import DEFAULT_SERVER_ADDRESS_DRIVER, GrpcDriver
 
 
 class Driver:

src/py/flwr/server/driver/driver_test.py

@@ -24,7 +24,8 @@
     PushTaskInsRequest,
 )
 from flwr.proto.task_pb2 import Task, TaskIns, TaskRes  # pylint: disable=E0611
-from flwr.server.driver.driver import Driver
+
+from .driver import Driver
 
 
 class TestDriver(unittest.TestCase):

src/py/flwr/server/server_app.py

@@ -19,11 +19,11 @@
 from typing import Callable, Optional, cast
 
 from flwr.common import Context, RecordSet
-from flwr.server.driver.driver import Driver
 from flwr.server.strategy import Strategy
 
 from .client_manager import ClientManager
 from .compat import start_driver
+from .driver import Driver
 from .server import Server
 from .server_config import ServerConfig
 from .typing import ServerAppCallable

src/py/flwr/server/typing.py

@@ -18,6 +18,7 @@
 from typing import Callable
 
 from flwr.common import Context
-from flwr.server.driver import Driver
+
+from .driver import Driver
 
 ServerAppCallable = Callable[[Driver, Context], None]