From e9776ec62d94a72dc5b15c53edeb47907a23149c Mon Sep 17 00:00:00 2001 From: sreeshnap Date: Fri, 30 Sep 2022 09:42:21 +0530 Subject: [PATCH 1/8] delete models service and web --- packages/core/src/BaseServiceClient.js | 60 ++++++++++++++++++++++++++ packages/web/src/WebServiceClient.js | 6 ++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/packages/core/src/BaseServiceClient.js b/packages/core/src/BaseServiceClient.js index b07ab90..91cbd39 100644 --- a/packages/core/src/BaseServiceClient.js +++ b/packages/core/src/BaseServiceClient.js @@ -188,6 +188,60 @@ class BaseServiceClient { return modelStateRequest; } + //delete model + async deleteModel(modelId,address,method,name) { + console.log('hai'); + const request = await this._trainingDeleteModel(address,modelId,method,name); + logger.debug(`delete model request ${request} `); + return new Promise((resolve, reject) => { + this._modelServiceClient.delete_model(request, (err, response) => { + logger.debug(`delete model ${err} ${response}`); + if (err) { + reject(err); + } else { + resolve(response); + } + }); + }); + } + + async _trainingDeleteModel(address, modelId,method,name) { + const message = "__delete_model"; + const { currentBlockNumber, signatureBytes } = + await this._requestSignForModel(address, message); + + const ModelStateRequest = this._getDeleteModelRequestMethodDescriptor(); + const modelStateRequest = new ModelStateRequest(); + // modelStateRequest.getUpdateModelDetails(modelId); + + const AuthorizationRequest = + this._getAuthorizationRequestMethodDescriptor(); + const authorizationRequest = new AuthorizationRequest(); + const ModelDetailsRequest = this._getModelDetailsRequestMethodDescriptor(); + const modelDetailsRequest = new ModelDetailsRequest(); + + authorizationRequest.setCurrentBlock(currentBlockNumber); + authorizationRequest.setMessage(message); + authorizationRequest.setSignature(signatureBytes); + authorizationRequest.setSignerAddress(address); + modelDetailsRequest.setModelId(modelId); + modelDetailsRequest.setGrpcMethodName(method); + modelDetailsRequest.setGrpcServiceName(name); + + + // const { orgId, serviceId, groupId } = this.getServiceDetails(); + // modelDetailsRequest.setOrganizationId(orgId); + // modelDetailsRequest.setServiceId(serviceId); + // modelDetailsRequest.setGroupId(groupId); + // + + modelStateRequest.setAuthorization(authorizationRequest); + modelStateRequest.setUpdateModelDetails(modelDetailsRequest); + return modelStateRequest; + } + + // + /** * Fetches the latest channel state from the ai service daemon * @param channelId @@ -539,6 +593,12 @@ class BaseServiceClient { ); } + _getDeleteModelRequestMethodDescriptor() { + logger.error( + "_getDeleteModelRequestMethodDescriptor must be implemented in the sub classes" + ); + } + _getModelDetailsRequestMethodDescriptor() { logger.error( "_getModelDetailsRequestMethodDescriptor must be implemented in the sub classes" diff --git a/packages/web/src/WebServiceClient.js b/packages/web/src/WebServiceClient.js index 24e65cc..188d829 100644 --- a/packages/web/src/WebServiceClient.js +++ b/packages/web/src/WebServiceClient.js @@ -132,7 +132,11 @@ class WebServiceClient extends BaseServiceClient { _getCreateModelRequestMethodDescriptor() { return Model.create_model.requestType; } - + + _getDeleteModelRequestMethodDescriptor() { + return Model.delete_model.requestType; + } + _getModelDetailsRequestMethodDescriptor() { return training_pb.ModelDetails; } From 64e06e379428576239d7473bc61680aa5d83849e Mon Sep 17 00:00:00 2001 From: sreeshnap Date: Fri, 30 Sep 2022 13:08:59 +0530 Subject: [PATCH 2/8] delete model new changes in baseService --- packages/core/src/BaseServiceClient.js | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/packages/core/src/BaseServiceClient.js b/packages/core/src/BaseServiceClient.js index bf5ef14..d774b31 100644 --- a/packages/core/src/BaseServiceClient.js +++ b/packages/core/src/BaseServiceClient.js @@ -195,11 +195,9 @@ class BaseServiceClient { return modelStateRequest; } - //delete model - async deleteModel(modelId,address,method,name) { - console.log('hai'); - const request = await this._trainingDeleteModel(address,modelId,method,name); - logger.debug(`delete model request ${request} `); + + async deleteModel(modelId,address,methodName,modelName) { + const request = await this._trainingDeleteModel(address,modelId,methodName,modelName); return new Promise((resolve, reject) => { this._modelServiceClient.delete_model(request, (err, response) => { logger.debug(`delete model ${err} ${response}`); @@ -212,15 +210,14 @@ class BaseServiceClient { }); } - async _trainingDeleteModel(address, modelId,method,name) { + async _trainingDeleteModel(address, modelId,methodName,modelName) { const message = "__delete_model"; const { currentBlockNumber, signatureBytes } = await this._requestSignForModel(address, message); const ModelStateRequest = this._getDeleteModelRequestMethodDescriptor(); const modelStateRequest = new ModelStateRequest(); - // modelStateRequest.getUpdateModelDetails(modelId); - + const AuthorizationRequest = this._getAuthorizationRequestMethodDescriptor(); const authorizationRequest = new AuthorizationRequest(); @@ -232,22 +229,14 @@ class BaseServiceClient { authorizationRequest.setSignature(signatureBytes); authorizationRequest.setSignerAddress(address); modelDetailsRequest.setModelId(modelId); - modelDetailsRequest.setGrpcMethodName(method); - modelDetailsRequest.setGrpcServiceName(name); + modelDetailsRequest.setGrpcMethodName(methodName); + modelDetailsRequest.setGrpcServiceName(modelName); - - // const { orgId, serviceId, groupId } = this.getServiceDetails(); - // modelDetailsRequest.setOrganizationId(orgId); - // modelDetailsRequest.setServiceId(serviceId); - // modelDetailsRequest.setGroupId(groupId); - // - modelStateRequest.setAuthorization(authorizationRequest); modelStateRequest.setUpdateModelDetails(modelDetailsRequest); return modelStateRequest; } - // /** * Fetches the latest channel state from the ai service daemon From 07877d76f3f87366622b11622a01aa1e61bdb93f Mon Sep 17 00:00:00 2001 From: sreeshnap Date: Thu, 6 Oct 2022 08:58:45 +0530 Subject: [PATCH 3/8] update model sdk --- packages/core/src/BaseServiceClient.js | 72 +++++++++++++++++++++++--- packages/web/src/WebServiceClient.js | 4 ++ 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/packages/core/src/BaseServiceClient.js b/packages/core/src/BaseServiceClient.js index d774b31..838528f 100644 --- a/packages/core/src/BaseServiceClient.js +++ b/packages/core/src/BaseServiceClient.js @@ -196,8 +196,8 @@ class BaseServiceClient { } - async deleteModel(modelId,address,methodName,modelName) { - const request = await this._trainingDeleteModel(address,modelId,methodName,modelName); + async deleteModel(params) { + const request = await this._trainingDeleteModel(params); return new Promise((resolve, reject) => { this._modelServiceClient.delete_model(request, (err, response) => { logger.debug(`delete model ${err} ${response}`); @@ -210,7 +210,7 @@ class BaseServiceClient { }); } - async _trainingDeleteModel(address, modelId,methodName,modelName) { + async _trainingDeleteModel(params) { const message = "__delete_model"; const { currentBlockNumber, signatureBytes } = await this._requestSignForModel(address, message); @@ -227,16 +227,68 @@ class BaseServiceClient { authorizationRequest.setCurrentBlock(currentBlockNumber); authorizationRequest.setMessage(message); authorizationRequest.setSignature(signatureBytes); - authorizationRequest.setSignerAddress(address); - modelDetailsRequest.setModelId(modelId); - modelDetailsRequest.setGrpcMethodName(methodName); - modelDetailsRequest.setGrpcServiceName(modelName); + authorizationRequest.setSignerAddress(params.address); + modelDetailsRequest.setModelId(params.modelId); + modelDetailsRequest.setGrpcMethodName(params.method); + modelDetailsRequest.setGrpcServiceName(params.name); modelStateRequest.setAuthorization(authorizationRequest); modelStateRequest.setUpdateModelDetails(modelDetailsRequest); return modelStateRequest; } + + async updateModel(params) { + const request = await this._trainingUpdateModel(params); + return new Promise((resolve, reject) => { + this._modelServiceClient.update_model_access(request, (err, response) => { + logger.debug(`delete model ${err} ${response}`); + if (err) { + reject(err); + } else { + resolve(response); + } + }); + }); + } + + async _trainingUpdateModel(params) { + const message = "__update_model"; + const { currentBlockNumber, signatureBytes } = + await this._requestSignForModel(address, message); + + const ModelStateRequest = this._getUpdateModelRequestMethodDescriptor(); + const modelStateRequest = new ModelStateRequest(); + + const AuthorizationRequest = + this._getAuthorizationRequestMethodDescriptor(); + const authorizationRequest = new AuthorizationRequest(); + const ModelDetailsRequest = this._getModelDetailsRequestMethodDescriptor(); + const modelDetailsRequest = new ModelDetailsRequest(); + + authorizationRequest.setCurrentBlock(currentBlockNumber); + authorizationRequest.setMessage(message); + authorizationRequest.setSignature(signatureBytes); + authorizationRequest.setSignerAddress(params.address); + modelDetailsRequest.setModelId(params.modelId); + modelDetailsRequest.setGrpcMethodName(params.methodName); + modelDetailsRequest.setGrpcServiceName(params.modelName); + + modelDetailsRequest.setDescription(params.description); + modelDetailsRequest.setAddressListList(params.addressList); + modelDetailsRequest.setTrainingDataLink(""); + modelDetailsRequest.setIsDefaultModel(""); + + const { orgId, serviceId, groupId } = this.getServiceDetails(); + modelDetailsRequest.setOrganizationId(orgId); + modelDetailsRequest.setServiceId(serviceId); + modelDetailsRequest.setGroupId(groupId); + + modelStateRequest.setAuthorization(authorizationRequest); + modelStateRequest.setUpdateModelDetails(modelDetailsRequest); + return modelStateRequest; + } + /** * Fetches the latest channel state from the ai service daemon @@ -595,6 +647,12 @@ class BaseServiceClient { ); } + _getUpdateModelRequestMethodDescriptor(){ + logger.error( + "__getUpdateModelRequestMethodDescriptor must be implemented in the sub classes" + ); + } + _getModelDetailsRequestMethodDescriptor() { logger.error( "_getModelDetailsRequestMethodDescriptor must be implemented in the sub classes" diff --git a/packages/web/src/WebServiceClient.js b/packages/web/src/WebServiceClient.js index 188d829..dec9951 100644 --- a/packages/web/src/WebServiceClient.js +++ b/packages/web/src/WebServiceClient.js @@ -136,6 +136,10 @@ class WebServiceClient extends BaseServiceClient { _getDeleteModelRequestMethodDescriptor() { return Model.delete_model.requestType; } + + _getUpdateModelRequestMethodDescriptor() { + return Model.update_model_access.requestType; + } _getModelDetailsRequestMethodDescriptor() { return training_pb.ModelDetails; From ac9956e7c5f7f7f03116c3ef001a9655e498ede4 Mon Sep 17 00:00:00 2001 From: sreeshnap Date: Thu, 6 Oct 2022 09:06:53 +0530 Subject: [PATCH 4/8] changes in the params --- packages/core/src/BaseServiceClient.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/BaseServiceClient.js b/packages/core/src/BaseServiceClient.js index 838528f..00d55dc 100644 --- a/packages/core/src/BaseServiceClient.js +++ b/packages/core/src/BaseServiceClient.js @@ -271,8 +271,8 @@ class BaseServiceClient { authorizationRequest.setSignature(signatureBytes); authorizationRequest.setSignerAddress(params.address); modelDetailsRequest.setModelId(params.modelId); - modelDetailsRequest.setGrpcMethodName(params.methodName); - modelDetailsRequest.setGrpcServiceName(params.modelName); + modelDetailsRequest.setGrpcMethodName(params.method); + modelDetailsRequest.setGrpcServiceName(params.name); modelDetailsRequest.setDescription(params.description); modelDetailsRequest.setAddressListList(params.addressList); From 30759381d9c8db77b20be38a8fa91266a4d1491d Mon Sep 17 00:00:00 2001 From: sreeshnap Date: Thu, 6 Oct 2022 10:27:14 +0530 Subject: [PATCH 5/8] pb stubs change --- packages/web/src/proto/training.proto | 24 ++- packages/web/src/proto/training_pb.js | 182 +++++++++++------- packages/web/src/proto/training_pb_service.js | 25 +-- 3 files changed, 145 insertions(+), 86 deletions(-) diff --git a/packages/web/src/proto/training.proto b/packages/web/src/proto/training.proto index 27567c3..f919915 100644 --- a/packages/web/src/proto/training.proto +++ b/packages/web/src/proto/training.proto @@ -11,17 +11,23 @@ message ModelDetails { //define the grpc service name , under which the method is defined string grpc_service_name = 3; string description = 4; - //set this to true if you want your model to be used by other AI consumers - bool is_publicly_accessible = 5; + + string status = 6; + string updated_date = 7; //List of all the addresses that will have access to this model - repeated string address_list = 6; + repeated string address_list = 8; // this is optional - string training_data_link = 7; - bool is_default_model = 8; + string training_data_link = 9; + string model_name = 10; + + + string organization_id = 11; + string service_id = 12 ; + string group_id = 13; + + //set this to true if you want your model to be used by other AI consumers + bool is_publicly_accessible = 14; - string organization_id = 9; - string service_id = 10 ; - string group_id = 11; } message AuthorizationDetails { @@ -103,4 +109,4 @@ service Model { rpc get_all_models(AccessibleModelsRequest) returns (AccessibleModelsResponse) {} -} \ No newline at end of file +} diff --git a/packages/web/src/proto/training_pb.js b/packages/web/src/proto/training_pb.js index c7c2119..53473c4 100644 --- a/packages/web/src/proto/training_pb.js +++ b/packages/web/src/proto/training_pb.js @@ -46,7 +46,7 @@ if (goog.DEBUG && !COMPILED) { * @private {!Array} * @const */ -training.ModelDetails.repeatedFields_ = [6]; +training.ModelDetails.repeatedFields_ = [8]; @@ -81,13 +81,15 @@ training.ModelDetails.toObject = function(includeInstance, msg) { grpcMethodName: jspb.Message.getFieldWithDefault(msg, 2, ""), grpcServiceName: jspb.Message.getFieldWithDefault(msg, 3, ""), description: jspb.Message.getFieldWithDefault(msg, 4, ""), - isPubliclyAccessible: jspb.Message.getFieldWithDefault(msg, 5, false), - addressListList: jspb.Message.getRepeatedField(msg, 6), - trainingDataLink: jspb.Message.getFieldWithDefault(msg, 7, ""), - isDefaultModel: jspb.Message.getFieldWithDefault(msg, 8, false), - organizationId: jspb.Message.getFieldWithDefault(msg, 9, ""), - serviceId: jspb.Message.getFieldWithDefault(msg, 10, ""), - groupId: jspb.Message.getFieldWithDefault(msg, 11, "") + status: jspb.Message.getFieldWithDefault(msg, 6, ""), + updatedDate: jspb.Message.getFieldWithDefault(msg, 7, ""), + addressListList: jspb.Message.getRepeatedField(msg, 8), + trainingDataLink: jspb.Message.getFieldWithDefault(msg, 9, ""), + modelName: jspb.Message.getFieldWithDefault(msg, 10, ""), + organizationId: jspb.Message.getFieldWithDefault(msg, 11, ""), + serviceId: jspb.Message.getFieldWithDefault(msg, 12, ""), + groupId: jspb.Message.getFieldWithDefault(msg, 13, ""), + isPubliclyAccessible: jspb.Message.getFieldWithDefault(msg, 14, false) }; if (includeInstance) { @@ -140,34 +142,42 @@ training.ModelDetails.deserializeBinaryFromReader = function(msg, reader) { var value = /** @type {string} */ (reader.readString()); msg.setDescription(value); break; - case 5: - var value = /** @type {boolean} */ (reader.readBool()); - msg.setIsPubliclyAccessible(value); - break; case 6: var value = /** @type {string} */ (reader.readString()); - msg.addAddressList(value); + msg.setStatus(value); break; case 7: var value = /** @type {string} */ (reader.readString()); - msg.setTrainingDataLink(value); + msg.setUpdatedDate(value); break; case 8: - var value = /** @type {boolean} */ (reader.readBool()); - msg.setIsDefaultModel(value); + var value = /** @type {string} */ (reader.readString()); + msg.addAddressList(value); break; case 9: var value = /** @type {string} */ (reader.readString()); - msg.setOrganizationId(value); + msg.setTrainingDataLink(value); break; case 10: var value = /** @type {string} */ (reader.readString()); - msg.setServiceId(value); + msg.setModelName(value); break; case 11: + var value = /** @type {string} */ (reader.readString()); + msg.setOrganizationId(value); + break; + case 12: + var value = /** @type {string} */ (reader.readString()); + msg.setServiceId(value); + break; + case 13: var value = /** @type {string} */ (reader.readString()); msg.setGroupId(value); break; + case 14: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setIsPubliclyAccessible(value); + break; default: reader.skipField(); break; @@ -225,52 +235,66 @@ training.ModelDetails.serializeBinaryToWriter = function(message, writer) { f ); } - f = message.getIsPubliclyAccessible(); - if (f) { - writer.writeBool( - 5, + f = message.getStatus(); + if (f.length > 0) { + writer.writeString( + 6, + f + ); + } + f = message.getUpdatedDate(); + if (f.length > 0) { + writer.writeString( + 7, f ); } f = message.getAddressListList(); if (f.length > 0) { writer.writeRepeatedString( - 6, + 8, f ); } f = message.getTrainingDataLink(); if (f.length > 0) { writer.writeString( - 7, + 9, f ); } - f = message.getIsDefaultModel(); - if (f) { - writer.writeBool( - 8, + f = message.getModelName(); + if (f.length > 0) { + writer.writeString( + 10, f ); } f = message.getOrganizationId(); if (f.length > 0) { writer.writeString( - 9, + 11, f ); } f = message.getServiceId(); if (f.length > 0) { writer.writeString( - 10, + 12, f ); } f = message.getGroupId(); if (f.length > 0) { writer.writeString( - 11, + 13, + f + ); + } + f = message.getIsPubliclyAccessible(); + if (f) { + writer.writeBool( + 14, f ); } @@ -338,34 +362,47 @@ training.ModelDetails.prototype.setDescription = function(value) { /** - * optional bool is_publicly_accessible = 5; - * Note that Boolean fields may be set to 0/1 when serialized from a Java server. - * You should avoid comparisons like {@code val === true/false} in those cases. - * @return {boolean} + * optional string status = 6; + * @return {string} */ -training.ModelDetails.prototype.getIsPubliclyAccessible = function() { - return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false)); +training.ModelDetails.prototype.getStatus = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, "")); }; -/** @param {boolean} value */ -training.ModelDetails.prototype.setIsPubliclyAccessible = function(value) { - jspb.Message.setProto3BooleanField(this, 5, value); +/** @param {string} value */ +training.ModelDetails.prototype.setStatus = function(value) { + jspb.Message.setProto3StringField(this, 6, value); }; /** - * repeated string address_list = 6; + * optional string updated_date = 7; + * @return {string} + */ +training.ModelDetails.prototype.getUpdatedDate = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, "")); +}; + + +/** @param {string} value */ +training.ModelDetails.prototype.setUpdatedDate = function(value) { + jspb.Message.setProto3StringField(this, 7, value); +}; + + +/** + * repeated string address_list = 8; * @return {!Array} */ training.ModelDetails.prototype.getAddressListList = function() { - return /** @type {!Array} */ (jspb.Message.getRepeatedField(this, 6)); + return /** @type {!Array} */ (jspb.Message.getRepeatedField(this, 8)); }; /** @param {!Array} value */ training.ModelDetails.prototype.setAddressListList = function(value) { - jspb.Message.setField(this, 6, value || []); + jspb.Message.setField(this, 8, value || []); }; @@ -374,7 +411,7 @@ training.ModelDetails.prototype.setAddressListList = function(value) { * @param {number=} opt_index */ training.ModelDetails.prototype.addAddressList = function(value, opt_index) { - jspb.Message.addToRepeatedField(this, 6, value, opt_index); + jspb.Message.addToRepeatedField(this, 8, value, opt_index); }; @@ -384,79 +421,94 @@ training.ModelDetails.prototype.clearAddressListList = function() { /** - * optional string training_data_link = 7; + * optional string training_data_link = 9; * @return {string} */ training.ModelDetails.prototype.getTrainingDataLink = function() { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, "")); + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, "")); }; /** @param {string} value */ training.ModelDetails.prototype.setTrainingDataLink = function(value) { - jspb.Message.setProto3StringField(this, 7, value); + jspb.Message.setProto3StringField(this, 9, value); }; /** - * optional bool is_default_model = 8; - * Note that Boolean fields may be set to 0/1 when serialized from a Java server. - * You should avoid comparisons like {@code val === true/false} in those cases. - * @return {boolean} + * optional string model_name = 10; + * @return {string} */ -training.ModelDetails.prototype.getIsDefaultModel = function() { - return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 8, false)); +training.ModelDetails.prototype.getModelName = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, "")); }; -/** @param {boolean} value */ -training.ModelDetails.prototype.setIsDefaultModel = function(value) { - jspb.Message.setProto3BooleanField(this, 8, value); +/** @param {string} value */ +training.ModelDetails.prototype.setModelName = function(value) { + jspb.Message.setProto3StringField(this, 10, value); }; /** - * optional string organization_id = 9; + * optional string organization_id = 11; * @return {string} */ training.ModelDetails.prototype.getOrganizationId = function() { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, "")); + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, "")); }; /** @param {string} value */ training.ModelDetails.prototype.setOrganizationId = function(value) { - jspb.Message.setProto3StringField(this, 9, value); + jspb.Message.setProto3StringField(this, 11, value); }; /** - * optional string service_id = 10; + * optional string service_id = 12; * @return {string} */ training.ModelDetails.prototype.getServiceId = function() { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, "")); + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, "")); }; /** @param {string} value */ training.ModelDetails.prototype.setServiceId = function(value) { - jspb.Message.setProto3StringField(this, 10, value); + jspb.Message.setProto3StringField(this, 12, value); }; /** - * optional string group_id = 11; + * optional string group_id = 13; * @return {string} */ training.ModelDetails.prototype.getGroupId = function() { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, "")); + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, "")); }; /** @param {string} value */ training.ModelDetails.prototype.setGroupId = function(value) { - jspb.Message.setProto3StringField(this, 11, value); + jspb.Message.setProto3StringField(this, 13, value); +}; + + +/** + * optional bool is_publicly_accessible = 14; + * Note that Boolean fields may be set to 0/1 when serialized from a Java server. + * You should avoid comparisons like {@code val === true/false} in those cases. + * @return {boolean} + */ +training.ModelDetails.prototype.getIsPubliclyAccessible = function() { + return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 14, false)); +}; + + +/** @param {boolean} value */ +training.ModelDetails.prototype.setIsPubliclyAccessible = function(value) { + jspb.Message.setProto3BooleanField(this, 14, value); }; diff --git a/packages/web/src/proto/training_pb_service.js b/packages/web/src/proto/training_pb_service.js index 0e025c9..2dad448 100644 --- a/packages/web/src/proto/training_pb_service.js +++ b/packages/web/src/proto/training_pb_service.js @@ -1,7 +1,8 @@ // package: training -// file: training.proto +// file: singnet/snet-daemon/training/training.proto -var training_pb = require("./training_pb"); +// var singnet_snet_daemon_training_training_pb = require("../../../singnet/snet-daemon/training/training_pb"); +var singnet_snet_daemon_training_training_pb = require("./training_pb"); var grpc = require("@improbable-eng/grpc-web").grpc; var Model = (function () { @@ -15,8 +16,8 @@ Model.create_model = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.CreateModelRequest, - responseType: training_pb.ModelDetailsResponse + requestType: singnet_snet_daemon_training_training_pb.CreateModelRequest, + responseType: singnet_snet_daemon_training_training_pb.ModelDetailsResponse }; Model.delete_model = { @@ -24,8 +25,8 @@ Model.delete_model = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.UpdateModelRequest, - responseType: training_pb.ModelDetailsResponse + requestType: singnet_snet_daemon_training_training_pb.UpdateModelRequest, + responseType: singnet_snet_daemon_training_training_pb.ModelDetailsResponse }; Model.get_model_status = { @@ -33,8 +34,8 @@ Model.get_model_status = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.ModelDetailsRequest, - responseType: training_pb.ModelDetailsResponse + requestType: singnet_snet_daemon_training_training_pb.ModelDetailsRequest, + responseType: singnet_snet_daemon_training_training_pb.ModelDetailsResponse }; Model.update_model_access = { @@ -42,8 +43,8 @@ Model.update_model_access = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.UpdateModelRequest, - responseType: training_pb.ModelDetailsResponse + requestType: singnet_snet_daemon_training_training_pb.UpdateModelRequest, + responseType: singnet_snet_daemon_training_training_pb.ModelDetailsResponse }; Model.get_all_models = { @@ -51,8 +52,8 @@ Model.get_all_models = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.AccessibleModelsRequest, - responseType: training_pb.AccessibleModelsResponse + requestType: singnet_snet_daemon_training_training_pb.AccessibleModelsRequest, + responseType: singnet_snet_daemon_training_training_pb.AccessibleModelsResponse }; exports.Model = Model; From 556bd40ffe45028b04dff9092f3b41519e7fbb61 Mon Sep 17 00:00:00 2001 From: Shyam-Khokhariya Date: Thu, 6 Oct 2022 11:52:07 +0530 Subject: [PATCH 6/8] Update the existing and create model response --- packages/core/src/BaseServiceClient.js | 59 +++--- packages/web/src/proto/training.proto | 24 ++- packages/web/src/proto/training_pb.js | 182 +++++++++++------- packages/web/src/proto/training_pb_service.js | 24 +-- 4 files changed, 178 insertions(+), 111 deletions(-) diff --git a/packages/core/src/BaseServiceClient.js b/packages/core/src/BaseServiceClient.js index 00d55dc..529bad6 100644 --- a/packages/core/src/BaseServiceClient.js +++ b/packages/core/src/BaseServiceClient.js @@ -83,17 +83,22 @@ class BaseServiceClient { return this._options.concurrency; } - async getExistingModel(grpcMethod, address) { - const request = await this._trainingStateRequest(address, grpcMethod); + async getExistingModel(params) { + const request = await this._trainingStateRequest(params); return new Promise((resolve, reject) => { this._modelServiceClient.get_all_models(request, (err, response) => { const modelDetails = response.getListOfModelsList(); const data = modelDetails.map((item) => { return { modelId: item.getModelId(), - description: item.getDescription(), methodName: item.getGrpcMethodName(), + serviceName: item.getGrpcServiceName(), + description: item.getDescription(), + status: item.getStatus(), + updatedDate: item.getUpdatedDate(), addressList: item.getAddressListList(), + modelName: item.getModelName(), + publicAccess: item.getIsPubliclyAccessible(), }; }); if (err) { @@ -105,13 +110,15 @@ class BaseServiceClient { }); } - async _trainingStateRequest(address, grpcMethod) { + async _trainingStateRequest(params) { const message = "__get_existing_model"; const { currentBlockNumber, signatureBytes } = - await this._requestSignForModel(address, message); + await this._requestSignForModel(params.address, message); const ModelStateRequest = this._getModelRequestMethodDescriptor(); const modelStateRequest = new ModelStateRequest(); - modelStateRequest.setGrpcMethodName(grpcMethod); + modelStateRequest.setGrpcMethodName(params.grpcMethod); + modelStateRequest.setGrpcServiceName(params.grpcService); + const AuthorizationRequest = this._getAuthorizationRequestMethodDescriptor(); const authorizationRequest = new AuthorizationRequest(); @@ -119,7 +126,7 @@ class BaseServiceClient { authorizationRequest.setCurrentBlock(currentBlockNumber); authorizationRequest.setMessage(message); authorizationRequest.setSignature(signatureBytes); - authorizationRequest.setSignerAddress(address); + authorizationRequest.setSignerAddress(params.address); modelStateRequest.setAuthorization(authorizationRequest); return modelStateRequest; } @@ -142,13 +149,18 @@ class BaseServiceClient { const request = await this._trainingCreateModel(address, params); return new Promise((resolve, reject) => { this._modelServiceClient.create_model(request, (err, response) => { + logger.debug(`create model ${err} ${response}`); const modelDetails = response.getModelDetails(); - logger.debug(`create model ${err} ${modelDetails}`); const data = { modelId: modelDetails.getModelId(), - description: modelDetails.getDescription(), methodName: modelDetails.getGrpcMethodName(), + serviceName: modelDetails.getGrpcServiceName(), + description: modelDetails.getDescription(), + status: modelDetails.getStatus(), + updatedDate: modelDetails.getUpdatedDate(), addressList: modelDetails.getAddressListList(), + modelName: modelDetails.getModelName(), + publicAccess: modelDetails.getIsPubliclyAccessible(), }; if (err) { reject(err); @@ -170,22 +182,22 @@ class BaseServiceClient { this._getAuthorizationRequestMethodDescriptor(); const authorizationRequest = new AuthorizationRequest(); const ModelDetailsRequest = this._getModelDetailsRequestMethodDescriptor(); + + const { orgId, serviceId, groupId } = this.getServiceDetails(); const modelDetailsRequest = new ModelDetailsRequest(); authorizationRequest.setCurrentBlock(currentBlockNumber); authorizationRequest.setMessage(message); authorizationRequest.setSignature(signatureBytes); authorizationRequest.setSignerAddress(address); - modelDetailsRequest.setModelId(""); + modelDetailsRequest.setModelName(params.modelName); modelDetailsRequest.setGrpcMethodName(params.method); - modelDetailsRequest.setGrpcServiceName(params.name); + modelDetailsRequest.setGrpcServiceName(params.serviceName); modelDetailsRequest.setDescription(params.description); - modelDetailsRequest.setIsPubliclyAccessible(params.enableAccess); + modelDetailsRequest.setIsPubliclyAccessible(params.publicAccess); modelDetailsRequest.setAddressListList(params.address); modelDetailsRequest.setTrainingDataLink(""); - modelDetailsRequest.setIsDefaultModel(""); - const { orgId, serviceId, groupId } = this.getServiceDetails(); modelDetailsRequest.setOrganizationId(orgId); modelDetailsRequest.setServiceId(serviceId); modelDetailsRequest.setGroupId(groupId); @@ -195,7 +207,6 @@ class BaseServiceClient { return modelStateRequest; } - async deleteModel(params) { const request = await this._trainingDeleteModel(params); return new Promise((resolve, reject) => { @@ -213,11 +224,11 @@ class BaseServiceClient { async _trainingDeleteModel(params) { const message = "__delete_model"; const { currentBlockNumber, signatureBytes } = - await this._requestSignForModel(address, message); + await this._requestSignForModel(params.address, message); - const ModelStateRequest = this._getDeleteModelRequestMethodDescriptor(); + const ModelStateRequest = this._getUpdateModelRequestMethodDescriptor(); const modelStateRequest = new ModelStateRequest(); - + const AuthorizationRequest = this._getAuthorizationRequestMethodDescriptor(); const authorizationRequest = new AuthorizationRequest(); @@ -231,13 +242,12 @@ class BaseServiceClient { modelDetailsRequest.setModelId(params.modelId); modelDetailsRequest.setGrpcMethodName(params.method); modelDetailsRequest.setGrpcServiceName(params.name); - + modelStateRequest.setAuthorization(authorizationRequest); modelStateRequest.setUpdateModelDetails(modelDetailsRequest); return modelStateRequest; } - async updateModel(params) { const request = await this._trainingUpdateModel(params); return new Promise((resolve, reject) => { @@ -259,7 +269,7 @@ class BaseServiceClient { const ModelStateRequest = this._getUpdateModelRequestMethodDescriptor(); const modelStateRequest = new ModelStateRequest(); - + const AuthorizationRequest = this._getAuthorizationRequestMethodDescriptor(); const authorizationRequest = new AuthorizationRequest(); @@ -277,18 +287,17 @@ class BaseServiceClient { modelDetailsRequest.setDescription(params.description); modelDetailsRequest.setAddressListList(params.addressList); modelDetailsRequest.setTrainingDataLink(""); - modelDetailsRequest.setIsDefaultModel(""); + // modelDetailsRequest.setIsDefaultModel(""); const { orgId, serviceId, groupId } = this.getServiceDetails(); modelDetailsRequest.setOrganizationId(orgId); modelDetailsRequest.setServiceId(serviceId); modelDetailsRequest.setGroupId(groupId); - + modelStateRequest.setAuthorization(authorizationRequest); modelStateRequest.setUpdateModelDetails(modelDetailsRequest); return modelStateRequest; } - /** * Fetches the latest channel state from the ai service daemon @@ -647,7 +656,7 @@ class BaseServiceClient { ); } - _getUpdateModelRequestMethodDescriptor(){ + _getUpdateModelRequestMethodDescriptor() { logger.error( "__getUpdateModelRequestMethodDescriptor must be implemented in the sub classes" ); diff --git a/packages/web/src/proto/training.proto b/packages/web/src/proto/training.proto index 27567c3..f919915 100644 --- a/packages/web/src/proto/training.proto +++ b/packages/web/src/proto/training.proto @@ -11,17 +11,23 @@ message ModelDetails { //define the grpc service name , under which the method is defined string grpc_service_name = 3; string description = 4; - //set this to true if you want your model to be used by other AI consumers - bool is_publicly_accessible = 5; + + string status = 6; + string updated_date = 7; //List of all the addresses that will have access to this model - repeated string address_list = 6; + repeated string address_list = 8; // this is optional - string training_data_link = 7; - bool is_default_model = 8; + string training_data_link = 9; + string model_name = 10; + + + string organization_id = 11; + string service_id = 12 ; + string group_id = 13; + + //set this to true if you want your model to be used by other AI consumers + bool is_publicly_accessible = 14; - string organization_id = 9; - string service_id = 10 ; - string group_id = 11; } message AuthorizationDetails { @@ -103,4 +109,4 @@ service Model { rpc get_all_models(AccessibleModelsRequest) returns (AccessibleModelsResponse) {} -} \ No newline at end of file +} diff --git a/packages/web/src/proto/training_pb.js b/packages/web/src/proto/training_pb.js index c7c2119..53473c4 100644 --- a/packages/web/src/proto/training_pb.js +++ b/packages/web/src/proto/training_pb.js @@ -46,7 +46,7 @@ if (goog.DEBUG && !COMPILED) { * @private {!Array} * @const */ -training.ModelDetails.repeatedFields_ = [6]; +training.ModelDetails.repeatedFields_ = [8]; @@ -81,13 +81,15 @@ training.ModelDetails.toObject = function(includeInstance, msg) { grpcMethodName: jspb.Message.getFieldWithDefault(msg, 2, ""), grpcServiceName: jspb.Message.getFieldWithDefault(msg, 3, ""), description: jspb.Message.getFieldWithDefault(msg, 4, ""), - isPubliclyAccessible: jspb.Message.getFieldWithDefault(msg, 5, false), - addressListList: jspb.Message.getRepeatedField(msg, 6), - trainingDataLink: jspb.Message.getFieldWithDefault(msg, 7, ""), - isDefaultModel: jspb.Message.getFieldWithDefault(msg, 8, false), - organizationId: jspb.Message.getFieldWithDefault(msg, 9, ""), - serviceId: jspb.Message.getFieldWithDefault(msg, 10, ""), - groupId: jspb.Message.getFieldWithDefault(msg, 11, "") + status: jspb.Message.getFieldWithDefault(msg, 6, ""), + updatedDate: jspb.Message.getFieldWithDefault(msg, 7, ""), + addressListList: jspb.Message.getRepeatedField(msg, 8), + trainingDataLink: jspb.Message.getFieldWithDefault(msg, 9, ""), + modelName: jspb.Message.getFieldWithDefault(msg, 10, ""), + organizationId: jspb.Message.getFieldWithDefault(msg, 11, ""), + serviceId: jspb.Message.getFieldWithDefault(msg, 12, ""), + groupId: jspb.Message.getFieldWithDefault(msg, 13, ""), + isPubliclyAccessible: jspb.Message.getFieldWithDefault(msg, 14, false) }; if (includeInstance) { @@ -140,34 +142,42 @@ training.ModelDetails.deserializeBinaryFromReader = function(msg, reader) { var value = /** @type {string} */ (reader.readString()); msg.setDescription(value); break; - case 5: - var value = /** @type {boolean} */ (reader.readBool()); - msg.setIsPubliclyAccessible(value); - break; case 6: var value = /** @type {string} */ (reader.readString()); - msg.addAddressList(value); + msg.setStatus(value); break; case 7: var value = /** @type {string} */ (reader.readString()); - msg.setTrainingDataLink(value); + msg.setUpdatedDate(value); break; case 8: - var value = /** @type {boolean} */ (reader.readBool()); - msg.setIsDefaultModel(value); + var value = /** @type {string} */ (reader.readString()); + msg.addAddressList(value); break; case 9: var value = /** @type {string} */ (reader.readString()); - msg.setOrganizationId(value); + msg.setTrainingDataLink(value); break; case 10: var value = /** @type {string} */ (reader.readString()); - msg.setServiceId(value); + msg.setModelName(value); break; case 11: + var value = /** @type {string} */ (reader.readString()); + msg.setOrganizationId(value); + break; + case 12: + var value = /** @type {string} */ (reader.readString()); + msg.setServiceId(value); + break; + case 13: var value = /** @type {string} */ (reader.readString()); msg.setGroupId(value); break; + case 14: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setIsPubliclyAccessible(value); + break; default: reader.skipField(); break; @@ -225,52 +235,66 @@ training.ModelDetails.serializeBinaryToWriter = function(message, writer) { f ); } - f = message.getIsPubliclyAccessible(); - if (f) { - writer.writeBool( - 5, + f = message.getStatus(); + if (f.length > 0) { + writer.writeString( + 6, + f + ); + } + f = message.getUpdatedDate(); + if (f.length > 0) { + writer.writeString( + 7, f ); } f = message.getAddressListList(); if (f.length > 0) { writer.writeRepeatedString( - 6, + 8, f ); } f = message.getTrainingDataLink(); if (f.length > 0) { writer.writeString( - 7, + 9, f ); } - f = message.getIsDefaultModel(); - if (f) { - writer.writeBool( - 8, + f = message.getModelName(); + if (f.length > 0) { + writer.writeString( + 10, f ); } f = message.getOrganizationId(); if (f.length > 0) { writer.writeString( - 9, + 11, f ); } f = message.getServiceId(); if (f.length > 0) { writer.writeString( - 10, + 12, f ); } f = message.getGroupId(); if (f.length > 0) { writer.writeString( - 11, + 13, + f + ); + } + f = message.getIsPubliclyAccessible(); + if (f) { + writer.writeBool( + 14, f ); } @@ -338,34 +362,47 @@ training.ModelDetails.prototype.setDescription = function(value) { /** - * optional bool is_publicly_accessible = 5; - * Note that Boolean fields may be set to 0/1 when serialized from a Java server. - * You should avoid comparisons like {@code val === true/false} in those cases. - * @return {boolean} + * optional string status = 6; + * @return {string} */ -training.ModelDetails.prototype.getIsPubliclyAccessible = function() { - return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 5, false)); +training.ModelDetails.prototype.getStatus = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, "")); }; -/** @param {boolean} value */ -training.ModelDetails.prototype.setIsPubliclyAccessible = function(value) { - jspb.Message.setProto3BooleanField(this, 5, value); +/** @param {string} value */ +training.ModelDetails.prototype.setStatus = function(value) { + jspb.Message.setProto3StringField(this, 6, value); }; /** - * repeated string address_list = 6; + * optional string updated_date = 7; + * @return {string} + */ +training.ModelDetails.prototype.getUpdatedDate = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, "")); +}; + + +/** @param {string} value */ +training.ModelDetails.prototype.setUpdatedDate = function(value) { + jspb.Message.setProto3StringField(this, 7, value); +}; + + +/** + * repeated string address_list = 8; * @return {!Array} */ training.ModelDetails.prototype.getAddressListList = function() { - return /** @type {!Array} */ (jspb.Message.getRepeatedField(this, 6)); + return /** @type {!Array} */ (jspb.Message.getRepeatedField(this, 8)); }; /** @param {!Array} value */ training.ModelDetails.prototype.setAddressListList = function(value) { - jspb.Message.setField(this, 6, value || []); + jspb.Message.setField(this, 8, value || []); }; @@ -374,7 +411,7 @@ training.ModelDetails.prototype.setAddressListList = function(value) { * @param {number=} opt_index */ training.ModelDetails.prototype.addAddressList = function(value, opt_index) { - jspb.Message.addToRepeatedField(this, 6, value, opt_index); + jspb.Message.addToRepeatedField(this, 8, value, opt_index); }; @@ -384,79 +421,94 @@ training.ModelDetails.prototype.clearAddressListList = function() { /** - * optional string training_data_link = 7; + * optional string training_data_link = 9; * @return {string} */ training.ModelDetails.prototype.getTrainingDataLink = function() { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, "")); + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, "")); }; /** @param {string} value */ training.ModelDetails.prototype.setTrainingDataLink = function(value) { - jspb.Message.setProto3StringField(this, 7, value); + jspb.Message.setProto3StringField(this, 9, value); }; /** - * optional bool is_default_model = 8; - * Note that Boolean fields may be set to 0/1 when serialized from a Java server. - * You should avoid comparisons like {@code val === true/false} in those cases. - * @return {boolean} + * optional string model_name = 10; + * @return {string} */ -training.ModelDetails.prototype.getIsDefaultModel = function() { - return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 8, false)); +training.ModelDetails.prototype.getModelName = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, "")); }; -/** @param {boolean} value */ -training.ModelDetails.prototype.setIsDefaultModel = function(value) { - jspb.Message.setProto3BooleanField(this, 8, value); +/** @param {string} value */ +training.ModelDetails.prototype.setModelName = function(value) { + jspb.Message.setProto3StringField(this, 10, value); }; /** - * optional string organization_id = 9; + * optional string organization_id = 11; * @return {string} */ training.ModelDetails.prototype.getOrganizationId = function() { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, "")); + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, "")); }; /** @param {string} value */ training.ModelDetails.prototype.setOrganizationId = function(value) { - jspb.Message.setProto3StringField(this, 9, value); + jspb.Message.setProto3StringField(this, 11, value); }; /** - * optional string service_id = 10; + * optional string service_id = 12; * @return {string} */ training.ModelDetails.prototype.getServiceId = function() { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, "")); + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, "")); }; /** @param {string} value */ training.ModelDetails.prototype.setServiceId = function(value) { - jspb.Message.setProto3StringField(this, 10, value); + jspb.Message.setProto3StringField(this, 12, value); }; /** - * optional string group_id = 11; + * optional string group_id = 13; * @return {string} */ training.ModelDetails.prototype.getGroupId = function() { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, "")); + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, "")); }; /** @param {string} value */ training.ModelDetails.prototype.setGroupId = function(value) { - jspb.Message.setProto3StringField(this, 11, value); + jspb.Message.setProto3StringField(this, 13, value); +}; + + +/** + * optional bool is_publicly_accessible = 14; + * Note that Boolean fields may be set to 0/1 when serialized from a Java server. + * You should avoid comparisons like {@code val === true/false} in those cases. + * @return {boolean} + */ +training.ModelDetails.prototype.getIsPubliclyAccessible = function() { + return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 14, false)); +}; + + +/** @param {boolean} value */ +training.ModelDetails.prototype.setIsPubliclyAccessible = function(value) { + jspb.Message.setProto3BooleanField(this, 14, value); }; diff --git a/packages/web/src/proto/training_pb_service.js b/packages/web/src/proto/training_pb_service.js index 0e025c9..61ae6c8 100644 --- a/packages/web/src/proto/training_pb_service.js +++ b/packages/web/src/proto/training_pb_service.js @@ -1,7 +1,7 @@ // package: training -// file: training.proto +// file: singnet/snet-daemon/training/training.proto -var training_pb = require("./training_pb"); +var singnet_snet_daemon_training_training_pb = require("./training_pb"); var grpc = require("@improbable-eng/grpc-web").grpc; var Model = (function () { @@ -15,8 +15,8 @@ Model.create_model = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.CreateModelRequest, - responseType: training_pb.ModelDetailsResponse + requestType: singnet_snet_daemon_training_training_pb.CreateModelRequest, + responseType: singnet_snet_daemon_training_training_pb.ModelDetailsResponse }; Model.delete_model = { @@ -24,8 +24,8 @@ Model.delete_model = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.UpdateModelRequest, - responseType: training_pb.ModelDetailsResponse + requestType: singnet_snet_daemon_training_training_pb.UpdateModelRequest, + responseType: singnet_snet_daemon_training_training_pb.ModelDetailsResponse }; Model.get_model_status = { @@ -33,8 +33,8 @@ Model.get_model_status = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.ModelDetailsRequest, - responseType: training_pb.ModelDetailsResponse + requestType: singnet_snet_daemon_training_training_pb.ModelDetailsRequest, + responseType: singnet_snet_daemon_training_training_pb.ModelDetailsResponse }; Model.update_model_access = { @@ -42,8 +42,8 @@ Model.update_model_access = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.UpdateModelRequest, - responseType: training_pb.ModelDetailsResponse + requestType: singnet_snet_daemon_training_training_pb.UpdateModelRequest, + responseType: singnet_snet_daemon_training_training_pb.ModelDetailsResponse }; Model.get_all_models = { @@ -51,8 +51,8 @@ Model.get_all_models = { service: Model, requestStream: false, responseStream: false, - requestType: training_pb.AccessibleModelsRequest, - responseType: training_pb.AccessibleModelsResponse + requestType: singnet_snet_daemon_training_training_pb.AccessibleModelsRequest, + responseType: singnet_snet_daemon_training_training_pb.AccessibleModelsResponse }; exports.Model = Model; From cd1f6d5df4d5c97d165b57691b2458210a0890da Mon Sep 17 00:00:00 2001 From: sreeshnap Date: Thu, 6 Oct 2022 15:34:44 +0530 Subject: [PATCH 7/8] update model-sdk added params --- packages/core/src/BaseServiceClient.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/core/src/BaseServiceClient.js b/packages/core/src/BaseServiceClient.js index 529bad6..e647e66 100644 --- a/packages/core/src/BaseServiceClient.js +++ b/packages/core/src/BaseServiceClient.js @@ -252,7 +252,7 @@ class BaseServiceClient { const request = await this._trainingUpdateModel(params); return new Promise((resolve, reject) => { this._modelServiceClient.update_model_access(request, (err, response) => { - logger.debug(`delete model ${err} ${response}`); + logger.debug(`update model ${err} ${response}`); if (err) { reject(err); } else { @@ -265,7 +265,7 @@ class BaseServiceClient { async _trainingUpdateModel(params) { const message = "__update_model"; const { currentBlockNumber, signatureBytes } = - await this._requestSignForModel(address, message); + await this._requestSignForModel(params.address, message); const ModelStateRequest = this._getUpdateModelRequestMethodDescriptor(); const modelStateRequest = new ModelStateRequest(); @@ -287,7 +287,10 @@ class BaseServiceClient { modelDetailsRequest.setDescription(params.description); modelDetailsRequest.setAddressListList(params.addressList); modelDetailsRequest.setTrainingDataLink(""); - // modelDetailsRequest.setIsDefaultModel(""); + modelDetailsRequest.setStatus(params.status); + modelDetailsRequest.setUpdatedDate(params.updatedDate); + modelDetailsRequest.setIsPubliclyAccessible(params.publicAccess); + const { orgId, serviceId, groupId } = this.getServiceDetails(); modelDetailsRequest.setOrganizationId(orgId); From 7044da44a404e59905ece8aa28bfbf82f3c0999c Mon Sep 17 00:00:00 2001 From: sreeshnap Date: Thu, 6 Oct 2022 15:47:32 +0530 Subject: [PATCH 8/8] modelName --- packages/core/src/BaseServiceClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/BaseServiceClient.js b/packages/core/src/BaseServiceClient.js index e647e66..e4edb74 100644 --- a/packages/core/src/BaseServiceClient.js +++ b/packages/core/src/BaseServiceClient.js @@ -283,7 +283,7 @@ class BaseServiceClient { modelDetailsRequest.setModelId(params.modelId); modelDetailsRequest.setGrpcMethodName(params.method); modelDetailsRequest.setGrpcServiceName(params.name); - + modelDetailsRequest.setModelName(params.modelName); modelDetailsRequest.setDescription(params.description); modelDetailsRequest.setAddressListList(params.addressList); modelDetailsRequest.setTrainingDataLink("");