Merge branch 'main' into bumpgrpcversion

stevebriskin · Oct 27, 2023 · 77b421b · 77b421b
2 parents 384305d + 822569e
commit 77b421b
Show file tree

Hide file tree

Showing 26 changed files with 2,778 additions and 210 deletions.
diff --git a/app/mltraining/v1/ml_training.pb.go b/app/mltraining/v1/ml_training.pb.go
diff --git a/component/base/v1/base.pb.gw.go b/component/base/v1/base.pb.gw.go
diff --git a/component/gantry/v1/gantry.pb.gw.go b/component/gantry/v1/gantry.pb.gw.go
diff --git a/component/gripper/v1/gripper.pb.gw.go b/component/gripper/v1/gripper.pb.gw.go
diff --git a/component/inputcontroller/v1/input_controller.pb.gw.go b/component/inputcontroller/v1/input_controller.pb.gw.go
diff --git a/component/posetracker/v1/pose_tracker.pb.gw.go b/component/posetracker/v1/pose_tracker.pb.gw.go
diff --git a/component/powersensor/v1/powersensor.pb.gw.go b/component/powersensor/v1/powersensor.pb.gw.go
diff --git a/component/servo/v1/servo.pb.gw.go b/component/servo/v1/servo.pb.gw.go
diff --git a/gen/js/app/mltraining/v1/ml_training_pb.d.ts b/gen/js/app/mltraining/v1/ml_training_pb.d.ts
@@ -13,6 +13,9 @@ export class SubmitTrainingJobRequest extends jspb.Message {
   getFilter(): app_data_v1_data_pb.Filter | undefined;
   setFilter(value?: app_data_v1_data_pb.Filter): void;
 
+  getDatasetId(): string;
+  setDatasetId(value: string): void;
+
   getOrganizationId(): string;
   setOrganizationId(value: string): void;
 
@@ -43,6 +46,7 @@ export class SubmitTrainingJobRequest extends jspb.Message {
 export namespace SubmitTrainingJobRequest {
   export type AsObject = {
     filter?: app_data_v1_data_pb.Filter.AsObject,
+    datasetId: string,
     organizationId: string,
     modelName: string,
     modelVersion: string,

diff --git a/gen/js/app/mltraining/v1/ml_training_pb.js b/gen/js/app/mltraining/v1/ml_training_pb.js
@@ -263,6 +263,7 @@ proto.viam.app.mltraining.v1.SubmitTrainingJobRequest.prototype.toObject = funct
 proto.viam.app.mltraining.v1.SubmitTrainingJobRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
     filter: (f = msg.getFilter()) && app_data_v1_data_pb.Filter.toObject(includeInstance, f),
+    datasetId: jspb.Message.getFieldWithDefault(msg, 7, ""),
     organizationId: jspb.Message.getFieldWithDefault(msg, 2, ""),
     modelName: jspb.Message.getFieldWithDefault(msg, 3, ""),
     modelVersion: jspb.Message.getFieldWithDefault(msg, 4, ""),
@@ -309,6 +310,10 @@ proto.viam.app.mltraining.v1.SubmitTrainingJobRequest.deserializeBinaryFromReade
       reader.readMessage(value,app_data_v1_data_pb.Filter.deserializeBinaryFromReader);
       msg.setFilter(value);
       break;
+    case 7:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setDatasetId(value);
+      break;
     case 2:
       var value = /** @type {string} */ (reader.readString());
       msg.setOrganizationId(value);
@@ -366,6 +371,13 @@ proto.viam.app.mltraining.v1.SubmitTrainingJobRequest.serializeBinaryToWriter =
       app_data_v1_data_pb.Filter.serializeBinaryToWriter
     );
   }
+  f = message.getDatasetId();
+  if (f.length > 0) {
+    writer.writeString(
+      7,
+      f
+    );
+  }
   f = message.getOrganizationId();
   if (f.length > 0) {
     writer.writeString(
@@ -441,6 +453,24 @@ proto.viam.app.mltraining.v1.SubmitTrainingJobRequest.prototype.hasFilter = func
 };
 
 
+/**
+ * optional string dataset_id = 7;
+ * @return {string}
+ */
+proto.viam.app.mltraining.v1.SubmitTrainingJobRequest.prototype.getDatasetId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.viam.app.mltraining.v1.SubmitTrainingJobRequest} returns this
+ */
+proto.viam.app.mltraining.v1.SubmitTrainingJobRequest.prototype.setDatasetId = function(value) {
+  return jspb.Message.setProto3StringField(this, 7, value);
+};
+
+
 /**
  * optional string organization_id = 2;
  * @return {string}