Skip to content

Commit

Permalink
DATA-1352 - Add error to TrainingJobMetadata in API (viamrobotics#265)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
tahiyasalam and github-actions[bot] authored Jun 2, 2023
1 parent 335775d commit 19deb2a
Show file tree
Hide file tree
Showing 10 changed files with 276 additions and 194 deletions.
362 changes: 190 additions & 172 deletions app/mltraining/v1/ml_training.pb.go

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions component/inputcontroller/v1/input_controller.pb.gw.go

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

10 changes: 5 additions & 5 deletions component/posetracker/v1/pose_tracker.pb.gw.go

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

10 changes: 5 additions & 5 deletions component/servo/v1/servo.pb.gw.go

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

2 changes: 2 additions & 0 deletions gen/js/app/mltraining/v1/ml_training_grpc_web_pb.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ var app_data_v1_data_pb = require('../../../app/data/v1/data_pb.js')

var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js')

var google_rpc_status_pb = require('../../../google/rpc/status_pb.js')

var tagger_v1_tagger_pb = require('../../../tagger/v1/tagger_pb.js')
const proto = {};
proto.viam = {};
Expand Down
7 changes: 7 additions & 0 deletions gen/js/app/mltraining/v1/ml_training_pb.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import * as jspb from "google-protobuf";
import * as app_data_v1_data_pb from "../../../app/data/v1/data_pb";
import * as google_protobuf_timestamp_pb from "google-protobuf/google/protobuf/timestamp_pb";
import * as google_rpc_status_pb from "../../../google/rpc/status_pb";
import * as tagger_v1_tagger_pb from "../../../tagger/v1/tagger_pb";

export class SubmitTrainingJobRequest extends jspb.Message {
Expand Down Expand Up @@ -186,6 +187,11 @@ export class TrainingJobMetadata extends jspb.Message {
getId(): string;
setId(value: string): void;

hasErrorStatus(): boolean;
clearErrorStatus(): void;
getErrorStatus(): google_rpc_status_pb.Status | undefined;
setErrorStatus(value?: google_rpc_status_pb.Status): void;

serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): TrainingJobMetadata.AsObject;
static toObject(includeInstance: boolean, msg: TrainingJobMetadata): TrainingJobMetadata.AsObject;
Expand All @@ -205,6 +211,7 @@ export namespace TrainingJobMetadata {
syncedModelId: string,
userEmail: string,
id: string,
errorStatus?: google_rpc_status_pb.Status.AsObject,
}
}

Expand Down
55 changes: 54 additions & 1 deletion gen/js/app/mltraining/v1/ml_training_pb.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ var app_data_v1_data_pb = require('../../../app/data/v1/data_pb.js');
goog.object.extend(proto, app_data_v1_data_pb);
var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js');
goog.object.extend(proto, google_protobuf_timestamp_pb);
var google_rpc_status_pb = require('../../../google/rpc/status_pb.js');
goog.object.extend(proto, google_rpc_status_pb);
var tagger_v1_tagger_pb = require('../../../tagger/v1/tagger_pb.js');
goog.object.extend(proto, tagger_v1_tagger_pb);
goog.exportSymbol('proto.viam.app.mltraining.v1.CancelTrainingJobRequest', null, global);
Expand Down Expand Up @@ -1317,7 +1319,8 @@ proto.viam.app.mltraining.v1.TrainingJobMetadata.toObject = function(includeInst
lastModified: (f = msg.getLastModified()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
syncedModelId: jspb.Message.getFieldWithDefault(msg, 5, ""),
userEmail: jspb.Message.getFieldWithDefault(msg, 6, ""),
id: jspb.Message.getFieldWithDefault(msg, 7, "")
id: jspb.Message.getFieldWithDefault(msg, 7, ""),
errorStatus: (f = msg.getErrorStatus()) && google_rpc_status_pb.Status.toObject(includeInstance, f)
};

if (includeInstance) {
Expand Down Expand Up @@ -1385,6 +1388,11 @@ proto.viam.app.mltraining.v1.TrainingJobMetadata.deserializeBinaryFromReader = f
var value = /** @type {string} */ (reader.readString());
msg.setId(value);
break;
case 8:
var value = new google_rpc_status_pb.Status;
reader.readMessage(value,google_rpc_status_pb.Status.deserializeBinaryFromReader);
msg.setErrorStatus(value);
break;
default:
reader.skipField();
break;
Expand Down Expand Up @@ -1466,6 +1474,14 @@ proto.viam.app.mltraining.v1.TrainingJobMetadata.serializeBinaryToWriter = funct
f
);
}
f = message.getErrorStatus();
if (f != null) {
writer.writeMessage(
8,
f,
google_rpc_status_pb.Status.serializeBinaryToWriter
);
}
};


Expand Down Expand Up @@ -1652,6 +1668,43 @@ proto.viam.app.mltraining.v1.TrainingJobMetadata.prototype.setId = function(valu
};


/**
* optional google.rpc.Status error_status = 8;
* @return {?proto.google.rpc.Status}
*/
proto.viam.app.mltraining.v1.TrainingJobMetadata.prototype.getErrorStatus = function() {
return /** @type{?proto.google.rpc.Status} */ (
jspb.Message.getWrapperField(this, google_rpc_status_pb.Status, 8));
};


/**
* @param {?proto.google.rpc.Status|undefined} value
* @return {!proto.viam.app.mltraining.v1.TrainingJobMetadata} returns this
*/
proto.viam.app.mltraining.v1.TrainingJobMetadata.prototype.setErrorStatus = function(value) {
return jspb.Message.setWrapperField(this, 8, value);
};


/**
* Clears the message field making it undefined.
* @return {!proto.viam.app.mltraining.v1.TrainingJobMetadata} returns this
*/
proto.viam.app.mltraining.v1.TrainingJobMetadata.prototype.clearErrorStatus = function() {
return this.setErrorStatus(undefined);
};


/**
* Returns whether this field is set.
* @return {boolean}
*/
proto.viam.app.mltraining.v1.TrainingJobMetadata.prototype.hasErrorStatus = function() {
return jspb.Message.getField(this, 8) != null;
};





Expand Down
2 changes: 2 additions & 0 deletions proto/viam/app/mltraining/v1/ml_training.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package viam.app.mltraining.v1;

import "app/data/v1/data.proto";
import "google/protobuf/timestamp.proto";
import "google/rpc/status.proto";
import "tagger/v1/tagger.proto";

option go_package = "go.viam.com/api/app/mltraining/v1";
Expand Down Expand Up @@ -70,6 +71,7 @@ message TrainingJobMetadata {
string synced_model_id = 5 [(tagger.v1.tags) = "bson:\"synced_model_id\" json:\"synced_model_id\""];
string user_email = 6 [(tagger.v1.tags) = "bson:\"user_email\" json:\"user_email\""];
string id = 7 [(tagger.v1.tags) = "bson:\"_id\" json:\"id,omitempty\""];
google.rpc.Status error_status = 8 [(tagger.v1.tags) = "bson:\"error_status\" json:\"error_status\""];
}

message CancelTrainingJobRequest {
Expand Down
6 changes: 3 additions & 3 deletions service/datamanager/v1/data_manager.pb.gw.go

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

6 changes: 3 additions & 3 deletions service/sensors/v1/sensors.pb.gw.go

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

0 comments on commit 19deb2a

Please sign in to comment.