fix!: removed fields from SafeSearchAnnotation message

Google APIs · copybara-github · commit ca1777117692 · 2022-05-05T15:45:34.000-07:00
PiperOrigin-RevId: 446836546
diff --git a/google/cloud/vision/v1/BUILD.bazel b/google/cloud/vision/v1/BUILD.bazel
@@ -1,4 +1,13 @@
 # This file was automatically generated by BuildFileGenerator
+# https://github.com/googleapis/rules_gapic/tree/master/bazel
+
+# Most of the manual changes to this file will be overwritten.
+# It's **only** allowed to change the following rule attribute values:
+# - names of *_gapic_assembly_* rules
+# - certain parameters of *_gapic_library rules, including but not limited to:
+#    * extra_protoc_parameters
+#    * extra_protoc_file_parameters
+# The complete list of preserved parameters can be found in the source code.
 
 # This is an API workspace, having public visibility by default makes perfect sense.
 package(default_visibility = ["//visibility:public"])
@@ -70,11 +79,13 @@ java_gapic_library(
     srcs = [":vision_proto_with_info"],
     gapic_yaml = "vision_gapic.yaml",
     grpc_service_config = "vision_grpc_service_config.json",
+    service_yaml = "vision_v1.yaml",
     test_deps = [
         ":vision_java_grpc",
     ],
     deps = [
         ":vision_java_proto",
+        "//google/api:api_java_proto",
     ],
 )
 
