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

Create Ping endpoint #3171

Merged
merged 3 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 5 additions & 0 deletions src/proto/flwr/proto/fleet.proto
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import "flwr/proto/task.proto";
service Fleet {
rpc CreateNode(CreateNodeRequest) returns (CreateNodeResponse) {}
rpc DeleteNode(DeleteNodeRequest) returns (DeleteNodeResponse) {}
rpc Ping(PingRequest) returns (PingResponse) {}

// Retrieve one or more tasks, if possible
//
Expand All @@ -43,6 +44,10 @@ message CreateNodeResponse { Node node = 1; }
message DeleteNodeRequest { Node node = 1; }
message DeleteNodeResponse {}

// Ping messages
message PingRequest { Node node = 1; }
message PingResponse { bool success = 1; }

// PullTaskIns messages
message PullTaskInsRequest {
Node node = 1;
Expand Down
34 changes: 19 additions & 15 deletions src/py/flwr/proto/fleet_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions src/py/flwr/proto/fleet_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,31 @@ class DeleteNodeResponse(google.protobuf.message.Message):
) -> None: ...
global___DeleteNodeResponse = DeleteNodeResponse

class PingRequest(google.protobuf.message.Message):
"""Ping messages"""
DESCRIPTOR: google.protobuf.descriptor.Descriptor
NODE_FIELD_NUMBER: builtins.int
@property
def node(self) -> flwr.proto.node_pb2.Node: ...
def __init__(self,
*,
node: typing.Optional[flwr.proto.node_pb2.Node] = ...,
) -> None: ...
def HasField(self, field_name: typing_extensions.Literal["node",b"node"]) -> builtins.bool: ...
def ClearField(self, field_name: typing_extensions.Literal["node",b"node"]) -> None: ...
global___PingRequest = PingRequest

class PingResponse(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor
SUCCESS_FIELD_NUMBER: builtins.int
success: builtins.bool
def __init__(self,
*,
success: builtins.bool = ...,
) -> None: ...
def ClearField(self, field_name: typing_extensions.Literal["success",b"success"]) -> None: ...
global___PingResponse = PingResponse

class PullTaskInsRequest(google.protobuf.message.Message):
"""PullTaskIns messages"""
DESCRIPTOR: google.protobuf.descriptor.Descriptor
Expand Down
33 changes: 33 additions & 0 deletions src/py/flwr/proto/fleet_pb2_grpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ def __init__(self, channel):
request_serializer=flwr_dot_proto_dot_fleet__pb2.DeleteNodeRequest.SerializeToString,
response_deserializer=flwr_dot_proto_dot_fleet__pb2.DeleteNodeResponse.FromString,
)
self.Ping = channel.unary_unary(
'/flwr.proto.Fleet/Ping',
request_serializer=flwr_dot_proto_dot_fleet__pb2.PingRequest.SerializeToString,
response_deserializer=flwr_dot_proto_dot_fleet__pb2.PingResponse.FromString,
)
self.PullTaskIns = channel.unary_unary(
'/flwr.proto.Fleet/PullTaskIns',
request_serializer=flwr_dot_proto_dot_fleet__pb2.PullTaskInsRequest.SerializeToString,
Expand Down Expand Up @@ -51,6 +56,12 @@ def DeleteNode(self, request, context):
context.set_details('Method not implemented!')
raise NotImplementedError('Method not implemented!')

def Ping(self, request, context):
"""Missing associated documentation comment in .proto file."""
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
context.set_details('Method not implemented!')
raise NotImplementedError('Method not implemented!')

def PullTaskIns(self, request, context):
"""Retrieve one or more tasks, if possible

Expand Down Expand Up @@ -82,6 +93,11 @@ def add_FleetServicer_to_server(servicer, server):
request_deserializer=flwr_dot_proto_dot_fleet__pb2.DeleteNodeRequest.FromString,
response_serializer=flwr_dot_proto_dot_fleet__pb2.DeleteNodeResponse.SerializeToString,
),
'Ping': grpc.unary_unary_rpc_method_handler(
servicer.Ping,
request_deserializer=flwr_dot_proto_dot_fleet__pb2.PingRequest.FromString,
response_serializer=flwr_dot_proto_dot_fleet__pb2.PingResponse.SerializeToString,
),
'PullTaskIns': grpc.unary_unary_rpc_method_handler(
servicer.PullTaskIns,
request_deserializer=flwr_dot_proto_dot_fleet__pb2.PullTaskInsRequest.FromString,
Expand Down Expand Up @@ -136,6 +152,23 @@ def DeleteNode(request,
options, channel_credentials,
insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

@staticmethod
def Ping(request,
target,
options=(),
channel_credentials=None,
call_credentials=None,
insecure=False,
compression=None,
wait_for_ready=None,
timeout=None,
metadata=None):
return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/Ping',
flwr_dot_proto_dot_fleet__pb2.PingRequest.SerializeToString,
flwr_dot_proto_dot_fleet__pb2.PingResponse.FromString,
options, channel_credentials,
insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

@staticmethod
def PullTaskIns(request,
target,
Expand Down
10 changes: 10 additions & 0 deletions src/py/flwr/proto/fleet_pb2_grpc.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ class FleetStub:
flwr.proto.fleet_pb2.DeleteNodeRequest,
flwr.proto.fleet_pb2.DeleteNodeResponse]

Ping: grpc.UnaryUnaryMultiCallable[
flwr.proto.fleet_pb2.PingRequest,
flwr.proto.fleet_pb2.PingResponse]

PullTaskIns: grpc.UnaryUnaryMultiCallable[
flwr.proto.fleet_pb2.PullTaskInsRequest,
flwr.proto.fleet_pb2.PullTaskInsResponse]
Expand Down Expand Up @@ -46,6 +50,12 @@ class FleetServicer(metaclass=abc.ABCMeta):
context: grpc.ServicerContext,
) -> flwr.proto.fleet_pb2.DeleteNodeResponse: ...

@abc.abstractmethod
def Ping(self,
request: flwr.proto.fleet_pb2.PingRequest,
context: grpc.ServicerContext,
) -> flwr.proto.fleet_pb2.PingResponse: ...

@abc.abstractmethod
def PullTaskIns(self,
request: flwr.proto.fleet_pb2.PullTaskInsRequest,
Expand Down
10 changes: 10 additions & 0 deletions src/py/flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
CreateNodeResponse,
DeleteNodeRequest,
DeleteNodeResponse,
PingRequest,
PingResponse,
PullTaskInsRequest,
PullTaskInsResponse,
PushTaskResRequest,
Expand Down Expand Up @@ -61,6 +63,14 @@ def DeleteNode(
state=self.state_factory.state(),
)

def Ping(self, request: PingRequest, context: grpc.ServicerContext) -> PingResponse:
"""."""
log(INFO, "FleetServicer.Ping")
return message_handler.ping(
request=request,
state=self.state_factory.state(),
)

def PullTaskIns(
self, request: PullTaskInsRequest, context: grpc.ServicerContext
) -> PullTaskInsResponse:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
CreateNodeResponse,
DeleteNodeRequest,
DeleteNodeResponse,
PingRequest,
PingResponse,
PullTaskInsRequest,
PullTaskInsResponse,
PushTaskResRequest,
Expand Down Expand Up @@ -55,6 +57,14 @@ def delete_node(request: DeleteNodeRequest, state: State) -> DeleteNodeResponse:
return DeleteNodeResponse()


def ping(
request: PingRequest, # pylint: disable=unused-argument
state: State, # pylint: disable=unused-argument
) -> PingResponse:
"""."""
return PingResponse(success=True)


def pull_task_ins(request: PullTaskInsRequest, state: State) -> PullTaskInsResponse:
"""Pull TaskIns handler."""
# Get node_id if client node is not anonymous
Expand Down