move CreateRun* to control.proto

adap · Sep 20, 2024 · 293725d · 293725d
1 parent 02e1813
commit 293725d
Show file tree

Hide file tree

Showing 15 changed files with 138 additions and 126 deletions.
diff --git a/src/proto/flwr/proto/control.proto b/src/proto/flwr/proto/control.proto
@@ -17,9 +17,19 @@ syntax = "proto3";
 
 package flwr.proto;
 
-import "flwr/proto/run.proto";
+import "flwr/proto/fab.proto";
+import "flwr/proto/transport.proto";
 
 service Control {
   // Request to create a new run
   rpc CreateRun(CreateRunRequest) returns (CreateRunResponse) {}
 }
+
+// CreateRun
+message CreateRunRequest {
+  string fab_id = 1;
+  string fab_version = 2;
+  map<string, Scalar> override_config = 3;
+  Fab fab = 4;
+}
+message CreateRunResponse { uint64 run_id = 1; }
diff --git a/src/proto/flwr/proto/driver.proto b/src/proto/flwr/proto/driver.proto
@@ -20,6 +20,7 @@ package flwr.proto;
 import "flwr/proto/node.proto";
 import "flwr/proto/task.proto";
 import "flwr/proto/run.proto";
+import "flwr/proto/control.proto";
 import "flwr/proto/fab.proto";
 
 service Driver {

diff --git a/src/proto/flwr/proto/run.proto b/src/proto/flwr/proto/run.proto
@@ -17,7 +17,6 @@ syntax = "proto3";
 
 package flwr.proto;
 
-import "flwr/proto/fab.proto";
 import "flwr/proto/transport.proto";
 
 message Run {
@@ -28,15 +27,6 @@ message Run {
   string fab_hash = 5;
 }
 
-// CreateRun
-message CreateRunRequest {
-  string fab_id = 1;
-  string fab_version = 2;
-  map<string, Scalar> override_config = 3;
-  Fab fab = 4;
-}
-message CreateRunResponse { uint64 run_id = 1; }
-
 // GetRun
 message GetRunRequest { uint64 run_id = 1; }
 message GetRunResponse { Run run = 1; }
diff --git a/src/py/flwr/proto/control_pb2.py b/src/py/flwr/proto/control_pb2.py
diff --git a/src/py/flwr/proto/control_pb2.pyi b/src/py/flwr/proto/control_pb2.pyi
@@ -2,6 +2,63 @@
 @generated by mypy-protobuf.  Do not edit manually!
 isort:skip_file
 """
+import builtins
+import flwr.proto.fab_pb2
+import flwr.proto.transport_pb2
 import google.protobuf.descriptor
+import google.protobuf.internal.containers
+import google.protobuf.message
+import typing
+import typing_extensions
 
 DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+
+class CreateRunRequest(google.protobuf.message.Message):
+    """CreateRun"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    class OverrideConfigEntry(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        KEY_FIELD_NUMBER: builtins.int
+        VALUE_FIELD_NUMBER: builtins.int
+        key: typing.Text
+        @property
+        def value(self) -> flwr.proto.transport_pb2.Scalar: ...
+        def __init__(self,
+            *,
+            key: typing.Text = ...,
+            value: typing.Optional[flwr.proto.transport_pb2.Scalar] = ...,
+            ) -> None: ...
+        def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
+
+    FAB_ID_FIELD_NUMBER: builtins.int
+    FAB_VERSION_FIELD_NUMBER: builtins.int
+    OVERRIDE_CONFIG_FIELD_NUMBER: builtins.int
+    FAB_FIELD_NUMBER: builtins.int
+    fab_id: typing.Text
+    fab_version: typing.Text
+    @property
+    def override_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
+    @property
+    def fab(self) -> flwr.proto.fab_pb2.Fab: ...
+    def __init__(self,
+        *,
+        fab_id: typing.Text = ...,
+        fab_version: typing.Text = ...,
+        override_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
+        fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["fab",b"fab"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["fab",b"fab","fab_id",b"fab_id","fab_version",b"fab_version","override_config",b"override_config"]) -> None: ...
+global___CreateRunRequest = CreateRunRequest
+
+class CreateRunResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    RUN_ID_FIELD_NUMBER: builtins.int
+    run_id: builtins.int
+    def __init__(self,
+        *,
+        run_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id"]) -> None: ...
+global___CreateRunResponse = CreateRunResponse
diff --git a/src/py/flwr/proto/control_pb2_grpc.py b/src/py/flwr/proto/control_pb2_grpc.py
@@ -2,7 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+from flwr.proto import control_pb2 as flwr_dot_proto_dot_control__pb2
 
 
 class ControlStub(object):
@@ -16,8 +16,8 @@ def __init__(self, channel):
         """
         self.CreateRun = channel.unary_unary(
                 '/flwr.proto.Control/CreateRun',
-                request_serializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
+                request_serializer=flwr_dot_proto_dot_control__pb2.CreateRunRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.CreateRunResponse.FromString,
                 )
 
 
@@ -36,8 +36,8 @@ def add_ControlServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'CreateRun': grpc.unary_unary_rpc_method_handler(
                     servicer.CreateRun,
-                    request_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.CreateRunRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.CreateRunResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -61,7 +61,7 @@ def CreateRun(request,
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/CreateRun',
-            flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
-            flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
+            flwr_dot_proto_dot_control__pb2.CreateRunRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.CreateRunResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/src/py/flwr/proto/control_pb2_grpc.pyi b/src/py/flwr/proto/control_pb2_grpc.pyi
@@ -3,23 +3,23 @@
 isort:skip_file
 """
 import abc
-import flwr.proto.run_pb2
+import flwr.proto.control_pb2
 import grpc
 
 class ControlStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
     CreateRun: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.run_pb2.CreateRunRequest,
-        flwr.proto.run_pb2.CreateRunResponse]
+        flwr.proto.control_pb2.CreateRunRequest,
+        flwr.proto.control_pb2.CreateRunResponse]
     """Request to create a new run"""
 
 
 class ControlServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def CreateRun(self,
-        request: flwr.proto.run_pb2.CreateRunRequest,
+        request: flwr.proto.control_pb2.CreateRunRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.run_pb2.CreateRunResponse:
+    ) -> flwr.proto.control_pb2.CreateRunResponse:
         """Request to create a new run"""
         pass
 

diff --git a/src/py/flwr/proto/driver_pb2.py b/src/py/flwr/proto/driver_pb2.py
diff --git a/src/py/flwr/proto/driver_pb2_grpc.py b/src/py/flwr/proto/driver_pb2_grpc.py
@@ -2,6 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
+from flwr.proto import control_pb2 as flwr_dot_proto_dot_control__pb2
 from flwr.proto import driver_pb2 as flwr_dot_proto_dot_driver__pb2
 from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
@@ -18,8 +19,8 @@ def __init__(self, channel):
         """
         self.CreateRun = channel.unary_unary(
                 '/flwr.proto.Driver/CreateRun',
-                request_serializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
+                request_serializer=flwr_dot_proto_dot_control__pb2.CreateRunRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.CreateRunResponse.FromString,
                 )
         self.GetNodes = channel.unary_unary(
                 '/flwr.proto.Driver/GetNodes',
@@ -98,8 +99,8 @@ def add_DriverServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'CreateRun': grpc.unary_unary_rpc_method_handler(
                     servicer.CreateRun,
-                    request_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.CreateRunRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.CreateRunResponse.SerializeToString,
             ),
             'GetNodes': grpc.unary_unary_rpc_method_handler(
                     servicer.GetNodes,
@@ -148,8 +149,8 @@ def CreateRun(request,
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/CreateRun',
-            flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
-            flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
+            flwr_dot_proto_dot_control__pb2.CreateRunRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.CreateRunResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 

diff --git a/src/py/flwr/proto/driver_pb2_grpc.pyi b/src/py/flwr/proto/driver_pb2_grpc.pyi
@@ -3,6 +3,7 @@
 isort:skip_file
 """
 import abc
+import flwr.proto.control_pb2
 import flwr.proto.driver_pb2
 import flwr.proto.fab_pb2
 import flwr.proto.run_pb2
@@ -11,8 +12,8 @@ import grpc
 class DriverStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
     CreateRun: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.run_pb2.CreateRunRequest,
-        flwr.proto.run_pb2.CreateRunResponse]
+        flwr.proto.control_pb2.CreateRunRequest,
+        flwr.proto.control_pb2.CreateRunResponse]
     """Request run_id"""
 
     GetNodes: grpc.UnaryUnaryMultiCallable[
@@ -44,9 +45,9 @@ class DriverStub:
 class DriverServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def CreateRun(self,
-        request: flwr.proto.run_pb2.CreateRunRequest,
+        request: flwr.proto.control_pb2.CreateRunRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.run_pb2.CreateRunResponse:
+    ) -> flwr.proto.control_pb2.CreateRunResponse:
         """Request run_id"""
         pass