@@ -128,6 +139,7 @@ go_gapic_library(
     srcs = [":vision_proto_with_info"],
     grpc_service_config = "vision_grpc_service_config.json",
     importpath = "cloud.google.com/go/vision/apiv1;vision",
+    metadata = True,
     service_yaml = "vision_v1.yaml",
     deps = [
         ":vision_go_proto",
@@ -149,6 +161,7 @@ go_gapic_assembly_pkg(
     name = "gapi-cloud-vision-v1-go",
     deps = [
         ":vision_go_gapic",
+        ":vision_go_gapic_srcjar-metadata.srcjar",
         ":vision_go_gapic_srcjar-test.srcjar",
         ":vision_go_proto",
     ],
@@ -167,8 +180,10 @@ py_gapic_library(
     name = "vision_py_gapic",
     srcs = [":vision_proto"],
     grpc_service_config = "vision_grpc_service_config.json",
+    service_yaml = "vision_v1.yaml",
 )
 
+# Open Source Packages
 py_gapic_assembly_pkg(
     name = "vision-v1-py",
     deps = [
@@ -201,7 +216,6 @@ php_grpc_library(
 php_gapic_library(
     name = "vision_php_gapic",
     srcs = [":vision_proto_with_info"],
-    gapic_yaml = "vision_gapic.yaml",
     grpc_service_config = "vision_grpc_service_config.json",
     service_yaml = "vision_v1.yaml",
     deps = [
@@ -275,13 +289,13 @@ ruby_cloud_gapic_library(
     name = "vision_ruby_gapic",
     srcs = [":vision_proto_with_info"],
     extra_protoc_parameters = [
-        "ruby-cloud-gem-name=google-cloud-vision-v1",
-        "ruby-cloud-env-prefix=VISION",
-        "ruby-cloud-product-url=https://cloud.google.com/vision",
         "ruby-cloud-api-id=vision.googleapis.com",
         "ruby-cloud-api-shortname=vision",
+        "ruby-cloud-env-prefix=VISION",
+        "ruby-cloud-gem-name=google-cloud-vision-v1",
         "ruby-cloud-generate-standalone-snippets=true",
         "ruby-cloud-generate-yardoc-snippets=true",
+        "ruby-cloud-product-url=https://cloud.google.com/vision",
     ],
     grpc_service_config = "vision_grpc_service_config.json",
     ruby_cloud_description = "Cloud Vision API allows developers to easily integrate vision detection features within applications, including image labeling, face and landmark detection, optical character recognition (OCR), and tagging of explicit content.",
@@ -351,7 +365,6 @@ csharp_gapic_assembly_pkg(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "cc_gapic_library",
     "cc_grpc_library",
     "cc_proto_library",
 )
@@ -364,17 +377,6 @@ cc_proto_library(
 cc_grpc_library(
     name = "vision_cc_grpc",
     srcs = [":vision_proto"],
-    generate_mocks = True,
     grpc_only = True,
     deps = [":vision_cc_proto"],
 )
-
-cc_gapic_library(
-    name = "vision_cc_gapic",
-    src = ":vision_proto_with_info",
-    package = "google.cloud.vision.v1",
-    deps = [
-        ":vision_cc_grpc",
-        ":vision_cc_proto",
-    ],
-)
diff --git a/google/cloud/vision/v1/geometry.proto b/google/cloud/vision/v1/geometry.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 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.
diff --git a/google/cloud/vision/v1/image_annotator.proto b/google/cloud/vision/v1/image_annotator.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 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.
@@ -46,8 +46,7 @@ service ImageAnnotator {
       "https://www.googleapis.com/auth/cloud-vision";
 
   // Run image detection and annotation for a batch of images.
-  rpc BatchAnnotateImages(BatchAnnotateImagesRequest)
-      returns (BatchAnnotateImagesResponse) {
+  rpc BatchAnnotateImages(BatchAnnotateImagesRequest) returns (BatchAnnotateImagesResponse) {
     option (google.api.http) = {
       post: "/v1/images:annotate"
       body: "*"
@@ -70,8 +69,7 @@ service ImageAnnotator {
   // AnnotateFileRequest.pages) frames (gif) or pages (pdf or tiff) from each
   // file provided and perform detection and annotation for each image
   // extracted.
-  rpc BatchAnnotateFiles(BatchAnnotateFilesRequest)
-      returns (BatchAnnotateFilesResponse) {
+  rpc BatchAnnotateFiles(BatchAnnotateFilesRequest) returns (BatchAnnotateFilesResponse) {
     option (google.api.http) = {
       post: "/v1/files:annotate"
       body: "*"
@@ -96,8 +94,7 @@ service ImageAnnotator {
   //
   // This service will write image annotation outputs to json files in customer
   // GCS bucket, each json file containing BatchAnnotateImagesResponse proto.
-  rpc AsyncBatchAnnotateImages(AsyncBatchAnnotateImagesRequest)
-      returns (google.longrunning.Operation) {
+  rpc AsyncBatchAnnotateImages(AsyncBatchAnnotateImagesRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1/images:asyncBatchAnnotate"
       body: "*"
@@ -123,8 +120,7 @@ service ImageAnnotator {
   // `google.longrunning.Operations` interface.
   // `Operation.metadata` contains `OperationMetadata` (metadata).
   // `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
-  rpc AsyncBatchAnnotateFiles(AsyncBatchAnnotateFilesRequest)
-      returns (google.longrunning.Operation) {
+  rpc AsyncBatchAnnotateFiles(AsyncBatchAnnotateFilesRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1/files:asyncBatchAnnotate"
       body: "*"
@@ -145,6 +141,28 @@ service ImageAnnotator {
   }
 }
 
+// A bucketized representation of likelihood, which is intended to give clients
+// highly stable results across model upgrades.
+enum Likelihood {
+  // Unknown likelihood.
+  UNKNOWN = 0;
+
+  // It is very unlikely.
+  VERY_UNLIKELY = 1;
+
+  // It is unlikely.
+  UNLIKELY = 2;
+
+  // It is possible.
+  POSSIBLE = 3;
+
+  // It is likely.
+  LIKELY = 4;
+
+  // It is very likely.
+  VERY_LIKELY = 5;
+}
+
 // The type of Google Cloud Vision API detection to perform, and the maximum
 // number of results to return for that type. Multiple `Feature` objects can
 // be specified in the `features` list.
@@ -255,28 +273,6 @@ message Image {
   ImageSource source = 2;
 }
 
-// A bucketized representation of likelihood, which is intended to give clients
-// highly stable results across model upgrades.
-enum Likelihood {
-  // Unknown likelihood.
-  UNKNOWN = 0;
-
-  // It is very unlikely.
-  VERY_UNLIKELY = 1;
-
-  // It is unlikely.
-  UNLIKELY = 2;
-
-  // It is possible.
-  POSSIBLE = 3;
-
-  // It is likely.
-  LIKELY = 4;
-
-  // It is very likely.
-  VERY_LIKELY = 5;
-}
-
 // A face annotation object contains the results of face detection.
 message FaceAnnotation {
   // A face-specific landmark (for example, a face feature).
@@ -577,30 +573,6 @@ message SafeSearchAnnotation {
   // covered nudity, lewd or provocative poses, or close-ups of sensitive
   // body areas.
   Likelihood racy = 9;
-
-  // Confidence of adult_score. Range [0, 1]. 0 means not confident, 1 means
-  // very confident.
-  float adult_confidence = 16 [deprecated = true];
-
-  // Confidence of spoof_score. Range [0, 1]. 0 means not confident, 1 means
-  // very confident.
-  float spoof_confidence = 18 [deprecated = true];
-
-  // Confidence of medical_score. Range [0, 1]. 0 means not confident, 1 means
-  // very confident.
-  float medical_confidence = 20 [deprecated = true];
-
-  // Confidence of violence_score. Range [0, 1]. 0 means not confident, 1 means
-  // very confident.
-  float violence_confidence = 22 [deprecated = true];
-
-  // Confidence of racy_score. Range [0, 1]. 0 means not confident, 1 means very
-  // confident.
-  float racy_confidence = 24 [deprecated = true];
-
-  // Confidence of nsfw_score. Range [0, 1]. 0 means not confident, 1 means very
-  // confident.
-  float nsfw_confidence = 26 [deprecated = true];
 }
 
 // Rectangle determined by min and max `LatLng` pairs.
@@ -791,8 +763,7 @@ message AnnotateImageResponse {
 // Multiple image annotation requests are batched into a single service call.
 message BatchAnnotateImagesRequest {
   // Required. Individual image annotation requests for this batch.
-  repeated AnnotateImageRequest requests = 1
-      [(google.api.field_behavior) = REQUIRED];
+  repeated AnnotateImageRequest requests = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Optional. Target project and location to make a call.
   //
@@ -863,10 +834,9 @@ message AnnotateFileResponse {
 
 // A list of requests to annotate files using the BatchAnnotateFiles API.
 message BatchAnnotateFilesRequest {
-  // Required. The list of file annotation requests. Right now we support only
-  // one AnnotateFileRequest in BatchAnnotateFilesRequest.
-  repeated AnnotateFileRequest requests = 1
-      [(google.api.field_behavior) = REQUIRED];
+  // Required. The list of file annotation requests. Right now we support only one
+  // AnnotateFileRequest in BatchAnnotateFilesRequest.
+  repeated AnnotateFileRequest requests = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Optional. Target project and location to make a call.
   //
@@ -914,8 +884,7 @@ message AsyncAnnotateFileResponse {
 // Request for async image annotation for a list of images.
 message AsyncBatchAnnotateImagesRequest {
   // Required. Individual image annotation requests for this batch.
-  repeated AnnotateImageRequest requests = 1
-      [(google.api.field_behavior) = REQUIRED];
+  repeated AnnotateImageRequest requests = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The desired output location and metadata (e.g. format).
   OutputConfig output_config = 2 [(google.api.field_behavior) = REQUIRED];
@@ -945,8 +914,7 @@ message AsyncBatchAnnotateImagesResponse {
 // call.
 message AsyncBatchAnnotateFilesRequest {
   // Required. Individual async file annotation requests for this batch.
-  repeated AsyncAnnotateFileRequest requests = 1
-      [(google.api.field_behavior) = REQUIRED];
+  repeated AsyncAnnotateFileRequest requests = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Optional. Target project and location to make a call.
   //
diff --git a/google/cloud/vision/v1/product_search.proto b/google/cloud/vision/v1/product_search.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 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.
diff --git a/google/cloud/vision/v1/product_search_service.proto b/google/cloud/vision/v1/product_search_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 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.
diff --git a/google/cloud/vision/v1/text_annotation.proto b/google/cloud/vision/v1/text_annotation.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 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.
diff --git a/google/cloud/vision/v1/web_detection.proto b/google/cloud/vision/v1/web_detection.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 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.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2020 Google LLC`
	`1`	`+// Copyright 2022 Google LLC`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`