Skip to content

Commit 14fea71

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [language] Added client library support for ModerateText in the Natural Language API (V1) (#9463)
* feat: Added client library support for ModerateText in the Natural Language API (V1Beta2) PiperOrigin-RevId: 534975458 Source-Link: googleapis/googleapis@392db1d Source-Link: https://github.com/googleapis/googleapis-gen/commit/df98b94b1218af16109fe3e1aef329732779c0a9 Copy-Tag: eyJwIjoiamF2YS1sYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiZGY5OGI5NGIxMjE4YWYxNjEwOWZlM2UxYWVmMzI5NzMyNzc5YzBhOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Added client library support for ModerateText in the Natural Language API (V1) PiperOrigin-RevId: 534992604 Source-Link: googleapis/googleapis@2400fac Source-Link: https://github.com/googleapis/googleapis-gen/commit/32caa580131b05b880fa3b802ca0c21179881733 Copy-Tag: eyJwIjoiamF2YS1sYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiMzJjYWE1ODAxMzFiMDViODgwZmEzYjgwMmNhMGMyMTE3OTg4MTczMyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 5c12b61 commit 14fea71

File tree

104 files changed

+6895
-2453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+6895
-2453
lines changed

‎java-language/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>libraries-bom</artifactId>
23-
<version>26.12.0</version>
23+
<version>26.15.0</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
@@ -227,7 +227,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
227227
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
228228
[stability-image]: https://img.shields.io/badge/stability-stable-green
229229
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-language.svg
230-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-language/2.15.0
230+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-language/2.18.0
231231
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
232232
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
233233
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎java-language/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,84 @@ public final UnaryCallable<ClassifyTextRequest, ClassifyTextResponse> classifyTe
747747
return stub.classifyTextCallable();
748748
}
749749

750+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
751+
/**
752+
* Moderates a document for harmful and sensitive categories.
753+
*
754+
* <p>Sample code:
755+
*
756+
* <pre>{@code
757+
* // This snippet has been automatically generated and should be regarded as a code template only.
758+
* // It will require modifications to work:
759+
* // - It may require correct/in-range values for request initialization.
760+
* // - It may require specifying regional endpoints when creating the service client as shown in
761+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
762+
* try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
763+
* Document document = Document.newBuilder().build();
764+
* ModerateTextResponse response = languageServiceClient.moderateText(document);
765+
* }
766+
* }</pre>
767+
*
768+
* @param document Required. Input document.
769+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
770+
*/
771+
public final ModerateTextResponse moderateText(Document document) {
772+
ModerateTextRequest request = ModerateTextRequest.newBuilder().setDocument(document).build();
773+
return moderateText(request);
774+
}
775+
776+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
777+
/**
778+
* Moderates a document for harmful and sensitive categories.
779+
*
780+
* <p>Sample code:
781+
*
782+
* <pre>{@code
783+
* // This snippet has been automatically generated and should be regarded as a code template only.
784+
* // It will require modifications to work:
785+
* // - It may require correct/in-range values for request initialization.
786+
* // - It may require specifying regional endpoints when creating the service client as shown in
787+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
788+
* try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
789+
* ModerateTextRequest request =
790+
* ModerateTextRequest.newBuilder().setDocument(Document.newBuilder().build()).build();
791+
* ModerateTextResponse response = languageServiceClient.moderateText(request);
792+
* }
793+
* }</pre>
794+
*
795+
* @param request The request object containing all of the parameters for the API call.
796+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
797+
*/
798+
public final ModerateTextResponse moderateText(ModerateTextRequest request) {
799+
return moderateTextCallable().call(request);
800+
}
801+
802+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
803+
/**
804+
* Moderates a document for harmful and sensitive categories.
805+
*
806+
* <p>Sample code:
807+
*
808+
* <pre>{@code
809+
* // This snippet has been automatically generated and should be regarded as a code template only.
810+
* // It will require modifications to work:
811+
* // - It may require correct/in-range values for request initialization.
812+
* // - It may require specifying regional endpoints when creating the service client as shown in
813+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
814+
* try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
815+
* ModerateTextRequest request =
816+
* ModerateTextRequest.newBuilder().setDocument(Document.newBuilder().build()).build();
817+
* ApiFuture<ModerateTextResponse> future =
818+
* languageServiceClient.moderateTextCallable().futureCall(request);
819+
* // Do something.
820+
* ModerateTextResponse response = future.get();
821+
* }
822+
* }</pre>
823+
*/
824+
public final UnaryCallable<ModerateTextRequest, ModerateTextResponse> moderateTextCallable() {
825+
return stub.moderateTextCallable();
826+
}
827+
750828
// AUTO-GENERATED DOCUMENTATION AND METHOD.
751829
/**
752830
* A convenience method that provides all the features that analyzeSentiment, analyzeEntities, and

‎java-language/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ public UnaryCallSettings<ClassifyTextRequest, ClassifyTextResponse> classifyText
100100
return ((LanguageServiceStubSettings) getStubSettings()).classifyTextSettings();
101101
}
102102

103+
/** Returns the object with the settings used for calls to moderateText. */
104+
public UnaryCallSettings<ModerateTextRequest, ModerateTextResponse> moderateTextSettings() {
105+
return ((LanguageServiceStubSettings) getStubSettings()).moderateTextSettings();
106+
}
107+
103108
/** Returns the object with the settings used for calls to annotateText. */
104109
public UnaryCallSettings<AnnotateTextRequest, AnnotateTextResponse> annotateTextSettings() {
105110
return ((LanguageServiceStubSettings) getStubSettings()).annotateTextSettings();
@@ -250,6 +255,12 @@ public Builder applyToAllUnaryMethods(
250255
return getStubSettingsBuilder().classifyTextSettings();
251256
}
252257

258+
/** Returns the builder for the settings used for calls to moderateText. */
259+
public UnaryCallSettings.Builder<ModerateTextRequest, ModerateTextResponse>
260+
moderateTextSettings() {
261+
return getStubSettingsBuilder().moderateTextSettings();
262+
}
263+
253264
/** Returns the builder for the settings used for calls to annotateText. */
254265
public UnaryCallSettings.Builder<AnnotateTextRequest, AnnotateTextResponse>
255266
annotateTextSettings() {

‎java-language/google-cloud-language/src/main/java/com/google/cloud/language/v1/gapic_metadata.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
},
2828
"ClassifyText": {
2929
"methods": ["classifyText", "classifyText", "classifyTextCallable"]
30+
},
31+
"ModerateText": {
32+
"methods": ["moderateText", "moderateText", "moderateTextCallable"]
3033
}
3134
}
3235
}

