Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(framework:skip) Move existing transport code to flwr/client/connection folder #4055

Open
wants to merge 2 commits into
base: intro-abc-conn
Choose a base branch
from
Open

refactor(framework:skip) Move existing transport code to flwr/client/connection folder #4055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c94309
move connections
panh99 Aug 22, 2024
03c36a6
update copyright
panh99 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/py/flwr/client/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
from flwr.server.superlink.linkstate.utils import generate_rand_int_from_bytes

from .clientapp.clientappio_servicer import ClientAppInputs, ClientAppIoServicer
from .grpc_adapter_client.connection import grpc_adapter
from .grpc_client.connection import grpc_connection
from .grpc_rere_client.connection import grpc_request_response
from .connection.grpc_adapter.connection import grpc_adapter
from .connection.grpc_bidi.connection import grpc_connection
from .connection.grpc_rere.connection import grpc_request_response
from .message_handler.message_handler import handle_control_message
from .numpy_client import NumPyClient
from .run_info_store import DeprecatedRunInfoStore
Expand Down Expand Up @@ -739,7 +739,7 @@ def _init_connection(transport: Optional[str], server_address: str) -> tuple[
try:
from requests.exceptions import ConnectionError as RequestsConnectionError

from .rest_client.connection import http_request_response
from .connection.rest.connection import http_request_response
except ModuleNotFoundError:
sys.exit(MISSING_EXTRA_REST)
if server_address[:4] != "http":
Expand Down
0 ...wr/client/grpc_adapter_client/__init__.py → ...lient/connection/grpc_adapter/__init__.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../client/grpc_adapter_client/connection.py → ...ent/connection/grpc_adapter/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

from cryptography.hazmat.primitives.asymmetric import ec

from flwr.client.grpc_rere_client.connection import grpc_request_response
from flwr.client.grpc_rere_client.grpc_adapter import GrpcAdapter
from flwr.client.connection.grpc_rere.connection import grpc_request_response
from flwr.client.connection.grpc_rere.grpc_adapter import GrpcAdapter
from flwr.common import GRPC_MAX_MESSAGE_LENGTH
from flwr.common.logger import log
from flwr.common.message import Message
Expand Down
2 changes: 1 addition & 1 deletion src/py/flwr/client/grpc_client/__init__.py → ...r/client/connection/grpc_bidi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020 Flower Labs GmbH. All Rights Reserved.
# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/py/flwr/client/grpc_client/connection.py → ...client/connection/grpc_bidi/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020 Flower Labs GmbH. All Rights Reserved.
# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ...lwr/client/grpc_client/connection_test.py → ...t/connection/grpc_bidi/connection_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020 Flower Labs GmbH. All Rights Reserved.
# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .../flwr/client/grpc_rere_client/__init__.py → ...r/client/connection/grpc_rere/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023 Flower Labs GmbH. All Rights Reserved.
# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
0 ...nt/grpc_rere_client/client_interceptor.py → ...onnection/grpc_rere/client_interceptor.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...pc_rere_client/client_interceptor_test.py → ...tion/grpc_rere/client_interceptor_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import grpc

from flwr.client.grpc_rere_client.connection import grpc_request_response
from flwr.common import GRPC_MAX_MESSAGE_LENGTH, serde
from flwr.common.logger import log
from flwr.common.message import Message, Metadata
Expand Down Expand Up @@ -54,6 +53,7 @@
from flwr.proto.task_pb2 import Task, TaskIns # pylint: disable=E0611

from .client_interceptor import _AUTH_TOKEN_HEADER, _PUBLIC_KEY_HEADER, Request
from .connection import grpc_request_response


class _MockServicer:
Expand Down
2 changes: 1 addition & 1 deletion ...lwr/client/grpc_rere_client/connection.py → ...client/connection/grpc_rere/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023 Flower Labs GmbH. All Rights Reserved.
# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
0 ...r/client/grpc_rere_client/grpc_adapter.py → ...ient/connection/grpc_rere/grpc_adapter.py
View file
Open in desktop
File renamed without changes.
0 ...ent/grpc_rere_client/grpc_adapter_test.py → ...connection/grpc_rere/grpc_adapter_test.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/py/flwr/client/rest_client/__init__.py → ...y/flwr/client/connection/rest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023 Flower Labs GmbH. All Rights Reserved.
# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/py/flwr/client/rest_client/connection.py → ...flwr/client/connection/rest/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023 Flower Labs GmbH. All Rights Reserved.
# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down