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

fix(framework) Use uint for IDs #4168

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions src/proto/flwr/proto/clientappio.proto
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ message ClientAppOutputStatus {
}

message GetTokenRequest {}
message GetTokenResponse { sint64 token = 1; }
message GetTokenResponse { uint64 token = 1; }

message PullClientAppInputsRequest { sint64 token = 1; }
message PullClientAppInputsRequest { uint64 token = 1; }
message PullClientAppInputsResponse {
Message message = 1;
Context context = 2;
Expand All @@ -41,7 +41,7 @@ message PullClientAppInputsResponse {
}

message PushClientAppOutputsRequest {
sint64 token = 1;
uint64 token = 1;
Message message = 2;
Context context = 3;
}
Expand Down
4 changes: 2 additions & 2 deletions src/proto/flwr/proto/driver.proto
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ message CreateRunRequest {
map<string, Scalar> override_config = 3;
Fab fab = 4;
}
message CreateRunResponse { sint64 run_id = 1; }
message CreateRunResponse { uint64 run_id = 1; }

// GetNodes messages
message GetNodesRequest { sint64 run_id = 1; }
message GetNodesRequest { uint64 run_id = 1; }
message GetNodesResponse { repeated Node nodes = 1; }

// PushTaskIns messages
Expand Down
4 changes: 2 additions & 2 deletions src/proto/flwr/proto/exec.proto
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ message StartRunRequest {
map<string, Scalar> override_config = 2;
map<string, Scalar> federation_config = 3;
}
message StartRunResponse { sint64 run_id = 1; }
message StreamLogsRequest { sint64 run_id = 1; }
message StartRunResponse { uint64 run_id = 1; }
message StreamLogsRequest { uint64 run_id = 1; }
message StreamLogsResponse { string log_output = 1; }
8 changes: 4 additions & 4 deletions src/proto/flwr/proto/message.proto
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ message Message {
}

message Context {
sint64 node_id = 1;
uint64 node_id = 1;
map<string, Scalar> node_config = 2;
RecordSet state = 3;
map<string, Scalar> run_config = 4;
}

message Metadata {
sint64 run_id = 1;
uint64 run_id = 1;
string message_id = 2;
sint64 src_node_id = 3;
sint64 dst_node_id = 4;
uint64 src_node_id = 3;
uint64 dst_node_id = 4;
string reply_to_message = 5;
string group_id = 6;
double ttl = 7;
Expand Down
2 changes: 1 addition & 1 deletion src/proto/flwr/proto/node.proto
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ syntax = "proto3";
package flwr.proto;

message Node {
sint64 node_id = 1;
uint64 node_id = 1;
bool anonymous = 2;
}
4 changes: 2 additions & 2 deletions src/proto/flwr/proto/run.proto
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ package flwr.proto;
import "flwr/proto/transport.proto";

message Run {
sint64 run_id = 1;
uint64 run_id = 1;
string fab_id = 2;
string fab_version = 3;
map<string, Scalar> override_config = 4;
string fab_hash = 5;
}
message GetRunRequest { sint64 run_id = 1; }
message GetRunRequest { uint64 run_id = 1; }
message GetRunResponse { Run run = 1; }
4 changes: 2 additions & 2 deletions src/proto/flwr/proto/task.proto
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ message Task {
message TaskIns {
string task_id = 1;
string group_id = 2;
sint64 run_id = 3;
uint64 run_id = 3;
Task task = 4;
}

message TaskRes {
string task_id = 1;
string group_id = 2;
sint64 run_id = 3;
uint64 run_id = 3;
Task task = 4;
}
18 changes: 14 additions & 4 deletions src/py/flwr/proto/clientappio_pb2.py

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

108 changes: 71 additions & 37 deletions src/py/flwr/proto/clientappio_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -2,79 +2,103 @@
@generated by mypy-protobuf. Do not edit manually!
isort:skip_file
"""

import builtins
import flwr.proto.fab_pb2
import flwr.proto.message_pb2
import flwr.proto.run_pb2
import google.protobuf.descriptor
import google.protobuf.internal.enum_type_wrapper
import google.protobuf.message
import sys
import typing
import typing_extensions

if sys.version_info >= (3, 10):
import typing as typing_extensions
else:
import typing_extensions

DESCRIPTOR: google.protobuf.descriptor.FileDescriptor

class _ClientAppOutputCode:
ValueType = typing.NewType('ValueType', builtins.int)
ValueType = typing.NewType("ValueType", builtins.int)
V: typing_extensions.TypeAlias = ValueType

class _ClientAppOutputCodeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_ClientAppOutputCode.ValueType], builtins.type):
DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
SUCCESS: _ClientAppOutputCode.ValueType # 0
DEADLINE_EXCEEDED: _ClientAppOutputCode.ValueType # 1
UNKNOWN_ERROR: _ClientAppOutputCode.ValueType # 2
class ClientAppOutputCode(_ClientAppOutputCode, metaclass=_ClientAppOutputCodeEnumTypeWrapper):
pass

class ClientAppOutputCode(_ClientAppOutputCode, metaclass=_ClientAppOutputCodeEnumTypeWrapper): ...

SUCCESS: ClientAppOutputCode.ValueType # 0
DEADLINE_EXCEEDED: ClientAppOutputCode.ValueType # 1
UNKNOWN_ERROR: ClientAppOutputCode.ValueType # 2
global___ClientAppOutputCode = ClientAppOutputCode


@typing.final
class ClientAppOutputStatus(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor

CODE_FIELD_NUMBER: builtins.int
MESSAGE_FIELD_NUMBER: builtins.int
code: global___ClientAppOutputCode.ValueType
message: typing.Text
def __init__(self,
message: builtins.str
def __init__(
self,
*,
code: global___ClientAppOutputCode.ValueType = ...,
message: typing.Text = ...,
) -> None: ...
def ClearField(self, field_name: typing_extensions.Literal["code",b"code","message",b"message"]) -> None: ...
message: builtins.str = ...,
) -> None: ...
def ClearField(self, field_name: typing.Literal["code", b"code", "message", b"message"]) -> None: ...

global___ClientAppOutputStatus = ClientAppOutputStatus

@typing.final
class GetTokenRequest(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor
def __init__(self,
) -> None: ...

def __init__(
self,
) -> None: ...

global___GetTokenRequest = GetTokenRequest

@typing.final
class GetTokenResponse(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor

TOKEN_FIELD_NUMBER: builtins.int
token: builtins.int
def __init__(self,
def __init__(
self,
*,
token: builtins.int = ...,
) -> None: ...
def ClearField(self, field_name: typing_extensions.Literal["token",b"token"]) -> None: ...
) -> None: ...
def ClearField(self, field_name: typing.Literal["token", b"token"]) -> None: ...

global___GetTokenResponse = GetTokenResponse

@typing.final
class PullClientAppInputsRequest(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor

TOKEN_FIELD_NUMBER: builtins.int
token: builtins.int
def __init__(self,
def __init__(
self,
*,
token: builtins.int = ...,
) -> None: ...
def ClearField(self, field_name: typing_extensions.Literal["token",b"token"]) -> None: ...
) -> None: ...
def ClearField(self, field_name: typing.Literal["token", b"token"]) -> None: ...

global___PullClientAppInputsRequest = PullClientAppInputsRequest

@typing.final
class PullClientAppInputsResponse(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor

MESSAGE_FIELD_NUMBER: builtins.int
CONTEXT_FIELD_NUMBER: builtins.int
RUN_FIELD_NUMBER: builtins.int
Expand All @@ -87,19 +111,23 @@ class PullClientAppInputsResponse(google.protobuf.message.Message):
def run(self) -> flwr.proto.run_pb2.Run: ...
@property
def fab(self) -> flwr.proto.fab_pb2.Fab: ...
def __init__(self,
def __init__(
self,
*,
message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
run: typing.Optional[flwr.proto.run_pb2.Run] = ...,
fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
) -> None: ...
def HasField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","message",b"message","run",b"run"]) -> builtins.bool: ...
def ClearField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","message",b"message","run",b"run"]) -> None: ...
message: flwr.proto.message_pb2.Message | None = ...,
context: flwr.proto.message_pb2.Context | None = ...,
run: flwr.proto.run_pb2.Run | None = ...,
fab: flwr.proto.fab_pb2.Fab | None = ...,
) -> None: ...
def HasField(self, field_name: typing.Literal["context", b"context", "fab", b"fab", "message", b"message", "run", b"run"]) -> builtins.bool: ...
def ClearField(self, field_name: typing.Literal["context", b"context", "fab", b"fab", "message", b"message", "run", b"run"]) -> None: ...

global___PullClientAppInputsResponse = PullClientAppInputsResponse

@typing.final
class PushClientAppOutputsRequest(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor

TOKEN_FIELD_NUMBER: builtins.int
MESSAGE_FIELD_NUMBER: builtins.int
CONTEXT_FIELD_NUMBER: builtins.int
Expand All @@ -108,25 +136,31 @@ class PushClientAppOutputsRequest(google.protobuf.message.Message):
def message(self) -> flwr.proto.message_pb2.Message: ...
@property
def context(self) -> flwr.proto.message_pb2.Context: ...
def __init__(self,
def __init__(
self,
*,
token: builtins.int = ...,
message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
) -> None: ...
def HasField(self, field_name: typing_extensions.Literal["context",b"context","message",b"message"]) -> builtins.bool: ...
def ClearField(self, field_name: typing_extensions.Literal["context",b"context","message",b"message","token",b"token"]) -> None: ...
message: flwr.proto.message_pb2.Message | None = ...,
context: flwr.proto.message_pb2.Context | None = ...,
) -> None: ...
def HasField(self, field_name: typing.Literal["context", b"context", "message", b"message"]) -> builtins.bool: ...
def ClearField(self, field_name: typing.Literal["context", b"context", "message", b"message", "token", b"token"]) -> None: ...

global___PushClientAppOutputsRequest = PushClientAppOutputsRequest

@typing.final
class PushClientAppOutputsResponse(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor

STATUS_FIELD_NUMBER: builtins.int
@property
def status(self) -> global___ClientAppOutputStatus: ...
def __init__(self,
def __init__(
self,
*,
status: typing.Optional[global___ClientAppOutputStatus] = ...,
) -> None: ...
def HasField(self, field_name: typing_extensions.Literal["status",b"status"]) -> builtins.bool: ...
def ClearField(self, field_name: typing_extensions.Literal["status",b"status"]) -> None: ...
status: global___ClientAppOutputStatus | None = ...,
) -> None: ...
def HasField(self, field_name: typing.Literal["status", b"status"]) -> builtins.bool: ...
def ClearField(self, field_name: typing.Literal["status", b"status"]) -> None: ...

global___PushClientAppOutputsResponse = PushClientAppOutputsResponse
Loading
Loading