From 976ab230eb23ce7ec8b553e1b60d0616492d0893 Mon Sep 17 00:00:00 2001 From: Karl Higley Date: Sun, 15 Mar 2020 12:34:15 -0400 Subject: [PATCH 1/2] Standardize the names of tensor, plan, and worker command messages --- js/protobuf.d.js | 78 ++--- js/protobuf.js | 160 ++++----- .../syftproto/messaging/v1/Message.java | 324 +++++++++--------- proto.json | 4 +- .../syft_proto/messaging/v1/message.proto | 10 +- syft_proto/messaging/v1/message_pb2.py | 60 ++-- 6 files changed, 319 insertions(+), 317 deletions(-) diff --git a/js/protobuf.d.js b/js/protobuf.d.js index 2130aac..38ca978 100644 --- a/js/protobuf.d.js +++ b/js/protobuf.d.js @@ -2516,8 +2516,8 @@ export namespace syft_proto { /** SyftMessage contents_object_msg */ contents_object_msg?: (syft_proto.messaging.v1.IObjectMessage|null); - /** SyftMessage contents_command_msg */ - contents_command_msg?: (syft_proto.messaging.v1.ICommandMessage|null); + /** SyftMessage contents_tensor_cmd_msg */ + contents_tensor_cmd_msg?: (syft_proto.messaging.v1.ITensorCommandMessage|null); } /** Represents a SyftMessage. */ @@ -2535,11 +2535,11 @@ export namespace syft_proto { /** SyftMessage contents_object_msg. */ public contents_object_msg?: (syft_proto.messaging.v1.IObjectMessage|null); - /** SyftMessage contents_command_msg. */ - public contents_command_msg?: (syft_proto.messaging.v1.ICommandMessage|null); + /** SyftMessage contents_tensor_cmd_msg. */ + public contents_tensor_cmd_msg?: (syft_proto.messaging.v1.ITensorCommandMessage|null); /** SyftMessage contents. */ - public contents?: ("contents_empty_msg"|"contents_object_msg"|"contents_command_msg"); + public contents?: ("contents_empty_msg"|"contents_object_msg"|"contents_tensor_cmd_msg"); /** * Creates a new SyftMessage instance using the specified properties. @@ -2702,100 +2702,100 @@ export namespace syft_proto { public toJSON(): { [k: string]: any }; } - /** Properties of a CommandMessage. */ - interface ICommandMessage { + /** Properties of a TensorCommandMessage. */ + interface ITensorCommandMessage { - /** CommandMessage computation */ + /** TensorCommandMessage computation */ computation?: (syft_proto.execution.v1.IComputationAction|null); - /** CommandMessage communication */ + /** TensorCommandMessage communication */ communication?: (syft_proto.execution.v1.ICommunicationAction|null); } - /** Represents a CommandMessage. */ - class CommandMessage implements ICommandMessage { + /** Represents a TensorCommandMessage. */ + class TensorCommandMessage implements ITensorCommandMessage { /** - * Constructs a new CommandMessage. + * Constructs a new TensorCommandMessage. * @param [properties] Properties to set */ - constructor(properties?: syft_proto.messaging.v1.ICommandMessage); + constructor(properties?: syft_proto.messaging.v1.ITensorCommandMessage); - /** CommandMessage computation. */ + /** TensorCommandMessage computation. */ public computation?: (syft_proto.execution.v1.IComputationAction|null); - /** CommandMessage communication. */ + /** TensorCommandMessage communication. */ public communication?: (syft_proto.execution.v1.ICommunicationAction|null); - /** CommandMessage action. */ + /** TensorCommandMessage action. */ public action?: ("computation"|"communication"); /** - * Creates a new CommandMessage instance using the specified properties. + * Creates a new TensorCommandMessage instance using the specified properties. * @param [properties] Properties to set - * @returns CommandMessage instance + * @returns TensorCommandMessage instance */ - public static create(properties?: syft_proto.messaging.v1.ICommandMessage): syft_proto.messaging.v1.CommandMessage; + public static create(properties?: syft_proto.messaging.v1.ITensorCommandMessage): syft_proto.messaging.v1.TensorCommandMessage; /** - * Encodes the specified CommandMessage message. Does not implicitly {@link syft_proto.messaging.v1.CommandMessage.verify|verify} messages. - * @param message CommandMessage message or plain object to encode + * Encodes the specified TensorCommandMessage message. Does not implicitly {@link syft_proto.messaging.v1.TensorCommandMessage.verify|verify} messages. + * @param message TensorCommandMessage message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: syft_proto.messaging.v1.ICommandMessage, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: syft_proto.messaging.v1.ITensorCommandMessage, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified CommandMessage message, length delimited. Does not implicitly {@link syft_proto.messaging.v1.CommandMessage.verify|verify} messages. - * @param message CommandMessage message or plain object to encode + * Encodes the specified TensorCommandMessage message, length delimited. Does not implicitly {@link syft_proto.messaging.v1.TensorCommandMessage.verify|verify} messages. + * @param message TensorCommandMessage message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: syft_proto.messaging.v1.ICommandMessage, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: syft_proto.messaging.v1.ITensorCommandMessage, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a CommandMessage message from the specified reader or buffer. + * Decodes a TensorCommandMessage message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns CommandMessage + * @returns TensorCommandMessage * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): syft_proto.messaging.v1.CommandMessage; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): syft_proto.messaging.v1.TensorCommandMessage; /** - * Decodes a CommandMessage message from the specified reader or buffer, length delimited. + * Decodes a TensorCommandMessage message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns CommandMessage + * @returns TensorCommandMessage * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): syft_proto.messaging.v1.CommandMessage; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): syft_proto.messaging.v1.TensorCommandMessage; /** - * Verifies a CommandMessage message. + * Verifies a TensorCommandMessage message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a CommandMessage message from a plain object. Also converts values to their respective internal types. + * Creates a TensorCommandMessage message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns CommandMessage + * @returns TensorCommandMessage */ - public static fromObject(object: { [k: string]: any }): syft_proto.messaging.v1.CommandMessage; + public static fromObject(object: { [k: string]: any }): syft_proto.messaging.v1.TensorCommandMessage; /** - * Creates a plain object from a CommandMessage message. Also converts values to other types if specified. - * @param message CommandMessage + * Creates a plain object from a TensorCommandMessage message. Also converts values to other types if specified. + * @param message TensorCommandMessage * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: syft_proto.messaging.v1.CommandMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: syft_proto.messaging.v1.TensorCommandMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this CommandMessage to JSON. + * Converts this TensorCommandMessage to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; diff --git a/js/protobuf.js b/js/protobuf.js index c0e7e6d..13dfdf0 100644 --- a/js/protobuf.js +++ b/js/protobuf.js @@ -7121,7 +7121,7 @@ $root.syft_proto = (function() { * @interface ISyftMessage * @property {google.protobuf.IEmpty|null} [contents_empty_msg] SyftMessage contents_empty_msg * @property {syft_proto.messaging.v1.IObjectMessage|null} [contents_object_msg] SyftMessage contents_object_msg - * @property {syft_proto.messaging.v1.ICommandMessage|null} [contents_command_msg] SyftMessage contents_command_msg + * @property {syft_proto.messaging.v1.ITensorCommandMessage|null} [contents_tensor_cmd_msg] SyftMessage contents_tensor_cmd_msg */ /** @@ -7156,24 +7156,24 @@ $root.syft_proto = (function() { SyftMessage.prototype.contents_object_msg = null; /** - * SyftMessage contents_command_msg. - * @member {syft_proto.messaging.v1.ICommandMessage|null|undefined} contents_command_msg + * SyftMessage contents_tensor_cmd_msg. + * @member {syft_proto.messaging.v1.ITensorCommandMessage|null|undefined} contents_tensor_cmd_msg * @memberof syft_proto.messaging.v1.SyftMessage * @instance */ - SyftMessage.prototype.contents_command_msg = null; + SyftMessage.prototype.contents_tensor_cmd_msg = null; // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * SyftMessage contents. - * @member {"contents_empty_msg"|"contents_object_msg"|"contents_command_msg"|undefined} contents + * @member {"contents_empty_msg"|"contents_object_msg"|"contents_tensor_cmd_msg"|undefined} contents * @memberof syft_proto.messaging.v1.SyftMessage * @instance */ Object.defineProperty(SyftMessage.prototype, "contents", { - get: $util.oneOfGetter($oneOfFields = ["contents_empty_msg", "contents_object_msg", "contents_command_msg"]), + get: $util.oneOfGetter($oneOfFields = ["contents_empty_msg", "contents_object_msg", "contents_tensor_cmd_msg"]), set: $util.oneOfSetter($oneOfFields) }); @@ -7205,8 +7205,8 @@ $root.syft_proto = (function() { $root.google.protobuf.Empty.encode(message.contents_empty_msg, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); if (message.contents_object_msg != null && message.hasOwnProperty("contents_object_msg")) $root.syft_proto.messaging.v1.ObjectMessage.encode(message.contents_object_msg, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); - if (message.contents_command_msg != null && message.hasOwnProperty("contents_command_msg")) - $root.syft_proto.messaging.v1.CommandMessage.encode(message.contents_command_msg, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); + if (message.contents_tensor_cmd_msg != null && message.hasOwnProperty("contents_tensor_cmd_msg")) + $root.syft_proto.messaging.v1.TensorCommandMessage.encode(message.contents_tensor_cmd_msg, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); return writer; }; @@ -7248,7 +7248,7 @@ $root.syft_proto = (function() { message.contents_object_msg = $root.syft_proto.messaging.v1.ObjectMessage.decode(reader, reader.uint32()); break; case 7: - message.contents_command_msg = $root.syft_proto.messaging.v1.CommandMessage.decode(reader, reader.uint32()); + message.contents_tensor_cmd_msg = $root.syft_proto.messaging.v1.TensorCommandMessage.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -7304,14 +7304,14 @@ $root.syft_proto = (function() { return "contents_object_msg." + error; } } - if (message.contents_command_msg != null && message.hasOwnProperty("contents_command_msg")) { + if (message.contents_tensor_cmd_msg != null && message.hasOwnProperty("contents_tensor_cmd_msg")) { if (properties.contents === 1) return "contents: multiple values"; properties.contents = 1; { - var error = $root.syft_proto.messaging.v1.CommandMessage.verify(message.contents_command_msg); + var error = $root.syft_proto.messaging.v1.TensorCommandMessage.verify(message.contents_tensor_cmd_msg); if (error) - return "contents_command_msg." + error; + return "contents_tensor_cmd_msg." + error; } } return null; @@ -7339,10 +7339,10 @@ $root.syft_proto = (function() { throw TypeError(".syft_proto.messaging.v1.SyftMessage.contents_object_msg: object expected"); message.contents_object_msg = $root.syft_proto.messaging.v1.ObjectMessage.fromObject(object.contents_object_msg); } - if (object.contents_command_msg != null) { - if (typeof object.contents_command_msg !== "object") - throw TypeError(".syft_proto.messaging.v1.SyftMessage.contents_command_msg: object expected"); - message.contents_command_msg = $root.syft_proto.messaging.v1.CommandMessage.fromObject(object.contents_command_msg); + if (object.contents_tensor_cmd_msg != null) { + if (typeof object.contents_tensor_cmd_msg !== "object") + throw TypeError(".syft_proto.messaging.v1.SyftMessage.contents_tensor_cmd_msg: object expected"); + message.contents_tensor_cmd_msg = $root.syft_proto.messaging.v1.TensorCommandMessage.fromObject(object.contents_tensor_cmd_msg); } return message; }; @@ -7370,10 +7370,10 @@ $root.syft_proto = (function() { if (options.oneofs) object.contents = "contents_object_msg"; } - if (message.contents_command_msg != null && message.hasOwnProperty("contents_command_msg")) { - object.contents_command_msg = $root.syft_proto.messaging.v1.CommandMessage.toObject(message.contents_command_msg, options); + if (message.contents_tensor_cmd_msg != null && message.hasOwnProperty("contents_tensor_cmd_msg")) { + object.contents_tensor_cmd_msg = $root.syft_proto.messaging.v1.TensorCommandMessage.toObject(message.contents_tensor_cmd_msg, options); if (options.oneofs) - object.contents = "contents_command_msg"; + object.contents = "contents_tensor_cmd_msg"; } return object; }; @@ -7584,25 +7584,25 @@ $root.syft_proto = (function() { return ObjectMessage; })(); - v1.CommandMessage = (function() { + v1.TensorCommandMessage = (function() { /** - * Properties of a CommandMessage. + * Properties of a TensorCommandMessage. * @memberof syft_proto.messaging.v1 - * @interface ICommandMessage - * @property {syft_proto.execution.v1.IComputationAction|null} [computation] CommandMessage computation - * @property {syft_proto.execution.v1.ICommunicationAction|null} [communication] CommandMessage communication + * @interface ITensorCommandMessage + * @property {syft_proto.execution.v1.IComputationAction|null} [computation] TensorCommandMessage computation + * @property {syft_proto.execution.v1.ICommunicationAction|null} [communication] TensorCommandMessage communication */ /** - * Constructs a new CommandMessage. + * Constructs a new TensorCommandMessage. * @memberof syft_proto.messaging.v1 - * @classdesc Represents a CommandMessage. - * @implements ICommandMessage + * @classdesc Represents a TensorCommandMessage. + * @implements ITensorCommandMessage * @constructor - * @param {syft_proto.messaging.v1.ICommandMessage=} [properties] Properties to set + * @param {syft_proto.messaging.v1.ITensorCommandMessage=} [properties] Properties to set */ - function CommandMessage(properties) { + function TensorCommandMessage(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -7610,57 +7610,57 @@ $root.syft_proto = (function() { } /** - * CommandMessage computation. + * TensorCommandMessage computation. * @member {syft_proto.execution.v1.IComputationAction|null|undefined} computation - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @instance */ - CommandMessage.prototype.computation = null; + TensorCommandMessage.prototype.computation = null; /** - * CommandMessage communication. + * TensorCommandMessage communication. * @member {syft_proto.execution.v1.ICommunicationAction|null|undefined} communication - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @instance */ - CommandMessage.prototype.communication = null; + TensorCommandMessage.prototype.communication = null; // OneOf field names bound to virtual getters and setters var $oneOfFields; /** - * CommandMessage action. + * TensorCommandMessage action. * @member {"computation"|"communication"|undefined} action - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @instance */ - Object.defineProperty(CommandMessage.prototype, "action", { + Object.defineProperty(TensorCommandMessage.prototype, "action", { get: $util.oneOfGetter($oneOfFields = ["computation", "communication"]), set: $util.oneOfSetter($oneOfFields) }); /** - * Creates a new CommandMessage instance using the specified properties. + * Creates a new TensorCommandMessage instance using the specified properties. * @function create - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @static - * @param {syft_proto.messaging.v1.ICommandMessage=} [properties] Properties to set - * @returns {syft_proto.messaging.v1.CommandMessage} CommandMessage instance + * @param {syft_proto.messaging.v1.ITensorCommandMessage=} [properties] Properties to set + * @returns {syft_proto.messaging.v1.TensorCommandMessage} TensorCommandMessage instance */ - CommandMessage.create = function create(properties) { - return new CommandMessage(properties); + TensorCommandMessage.create = function create(properties) { + return new TensorCommandMessage(properties); }; /** - * Encodes the specified CommandMessage message. Does not implicitly {@link syft_proto.messaging.v1.CommandMessage.verify|verify} messages. + * Encodes the specified TensorCommandMessage message. Does not implicitly {@link syft_proto.messaging.v1.TensorCommandMessage.verify|verify} messages. * @function encode - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @static - * @param {syft_proto.messaging.v1.ICommandMessage} message CommandMessage message or plain object to encode + * @param {syft_proto.messaging.v1.ITensorCommandMessage} message TensorCommandMessage message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - CommandMessage.encode = function encode(message, writer) { + TensorCommandMessage.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); if (message.computation != null && message.hasOwnProperty("computation")) @@ -7671,33 +7671,33 @@ $root.syft_proto = (function() { }; /** - * Encodes the specified CommandMessage message, length delimited. Does not implicitly {@link syft_proto.messaging.v1.CommandMessage.verify|verify} messages. + * Encodes the specified TensorCommandMessage message, length delimited. Does not implicitly {@link syft_proto.messaging.v1.TensorCommandMessage.verify|verify} messages. * @function encodeDelimited - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @static - * @param {syft_proto.messaging.v1.ICommandMessage} message CommandMessage message or plain object to encode + * @param {syft_proto.messaging.v1.ITensorCommandMessage} message TensorCommandMessage message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - CommandMessage.encodeDelimited = function encodeDelimited(message, writer) { + TensorCommandMessage.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a CommandMessage message from the specified reader or buffer. + * Decodes a TensorCommandMessage message from the specified reader or buffer. * @function decode - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {syft_proto.messaging.v1.CommandMessage} CommandMessage + * @returns {syft_proto.messaging.v1.TensorCommandMessage} TensorCommandMessage * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CommandMessage.decode = function decode(reader, length) { + TensorCommandMessage.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.syft_proto.messaging.v1.CommandMessage(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.syft_proto.messaging.v1.TensorCommandMessage(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -7716,30 +7716,30 @@ $root.syft_proto = (function() { }; /** - * Decodes a CommandMessage message from the specified reader or buffer, length delimited. + * Decodes a TensorCommandMessage message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {syft_proto.messaging.v1.CommandMessage} CommandMessage + * @returns {syft_proto.messaging.v1.TensorCommandMessage} TensorCommandMessage * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CommandMessage.decodeDelimited = function decodeDelimited(reader) { + TensorCommandMessage.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a CommandMessage message. + * Verifies a TensorCommandMessage message. * @function verify - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - CommandMessage.verify = function verify(message) { + TensorCommandMessage.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; var properties = {}; @@ -7765,40 +7765,40 @@ $root.syft_proto = (function() { }; /** - * Creates a CommandMessage message from a plain object. Also converts values to their respective internal types. + * Creates a TensorCommandMessage message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @static * @param {Object.} object Plain object - * @returns {syft_proto.messaging.v1.CommandMessage} CommandMessage + * @returns {syft_proto.messaging.v1.TensorCommandMessage} TensorCommandMessage */ - CommandMessage.fromObject = function fromObject(object) { - if (object instanceof $root.syft_proto.messaging.v1.CommandMessage) + TensorCommandMessage.fromObject = function fromObject(object) { + if (object instanceof $root.syft_proto.messaging.v1.TensorCommandMessage) return object; - var message = new $root.syft_proto.messaging.v1.CommandMessage(); + var message = new $root.syft_proto.messaging.v1.TensorCommandMessage(); if (object.computation != null) { if (typeof object.computation !== "object") - throw TypeError(".syft_proto.messaging.v1.CommandMessage.computation: object expected"); + throw TypeError(".syft_proto.messaging.v1.TensorCommandMessage.computation: object expected"); message.computation = $root.syft_proto.execution.v1.ComputationAction.fromObject(object.computation); } if (object.communication != null) { if (typeof object.communication !== "object") - throw TypeError(".syft_proto.messaging.v1.CommandMessage.communication: object expected"); + throw TypeError(".syft_proto.messaging.v1.TensorCommandMessage.communication: object expected"); message.communication = $root.syft_proto.execution.v1.CommunicationAction.fromObject(object.communication); } return message; }; /** - * Creates a plain object from a CommandMessage message. Also converts values to other types if specified. + * Creates a plain object from a TensorCommandMessage message. Also converts values to other types if specified. * @function toObject - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @static - * @param {syft_proto.messaging.v1.CommandMessage} message CommandMessage + * @param {syft_proto.messaging.v1.TensorCommandMessage} message TensorCommandMessage * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - CommandMessage.toObject = function toObject(message, options) { + TensorCommandMessage.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; @@ -7816,17 +7816,17 @@ $root.syft_proto = (function() { }; /** - * Converts this CommandMessage to JSON. + * Converts this TensorCommandMessage to JSON. * @function toJSON - * @memberof syft_proto.messaging.v1.CommandMessage + * @memberof syft_proto.messaging.v1.TensorCommandMessage * @instance * @returns {Object.} JSON object */ - CommandMessage.prototype.toJSON = function toJSON() { + TensorCommandMessage.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return CommandMessage; + return TensorCommandMessage; })(); return v1; diff --git a/jvm/src/main/java/org/openmined/syftproto/messaging/v1/Message.java b/jvm/src/main/java/org/openmined/syftproto/messaging/v1/Message.java index 27912c0..ce1df5f 100644 --- a/jvm/src/main/java/org/openmined/syftproto/messaging/v1/Message.java +++ b/jvm/src/main/java/org/openmined/syftproto/messaging/v1/Message.java @@ -67,25 +67,25 @@ public interface SyftMessageOrBuilder extends * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - boolean hasContentsCommandMsg(); + boolean hasContentsTensorCmdMsg(); /** * 
      * ObjectRequestMessage contents_object_request_msg = 6;
      *
* - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - org.openmined.syftproto.messaging.v1.Message.CommandMessage getContentsCommandMsg(); + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage getContentsTensorCmdMsg(); /** * 
      * ObjectRequestMessage contents_object_request_msg = 6;
      *
* - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - org.openmined.syftproto.messaging.v1.Message.CommandMessageOrBuilder getContentsCommandMsgOrBuilder(); + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessageOrBuilder getContentsTensorCmdMsgOrBuilder(); public org.openmined.syftproto.messaging.v1.Message.SyftMessage.ContentsCase getContentsCase(); } @@ -163,14 +163,14 @@ private SyftMessage( break; } case 58: { - org.openmined.syftproto.messaging.v1.Message.CommandMessage.Builder subBuilder = null; + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.Builder subBuilder = null; if (contentsCase_ == 7) { - subBuilder = ((org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_).toBuilder(); + subBuilder = ((org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_).toBuilder(); } contents_ = - input.readMessage(org.openmined.syftproto.messaging.v1.Message.CommandMessage.parser(), extensionRegistry); + input.readMessage(org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom((org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_); + subBuilder.mergeFrom((org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_); contents_ = subBuilder.buildPartial(); } contentsCase_ = 7; @@ -214,7 +214,7 @@ public enum ContentsCase implements com.google.protobuf.Internal.EnumLite { CONTENTS_EMPTY_MSG(1), CONTENTS_OBJECT_MSG(5), - CONTENTS_COMMAND_MSG(7), + CONTENTS_TENSOR_CMD_MSG(7), CONTENTS_NOT_SET(0); private final int value; private ContentsCase(int value) { @@ -232,7 +232,7 @@ public static ContentsCase forNumber(int value) { switch (value) { case 1: return CONTENTS_EMPTY_MSG; case 5: return CONTENTS_OBJECT_MSG; - case 7: return CONTENTS_COMMAND_MSG; + case 7: return CONTENTS_TENSOR_CMD_MSG; case 0: return CONTENTS_NOT_SET; default: return null; } @@ -318,15 +318,15 @@ public org.openmined.syftproto.messaging.v1.Message.ObjectMessageOrBuilder getCo return org.openmined.syftproto.messaging.v1.Message.ObjectMessage.getDefaultInstance(); } - public static final int CONTENTS_COMMAND_MSG_FIELD_NUMBER = 7; + public static final int CONTENTS_TENSOR_CMD_MSG_FIELD_NUMBER = 7; /** * 
      * ObjectRequestMessage contents_object_request_msg = 6;
      *
* - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public boolean hasContentsCommandMsg() { + public boolean hasContentsTensorCmdMsg() { return contentsCase_ == 7; } /** @@ -334,26 +334,26 @@ public boolean hasContentsCommandMsg() { * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public org.openmined.syftproto.messaging.v1.Message.CommandMessage getContentsCommandMsg() { + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage getContentsTensorCmdMsg() { if (contentsCase_ == 7) { - return (org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_; + return (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_; } - return org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance(); + return org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance(); } /** * 
      * ObjectRequestMessage contents_object_request_msg = 6;
      *
* - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public org.openmined.syftproto.messaging.v1.Message.CommandMessageOrBuilder getContentsCommandMsgOrBuilder() { + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessageOrBuilder getContentsTensorCmdMsgOrBuilder() { if (contentsCase_ == 7) { - return (org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_; + return (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_; } - return org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance(); + return org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -377,7 +377,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeMessage(5, (org.openmined.syftproto.messaging.v1.Message.ObjectMessage) contents_); } if (contentsCase_ == 7) { - output.writeMessage(7, (org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_); + output.writeMessage(7, (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_); } unknownFields.writeTo(output); } @@ -398,7 +398,7 @@ public int getSerializedSize() { } if (contentsCase_ == 7) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, (org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_); + .computeMessageSize(7, (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -426,8 +426,8 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getContentsObjectMsg())) return false; break; case 7: - if (!getContentsCommandMsg() - .equals(other.getContentsCommandMsg())) return false; + if (!getContentsTensorCmdMsg() + .equals(other.getContentsTensorCmdMsg())) return false; break; case 0: default: @@ -453,8 +453,8 @@ public int hashCode() { hash = (53 * hash) + getContentsObjectMsg().hashCode(); break; case 7: - hash = (37 * hash) + CONTENTS_COMMAND_MSG_FIELD_NUMBER; - hash = (53 * hash) + getContentsCommandMsg().hashCode(); + hash = (37 * hash) + CONTENTS_TENSOR_CMD_MSG_FIELD_NUMBER; + hash = (53 * hash) + getContentsTensorCmdMsg().hashCode(); break; case 0: default: @@ -635,10 +635,10 @@ public org.openmined.syftproto.messaging.v1.Message.SyftMessage buildPartial() { } } if (contentsCase_ == 7) { - if (contentsCommandMsgBuilder_ == null) { + if (contentsTensorCmdMsgBuilder_ == null) { result.contents_ = contents_; } else { - result.contents_ = contentsCommandMsgBuilder_.build(); + result.contents_ = contentsTensorCmdMsgBuilder_.build(); } } result.contentsCase_ = contentsCase_; @@ -699,8 +699,8 @@ public Builder mergeFrom(org.openmined.syftproto.messaging.v1.Message.SyftMessag mergeContentsObjectMsg(other.getContentsObjectMsg()); break; } - case CONTENTS_COMMAND_MSG: { - mergeContentsCommandMsg(other.getContentsCommandMsg()); + case CONTENTS_TENSOR_CMD_MSG: { + mergeContentsTensorCmdMsg(other.getContentsTensorCmdMsg()); break; } case CONTENTS_NOT_SET: { @@ -1078,15 +1078,15 @@ public org.openmined.syftproto.messaging.v1.Message.ObjectMessageOrBuilder getCo } private com.google.protobuf.SingleFieldBuilderV3< - org.openmined.syftproto.messaging.v1.Message.CommandMessage, org.openmined.syftproto.messaging.v1.Message.CommandMessage.Builder, org.openmined.syftproto.messaging.v1.Message.CommandMessageOrBuilder> contentsCommandMsgBuilder_; + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage, org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.Builder, org.openmined.syftproto.messaging.v1.Message.TensorCommandMessageOrBuilder> contentsTensorCmdMsgBuilder_; /** * 
        * ObjectRequestMessage contents_object_request_msg = 6;
        *
* - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public boolean hasContentsCommandMsg() { + public boolean hasContentsTensorCmdMsg() { return contentsCase_ == 7; } /** @@ -1094,19 +1094,19 @@ public boolean hasContentsCommandMsg() { * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public org.openmined.syftproto.messaging.v1.Message.CommandMessage getContentsCommandMsg() { - if (contentsCommandMsgBuilder_ == null) { + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage getContentsTensorCmdMsg() { + if (contentsTensorCmdMsgBuilder_ == null) { if (contentsCase_ == 7) { - return (org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_; + return (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_; } - return org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance(); + return org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance(); } else { if (contentsCase_ == 7) { - return contentsCommandMsgBuilder_.getMessage(); + return contentsTensorCmdMsgBuilder_.getMessage(); } - return org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance(); + return org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance(); } } /** @@ -1114,17 +1114,17 @@ public org.openmined.syftproto.messaging.v1.Message.CommandMessage getContentsCo * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public Builder setContentsCommandMsg(org.openmined.syftproto.messaging.v1.Message.CommandMessage value) { - if (contentsCommandMsgBuilder_ == null) { + public Builder setContentsTensorCmdMsg(org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage value) { + if (contentsTensorCmdMsgBuilder_ == null) { if (value == null) { throw new NullPointerException(); } contents_ = value; onChanged(); } else { - contentsCommandMsgBuilder_.setMessage(value); + contentsTensorCmdMsgBuilder_.setMessage(value); } contentsCase_ = 7; return this; @@ -1134,15 +1134,15 @@ public Builder setContentsCommandMsg(org.openmined.syftproto.messaging.v1.Messag * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public Builder setContentsCommandMsg( - org.openmined.syftproto.messaging.v1.Message.CommandMessage.Builder builderForValue) { - if (contentsCommandMsgBuilder_ == null) { + public Builder setContentsTensorCmdMsg( + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.Builder builderForValue) { + if (contentsTensorCmdMsgBuilder_ == null) { contents_ = builderForValue.build(); onChanged(); } else { - contentsCommandMsgBuilder_.setMessage(builderForValue.build()); + contentsTensorCmdMsgBuilder_.setMessage(builderForValue.build()); } contentsCase_ = 7; return this; @@ -1152,13 +1152,13 @@ public Builder setContentsCommandMsg( * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public Builder mergeContentsCommandMsg(org.openmined.syftproto.messaging.v1.Message.CommandMessage value) { - if (contentsCommandMsgBuilder_ == null) { + public Builder mergeContentsTensorCmdMsg(org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage value) { + if (contentsTensorCmdMsgBuilder_ == null) { if (contentsCase_ == 7 && - contents_ != org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance()) { - contents_ = org.openmined.syftproto.messaging.v1.Message.CommandMessage.newBuilder((org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_) + contents_ != org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance()) { + contents_ = org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.newBuilder((org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_) .mergeFrom(value).buildPartial(); } else { contents_ = value; @@ -1166,9 +1166,9 @@ public Builder mergeContentsCommandMsg(org.openmined.syftproto.messaging.v1.Mess onChanged(); } else { if (contentsCase_ == 7) { - contentsCommandMsgBuilder_.mergeFrom(value); + contentsTensorCmdMsgBuilder_.mergeFrom(value); } - contentsCommandMsgBuilder_.setMessage(value); + contentsTensorCmdMsgBuilder_.setMessage(value); } contentsCase_ = 7; return this; @@ -1178,10 +1178,10 @@ public Builder mergeContentsCommandMsg(org.openmined.syftproto.messaging.v1.Mess * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public Builder clearContentsCommandMsg() { - if (contentsCommandMsgBuilder_ == null) { + public Builder clearContentsTensorCmdMsg() { + if (contentsTensorCmdMsgBuilder_ == null) { if (contentsCase_ == 7) { contentsCase_ = 0; contents_ = null; @@ -1192,7 +1192,7 @@ public Builder clearContentsCommandMsg() { contentsCase_ = 0; contents_ = null; } - contentsCommandMsgBuilder_.clear(); + contentsTensorCmdMsgBuilder_.clear(); } return this; } @@ -1201,26 +1201,26 @@ public Builder clearContentsCommandMsg() { * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public org.openmined.syftproto.messaging.v1.Message.CommandMessage.Builder getContentsCommandMsgBuilder() { - return getContentsCommandMsgFieldBuilder().getBuilder(); + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.Builder getContentsTensorCmdMsgBuilder() { + return getContentsTensorCmdMsgFieldBuilder().getBuilder(); } /** * 
        * ObjectRequestMessage contents_object_request_msg = 6;
        *
* - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ - public org.openmined.syftproto.messaging.v1.Message.CommandMessageOrBuilder getContentsCommandMsgOrBuilder() { - if ((contentsCase_ == 7) && (contentsCommandMsgBuilder_ != null)) { - return contentsCommandMsgBuilder_.getMessageOrBuilder(); + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessageOrBuilder getContentsTensorCmdMsgOrBuilder() { + if ((contentsCase_ == 7) && (contentsTensorCmdMsgBuilder_ != null)) { + return contentsTensorCmdMsgBuilder_.getMessageOrBuilder(); } else { if (contentsCase_ == 7) { - return (org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_; + return (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_; } - return org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance(); + return org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance(); } } /** @@ -1228,25 +1228,25 @@ public org.openmined.syftproto.messaging.v1.Message.CommandMessageOrBuilder getC * ObjectRequestMessage contents_object_request_msg = 6; * * - * .syft_proto.messaging.v1.CommandMessage contents_command_msg = 7[json_name = "contentsCommandMsg"]; + * .syft_proto.messaging.v1.TensorCommandMessage contents_tensor_cmd_msg = 7[json_name = "contentsTensorCmdMsg"]; */ private com.google.protobuf.SingleFieldBuilderV3< - org.openmined.syftproto.messaging.v1.Message.CommandMessage, org.openmined.syftproto.messaging.v1.Message.CommandMessage.Builder, org.openmined.syftproto.messaging.v1.Message.CommandMessageOrBuilder> - getContentsCommandMsgFieldBuilder() { - if (contentsCommandMsgBuilder_ == null) { + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage, org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.Builder, org.openmined.syftproto.messaging.v1.Message.TensorCommandMessageOrBuilder> + getContentsTensorCmdMsgFieldBuilder() { + if (contentsTensorCmdMsgBuilder_ == null) { if (!(contentsCase_ == 7)) { - contents_ = org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance(); + contents_ = org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance(); } - contentsCommandMsgBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.openmined.syftproto.messaging.v1.Message.CommandMessage, org.openmined.syftproto.messaging.v1.Message.CommandMessage.Builder, org.openmined.syftproto.messaging.v1.Message.CommandMessageOrBuilder>( - (org.openmined.syftproto.messaging.v1.Message.CommandMessage) contents_, + contentsTensorCmdMsgBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage, org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.Builder, org.openmined.syftproto.messaging.v1.Message.TensorCommandMessageOrBuilder>( + (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) contents_, getParentForChildren(), isClean()); contents_ = null; } contentsCase_ = 7; onChanged();; - return contentsCommandMsgBuilder_; + return contentsTensorCmdMsgBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -1913,8 +1913,8 @@ public org.openmined.syftproto.messaging.v1.Message.ObjectMessage getDefaultInst } - public interface CommandMessageOrBuilder extends - // @@protoc_insertion_point(interface_extends:syft_proto.messaging.v1.CommandMessage) + public interface TensorCommandMessageOrBuilder extends + // @@protoc_insertion_point(interface_extends:syft_proto.messaging.v1.TensorCommandMessage) com.google.protobuf.MessageOrBuilder { /** @@ -1943,28 +1943,28 @@ public interface CommandMessageOrBuilder extends */ org.openmined.syftproto.execution.v1.CommunicationActionOuterClass.CommunicationActionOrBuilder getCommunicationOrBuilder(); - public org.openmined.syftproto.messaging.v1.Message.CommandMessage.ActionCase getActionCase(); + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.ActionCase getActionCase(); } /** - * Protobuf type {@code syft_proto.messaging.v1.CommandMessage} + * Protobuf type {@code syft_proto.messaging.v1.TensorCommandMessage} */ - public static final class CommandMessage extends + public static final class TensorCommandMessage extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:syft_proto.messaging.v1.CommandMessage) - CommandMessageOrBuilder { + // @@protoc_insertion_point(message_implements:syft_proto.messaging.v1.TensorCommandMessage) + TensorCommandMessageOrBuilder { private static final long serialVersionUID = 0L; - // Use CommandMessage.newBuilder() to construct. - private CommandMessage(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use TensorCommandMessage.newBuilder() to construct. + private TensorCommandMessage(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private CommandMessage() { + private TensorCommandMessage() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new CommandMessage(); + return new TensorCommandMessage(); } @java.lang.Override @@ -1972,7 +1972,7 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private CommandMessage( + private TensorCommandMessage( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2039,15 +2039,15 @@ private CommandMessage( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_CommandMessage_descriptor; + return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_TensorCommandMessage_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_CommandMessage_fieldAccessorTable + return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_TensorCommandMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.openmined.syftproto.messaging.v1.Message.CommandMessage.class, org.openmined.syftproto.messaging.v1.Message.CommandMessage.Builder.class); + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.class, org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.Builder.class); } private int actionCase_ = 0; @@ -2187,10 +2187,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof org.openmined.syftproto.messaging.v1.Message.CommandMessage)) { + if (!(obj instanceof org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage)) { return super.equals(obj); } - org.openmined.syftproto.messaging.v1.Message.CommandMessage other = (org.openmined.syftproto.messaging.v1.Message.CommandMessage) obj; + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage other = (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) obj; if (!getActionCase().equals(other.getActionCase())) return false; switch (actionCase_) { @@ -2233,69 +2233,69 @@ public int hashCode() { return hash; } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom(byte[] data) + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom(java.io.InputStream input) + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseDelimitedFrom(java.io.InputStream input) + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseDelimitedFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseFrom( + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2308,7 +2308,7 @@ public static org.openmined.syftproto.messaging.v1.Message.CommandMessage parseF public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.openmined.syftproto.messaging.v1.Message.CommandMessage prototype) { + public static Builder newBuilder(org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -2324,26 +2324,26 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code syft_proto.messaging.v1.CommandMessage} + * Protobuf type {@code syft_proto.messaging.v1.TensorCommandMessage} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:syft_proto.messaging.v1.CommandMessage) - org.openmined.syftproto.messaging.v1.Message.CommandMessageOrBuilder { + // @@protoc_insertion_point(builder_implements:syft_proto.messaging.v1.TensorCommandMessage) + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_CommandMessage_descriptor; + return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_TensorCommandMessage_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_CommandMessage_fieldAccessorTable + return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_TensorCommandMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.openmined.syftproto.messaging.v1.Message.CommandMessage.class, org.openmined.syftproto.messaging.v1.Message.CommandMessage.Builder.class); + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.class, org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.Builder.class); } - // Construct using org.openmined.syftproto.messaging.v1.Message.CommandMessage.newBuilder() + // Construct using org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2369,17 +2369,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_CommandMessage_descriptor; + return org.openmined.syftproto.messaging.v1.Message.internal_static_syft_proto_messaging_v1_TensorCommandMessage_descriptor; } @java.lang.Override - public org.openmined.syftproto.messaging.v1.Message.CommandMessage getDefaultInstanceForType() { - return org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance(); + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage getDefaultInstanceForType() { + return org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance(); } @java.lang.Override - public org.openmined.syftproto.messaging.v1.Message.CommandMessage build() { - org.openmined.syftproto.messaging.v1.Message.CommandMessage result = buildPartial(); + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage build() { + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -2387,8 +2387,8 @@ public org.openmined.syftproto.messaging.v1.Message.CommandMessage build() { } @java.lang.Override - public org.openmined.syftproto.messaging.v1.Message.CommandMessage buildPartial() { - org.openmined.syftproto.messaging.v1.Message.CommandMessage result = new org.openmined.syftproto.messaging.v1.Message.CommandMessage(this); + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage buildPartial() { + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage result = new org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage(this); if (actionCase_ == 1) { if (computationBuilder_ == null) { result.action_ = action_; @@ -2442,16 +2442,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.openmined.syftproto.messaging.v1.Message.CommandMessage) { - return mergeFrom((org.openmined.syftproto.messaging.v1.Message.CommandMessage)other); + if (other instanceof org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) { + return mergeFrom((org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.openmined.syftproto.messaging.v1.Message.CommandMessage other) { - if (other == org.openmined.syftproto.messaging.v1.Message.CommandMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage other) { + if (other == org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage.getDefaultInstance()) return this; switch (other.getActionCase()) { case COMPUTATION: { mergeComputation(other.getComputation()); @@ -2480,11 +2480,11 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.openmined.syftproto.messaging.v1.Message.CommandMessage parsedMessage = null; + org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.openmined.syftproto.messaging.v1.Message.CommandMessage) e.getUnfinishedMessage(); + parsedMessage = (org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -2793,41 +2793,41 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:syft_proto.messaging.v1.CommandMessage) + // @@protoc_insertion_point(builder_scope:syft_proto.messaging.v1.TensorCommandMessage) } - // @@protoc_insertion_point(class_scope:syft_proto.messaging.v1.CommandMessage) - private static final org.openmined.syftproto.messaging.v1.Message.CommandMessage DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:syft_proto.messaging.v1.TensorCommandMessage) + private static final org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.openmined.syftproto.messaging.v1.Message.CommandMessage(); + DEFAULT_INSTANCE = new org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage(); } - public static org.openmined.syftproto.messaging.v1.Message.CommandMessage getDefaultInstance() { + public static org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public CommandMessage parsePartialFrom( + public TensorCommandMessage parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommandMessage(input, extensionRegistry); + return new TensorCommandMessage(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public org.openmined.syftproto.messaging.v1.Message.CommandMessage getDefaultInstanceForType() { + public org.openmined.syftproto.messaging.v1.Message.TensorCommandMessage getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2844,10 +2844,10 @@ public org.openmined.syftproto.messaging.v1.Message.CommandMessage getDefaultIns com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_syft_proto_messaging_v1_ObjectMessage_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_syft_proto_messaging_v1_CommandMessage_descriptor; + internal_static_syft_proto_messaging_v1_TensorCommandMessage_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_syft_proto_messaging_v1_CommandMessage_fieldAccessorTable; + internal_static_syft_proto_messaging_v1_TensorCommandMessage_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -2862,23 +2862,23 @@ public org.openmined.syftproto.messaging.v1.Message.CommandMessage getDefaultIns "f/empty.proto\0320syft_proto/execution/v1/c" + "omputation_action.proto\0322syft_proto/exec" + "ution/v1/communication_action.proto\032&syf" + - "t_proto/types/torch/v1/tensor.proto\"\230\002\n\013" + + "t_proto/types/torch/v1/tensor.proto\"\243\002\n\013" + "SyftMessage\022F\n\022contents_empty_msg\030\001 \001(\0132" + "\026.google.protobuf.EmptyH\000R\020contentsEmpty" + "Msg\022X\n\023contents_object_msg\030\005 \001(\0132&.syft_" + "proto.messaging.v1.ObjectMessageH\000R\021cont" + - "entsObjectMsg\022[\n\024contents_command_msg\030\007 " + - "\001(\0132\'.syft_proto.messaging.v1.CommandMes" + - "sageH\000R\022contentsCommandMsgB\n\n\010contents\"O" + - "\n\rObjectMessage\022>\n\006tensor\030\001 \001(\0132&.syft_p" + - "roto.types.torch.v1.TorchTensorR\006tensor\"" + - "\300\001\n\016CommandMessage\022N\n\013computation\030\001 \001(\0132" + - "*.syft_proto.execution.v1.ComputationAct" + - "ionH\000R\013computation\022T\n\rcommunication\030\002 \001(" + - "\0132,.syft_proto.execution.v1.Communicatio" + - "nActionH\000R\rcommunicationB\010\n\006actionB&\n$or" + - "g.openmined.syftproto.messaging.v1b\006prot" + - "o3" + "entsObjectMsg\022f\n\027contents_tensor_cmd_msg" + + "\030\007 \001(\0132-.syft_proto.messaging.v1.TensorC" + + "ommandMessageH\000R\024contentsTensorCmdMsgB\n\n" + + "\010contents\"O\n\rObjectMessage\022>\n\006tensor\030\001 \001" + + "(\0132&.syft_proto.types.torch.v1.TorchTens" + + "orR\006tensor\"\306\001\n\024TensorCommandMessage\022N\n\013c" + + "omputation\030\001 \001(\0132*.syft_proto.execution." + + "v1.ComputationActionH\000R\013computation\022T\n\rc" + + "ommunication\030\002 \001(\0132,.syft_proto.executio" + + "n.v1.CommunicationActionH\000R\rcommunicatio" + + "nB\010\n\006actionB&\n$org.openmined.syftproto.m" + + "essaging.v1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -2893,18 +2893,18 @@ public org.openmined.syftproto.messaging.v1.Message.CommandMessage getDefaultIns internal_static_syft_proto_messaging_v1_SyftMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_syft_proto_messaging_v1_SyftMessage_descriptor, - new java.lang.String[] { "ContentsEmptyMsg", "ContentsObjectMsg", "ContentsCommandMsg", "Contents", }); + new java.lang.String[] { "ContentsEmptyMsg", "ContentsObjectMsg", "ContentsTensorCmdMsg", "Contents", }); internal_static_syft_proto_messaging_v1_ObjectMessage_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_syft_proto_messaging_v1_ObjectMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_syft_proto_messaging_v1_ObjectMessage_descriptor, new java.lang.String[] { "Tensor", }); - internal_static_syft_proto_messaging_v1_CommandMessage_descriptor = + internal_static_syft_proto_messaging_v1_TensorCommandMessage_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_syft_proto_messaging_v1_CommandMessage_fieldAccessorTable = new + internal_static_syft_proto_messaging_v1_TensorCommandMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_syft_proto_messaging_v1_CommandMessage_descriptor, + internal_static_syft_proto_messaging_v1_TensorCommandMessage_descriptor, new java.lang.String[] { "Computation", "Communication", "Action", }); com.google.protobuf.EmptyProto.getDescriptor(); org.openmined.syftproto.execution.v1.ComputationActionOuterClass.getDescriptor(); diff --git a/proto.json b/proto.json index 9d1faf9..b8969b0 100644 --- a/proto.json +++ b/proto.json @@ -120,7 +120,7 @@ "syft.messaging.message.Message": { "code": 32 }, - "syft.messaging.message.CommandMessage": { + "syft.messaging.message.TensorCommandMessage": { "code": 33 }, "syft.messaging.message.ObjectMessage": { @@ -177,7 +177,7 @@ "torch.dtype": { "code": 52 }, - "syft.messaging.message.ExecuteWorkerFunctionMessage": { + "syft.messaging.message.WorkerCommandMessage": { "code": 53 }, "syft.execution.computation.ComputationAction": { diff --git a/protobuf/syft_proto/messaging/v1/message.proto b/protobuf/syft_proto/messaging/v1/message.proto index df623da..c47466d 100644 --- a/protobuf/syft_proto/messaging/v1/message.proto +++ b/protobuf/syft_proto/messaging/v1/message.proto @@ -17,9 +17,11 @@ message SyftMessage { // IsNoneMessage contents_is_none_msg = 4; ObjectMessage contents_object_msg = 5; // ObjectRequestMessage contents_object_request_msg = 6; - CommandMessage contents_command_msg = 7; - // PlanCommandMessage contents_plan_command_msg = 8; - // SearchMessage contents_search_msg = 9; + TensorCommandMessage contents_tensor_cmd_msg = 7; + // PlanCommandMessage contents_plan_cmd_msg = 8; + // WorkerCommandMessage contents_worker_cmd_msg = 9; + // SearchMessage contents_search_msg = 10; + } } @@ -27,7 +29,7 @@ message ObjectMessage { syft_proto.types.torch.v1.TorchTensor tensor = 1; } -message CommandMessage { +message TensorCommandMessage { oneof action { syft_proto.execution.v1.ComputationAction computation = 1; syft_proto.execution.v1.CommunicationAction communication = 2; diff --git a/syft_proto/messaging/v1/message_pb2.py b/syft_proto/messaging/v1/message_pb2.py index 80879da..f3b6054 100644 --- a/syft_proto/messaging/v1/message_pb2.py +++ b/syft_proto/messaging/v1/message_pb2.py @@ -24,7 +24,7 @@ package='syft_proto.messaging.v1', syntax='proto3', serialized_options=_b('\n$org.openmined.syftproto.messaging.v1'), - serialized_pb=_b('\n%syft_proto/messaging/v1/message.proto\x12\x17syft_proto.messaging.v1\x1a\x1bgoogle/protobuf/empty.proto\x1a\x30syft_proto/execution/v1/computation_action.proto\x1a\x32syft_proto/execution/v1/communication_action.proto\x1a&syft_proto/types/torch/v1/tensor.proto\"\x98\x02\n\x0bSyftMessage\x12\x46\n\x12\x63ontents_empty_msg\x18\x01 \x01(\x0b\x32\x16.google.protobuf.EmptyH\x00R\x10\x63ontentsEmptyMsg\x12X\n\x13\x63ontents_object_msg\x18\x05 \x01(\x0b\x32&.syft_proto.messaging.v1.ObjectMessageH\x00R\x11\x63ontentsObjectMsg\x12[\n\x14\x63ontents_command_msg\x18\x07 \x01(\x0b\x32\'.syft_proto.messaging.v1.CommandMessageH\x00R\x12\x63ontentsCommandMsgB\n\n\x08\x63ontents\"O\n\rObjectMessage\x12>\n\x06tensor\x18\x01 \x01(\x0b\x32&.syft_proto.types.torch.v1.TorchTensorR\x06tensor\"\xc0\x01\n\x0e\x43ommandMessage\x12N\n\x0b\x63omputation\x18\x01 \x01(\x0b\x32*.syft_proto.execution.v1.ComputationActionH\x00R\x0b\x63omputation\x12T\n\rcommunication\x18\x02 \x01(\x0b\x32,.syft_proto.execution.v1.CommunicationActionH\x00R\rcommunicationB\x08\n\x06\x61\x63tionB&\n$org.openmined.syftproto.messaging.v1b\x06proto3') + serialized_pb=_b('\n%syft_proto/messaging/v1/message.proto\x12\x17syft_proto.messaging.v1\x1a\x1bgoogle/protobuf/empty.proto\x1a\x30syft_proto/execution/v1/computation_action.proto\x1a\x32syft_proto/execution/v1/communication_action.proto\x1a&syft_proto/types/torch/v1/tensor.proto\"\xa3\x02\n\x0bSyftMessage\x12\x46\n\x12\x63ontents_empty_msg\x18\x01 \x01(\x0b\x32\x16.google.protobuf.EmptyH\x00R\x10\x63ontentsEmptyMsg\x12X\n\x13\x63ontents_object_msg\x18\x05 \x01(\x0b\x32&.syft_proto.messaging.v1.ObjectMessageH\x00R\x11\x63ontentsObjectMsg\x12\x66\n\x17\x63ontents_tensor_cmd_msg\x18\x07 \x01(\x0b\x32-.syft_proto.messaging.v1.TensorCommandMessageH\x00R\x14\x63ontentsTensorCmdMsgB\n\n\x08\x63ontents\"O\n\rObjectMessage\x12>\n\x06tensor\x18\x01 \x01(\x0b\x32&.syft_proto.types.torch.v1.TorchTensorR\x06tensor\"\xc6\x01\n\x14TensorCommandMessage\x12N\n\x0b\x63omputation\x18\x01 \x01(\x0b\x32*.syft_proto.execution.v1.ComputationActionH\x00R\x0b\x63omputation\x12T\n\rcommunication\x18\x02 \x01(\x0b\x32,.syft_proto.execution.v1.CommunicationActionH\x00R\rcommunicationB\x08\n\x06\x61\x63tionB&\n$org.openmined.syftproto.messaging.v1b\x06proto3') , dependencies=[google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,syft__proto_dot_execution_dot_v1_dot_computation__action__pb2.DESCRIPTOR,syft__proto_dot_execution_dot_v1_dot_communication__action__pb2.DESCRIPTOR,syft__proto_dot_types_dot_torch_dot_v1_dot_tensor__pb2.DESCRIPTOR,]) @@ -53,12 +53,12 @@ is_extension=False, extension_scope=None, serialized_options=None, json_name='contentsObjectMsg', file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='contents_command_msg', full_name='syft_proto.messaging.v1.SyftMessage.contents_command_msg', index=2, + name='contents_tensor_cmd_msg', full_name='syft_proto.messaging.v1.SyftMessage.contents_tensor_cmd_msg', index=2, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, json_name='contentsCommandMsg', file=DESCRIPTOR), + serialized_options=None, json_name='contentsTensorCmdMsg', file=DESCRIPTOR), ], extensions=[ ], @@ -75,7 +75,7 @@ index=0, containing_type=None, fields=[]), ], serialized_start=238, - serialized_end=518, + serialized_end=529, ) @@ -105,27 +105,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=520, - serialized_end=599, + serialized_start=531, + serialized_end=610, ) -_COMMANDMESSAGE = _descriptor.Descriptor( - name='CommandMessage', - full_name='syft_proto.messaging.v1.CommandMessage', +_TENSORCOMMANDMESSAGE = _descriptor.Descriptor( + name='TensorCommandMessage', + full_name='syft_proto.messaging.v1.TensorCommandMessage', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='computation', full_name='syft_proto.messaging.v1.CommandMessage.computation', index=0, + name='computation', full_name='syft_proto.messaging.v1.TensorCommandMessage.computation', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, json_name='computation', file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='communication', full_name='syft_proto.messaging.v1.CommandMessage.communication', index=1, + name='communication', full_name='syft_proto.messaging.v1.TensorCommandMessage.communication', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -143,16 +143,16 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='action', full_name='syft_proto.messaging.v1.CommandMessage.action', + name='action', full_name='syft_proto.messaging.v1.TensorCommandMessage.action', index=0, containing_type=None, fields=[]), ], - serialized_start=602, - serialized_end=794, + serialized_start=613, + serialized_end=811, ) _SYFTMESSAGE.fields_by_name['contents_empty_msg'].message_type = google_dot_protobuf_dot_empty__pb2._EMPTY _SYFTMESSAGE.fields_by_name['contents_object_msg'].message_type = _OBJECTMESSAGE -_SYFTMESSAGE.fields_by_name['contents_command_msg'].message_type = _COMMANDMESSAGE +_SYFTMESSAGE.fields_by_name['contents_tensor_cmd_msg'].message_type = _TENSORCOMMANDMESSAGE _SYFTMESSAGE.oneofs_by_name['contents'].fields.append( _SYFTMESSAGE.fields_by_name['contents_empty_msg']) _SYFTMESSAGE.fields_by_name['contents_empty_msg'].containing_oneof = _SYFTMESSAGE.oneofs_by_name['contents'] @@ -160,20 +160,20 @@ _SYFTMESSAGE.fields_by_name['contents_object_msg']) _SYFTMESSAGE.fields_by_name['contents_object_msg'].containing_oneof = _SYFTMESSAGE.oneofs_by_name['contents'] _SYFTMESSAGE.oneofs_by_name['contents'].fields.append( - _SYFTMESSAGE.fields_by_name['contents_command_msg']) -_SYFTMESSAGE.fields_by_name['contents_command_msg'].containing_oneof = _SYFTMESSAGE.oneofs_by_name['contents'] + _SYFTMESSAGE.fields_by_name['contents_tensor_cmd_msg']) +_SYFTMESSAGE.fields_by_name['contents_tensor_cmd_msg'].containing_oneof = _SYFTMESSAGE.oneofs_by_name['contents'] _OBJECTMESSAGE.fields_by_name['tensor'].message_type = syft__proto_dot_types_dot_torch_dot_v1_dot_tensor__pb2._TORCHTENSOR -_COMMANDMESSAGE.fields_by_name['computation'].message_type = syft__proto_dot_execution_dot_v1_dot_computation__action__pb2._COMPUTATIONACTION -_COMMANDMESSAGE.fields_by_name['communication'].message_type = syft__proto_dot_execution_dot_v1_dot_communication__action__pb2._COMMUNICATIONACTION -_COMMANDMESSAGE.oneofs_by_name['action'].fields.append( - _COMMANDMESSAGE.fields_by_name['computation']) -_COMMANDMESSAGE.fields_by_name['computation'].containing_oneof = _COMMANDMESSAGE.oneofs_by_name['action'] -_COMMANDMESSAGE.oneofs_by_name['action'].fields.append( - _COMMANDMESSAGE.fields_by_name['communication']) -_COMMANDMESSAGE.fields_by_name['communication'].containing_oneof = _COMMANDMESSAGE.oneofs_by_name['action'] +_TENSORCOMMANDMESSAGE.fields_by_name['computation'].message_type = syft__proto_dot_execution_dot_v1_dot_computation__action__pb2._COMPUTATIONACTION +_TENSORCOMMANDMESSAGE.fields_by_name['communication'].message_type = syft__proto_dot_execution_dot_v1_dot_communication__action__pb2._COMMUNICATIONACTION +_TENSORCOMMANDMESSAGE.oneofs_by_name['action'].fields.append( + _TENSORCOMMANDMESSAGE.fields_by_name['computation']) +_TENSORCOMMANDMESSAGE.fields_by_name['computation'].containing_oneof = _TENSORCOMMANDMESSAGE.oneofs_by_name['action'] +_TENSORCOMMANDMESSAGE.oneofs_by_name['action'].fields.append( + _TENSORCOMMANDMESSAGE.fields_by_name['communication']) +_TENSORCOMMANDMESSAGE.fields_by_name['communication'].containing_oneof = _TENSORCOMMANDMESSAGE.oneofs_by_name['action'] DESCRIPTOR.message_types_by_name['SyftMessage'] = _SYFTMESSAGE DESCRIPTOR.message_types_by_name['ObjectMessage'] = _OBJECTMESSAGE -DESCRIPTOR.message_types_by_name['CommandMessage'] = _COMMANDMESSAGE +DESCRIPTOR.message_types_by_name['TensorCommandMessage'] = _TENSORCOMMANDMESSAGE _sym_db.RegisterFileDescriptor(DESCRIPTOR) SyftMessage = _reflection.GeneratedProtocolMessageType('SyftMessage', (_message.Message,), { @@ -190,12 +190,12 @@ }) _sym_db.RegisterMessage(ObjectMessage) -CommandMessage = _reflection.GeneratedProtocolMessageType('CommandMessage', (_message.Message,), { - 'DESCRIPTOR' : _COMMANDMESSAGE, +TensorCommandMessage = _reflection.GeneratedProtocolMessageType('TensorCommandMessage', (_message.Message,), { + 'DESCRIPTOR' : _TENSORCOMMANDMESSAGE, '__module__' : 'syft_proto.messaging.v1.message_pb2' - # @@protoc_insertion_point(class_scope:syft_proto.messaging.v1.CommandMessage) + # @@protoc_insertion_point(class_scope:syft_proto.messaging.v1.TensorCommandMessage) }) -_sym_db.RegisterMessage(CommandMessage) +_sym_db.RegisterMessage(TensorCommandMessage) DESCRIPTOR._options = None From 297d40f70bef25fffff5e101ecf65f6f98691d2d Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 15 Mar 2020 16:34:49 +0000 Subject: [PATCH 2/2] Swift stubs auto-commit --- .../syft_proto/messaging/v1/message.pb.swift | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/swift/syft_proto/messaging/v1/message.pb.swift b/swift/syft_proto/messaging/v1/message.pb.swift index 77d457e..7ac7c64 100644 --- a/swift/syft_proto/messaging/v1/message.pb.swift +++ b/swift/syft_proto/messaging/v1/message.pb.swift @@ -49,12 +49,12 @@ public struct SyftProto_Messaging_V1_SyftMessage { } /// ObjectRequestMessage contents_object_request_msg = 6; - public var contentsCommandMsg: SyftProto_Messaging_V1_CommandMessage { + public var contentsTensorCmdMsg: SyftProto_Messaging_V1_TensorCommandMessage { get { - if case .contentsCommandMsg(let v)? = _storage._contents {return v} - return SyftProto_Messaging_V1_CommandMessage() + if case .contentsTensorCmdMsg(let v)? = _storage._contents {return v} + return SyftProto_Messaging_V1_TensorCommandMessage() } - set {_uniqueStorage()._contents = .contentsCommandMsg(newValue)} + set {_uniqueStorage()._contents = .contentsTensorCmdMsg(newValue)} } public var unknownFields = SwiftProtobuf.UnknownStorage() @@ -66,14 +66,14 @@ public struct SyftProto_Messaging_V1_SyftMessage { /// IsNoneMessage contents_is_none_msg = 4; case contentsObjectMsg(SyftProto_Messaging_V1_ObjectMessage) /// ObjectRequestMessage contents_object_request_msg = 6; - case contentsCommandMsg(SyftProto_Messaging_V1_CommandMessage) + case contentsTensorCmdMsg(SyftProto_Messaging_V1_TensorCommandMessage) #if !swift(>=4.1) public static func ==(lhs: SyftProto_Messaging_V1_SyftMessage.OneOf_Contents, rhs: SyftProto_Messaging_V1_SyftMessage.OneOf_Contents) -> Bool { switch (lhs, rhs) { case (.contentsEmptyMsg(let l), .contentsEmptyMsg(let r)): return l == r case (.contentsObjectMsg(let l), .contentsObjectMsg(let r)): return l == r - case (.contentsCommandMsg(let l), .contentsCommandMsg(let r)): return l == r + case (.contentsTensorCmdMsg(let l), .contentsTensorCmdMsg(let r)): return l == r default: return false } } @@ -106,7 +106,7 @@ public struct SyftProto_Messaging_V1_ObjectMessage { fileprivate var _storage = _StorageClass.defaultInstance } -public struct SyftProto_Messaging_V1_CommandMessage { +public struct SyftProto_Messaging_V1_TensorCommandMessage { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -139,7 +139,7 @@ public struct SyftProto_Messaging_V1_CommandMessage { case communication(SyftProto_Execution_V1_CommunicationAction) #if !swift(>=4.1) - public static func ==(lhs: SyftProto_Messaging_V1_CommandMessage.OneOf_Action, rhs: SyftProto_Messaging_V1_CommandMessage.OneOf_Action) -> Bool { + public static func ==(lhs: SyftProto_Messaging_V1_TensorCommandMessage.OneOf_Action, rhs: SyftProto_Messaging_V1_TensorCommandMessage.OneOf_Action) -> Bool { switch (lhs, rhs) { case (.computation(let l), .computation(let r)): return l == r case (.communication(let l), .communication(let r)): return l == r @@ -163,7 +163,7 @@ extension SyftProto_Messaging_V1_SyftMessage: SwiftProtobuf.Message, SwiftProtob public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "contents_empty_msg"), 5: .standard(proto: "contents_object_msg"), - 7: .standard(proto: "contents_command_msg"), + 7: .standard(proto: "contents_tensor_cmd_msg"), ] fileprivate class _StorageClass { @@ -207,13 +207,13 @@ extension SyftProto_Messaging_V1_SyftMessage: SwiftProtobuf.Message, SwiftProtob try decoder.decodeSingularMessageField(value: &v) if let v = v {_storage._contents = .contentsObjectMsg(v)} case 7: - var v: SyftProto_Messaging_V1_CommandMessage? + var v: SyftProto_Messaging_V1_TensorCommandMessage? if let current = _storage._contents { try decoder.handleConflictingOneOf() - if case .contentsCommandMsg(let m) = current {v = m} + if case .contentsTensorCmdMsg(let m) = current {v = m} } try decoder.decodeSingularMessageField(value: &v) - if let v = v {_storage._contents = .contentsCommandMsg(v)} + if let v = v {_storage._contents = .contentsTensorCmdMsg(v)} default: break } } @@ -227,7 +227,7 @@ extension SyftProto_Messaging_V1_SyftMessage: SwiftProtobuf.Message, SwiftProtob try visitor.visitSingularMessageField(value: v, fieldNumber: 1) case .contentsObjectMsg(let v)?: try visitor.visitSingularMessageField(value: v, fieldNumber: 5) - case .contentsCommandMsg(let v)?: + case .contentsTensorCmdMsg(let v)?: try visitor.visitSingularMessageField(value: v, fieldNumber: 7) case nil: break } @@ -311,15 +311,15 @@ extension SyftProto_Messaging_V1_ObjectMessage: SwiftProtobuf.Message, SwiftProt } } -extension SyftProto_Messaging_V1_CommandMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { - public static let protoMessageName: String = _protobuf_package + ".CommandMessage" +extension SyftProto_Messaging_V1_TensorCommandMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { + public static let protoMessageName: String = _protobuf_package + ".TensorCommandMessage" public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "computation"), 2: .same(proto: "communication"), ] fileprivate class _StorageClass { - var _action: SyftProto_Messaging_V1_CommandMessage.OneOf_Action? + var _action: SyftProto_Messaging_V1_TensorCommandMessage.OneOf_Action? static let defaultInstance = _StorageClass() @@ -377,7 +377,7 @@ extension SyftProto_Messaging_V1_CommandMessage: SwiftProtobuf.Message, SwiftPro try unknownFields.traverse(visitor: &visitor) } - public static func ==(lhs: SyftProto_Messaging_V1_CommandMessage, rhs: SyftProto_Messaging_V1_CommandMessage) -> Bool { + public static func ==(lhs: SyftProto_Messaging_V1_TensorCommandMessage, rhs: SyftProto_Messaging_V1_TensorCommandMessage) -> Bool { if lhs._storage !== rhs._storage { let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in let _storage = _args.0