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.

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

feat(framework) Add grpc-adapter transport #3540

Merged
merged 52 commits into from
Jun 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
e097ea4
add proto
panh99 May 30, 2024
2b3f44c
update test
panh99 May 30, 2024
a69ee45
fix test error
panh99 May 30, 2024
c612c43
Merge branch 'main' into protobuf-grpcadapter
panh99 May 30, 2024
58d823e
add grpc adapter
panh99 May 30, 2024
88e69ce
complete grpc adapter class
panh99 May 30, 2024
6783995
fix type
panh99 May 30, 2024
dd419f8
Merge branch 'fix-metadata-type' into add-grpc-adapter-class
panh99 May 30, 2024
6af6680
fix check errors
panh99 May 30, 2024
53785de
Merge branch 'main' into add-grpc-adapter-class
panh99 May 30, 2024
f61b550
update doc string
panh99 May 30, 2024
98cfda4
add servicer
panh99 May 31, 2024
05af29c
make directories
panh99 May 31, 2024
6c3ff4c
fix date, update doc string
panh99 May 31, 2024
08581be
Merge branch 'add-grpc-adapter-class' into test-grpcadapter
panh99 May 31, 2024
da1a207
Merge branch 'grpcadapter-servicer' into test-grpcadapter
panh99 May 31, 2024
4cd4a4f
amend run_client_app and run_superlink
panh99 May 31, 2024
083a6fb
Merge branch 'main' into grpcadapter-servicer
panh99 May 31, 2024
17cbcf3
Merge branch 'main' into add-grpc-adapter-class
panh99 May 31, 2024
e21aa1e
fix typing
panh99 May 31, 2024
ae3ca59
Merge branch 'main' into add-grpc-adapter-class
panh99 Jun 3, 2024
b3fb388
Merge branch 'main' into grpcadapter-servicer
panh99 Jun 3, 2024
248a49f
Merge branch 'main' into test-grpcadapter
panh99 Jun 3, 2024
ac09752
add arg for flower-superlink to specify grpc-adapter fleet api server…
panh99 Jun 3, 2024
49aae70
parse arg
panh99 Jun 3, 2024
c3d35bf
mv flwr-version-key to constant.py
panh99 Jun 4, 2024
f1be661
Merge branch 'main' into grpcadapter-servicer
panh99 Jun 10, 2024
a477f1e
Merge branch 'main' into add-grpc-adapter-class
panh99 Jun 10, 2024
f4e0978
mv constants to constant.py and handle control message
panh99 Jun 10, 2024
8877221
Merge branch 'add-grpc-adapter-class' of https://github.com/adap/flow…
panh99 Jun 10, 2024
95a076b
Merge branch 'add-grpc-adapter-class' into test-grpcadapter
panh99 Jun 10, 2024
0967d48
merge main
panh99 Jun 10, 2024
2473004
Merge branch 'grpcadapter-servicer' into test-grpcadapter
panh99 Jun 10, 2024
30c4a3e
update
panh99 Jun 10, 2024
b884048
Merge branch 'main' into test-grpcadapter
panh99 Jun 10, 2024
ce2e4a5
update log message and key name
panh99 Jun 10, 2024
23b7507
Merge branch 'main' into add-grpc-adapter-class
panh99 Jun 10, 2024
df403cc
Merge branch 'add-grpc-adapter-class' into test-grpcadapter
panh99 Jun 10, 2024
87bcaf0
Merge branch 'main' into grpcadapter-servicer
panh99 Jun 10, 2024
bd535e2
Merge branch 'main' into add-grpc-adapter-class
panh99 Jun 10, 2024
3b2c101
Merge branch 'main' into add-grpc-adapter-class
panh99 Jun 18, 2024
b33c578
Merge branch 'main' into grpcadapter-servicer
panh99 Jun 18, 2024
e6be0cc
update imports
panh99 Jun 18, 2024
0e1d737
update imports
panh99 Jun 18, 2024
0c354bb
Merge branch 'main' into test-grpcadapter
panh99 Jun 18, 2024
8b2be0d
update supernode/app.py
panh99 Jun 18, 2024
7ad13df
update client/app.py and server/app.py
panh99 Jun 18, 2024
2a91a6b
Merge branch 'add-grpc-adapter-class' into test-grpcadapter
panh99 Jun 18, 2024
84dc775
Merge branch 'grpcadapter-servicer' into test-grpcadapter
panh99 Jun 18, 2024
1e75190
Merge branch 'main' into test-grpcadapter
panh99 Jun 19, 2024
5c61be4
restore
panh99 Jun 19, 2024
8dd5152
Merge branch 'main' into test-grpcadapter
danieljanes Jun 19, 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
Prev Previous commit
Next Next commit
fix check errors
panh99 committed May 30, 2024
commit 6af6680b4682e1aa2a2bf581c9e745c5fb3b655b
10 changes: 8 additions & 2 deletions src/py/flwr/client/grpc_rere_client/grpc_adapter.py
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
from google.protobuf.message import Message as GrpcMessage

import flwr
from flwr.proto.fleet_pb2 import (
from flwr.proto.fleet_pb2 import ( # pylint: disable=E0611
CreateNodeRequest,
CreateNodeResponse,
DeleteNodeRequest,
@@ -34,7 +34,7 @@
PushTaskResRequest,
PushTaskResResponse,
)
from flwr.proto.grpcadapter_pb2 import MessageContainer
from flwr.proto.grpcadapter_pb2 import MessageContainer # pylint: disable=E0611
from flwr.proto.grpcadapter_pb2_grpc import GrpcAdapterStub

KEY_FLOWER_VERSION = "flower-version"
@@ -63,26 +63,32 @@ def _send_and_receive(self, request: GrpcMessage, response_type: Type[T]) -> T:
response.ParseFromString(container_res.grpc_message_content)
return response

# pylint: disable-next=C0103
def CreateNode(self, request: CreateNodeRequest) -> CreateNodeResponse:
"""."""
return self._send_and_receive(request, CreateNodeResponse)

# pylint: disable-next=C0103
def DeleteNode(self, request: DeleteNodeRequest) -> DeleteNodeResponse:
"""."""
return self._send_and_receive(request, DeleteNodeResponse)

# pylint: disable-next=C0103
def Ping(self, request: PingRequest) -> PingResponse:
"""."""
return self._send_and_receive(request, PingResponse)

# pylint: disable-next=C0103
def PullTaskIns(self, request: PullTaskInsRequest) -> PullTaskInsResponse:
"""."""
return self._send_and_receive(request, PullTaskInsResponse)

# pylint: disable-next=C0103
def PushTaskRes(self, request: PushTaskResRequest) -> PushTaskResResponse:
"""."""
return self._send_and_receive(request, PushTaskResResponse)

# pylint: disable-next=C0103
def GetRun(self, request: GetRunRequest) -> GetRunResponse:
"""."""
return self._send_and_receive(request, GetRunResponse)