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

refactor(framework) Remove unused rpcs in ServerAppio API and presence in framework #4877

Merged
merged 3 commits into from
Jan 29, 2025
Merged

refactor(framework) Remove unused rpcs in ServerAppio API and presence in framework #4877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4e617f
init
jafermarq Jan 29, 2025
6349e1e
Merge branch 'main' into rm-taskinsres-rps-in-serverappio
jafermarq Jan 29, 2025
368b124
Merge branch 'main' into rm-taskinsres-rps-in-serverappio
jafermarq Jan 29, 2025
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
22 changes: 2 additions & 20 deletions src/proto/flwr/proto/serverappio.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package flwr.proto;
import "flwr/proto/log.proto";
import "flwr/proto/node.proto";
import "flwr/proto/message.proto";
import "flwr/proto/task.proto";
import "flwr/proto/run.proto";
import "flwr/proto/fab.proto";

Expand All @@ -31,12 +30,10 @@ service ServerAppIo {
// Return a set of nodes
rpc GetNodes(GetNodesRequest) returns (GetNodesResponse) {}

// Create one or more tasks
rpc PushTaskIns(PushTaskInsRequest) returns (PushTaskInsResponse) {}
// Create one or more messages
rpc PushMessages(PushInsMessagesRequest) returns (PushInsMessagesResponse) {}

// Get task results
rpc PullTaskRes(PullTaskResRequest) returns (PullTaskResResponse) {}
// Get message results
rpc PullMessages(PullResMessagesRequest) returns (PullResMessagesResponse) {}

// Get run details
Expand Down Expand Up @@ -68,21 +65,6 @@ service ServerAppIo {
message GetNodesRequest { uint64 run_id = 1; }
message GetNodesResponse { repeated Node nodes = 1; }

// PushTaskIns messages
message PushTaskInsRequest {
repeated TaskIns task_ins_list = 1;
uint64 run_id = 2;
}
message PushTaskInsResponse { repeated string task_ids = 2; }

// PullTaskRes messages
message PullTaskResRequest {
Node node = 1;
repeated string task_ids = 2;
uint64 run_id = 3;
}
message PullTaskResResponse { repeated TaskRes task_res_list = 1; }

// PushMessages messages
message PushInsMessagesRequest {
repeated Message messages_list = 1;
Expand Down
55 changes: 23 additions & 32 deletions src/py/flwr/proto/serverappio_pb2.py
View file
Open in desktop

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

62 changes: 0 additions & 62 deletions src/py/flwr/proto/serverappio_pb2.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import flwr.proto.fab_pb2
import flwr.proto.message_pb2
import flwr.proto.node_pb2
import flwr.proto.run_pb2
import flwr.proto.task_pb2
import google.protobuf.descriptor
import google.protobuf.internal.containers
import google.protobuf.message
Expand Down Expand Up @@ -40,67 +39,6 @@ class GetNodesResponse(google.protobuf.message.Message):
def ClearField(self, field_name: typing_extensions.Literal["nodes",b"nodes"]) -> None: ...
global___GetNodesResponse = GetNodesResponse

class PushTaskInsRequest(google.protobuf.message.Message):
"""PushTaskIns messages"""
DESCRIPTOR: google.protobuf.descriptor.Descriptor
TASK_INS_LIST_FIELD_NUMBER: builtins.int
RUN_ID_FIELD_NUMBER: builtins.int
@property
def task_ins_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.task_pb2.TaskIns]: ...
run_id: builtins.int
def __init__(self,
*,
task_ins_list: typing.Optional[typing.Iterable[flwr.proto.task_pb2.TaskIns]] = ...,
run_id: builtins.int = ...,
) -> None: ...
def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id","task_ins_list",b"task_ins_list"]) -> None: ...
global___PushTaskInsRequest = PushTaskInsRequest

class PushTaskInsResponse(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor
TASK_IDS_FIELD_NUMBER: builtins.int
@property
def task_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
def __init__(self,
*,
task_ids: typing.Optional[typing.Iterable[typing.Text]] = ...,
) -> None: ...
def ClearField(self, field_name: typing_extensions.Literal["task_ids",b"task_ids"]) -> None: ...
global___PushTaskInsResponse = PushTaskInsResponse

class PullTaskResRequest(google.protobuf.message.Message):
"""PullTaskRes messages"""
DESCRIPTOR: google.protobuf.descriptor.Descriptor
NODE_FIELD_NUMBER: builtins.int
TASK_IDS_FIELD_NUMBER: builtins.int
RUN_ID_FIELD_NUMBER: builtins.int
@property
def node(self) -> flwr.proto.node_pb2.Node: ...
@property
def task_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
run_id: builtins.int
def __init__(self,
*,
node: typing.Optional[flwr.proto.node_pb2.Node] = ...,
task_ids: typing.Optional[typing.Iterable[typing.Text]] = ...,
run_id: builtins.int = ...,
) -> 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","run_id",b"run_id","task_ids",b"task_ids"]) -> None: ...
global___PullTaskResRequest = PullTaskResRequest

class PullTaskResResponse(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor
TASK_RES_LIST_FIELD_NUMBER: builtins.int
@property
def task_res_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.task_pb2.TaskRes]: ...
def __init__(self,
*,
task_res_list: typing.Optional[typing.Iterable[flwr.proto.task_pb2.TaskRes]] = ...,
) -> None: ...
def ClearField(self, field_name: typing_extensions.Literal["task_res_list",b"task_res_list"]) -> None: ...
global___PullTaskResResponse = PullTaskResResponse

class PushInsMessagesRequest(google.protobuf.message.Message):
"""PushMessages messages"""
DESCRIPTOR: google.protobuf.descriptor.Descriptor
Expand Down
Loading