From 461b671ad5688cf68f75a3ca04f2e0dc5e3d0507 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 19 Feb 2021 16:01:39 -0800 Subject: [PATCH 1/2] feat: add additional_bindings to Dialogflow v2beta1 ListIntents API docs: update copyrights and session docs PiperOrigin-RevId: 358315006 Source-Author: Google APIs Source-Date: Thu Feb 18 19:04:40 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: 3b69cb23ca5f969f57bdc4001cf78659c2f7100d Source-Link: https://github.com/googleapis/googleapis/commit/3b69cb23ca5f969f57bdc4001cf78659c2f7100d --- .../dialogflow/v2beta1/SessionsClient.java | 22 ++-- .../v2beta1/DetectIntentRequest.java | 21 ++-- .../v2beta1/DetectIntentRequestOrBuilder.java | 6 +- .../cloud/dialogflow/v2beta1/IntentProto.java | 118 +++++++++--------- .../cloud/dialogflow/v2beta1/agent.proto | 2 +- .../dialogflow/v2beta1/audio_config.proto | 48 +++---- .../cloud/dialogflow/v2beta1/context.proto | 2 +- .../cloud/dialogflow/v2beta1/document.proto | 2 +- .../dialogflow/v2beta1/entity_type.proto | 2 +- .../dialogflow/v2beta1/environment.proto | 2 +- .../google/cloud/dialogflow/v2beta1/gcs.proto | 2 +- .../cloud/dialogflow/v2beta1/intent.proto | 5 +- .../dialogflow/v2beta1/knowledge_base.proto | 2 +- .../cloud/dialogflow/v2beta1/session.proto | 5 +- .../v2beta1/session_entity_type.proto | 2 +- .../v2beta1/validation_result.proto | 2 +- .../cloud/dialogflow/v2beta1/webhook.proto | 2 +- synth.metadata | 10 +- 18 files changed, 136 insertions(+), 119 deletions(-) diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java index fe314657c..cbcbd97b9 100644 --- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java +++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java @@ -169,11 +169,12 @@ public SessionsStub getStub() { * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, *

