Skip to content

Commit

Permalink
Update app
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesbvll committed Aug 15, 2024
1 parent 38d403b commit 32b9fb6
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/py/flwr/server/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
ADDRESS_FLEET_API_REST = "0.0.0.0:9093"

DATABASE = ":flwr-in-memory-state:"
BASE_DIR = get_flwr_dir() / "superlink" / "ffs"
BASE_DIR = get_flwr_dir() / "ffs"


def start_server( # pylint: disable=too-many-arguments,too-many-locals
Expand Down Expand Up @@ -214,8 +214,8 @@ def run_superlink() -> None:
# Initialize StateFactory
state_factory = StateFactory(args.database)

# Initialize FfsFactory
ffs_factory = FfsFactory(args.storage_dir)
# Initialize StateFactory
ffs_factory = FfsFactory(args.base_dir)

# Start Driver API
driver_server: grpc.Server = run_driver_api_grpc(
Expand Down Expand Up @@ -301,6 +301,7 @@ def run_superlink() -> None:
fleet_server = _run_fleet_api_grpc_rere(
address=fleet_address,
state_factory=state_factory,
ffs_factory=ffs_factory,
certificates=certificates,
interceptors=interceptors,
)
Expand Down Expand Up @@ -487,13 +488,15 @@ def _try_obtain_certificates(
def _run_fleet_api_grpc_rere(
address: str,
state_factory: StateFactory,
ffs_factory: FfsFactory,
certificates: Optional[Tuple[bytes, bytes, bytes]],
interceptors: Optional[Sequence[grpc.ServerInterceptor]] = None,
) -> grpc.Server:
"""Run Fleet API (gRPC, request-response)."""
# Create Fleet API gRPC server
fleet_servicer = FleetServicer(
state_factory=state_factory,
ffs_factory=ffs_factory,
)
fleet_add_servicer_to_server_fn = add_FleetServicer_to_server
fleet_grpc_server = generic_create_grpc_server(
Expand Down Expand Up @@ -618,8 +621,8 @@ def _add_args_common(parser: argparse.ArgumentParser) -> None:
default=DATABASE,
)
parser.add_argument(
"--storage-dir",
help="The base directory to store the objects for the Flower File System.",
"--base-dir",
help="The base directory to store the objects.",
default=BASE_DIR,
)
parser.add_argument(
Expand Down

0 comments on commit 32b9fb6

Please sign in to comment.