‎java-language/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import com.google.cloud.language.v1.AnnotateTextResponse;
3535
import com.google.cloud.language.v1.ClassifyTextRequest;
3636
import com.google.cloud.language.v1.ClassifyTextResponse;
37+
import com.google.cloud.language.v1.ModerateTextRequest;
38+
import com.google.cloud.language.v1.ModerateTextResponse;
3739
import com.google.longrunning.stub.GrpcOperationsStub;
3840
import io.grpc.MethodDescriptor;
3941
import io.grpc.protobuf.ProtoUtils;
@@ -105,6 +107,16 @@ public class GrpcLanguageServiceStub extends LanguageServiceStub {
105107
ProtoUtils.marshaller(ClassifyTextResponse.getDefaultInstance()))
106108
.build();
107109

110+
private static final MethodDescriptor<ModerateTextRequest, ModerateTextResponse>
111+
moderateTextMethodDescriptor =
112+
MethodDescriptor.<ModerateTextRequest, ModerateTextResponse>newBuilder()
113+
.setType(MethodDescriptor.MethodType.UNARY)
114+
.setFullMethodName("google.cloud.language.v1.LanguageService/ModerateText")
115+
.setRequestMarshaller(ProtoUtils.marshaller(ModerateTextRequest.getDefaultInstance()))
116+
.setResponseMarshaller(
117+
ProtoUtils.marshaller(ModerateTextResponse.getDefaultInstance()))
118+
.build();
119+
108120
private static final MethodDescriptor<AnnotateTextRequest, AnnotateTextResponse>
109121
annotateTextMethodDescriptor =
110122
MethodDescriptor.<AnnotateTextRequest, AnnotateTextResponse>newBuilder()
@@ -123,6 +135,7 @@ public class GrpcLanguageServiceStub extends LanguageServiceStub {
123135
analyzeEntitySentimentCallable;
124136
private final UnaryCallable<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse> analyzeSyntaxCallable;
125137
private final UnaryCallable<ClassifyTextRequest, ClassifyTextResponse> classifyTextCallable;
138+
private final UnaryCallable<ModerateTextRequest, ModerateTextResponse> moderateTextCallable;
126139
private final UnaryCallable<AnnotateTextRequest, AnnotateTextResponse> annotateTextCallable;
127140

128141
private final BackgroundResource backgroundResources;
@@ -193,6 +206,10 @@ protected GrpcLanguageServiceStub(
193206
GrpcCallSettings.<ClassifyTextRequest, ClassifyTextResponse>newBuilder()
194207
.setMethodDescriptor(classifyTextMethodDescriptor)
195208
.build();
209+
GrpcCallSettings<ModerateTextRequest, ModerateTextResponse> moderateTextTransportSettings =
210+
GrpcCallSettings.<ModerateTextRequest, ModerateTextResponse>newBuilder()
211+
.setMethodDescriptor(moderateTextMethodDescriptor)
212+
.build();
196213
GrpcCallSettings<AnnotateTextRequest, AnnotateTextResponse> annotateTextTransportSettings =
197214
GrpcCallSettings.<AnnotateTextRequest, AnnotateTextResponse>newBuilder()
198215
.setMethodDescriptor(annotateTextMethodDescriptor)
@@ -215,6 +232,9 @@ protected GrpcLanguageServiceStub(
215232
this.classifyTextCallable =
216233
callableFactory.createUnaryCallable(
217234
classifyTextTransportSettings, settings.classifyTextSettings(), clientContext);
235+
this.moderateTextCallable =
236+
callableFactory.createUnaryCallable(
237+
moderateTextTransportSettings, settings.moderateTextSettings(), clientContext);
218238
this.annotateTextCallable =
219239
callableFactory.createUnaryCallable(
220240
annotateTextTransportSettings, settings.annotateTextSettings(), clientContext);
@@ -254,6 +274,11 @@ public UnaryCallable<ClassifyTextRequest, ClassifyTextResponse> classifyTextCall
254274
return classifyTextCallable;
255275
}
256276

277+
@Override
278+
public UnaryCallable<ModerateTextRequest, ModerateTextResponse> moderateTextCallable() {
279+
return moderateTextCallable;
280+
}
281+
257282
@Override
258283
public UnaryCallable<AnnotateTextRequest, AnnotateTextResponse> annotateTextCallable() {
259284
return annotateTextCallable;

‎java-language/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/HttpJsonLanguageServiceStub.java

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import com.google.cloud.language.v1.AnnotateTextResponse;
4141
import com.google.cloud.language.v1.ClassifyTextRequest;
4242
import com.google.cloud.language.v1.ClassifyTextResponse;
43+
import com.google.cloud.language.v1.ModerateTextRequest;
44+
import com.google.cloud.language.v1.ModerateTextResponse;
4345
import com.google.protobuf.TypeRegistry;
4446
import java.io.IOException;
4547
import java.util.ArrayList;
@@ -242,6 +244,42 @@ public class HttpJsonLanguageServiceStub extends LanguageServiceStub {
242244
.build())
243245
.build();
244246

247+
private static final ApiMethodDescriptor<ModerateTextRequest, ModerateTextResponse>
248+
moderateTextMethodDescriptor =
249+
ApiMethodDescriptor.<ModerateTextRequest, ModerateTextResponse>newBuilder()
250+
.setFullMethodName("google.cloud.language.v1.LanguageService/ModerateText")
251+
.setHttpMethod("POST")
252+
.setType(ApiMethodDescriptor.MethodType.UNARY)
253+
.setRequestFormatter(
254+
ProtoMessageRequestFormatter.<ModerateTextRequest>newBuilder()
255+
.setPath(
256+
"/v1/documents:moderateText",
257+
request -> {
258+
Map<String, String> fields = new HashMap<>();
259+
ProtoRestSerializer<ModerateTextRequest> serializer =
260+
ProtoRestSerializer.create();
261+
return fields;
262+
})
263+
.setQueryParamsExtractor(
264+
request -> {
265+
Map<String, List<String>> fields = new HashMap<>();
266+
ProtoRestSerializer<ModerateTextRequest> serializer =
267+
ProtoRestSerializer.create();
268+
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
269+
return fields;
270+
})
271+
.setRequestBodyExtractor(
272+
request ->
273+
ProtoRestSerializer.create()
274+
.toBody("*", request.toBuilder().build(), true))
275+
.build())
276+
.setResponseParser(
277+
ProtoMessageResponseParser.<ModerateTextResponse>newBuilder()
278+
.setDefaultInstance(ModerateTextResponse.getDefaultInstance())
279+
.setDefaultTypeRegistry(typeRegistry)
280+
.build())
281+
.build();
282+
245283
private static final ApiMethodDescriptor<AnnotateTextRequest, AnnotateTextResponse>
246284
annotateTextMethodDescriptor =
247285
ApiMethodDescriptor.<AnnotateTextRequest, AnnotateTextResponse>newBuilder()
@@ -286,6 +324,7 @@ public class HttpJsonLanguageServiceStub extends LanguageServiceStub {
286324
analyzeEntitySentimentCallable;
287325
private final UnaryCallable<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse> analyzeSyntaxCallable;
288326
private final UnaryCallable<ClassifyTextRequest, ClassifyTextResponse> classifyTextCallable;
327+
private final UnaryCallable<ModerateTextRequest, ModerateTextResponse> moderateTextCallable;
289328
private final UnaryCallable<AnnotateTextRequest, AnnotateTextResponse> annotateTextCallable;
290329

291330
private final BackgroundResource backgroundResources;
@@ -360,6 +399,11 @@ protected HttpJsonLanguageServiceStub(
360399
.setMethodDescriptor(classifyTextMethodDescriptor)
361400
.setTypeRegistry(typeRegistry)
362401
.build();
402+
HttpJsonCallSettings<ModerateTextRequest, ModerateTextResponse> moderateTextTransportSettings =
403+
HttpJsonCallSettings.<ModerateTextRequest, ModerateTextResponse>newBuilder()
404+
.setMethodDescriptor(moderateTextMethodDescriptor)
405+
.setTypeRegistry(typeRegistry)
406+
.build();
363407
HttpJsonCallSettings<AnnotateTextRequest, AnnotateTextResponse> annotateTextTransportSettings =
364408
HttpJsonCallSettings.<AnnotateTextRequest, AnnotateTextResponse>newBuilder()
365409
.setMethodDescriptor(annotateTextMethodDescriptor)
@@ -383,6 +427,9 @@ protected HttpJsonLanguageServiceStub(
383427
this.classifyTextCallable =
384428
callableFactory.createUnaryCallable(
385429
classifyTextTransportSettings, settings.classifyTextSettings(), clientContext);
430+
this.moderateTextCallable =
431+
callableFactory.createUnaryCallable(
432+
moderateTextTransportSettings, settings.moderateTextSettings(), clientContext);
386433
this.annotateTextCallable =
387434
callableFactory.createUnaryCallable(
388435
annotateTextTransportSettings, settings.annotateTextSettings(), clientContext);
@@ -399,6 +446,7 @@ public static List<ApiMethodDescriptor> getMethodDescriptors() {
399446
methodDescriptors.add(analyzeEntitySentimentMethodDescriptor);
400447
methodDescriptors.add(analyzeSyntaxMethodDescriptor);
401448
methodDescriptors.add(classifyTextMethodDescriptor);
449+
methodDescriptors.add(moderateTextMethodDescriptor);
402450
methodDescriptors.add(annotateTextMethodDescriptor);
403451
return methodDescriptors;
404452
}
@@ -430,6 +478,11 @@ public UnaryCallable<ClassifyTextRequest, ClassifyTextResponse> classifyTextCall
430478
return classifyTextCallable;
431479
}
432480

481+
@Override
482+
public UnaryCallable<ModerateTextRequest, ModerateTextResponse> moderateTextCallable() {
483+
return moderateTextCallable;
484+
}
485+
433486
@Override
434487
public UnaryCallable<AnnotateTextRequest, AnnotateTextResponse> annotateTextCallable() {
435488
return annotateTextCallable;

‎java-language/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import com.google.cloud.language.v1.AnnotateTextResponse;
3131
import com.google.cloud.language.v1.ClassifyTextRequest;
3232
import com.google.cloud.language.v1.ClassifyTextResponse;
33+
import com.google.cloud.language.v1.ModerateTextRequest;
34+
import com.google.cloud.language.v1.ModerateTextResponse;
3335
import javax.annotation.Generated;
3436

3537
// AUTO-GENERATED DOCUMENTATION AND CLASS.
@@ -63,6 +65,10 @@ public UnaryCallable<ClassifyTextRequest, ClassifyTextResponse> classifyTextCall
6365
throw new UnsupportedOperationException("Not implemented: classifyTextCallable()");
6466
}
6567

68+
public UnaryCallable<ModerateTextRequest, ModerateTextResponse> moderateTextCallable() {
69+
throw new UnsupportedOperationException("Not implemented: moderateTextCallable()");
70+
}
71+
6672
public UnaryCallable<AnnotateTextRequest, AnnotateTextResponse> annotateTextCallable() {
6773
throw new UnsupportedOperationException("Not implemented: annotateTextCallable()");
6874
}

0 commit comments

Comments
 (0)