Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

Commit

Permalink
fix: proto field markdown comment for the display_name field in anno…
Browse files Browse the repository at this point in the history
…tation_payload.proto to point the correct public v1/ version

fix: Add back java_multiple_files option to the text_sentiment.proto to match with the previous published version of text_sentiment proto
PiperOrigin-RevId: 421849336
Source-Link: googleapis/googleapis@5c24921
Source-Link: googleapis/googleapis-gen@0195e8e
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDE5NWU4ZTQ1ZjQxMjI1ZGRlMTViM2EyNGZlODllZDI3Njg2Y2I2NCJ9
  • Loading branch information
gcf-owl-bot[bot] committed Jan 17, 2022
1 parent dd9c5d8 commit 20995db
Show file tree
Hide file tree
Showing 77 changed files with 724 additions and 690 deletions.
4 changes: 2 additions & 2 deletions .jsdoc.js
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,7 +40,7 @@ module.exports = {
includePattern: '\\.js$'
},
templates: {
copyright: 'Copyright 2021 Google LLC',
copyright: 'Copyright 2022 Google LLC',
includeDate: false,
sourceFiles: false,
systemName: '@google-cloud/automl',
Expand Down
4 changes: 2 additions & 2 deletions protos/google/cloud/automl/v1/annotation_payload.proto
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -16,13 +16,13 @@ syntax = "proto3";

package google.cloud.automl.v1;

import "google/api/annotations.proto";
import "google/cloud/automl/v1/classification.proto";
import "google/cloud/automl/v1/detection.proto";
import "google/cloud/automl/v1/text_extraction.proto";
import "google/cloud/automl/v1/text_sentiment.proto";
import "google/cloud/automl/v1/translation.proto";
import "google/protobuf/any.proto";
import "google/api/annotations.proto";

option csharp_namespace = "Google.Cloud.AutoML.V1";
option go_package = "google.golang.org/genproto/googleapis/cloud/automl/v1;automl";
Expand Down
5 changes: 2 additions & 3 deletions protos/google/cloud/automl/v1/annotation_spec.proto
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -16,8 +16,8 @@ syntax = "proto3";

package google.cloud.automl.v1;

import "google/api/resource.proto";
import "google/api/annotations.proto";
import "google/api/resource.proto";

option csharp_namespace = "Google.Cloud.AutoML.V1";
option go_package = "google.golang.org/genproto/googleapis/cloud/automl/v1;automl";
Expand All @@ -35,7 +35,6 @@ message AnnotationSpec {

// Output only. Resource name of the annotation spec.
// Form:
//
// 'projects/{project_id}/locations/{location_id}/datasets/{dataset_id}/annotationSpecs/{annotation_spec_id}'
string name = 1;

Expand Down
4 changes: 1 addition & 3 deletions protos/google/cloud/automl/v1/classification.proto
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -124,15 +124,13 @@ message ClassificationEvaluationMetrics {

// Output only. IDs of the annotation specs used in the confusion matrix.
// For Tables CLASSIFICATION
//
// [prediction_type][google.cloud.automl.v1p1beta.TablesModelMetadata.prediction_type]
// only list of [annotation_spec_display_name-s][] is populated.
repeated string annotation_spec_id = 1;

// Output only. Display name of the annotation specs used in the confusion
// matrix, as they were at the moment of the evaluation. For Tables
// CLASSIFICATION
//
// [prediction_type-s][google.cloud.automl.v1p1beta.TablesModelMetadata.prediction_type],
// distinct values of the target column at the moment of the model
// evaluation are populated here.
Expand Down
5 changes: 2 additions & 3 deletions protos/google/cloud/automl/v1/data_items.proto
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -16,13 +16,13 @@ syntax = "proto3";

package google.cloud.automl.v1;

import "google/api/annotations.proto";
import "google/cloud/automl/v1/geometry.proto";
import "google/cloud/automl/v1/io.proto";
import "google/cloud/automl/v1/text_segment.proto";
import "google/protobuf/any.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/struct.proto";
import "google/api/annotations.proto";

option csharp_namespace = "Google.Cloud.AutoML.V1";
option go_package = "google.golang.org/genproto/googleapis/cloud/automl/v1;automl";
Expand Down Expand Up @@ -146,7 +146,6 @@ message Document {

// The position of the [text_segment][google.cloud.automl.v1.Document.Layout.text_segment] in the page.
// Contains exactly 4
//
// [normalized_vertices][google.cloud.automl.v1p1beta.BoundingPoly.normalized_vertices]
// and they are connected by edges in the order provided, which will
// represent a rectangle parallel to the frame. The
Expand Down
4 changes: 2 additions & 2 deletions protos/google/cloud/automl/v1/dataset.proto
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -16,12 +16,12 @@ syntax = "proto3";

package google.cloud.automl.v1;

import "google/api/annotations.proto";
import "google/api/resource.proto";
import "google/cloud/automl/v1/image.proto";
import "google/cloud/automl/v1/text.proto";
import "google/cloud/automl/v1/translation.proto";
import "google/protobuf/timestamp.proto";
import "google/api/annotations.proto";

option csharp_namespace = "Google.Cloud.AutoML.V1";
option go_package = "google.golang.org/genproto/googleapis/cloud/automl/v1;automl";
Expand Down
4 changes: 2 additions & 2 deletions protos/google/cloud/automl/v1/detection.proto
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -16,9 +16,9 @@ syntax = "proto3";

package google.cloud.automl.v1;

import "google/api/annotations.proto";
import "google/cloud/automl/v1/geometry.proto";
import "google/protobuf/duration.proto";
import "google/api/annotations.proto";

option csharp_namespace = "Google.Cloud.AutoML.V1";
option go_package = "google.golang.org/genproto/googleapis/cloud/automl/v1;automl";
Expand Down
2 changes: 1 addition & 1 deletion protos/google/cloud/automl/v1/geometry.proto
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
43 changes: 21 additions & 22 deletions protos/google/cloud/automl/v1/image.proto
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -16,11 +16,12 @@ syntax = "proto3";

package google.cloud.automl.v1;

import "google/api/annotations.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/cloud/automl/v1/annotation_spec.proto";
import "google/cloud/automl/v1/classification.proto";
import "google/protobuf/timestamp.proto";
import "google/api/annotations.proto";

option csharp_namespace = "Google.Cloud.AutoML.V1";
option go_package = "google.golang.org/genproto/googleapis/cloud/automl/v1;automl";
Expand All @@ -33,7 +34,7 @@ option ruby_package = "Google::Cloud::AutoML::V1";
// Dataset metadata that is specific to image classification.
message ImageClassificationDatasetMetadata {
// Required. Type of the classification problem.
ClassificationType classification_type = 1;
ClassificationType classification_type = 1 [(google.api.field_behavior) = REQUIRED];
}

// Dataset metadata specific to image object detection.
Expand All @@ -48,9 +49,9 @@ message ImageClassificationModelMetadata {
// created from scratch. The `base` model must be in the same
// `project` and `location` as the new model to create, and have the same
// `model_type`.
string base_model_id = 1;
string base_model_id = 1 [(google.api.field_behavior) = OPTIONAL];

// The train budget of creating this model, expressed in milli node
// Optional. The train budget of creating this model, expressed in milli node
// hours i.e. 1,000 value in this field means 1 node hour. The actual
// `train_cost` will be equal or less than this value. If further model
// training ceases to provide any improvements, it will stop without using
Expand All @@ -64,16 +65,16 @@ message ImageClassificationModelMetadata {
// `mobile-core-ml-high-accuracy-1`, the train budget must be between 1,000
// and 100,000 milli node hours, inclusive. The default value is 24, 000 which
// represents one day in wall time.
int64 train_budget_milli_node_hours = 16;
int64 train_budget_milli_node_hours = 16 [(google.api.field_behavior) = OPTIONAL];

// Output only. The actual train cost of creating this model, expressed in
// milli node hours, i.e. 1,000 value in this field means 1 node hour.
// Guaranteed to not exceed the train budget.
int64 train_cost_milli_node_hours = 17;
int64 train_cost_milli_node_hours = 17 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The reason that this create model operation stopped,
// e.g. `BUDGET_REACHED`, `MODEL_CONVERGED`.
string stop_reason = 5;
string stop_reason = 5 [(google.api.field_behavior) = OUTPUT_ONLY];

// Optional. Type of the model. The available values are:
// * `cloud` - Model to be used via prediction calls to AutoML API.
Expand Down Expand Up @@ -108,16 +109,16 @@ message ImageClassificationModelMetadata {
// Core ML afterwards. Expected to have a higher latency, but
// should also have a higher prediction quality than other
// models.
string model_type = 7;
string model_type = 7 [(google.api.field_behavior) = OPTIONAL];

// Output only. An approximate number of online prediction QPS that can
// be supported by this model per each node on which it is deployed.
double node_qps = 13;
double node_qps = 13 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The number of nodes this model is deployed on. A node is an
// abstraction of a machine resource, which can handle online prediction QPS
// as given in the node_qps field.
int64 node_count = 14;
int64 node_count = 14 [(google.api.field_behavior) = OUTPUT_ONLY];
}

// Model metadata specific to image object detection.
Expand Down Expand Up @@ -145,22 +146,22 @@ message ImageObjectDetectionModelMetadata {
// with TensorFlow afterwards. Expected to have a higher
// latency, but should also have a higher prediction quality
// than other models.
string model_type = 1;
string model_type = 1 [(google.api.field_behavior) = OPTIONAL];

// Output only. The number of nodes this model is deployed on. A node is an
// abstraction of a machine resource, which can handle online prediction QPS
// as given in the qps_per_node field.
int64 node_count = 3;
int64 node_count = 3 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. An approximate number of online prediction QPS that can
// be supported by this model per each node on which it is deployed.
double node_qps = 4;
double node_qps = 4 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The reason that this create model operation stopped,
// e.g. `BUDGET_REACHED`, `MODEL_CONVERGED`.
string stop_reason = 5;
string stop_reason = 5 [(google.api.field_behavior) = OUTPUT_ONLY];

// The train budget of creating this model, expressed in milli node
// Optional. The train budget of creating this model, expressed in milli node
// hours i.e. 1,000 value in this field means 1 node hour. The actual
// `train_cost` will be equal or less than this value. If further model
// training ceases to provide any improvements, it will stop without using
Expand All @@ -175,32 +176,30 @@ message ImageObjectDetectionModelMetadata {
// `mobile-core-ml-versatile-1`, `mobile-core-ml-high-accuracy-1`, the train
// budget must be between 1,000 and 100,000 milli node hours, inclusive.
// The default value is 24, 000 which represents one day in wall time.
int64 train_budget_milli_node_hours = 6;
int64 train_budget_milli_node_hours = 6 [(google.api.field_behavior) = OPTIONAL];

// Output only. The actual train cost of creating this model, expressed in
// milli node hours, i.e. 1,000 value in this field means 1 node hour.
// Guaranteed to not exceed the train budget.
int64 train_cost_milli_node_hours = 7;
int64 train_cost_milli_node_hours = 7 [(google.api.field_behavior) = OUTPUT_ONLY];
}

// Model deployment metadata specific to Image Classification.
message ImageClassificationModelDeploymentMetadata {
// Input only. The number of nodes to deploy the model on. A node is an
// abstraction of a machine resource, which can handle online prediction QPS
// as given in the model's
//
// [node_qps][google.cloud.automl.v1.ImageClassificationModelMetadata.node_qps].
// Must be between 1 and 100, inclusive on both ends.
int64 node_count = 1;
int64 node_count = 1 [(google.api.field_behavior) = INPUT_ONLY];
}

// Model deployment metadata specific to Image Object Detection.
message ImageObjectDetectionModelDeploymentMetadata {
// Input only. The number of nodes to deploy the model on. A node is an
// abstraction of a machine resource, which can handle online prediction QPS
// as given in the model's
//
// [qps_per_node][google.cloud.automl.v1.ImageObjectDetectionModelMetadata.qps_per_node].
// Must be between 1 and 100, inclusive on both ends.
int64 node_count = 1;
int64 node_count = 1 [(google.api.field_behavior) = INPUT_ONLY];
}

0 comments on commit 20995db

Please sign in to comment.