If `Location ID` is not specified we assume default 'us' location. If `Environment ID` - * is not specified, we assume default 'draft' environment. If `User ID` is not specified, we - * are using "-". It's up to the API caller to choose an appropriate `Session ID` and `User - * Id`. They can be a random number or some type of user and session identifiers (preferably - * hashed). The length of the `Session ID` and `User ID` must not exceed 36 characters. For - * more information, see the [API interactions + * is not specified, we assume default 'draft' environment (`Environment ID` might be referred + * to as environment name at some places). If `User ID` is not specified, we are using "-". + * It's up to the API caller to choose an appropriate `Session ID` and `User Id`. They can be + * a random number or some type of user and session identifiers (preferably hashed). The + * length of the `Session ID` and `User ID` must not exceed 36 characters. For more + * information, see the [API interactions * guide](https://cloud.google.com/dialogflow/docs/api-overview). *

Note: Always use agent versions for production traffic. See [Versions and * environments](https://cloud.google.com/dialogflow/es/docs/agents-versions). @@ -220,11 +221,12 @@ public final DetectIntentResponse detectIntent(SessionName session, QueryInput q * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, *

If `Location ID` is not specified we assume default 'us' location. If `Environment ID` - * is not specified, we assume default 'draft' environment. If `User ID` is not specified, we - * are using "-". It's up to the API caller to choose an appropriate `Session ID` and `User - * Id`. They can be a random number or some type of user and session identifiers (preferably - * hashed). The length of the `Session ID` and `User ID` must not exceed 36 characters. For - * more information, see the [API interactions + * is not specified, we assume default 'draft' environment (`Environment ID` might be referred + * to as environment name at some places). If `User ID` is not specified, we are using "-". + * It's up to the API caller to choose an appropriate `Session ID` and `User Id`. They can be + * a random number or some type of user and session identifiers (preferably hashed). The + * length of the `Session ID` and `User ID` must not exceed 36 characters. For more + * information, see the [API interactions * guide](https://cloud.google.com/dialogflow/docs/api-overview). *

Note: Always use agent versions for production traffic. See [Versions and * environments](https://cloud.google.com/dialogflow/es/docs/agents-versions). diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java index b7fe948b5..0eb9c9a09 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java @@ -198,7 +198,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). @@ -242,7 +243,8 @@ public java.lang.String getSession() { * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). @@ -984,7 +986,8 @@ public Builder mergeFrom( * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). @@ -1027,7 +1030,8 @@ public java.lang.String getSession() { * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). @@ -1070,7 +1074,8 @@ public com.google.protobuf.ByteString getSessionBytes() { * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). @@ -1112,7 +1117,8 @@ public Builder setSession(java.lang.String value) { * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). @@ -1150,7 +1156,8 @@ public Builder clearSession() { * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequestOrBuilder.java index 78064a0b2..b2c285824 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequestOrBuilder.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequestOrBuilder.java @@ -37,7 +37,8 @@ public interface DetectIntentRequestOrBuilder * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). @@ -70,7 +71,8 @@ public interface DetectIntentRequestOrBuilder * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session * ID>`, * If `Location ID` is not specified we assume default 'us' location. If - * `Environment ID` is not specified, we assume default 'draft' environment. + * `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). * If `User ID` is not specified, we are using "-". It's up to the API caller * to choose an appropriate `Session ID` and `User Id`. They can be a random * number or some type of user and session identifiers (preferably hashed). diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java index 1a836ca0b..7b1ffd1a0 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java @@ -572,66 +572,68 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ntentBatch\0228\n\007intents\030\001 \003(\0132\'.google.clo" + "ud.dialogflow.v2beta1.Intent*?\n\nIntentVi" + "ew\022\033\n\027INTENT_VIEW_UNSPECIFIED\020\000\022\024\n\020INTEN" - + "T_VIEW_FULL\020\0012\232\021\n\007Intents\022\207\002\n\013ListIntent" + + "T_VIEW_FULL\020\0012\330\021\n\007Intents\022\305\002\n\013ListIntent" + "s\0223.google.cloud.dialogflow.v2beta1.List" + "IntentsRequest\0324.google.cloud.dialogflow" - + ".v2beta1.ListIntentsResponse\"\214\001\202\323\344\223\002f\022*/" - + "v2beta1/{parent=projects/*/agent}/intent" - + "sZ8\0226/v2beta1/{parent=projects/*/locatio" - + "ns/*/agent}/intents\332A\006parent\332A\024parent,la" - + "nguage_code\022\362\001\n\tGetIntent\0221.google.cloud" - + ".dialogflow.v2beta1.GetIntentRequest\032\'.g" - + "oogle.cloud.dialogflow.v2beta1.Intent\"\210\001" - + "\202\323\344\223\002f\022*/v2beta1/{name=projects/*/agent/" - + "intents/*}Z8\0226/v2beta1/{name=projects/*/" - + "locations/*/agent/intents/*}\332A\004name\332A\022na" - + "me,language_code\022\232\002\n\014CreateIntent\0224.goog" - + "le.cloud.dialogflow.v2beta1.CreateIntent" - + "Request\032\'.google.cloud.dialogflow.v2beta" - + "1.Intent\"\252\001\202\323\344\223\002v\"*/v2beta1/{parent=proj" - + "ects/*/agent}/intents:\006intentZ@\"6/v2beta" - + "1/{parent=projects/*/locations/*/agent}/" - + "intents:\006intent\332A\rparent,intent\332A\033parent" - + ",intent,language_code\022\323\002\n\014UpdateIntent\0224" - + ".google.cloud.dialogflow.v2beta1.UpdateI" - + "ntentRequest\032\'.google.cloud.dialogflow.v" - + "2beta1.Intent\"\343\001\202\323\344\223\002\204\00121/v2beta1/{inten" - + "t.name=projects/*/agent/intents/*}:\006inte" - + "ntZG2=/v2beta1/{intent.name=projects/*/l" - + "ocations/*/agent/intents/*}:\006intent\332A\022in" - + "tent,update_mask\332A\006intent\332A\024intent,langu" - + "age_code\332A intent,language_code,update_m" - + "ask\022\321\001\n\014DeleteIntent\0224.google.cloud.dial" - + "ogflow.v2beta1.DeleteIntentRequest\032\026.goo" - + "gle.protobuf.Empty\"s\202\323\344\223\002f**/v2beta1/{na" - + "me=projects/*/agent/intents/*}Z8*6/v2bet" - + "a1/{name=projects/*/locations/*/agent/in" - + "tents/*}\332A\004name\022\213\003\n\022BatchUpdateIntents\022:" - + ".google.cloud.dialogflow.v2beta1.BatchUp" - + "dateIntentsRequest\032\035.google.longrunning." - + "Operation\"\231\002\202\323\344\223\002\204\001\"6/v2beta1/{parent=pr" - + "ojects/*/agent}/intents:batchUpdate:\001*ZG" - + "\"B/v2beta1/{parent=projects/*/locations/" - + "*/agent}/intents:batchUpdate:\001*\332A\027parent" - + ",intent_batch_uri\332A\032parent,intent_batch_" - + "inline\312AT\n:google.cloud.dialogflow.v2bet" - + "a1.BatchUpdateIntentsResponse\022\026google.pr" - + "otobuf.Struct\022\300\002\n\022BatchDeleteIntents\022:.g" - + "oogle.cloud.dialogflow.v2beta1.BatchDele" - + "teIntentsRequest\032\035.google.longrunning.Op" - + "eration\"\316\001\202\323\344\223\002\204\001\"6/v2beta1/{parent=proj" - + "ects/*/agent}/intents:batchDelete:\001*ZG\"B" - + "/v2beta1/{parent=projects/*/locations/*/" - + "agent}/intents:batchDelete:\001*\332A\016parent,i" - + "ntents\312A/\n\025google.protobuf.Empty\022\026google" - + ".protobuf.Struct\032x\312A\031dialogflow.googleap" - + "is.com\322AYhttps://www.googleapis.com/auth" - + "/cloud-platform,https://www.googleapis.c" - + "om/auth/dialogflowB\251\001\n#com.google.cloud." - + "dialogflow.v2beta1B\013IntentProtoP\001ZIgoogl" - + "e.golang.org/genproto/googleapis/cloud/d" - + "ialogflow/v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037G" - + "oogle.Cloud.Dialogflow.V2beta1b\006proto3" + + ".v2beta1.ListIntentsResponse\"\312\001\202\323\344\223\002\243\001\022*" + + "/v2beta1/{parent=projects/*/agent}/inten" + + "tsZ8\0226/v2beta1/{parent=projects/*/locati" + + "ons/*/agent}/intentsZ;\0229/v2beta1/{parent" + + "=projects/*/agent/environments/*}/intent" + + "s\332A\006parent\332A\024parent,language_code\022\362\001\n\tGe" + + "tIntent\0221.google.cloud.dialogflow.v2beta" + + "1.GetIntentRequest\032\'.google.cloud.dialog" + + "flow.v2beta1.Intent\"\210\001\202\323\344\223\002f\022*/v2beta1/{" + + "name=projects/*/agent/intents/*}Z8\0226/v2b" + + "eta1/{name=projects/*/locations/*/agent/" + + "intents/*}\332A\004name\332A\022name,language_code\022\232" + + "\002\n\014CreateIntent\0224.google.cloud.dialogflo" + + "w.v2beta1.CreateIntentRequest\032\'.google.c" + + "loud.dialogflow.v2beta1.Intent\"\252\001\202\323\344\223\002v\"" + + "*/v2beta1/{parent=projects/*/agent}/inte" + + "nts:\006intentZ@\"6/v2beta1/{parent=projects" + + "/*/locations/*/agent}/intents:\006intent\332A\r" + + "parent,intent\332A\033parent,intent,language_c" + + "ode\022\323\002\n\014UpdateIntent\0224.google.cloud.dial" + + "ogflow.v2beta1.UpdateIntentRequest\032\'.goo" + + "gle.cloud.dialogflow.v2beta1.Intent\"\343\001\202\323" + + "\344\223\002\204\00121/v2beta1/{intent.name=projects/*/" + + "agent/intents/*}:\006intentZG2=/v2beta1/{in" + + "tent.name=projects/*/locations/*/agent/i" + + "ntents/*}:\006intent\332A\022intent,update_mask\332A" + + "\006intent\332A\024intent,language_code\332A intent," + + "language_code,update_mask\022\321\001\n\014DeleteInte" + + "nt\0224.google.cloud.dialogflow.v2beta1.Del" + + "eteIntentRequest\032\026.google.protobuf.Empty" + + "\"s\202\323\344\223\002f**/v2beta1/{name=projects/*/agen" + + "t/intents/*}Z8*6/v2beta1/{name=projects/" + + "*/locations/*/agent/intents/*}\332A\004name\022\213\003" + + "\n\022BatchUpdateIntents\022:.google.cloud.dial" + + "ogflow.v2beta1.BatchUpdateIntentsRequest" + + "\032\035.google.longrunning.Operation\"\231\002\202\323\344\223\002\204" + + "\001\"6/v2beta1/{parent=projects/*/agent}/in" + + "tents:batchUpdate:\001*ZG\"B/v2beta1/{parent" + + "=projects/*/locations/*/agent}/intents:b" + + "atchUpdate:\001*\332A\027parent,intent_batch_uri\332" + + "A\032parent,intent_batch_inline\312AT\n:google." + + "cloud.dialogflow.v2beta1.BatchUpdateInte" + + "ntsResponse\022\026google.protobuf.Struct\022\300\002\n\022" + + "BatchDeleteIntents\022:.google.cloud.dialog" + + "flow.v2beta1.BatchDeleteIntentsRequest\032\035" + + ".google.longrunning.Operation\"\316\001\202\323\344\223\002\204\001\"" + + "6/v2beta1/{parent=projects/*/agent}/inte" + + "nts:batchDelete:\001*ZG\"B/v2beta1/{parent=p" + + "rojects/*/locations/*/agent}/intents:bat" + + "chDelete:\001*\332A\016parent,intents\312A/\n\025google." + + "protobuf.Empty\022\026google.protobuf.Struct\032x" + + "\312A\031dialogflow.googleapis.com\322AYhttps://w" + + "ww.googleapis.com/auth/cloud-platform,ht" + + "tps://www.googleapis.com/auth/dialogflow" + + "B\251\001\n#com.google.cloud.dialogflow.v2beta1" + + "B\013IntentProtoP\001ZIgoogle.golang.org/genpr" + + "oto/googleapis/cloud/dialogflow/v2beta1;" + + "dialogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dialog" + + "flow.V2beta1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/agent.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/agent.proto index bb413e845..51c5b831d 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/agent.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/agent.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto index 95bd8b353..1f330db7d 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.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. @@ -268,23 +268,6 @@ message VoiceSelectionParams { SsmlVoiceGender ssml_gender = 2; } -// Gender of the voice as described in -// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice). -enum SsmlVoiceGender { - // An unspecified gender, which means that the client doesn't care which - // gender the selected voice will have. - SSML_VOICE_GENDER_UNSPECIFIED = 0; - - // A male voice. - SSML_VOICE_GENDER_MALE = 1; - - // A female voice. - SSML_VOICE_GENDER_FEMALE = 2; - - // A gender-neutral voice. - SSML_VOICE_GENDER_NEUTRAL = 3; -} - // Configuration of how speech should be synthesized. message SynthesizeSpeechConfig { // Optional. Speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal @@ -317,6 +300,23 @@ message SynthesizeSpeechConfig { VoiceSelectionParams voice = 4; } +// Gender of the voice as described in +// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice). +enum SsmlVoiceGender { + // An unspecified gender, which means that the client doesn't care which + // gender the selected voice will have. + SSML_VOICE_GENDER_UNSPECIFIED = 0; + + // A male voice. + SSML_VOICE_GENDER_MALE = 1; + + // A female voice. + SSML_VOICE_GENDER_FEMALE = 2; + + // A gender-neutral voice. + SSML_VOICE_GENDER_NEUTRAL = 3; +} + // Instructs the speech synthesizer how to generate the output audio content. // If this audio config is supplied in a request, it overrides all existing // text-to-speech settings applied to the agent. @@ -335,6 +335,12 @@ message OutputAudioConfig { SynthesizeSpeechConfig synthesize_speech_config = 3; } +// A wrapper of repeated TelephonyDtmf digits. +message TelephonyDtmfEvents { + // A sequence of TelephonyDtmf digits. + repeated TelephonyDtmf dtmf_events = 1; +} + // Audio encoding of the output audio format in Text-To-Speech. enum OutputAudioEncoding { // Not specified. @@ -354,12 +360,6 @@ enum OutputAudioEncoding { OUTPUT_AUDIO_ENCODING_OGG_OPUS = 3; } -// A wrapper of repeated TelephonyDtmf digits. -message TelephonyDtmfEvents { - // A sequence of TelephonyDtmf digits. - repeated TelephonyDtmf dtmf_events = 1; -} - // [DTMF](https://en.wikipedia.org/wiki/Dual-tone_multi-frequency_signaling) // digit in Telephony Gateway. enum TelephonyDtmf { diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/context.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/context.proto index 82b61f29d..a48e0ab63 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/context.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/context.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/document.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/document.proto index a0bc4812a..60be8688f 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/document.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/document.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/entity_type.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/entity_type.proto index e1e5f8ef1..a1703f1be 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/entity_type.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/entity_type.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto index 49efe6ff5..a933b9bea 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/gcs.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/gcs.proto index 4750a0626..9a9e99d2b 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/gcs.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/gcs.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/intent.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/intent.proto index 58c3b31f8..0dc5f680e 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/intent.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/intent.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. @@ -50,6 +50,9 @@ service Intents { additional_bindings { get: "/v2beta1/{parent=projects/*/locations/*/agent}/intents" } + additional_bindings { + get: "/v2beta1/{parent=projects/*/agent/environments/*}/intents" + } }; option (google.api.method_signature) = "parent"; option (google.api.method_signature) = "parent,language_code"; diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/knowledge_base.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/knowledge_base.proto index 997b2bea0..fe50073bc 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/knowledge_base.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/knowledge_base.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session.proto index dd5d86c64..ab5e04523 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session.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. @@ -108,7 +108,8 @@ message DetectIntentRequest { // ID>`, // // If `Location ID` is not specified we assume default 'us' location. If - // `Environment ID` is not specified, we assume default 'draft' environment. + // `Environment ID` is not specified, we assume default 'draft' environment + // (`Environment ID` might be referred to as environment name at some places). // If `User ID` is not specified, we are using "-". It's up to the API caller // to choose an appropriate `Session ID` and `User Id`. They can be a random // number or some type of user and session identifiers (preferably hashed). diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session_entity_type.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session_entity_type.proto index c80497aa0..c692a6b94 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session_entity_type.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session_entity_type.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/validation_result.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/validation_result.proto index 2f655e84e..82352ad08 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/validation_result.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/validation_result.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. diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/webhook.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/webhook.proto index 83f9d70a1..a8340a968 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/webhook.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/webhook.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. diff --git a/synth.metadata b/synth.metadata index e2e6c1aca..d7ef70694 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,23 +4,23 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "50c8e5164c5273dca2fda57cd331ca06d663a413" + "sha": "931a5a7d29e4d66b5e482475be1e1e16619792ea" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e8bc4471a88ac5f60defe3ed436f517174e59ba0", - "internalRef": "357800868" + "sha": "3b69cb23ca5f969f57bdc4001cf78659c2f7100d", + "internalRef": "358315006" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e8bc4471a88ac5f60defe3ed436f517174e59ba0", - "internalRef": "357800868" + "sha": "3b69cb23ca5f969f57bdc4001cf78659c2f7100d", + "internalRef": "358315006" } }, { From 22a7fdc9df9091616aa8739ffaa2d6ecbd22aa42 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 19 Feb 2021 16:05:44 -0800 Subject: [PATCH 2/2] feat: add additional_bindings to Dialogflow v2 ListIntents API docs: update copyrights and session docs PiperOrigin-RevId: 358315519 Source-Author: Google APIs Source-Date: Thu Feb 18 19:08:57 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: 54020365f5a790dcff0bbcff5643adea2a199ccb Source-Link: https://github.com/googleapis/googleapis/commit/54020365f5a790dcff0bbcff5643adea2a199ccb --- .../cloud/dialogflow/v2/SessionsClient.java | 22 ++--- .../dialogflow/v2/DetectIntentRequest.java | 49 +++++----- .../v2/DetectIntentRequestOrBuilder.java | 14 +-- .../cloud/dialogflow/v2/IntentProto.java | 89 ++++++++++--------- .../google/cloud/dialogflow/v2/agent.proto | 2 +- .../cloud/dialogflow/v2/audio_config.proto | 36 ++++---- .../google/cloud/dialogflow/v2/context.proto | 2 +- .../cloud/dialogflow/v2/entity_type.proto | 2 +- .../cloud/dialogflow/v2/environment.proto | 2 +- .../google/cloud/dialogflow/v2/intent.proto | 5 +- .../google/cloud/dialogflow/v2/session.proto | 9 +- .../dialogflow/v2/session_entity_type.proto | 2 +- .../dialogflow/v2/validation_result.proto | 2 +- .../google/cloud/dialogflow/v2/webhook.proto | 2 +- synth.metadata | 8 +- 15 files changed, 131 insertions(+), 115 deletions(-) diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java index 017389e04..b4f2c0345 100644 --- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java +++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java @@ -163,11 +163,12 @@ public SessionsStub getStub() { * @param session Required. The name of the session this query is sent to. Format: * `projects/<Project ID>/agent/sessions/<Session ID>`, or `projects/<Project * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session - * ID>`. If `Environment ID` is not specified, we assume default 'draft' environment. If - * `User ID` is not specified, we are using "-". It's up to the API caller to choose an - * appropriate `Session ID` and `User Id`. They can be a random number or some type of user - * and session identifiers (preferably hashed). The length of the `Session ID` and `User ID` - * must not exceed 36 characters. + * ID>`. If `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). If `User ID` is + * not specified, we are using "-". It's up to the API caller to choose an appropriate + * `Session ID` and `User Id`. They can be a random number or some type of user and session + * identifiers (preferably hashed). The length of the `Session ID` and `User ID` must not + * exceed 36 characters. *

For more information, see the [API interactions * guide](https://cloud.google.com/dialogflow/docs/api-overview). *

Note: Always use agent versions for production traffic. See [Versions and @@ -210,11 +211,12 @@ public final DetectIntentResponse detectIntent(SessionName session, QueryInput q * @param session Required. The name of the session this query is sent to. Format: * `projects/<Project ID>/agent/sessions/<Session ID>`, or `projects/<Project * ID>/agent/environments/<Environment ID>/users/<User ID>/sessions/<Session - * ID>`. If `Environment ID` is not specified, we assume default 'draft' environment. If - * `User ID` is not specified, we are using "-". It's up to the API caller to choose an - * appropriate `Session ID` and `User Id`. They can be a random number or some type of user - * and session identifiers (preferably hashed). The length of the `Session ID` and `User ID` - * must not exceed 36 characters. + * ID>`. If `Environment ID` is not specified, we assume default 'draft' environment + * (`Environment ID` might be referred to as environment name at some places). If `User ID` is + * not specified, we are using "-". It's up to the API caller to choose an appropriate + * `Session ID` and `User Id`. They can be a random number or some type of user and session + * identifiers (preferably hashed). The length of the `Session ID` and `User ID` must not + * exceed 36 characters. *

For more information, see the [API interactions * guide](https://cloud.google.com/dialogflow/docs/api-overview). *

Note: Always use agent versions for production traffic. See [Versions and diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java index b41b9f990..6de636618 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java +++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java @@ -190,9 +190,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions @@ -228,9 +229,10 @@ public java.lang.String getSession() { * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions @@ -962,9 +964,10 @@ public Builder mergeFrom( * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions @@ -999,9 +1002,10 @@ public java.lang.String getSession() { * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions @@ -1036,9 +1040,10 @@ public com.google.protobuf.ByteString getSessionBytes() { * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions @@ -1072,9 +1077,10 @@ public Builder setSession(java.lang.String value) { * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions @@ -1104,9 +1110,10 @@ public Builder clearSession() { * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java index 3937cb315..3bbe69d16 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java +++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java @@ -31,9 +31,10 @@ public interface DetectIntentRequestOrBuilder * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions @@ -58,9 +59,10 @@ public interface DetectIntentRequestOrBuilder * `projects/<Project ID>/agent/sessions/<Session ID>`, or * `projects/<Project ID>/agent/environments/<Environment ID>/users/<User * ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume - * default 'draft' environment. If `User ID` is not specified, we are using - * "-". It's up to the API caller to choose an appropriate `Session ID` and - * `User Id`. They can be a random number or some type of user and session + * default 'draft' environment (`Environment ID` might be referred to as + * environment name at some places). If `User ID` is not specified, we are + * using "-". It's up to the API caller to choose an appropriate `Session ID` + * and `User Id`. They can be a random number or some type of user and session * identifiers (preferably hashed). The length of the `Session ID` and * `User ID` must not exceed 36 characters. * For more information, see the [API interactions diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java index 13b998cc0..c5994681c 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java +++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java @@ -440,52 +440,53 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + ".IntentB\003\340A\002\"B\n\013IntentBatch\0223\n\007intents\030\001" + " \003(\0132\".google.cloud.dialogflow.v2.Intent" + "*?\n\nIntentView\022\033\n\027INTENT_VIEW_UNSPECIFIE" - + "D\020\000\022\024\n\020INTENT_VIEW_FULL\020\0012\312\014\n\007Intents\022\275\001" + + "D\020\000\022\024\n\020INTENT_VIEW_FULL\020\0012\203\r\n\007Intents\022\366\001" + "\n\013ListIntents\022..google.cloud.dialogflow." + "v2.ListIntentsRequest\032/.google.cloud.dia" - + "logflow.v2.ListIntentsResponse\"M\202\323\344\223\002\'\022%" - + "/v2/{parent=projects/*/agent}/intents\332A\006" - + "parent\332A\024parent,language_code\022\250\001\n\tGetInt" - + "ent\022,.google.cloud.dialogflow.v2.GetInte" - + "ntRequest\032\".google.cloud.dialogflow.v2.I" - + "ntent\"I\202\323\344\223\002\'\022%/v2/{name=projects/*/agen" - + "t/intents/*}\332A\004name\332A\022name,language_code" - + "\022\310\001\n\014CreateIntent\022/.google.cloud.dialogf" - + "low.v2.CreateIntentRequest\032\".google.clou" - + "d.dialogflow.v2.Intent\"c\202\323\344\223\002/\"%/v2/{par" - + "ent=projects/*/agent}/intents:\006intent\332A\r" - + "parent,intent\332A\033parent,intent,language_c" - + "ode\022\333\001\n\014UpdateIntent\022/.google.cloud.dial" - + "ogflow.v2.UpdateIntentRequest\032\".google.c" - + "loud.dialogflow.v2.Intent\"v\202\323\344\223\00262,/v2/{" - + "intent.name=projects/*/agent/intents/*}:" - + "\006intent\332A\024intent,language_code\332A intent," - + "language_code,update_mask\022\215\001\n\014DeleteInte" - + "nt\022/.google.cloud.dialogflow.v2.DeleteIn" - + "tentRequest\032\026.google.protobuf.Empty\"4\202\323\344" - + "\223\002\'*%/v2/{name=projects/*/agent/intents/" - + "*}\332A\004name\022\262\002\n\022BatchUpdateIntents\0225.googl" - + "e.cloud.dialogflow.v2.BatchUpdateIntents" - + "Request\032\035.google.longrunning.Operation\"\305" - + "\001\202\323\344\223\0026\"1/v2/{parent=projects/*/agent}/i" - + "ntents:batchUpdate:\001*\332A\027parent,intent_ba" - + "tch_uri\332A\032parent,intent_batch_inline\312AO\n" - + "5google.cloud.dialogflow.v2.BatchUpdateI" - + "ntentsResponse\022\026google.protobuf.Struct\022\353" - + "\001\n\022BatchDeleteIntents\0225.google.cloud.dia" - + "logflow.v2.BatchDeleteIntentsRequest\032\035.g" - + "oogle.longrunning.Operation\"\177\202\323\344\223\0026\"1/v2" - + "/{parent=projects/*/agent}/intents:batch" - + "Delete:\001*\332A\016parent,intents\312A/\n\025google.pr" - + "otobuf.Empty\022\026google.protobuf.Struct\032x\312A" - + "\031dialogflow.googleapis.com\322AYhttps://www" - + ".googleapis.com/auth/cloud-platform,http" - + "s://www.googleapis.com/auth/dialogflowB\232" - + "\001\n\036com.google.cloud.dialogflow.v2B\013Inten" - + "tProtoP\001ZDgoogle.golang.org/genproto/goo" - + "gleapis/cloud/dialogflow/v2;dialogflow\370\001" - + "\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006pro" - + "to3" + + "logflow.v2.ListIntentsResponse\"\205\001\202\323\344\223\002_\022" + + "%/v2/{parent=projects/*/agent}/intentsZ6" + + "\0224/v2/{parent=projects/*/agent/environme" + + "nts/*}/intents\332A\006parent\332A\024parent,languag" + + "e_code\022\250\001\n\tGetIntent\022,.google.cloud.dial" + + "ogflow.v2.GetIntentRequest\032\".google.clou" + + "d.dialogflow.v2.Intent\"I\202\323\344\223\002\'\022%/v2/{nam" + + "e=projects/*/agent/intents/*}\332A\004name\332A\022n" + + "ame,language_code\022\310\001\n\014CreateIntent\022/.goo" + + "gle.cloud.dialogflow.v2.CreateIntentRequ" + + "est\032\".google.cloud.dialogflow.v2.Intent\"" + + "c\202\323\344\223\002/\"%/v2/{parent=projects/*/agent}/i" + + "ntents:\006intent\332A\rparent,intent\332A\033parent," + + "intent,language_code\022\333\001\n\014UpdateIntent\022/." + + "google.cloud.dialogflow.v2.UpdateIntentR" + + "equest\032\".google.cloud.dialogflow.v2.Inte" + + "nt\"v\202\323\344\223\00262,/v2/{intent.name=projects/*/" + + "agent/intents/*}:\006intent\332A\024intent,langua" + + "ge_code\332A intent,language_code,update_ma" + + "sk\022\215\001\n\014DeleteIntent\022/.google.cloud.dialo" + + "gflow.v2.DeleteIntentRequest\032\026.google.pr" + + "otobuf.Empty\"4\202\323\344\223\002\'*%/v2/{name=projects" + + "/*/agent/intents/*}\332A\004name\022\262\002\n\022BatchUpda" + + "teIntents\0225.google.cloud.dialogflow.v2.B" + + "atchUpdateIntentsRequest\032\035.google.longru" + + "nning.Operation\"\305\001\202\323\344\223\0026\"1/v2/{parent=pr" + + "ojects/*/agent}/intents:batchUpdate:\001*\332A" + + "\027parent,intent_batch_uri\332A\032parent,intent" + + "_batch_inline\312AO\n5google.cloud.dialogflo" + + "w.v2.BatchUpdateIntentsResponse\022\026google." + + "protobuf.Struct\022\353\001\n\022BatchDeleteIntents\0225" + + ".google.cloud.dialogflow.v2.BatchDeleteI" + + "ntentsRequest\032\035.google.longrunning.Opera" + + "tion\"\177\202\323\344\223\0026\"1/v2/{parent=projects/*/age" + + "nt}/intents:batchDelete:\001*\332A\016parent,inte" + + "nts\312A/\n\025google.protobuf.Empty\022\026google.pr" + + "otobuf.Struct\032x\312A\031dialogflow.googleapis." + + "com\322AYhttps://www.googleapis.com/auth/cl" + + "oud-platform,https://www.googleapis.com/" + + "auth/dialogflowB\232\001\n\036com.google.cloud.dia" + + "logflow.v2B\013IntentProtoP\001ZDgoogle.golang" + + ".org/genproto/googleapis/cloud/dialogflo" + + "w/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.D" + + "ialogflow.V2b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto index 82c1426c7..4ac05cd2a 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.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. diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto index 19b1e09b9..8a6777c93 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.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. @@ -264,23 +264,6 @@ message VoiceSelectionParams { SsmlVoiceGender ssml_gender = 2; } -// Gender of the voice as described in -// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice). -enum SsmlVoiceGender { - // An unspecified gender, which means that the client doesn't care which - // gender the selected voice will have. - SSML_VOICE_GENDER_UNSPECIFIED = 0; - - // A male voice. - SSML_VOICE_GENDER_MALE = 1; - - // A female voice. - SSML_VOICE_GENDER_FEMALE = 2; - - // A gender-neutral voice. - SSML_VOICE_GENDER_NEUTRAL = 3; -} - // Configuration of how speech should be synthesized. message SynthesizeSpeechConfig { // Optional. Speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal @@ -313,6 +296,23 @@ message SynthesizeSpeechConfig { VoiceSelectionParams voice = 4; } +// Gender of the voice as described in +// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice). +enum SsmlVoiceGender { + // An unspecified gender, which means that the client doesn't care which + // gender the selected voice will have. + SSML_VOICE_GENDER_UNSPECIFIED = 0; + + // A male voice. + SSML_VOICE_GENDER_MALE = 1; + + // A female voice. + SSML_VOICE_GENDER_FEMALE = 2; + + // A gender-neutral voice. + SSML_VOICE_GENDER_NEUTRAL = 3; +} + // Instructs the speech synthesizer on how to generate the output audio content. // If this audio config is supplied in a request, it overrides all existing // text-to-speech settings applied to the agent. diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto index 41f88aa43..246ee7be4 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.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. diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto index 13fcdb050..f8a69ec58 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.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. diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto index d48c210fc..ef094c71e 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.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. diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto index f4f78acad..3c7fa4aa9 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.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. @@ -47,6 +47,9 @@ service Intents { rpc ListIntents(ListIntentsRequest) returns (ListIntentsResponse) { option (google.api.http) = { get: "/v2/{parent=projects/*/agent}/intents" + additional_bindings { + get: "/v2/{parent=projects/*/agent/environments/*}/intents" + } }; option (google.api.method_signature) = "parent"; option (google.api.method_signature) = "parent,language_code"; diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto index 2f6562bfe..338489652 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.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. @@ -90,9 +90,10 @@ message DetectIntentRequest { // `projects//agent/sessions/`, or // `projects//agent/environments//users//sessions/`. If `Environment ID` is not specified, we assume - // default 'draft' environment. If `User ID` is not specified, we are using - // "-". It's up to the API caller to choose an appropriate `Session ID` and - // `User Id`. They can be a random number or some type of user and session + // default 'draft' environment (`Environment ID` might be referred to as + // environment name at some places). If `User ID` is not specified, we are + // using "-". It's up to the API caller to choose an appropriate `Session ID` + // and `User Id`. They can be a random number or some type of user and session // identifiers (preferably hashed). The length of the `Session ID` and // `User ID` must not exceed 36 characters. // diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto index 8d7fa89c0..0eceed81c 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.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. diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/validation_result.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/validation_result.proto index 4758596f0..e41cb9cde 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/validation_result.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/validation_result.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. diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/webhook.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/webhook.proto index 19f529aed..ce72e92d3 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/webhook.proto +++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/webhook.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. diff --git a/synth.metadata b/synth.metadata index d7ef70694..6556427d3 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,16 +11,16 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "3b69cb23ca5f969f57bdc4001cf78659c2f7100d", - "internalRef": "358315006" + "sha": "54020365f5a790dcff0bbcff5643adea2a199ccb", + "internalRef": "358315519" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "3b69cb23ca5f969f57bdc4001cf78659c2f7100d", - "internalRef": "358315006" + "sha": "54020365f5a790dcff0bbcff5643adea2a199ccb", + "internalRef": "358315519" } }, {