From 58de7eb1382cf33547cdfff19780e60fafe9a65b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 14 May 2021 02:14:35 +0000 Subject: [PATCH 01/23] chore: release 3.1.1-SNAPSHOT (#554) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-dialogflow-bom/pom.xml | 12 ++++++------ google-cloud-dialogflow/pom.xml | 4 ++-- grpc-google-cloud-dialogflow-v2/pom.xml | 4 ++-- grpc-google-cloud-dialogflow-v2beta1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-dialogflow-v2/pom.xml | 4 ++-- proto-google-cloud-dialogflow-v2beta1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/google-cloud-dialogflow-bom/pom.xml b/google-cloud-dialogflow-bom/pom.xml index 7ba0721de..673a1a59f 100644 --- a/google-cloud-dialogflow-bom/pom.xml +++ b/google-cloud-dialogflow-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dialogflow-bom - 3.1.0 + 3.1.1-SNAPSHOT pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-dialogflow-v2 - 3.1.0 + 3.1.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.95.0 + 0.95.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 3.1.0 + 3.1.1-SNAPSHOT com.google.cloud google-cloud-dialogflow - 3.1.0 + 3.1.1-SNAPSHOT com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.95.0 + 0.95.1-SNAPSHOT diff --git a/google-cloud-dialogflow/pom.xml b/google-cloud-dialogflow/pom.xml index 13a8b79ef..d3d5d8393 100644 --- a/google-cloud-dialogflow/pom.xml +++ b/google-cloud-dialogflow/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dialogflow - 3.1.0 + 3.1.1-SNAPSHOT jar Google Cloud Dialog Flow API https://github.com/googleapis/java-dialogflow @@ -11,7 +11,7 @@ com.google.cloud google-cloud-dialogflow-parent - 3.1.0 + 3.1.1-SNAPSHOT google-cloud-dialogflow diff --git a/grpc-google-cloud-dialogflow-v2/pom.xml b/grpc-google-cloud-dialogflow-v2/pom.xml index 384877a49..5b399156f 100644 --- a/grpc-google-cloud-dialogflow-v2/pom.xml +++ b/grpc-google-cloud-dialogflow-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 3.1.0 + 3.1.1-SNAPSHOT grpc-google-cloud-dialogflow-v2 GRPC library for grpc-google-cloud-dialogflow-v2 com.google.cloud google-cloud-dialogflow-parent - 3.1.0 + 3.1.1-SNAPSHOT diff --git a/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/grpc-google-cloud-dialogflow-v2beta1/pom.xml index f80d1a327..5b0e9fcfc 100644 --- a/grpc-google-cloud-dialogflow-v2beta1/pom.xml +++ b/grpc-google-cloud-dialogflow-v2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.95.0 + 0.95.1-SNAPSHOT grpc-google-cloud-dialogflow-v2beta1 GRPC library for grpc-google-cloud-dialogflow-v2beta1 com.google.cloud google-cloud-dialogflow-parent - 3.1.0 + 3.1.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index d46c00c9f..b102d7077 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dialogflow-parent pom - 3.1.0 + 3.1.1-SNAPSHOT Google Cloud Dialog Flow API Parent https://github.com/googleapis/java-dialogflow @@ -70,27 +70,27 @@ com.google.api.grpc proto-google-cloud-dialogflow-v2 - 3.1.0 + 3.1.1-SNAPSHOT com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.95.0 + 0.95.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.95.0 + 0.95.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 3.1.0 + 3.1.1-SNAPSHOT com.google.cloud google-cloud-dialogflow - 3.1.0 + 3.1.1-SNAPSHOT com.google.cloud diff --git a/proto-google-cloud-dialogflow-v2/pom.xml b/proto-google-cloud-dialogflow-v2/pom.xml index 4549d4e85..e7cc84fa5 100644 --- a/proto-google-cloud-dialogflow-v2/pom.xml +++ b/proto-google-cloud-dialogflow-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dialogflow-v2 - 3.1.0 + 3.1.1-SNAPSHOT proto-google-cloud-dialogflow-v2 PROTO library for proto-google-cloud-dialogflow-v2 com.google.cloud google-cloud-dialogflow-parent - 3.1.0 + 3.1.1-SNAPSHOT diff --git a/proto-google-cloud-dialogflow-v2beta1/pom.xml b/proto-google-cloud-dialogflow-v2beta1/pom.xml index 946b13a36..0ea18dbe7 100644 --- a/proto-google-cloud-dialogflow-v2beta1/pom.xml +++ b/proto-google-cloud-dialogflow-v2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.95.0 + 0.95.1-SNAPSHOT proto-google-cloud-dialogflow-v2beta1 PROTO library for proto-google-cloud-dialogflow-v2beta1 com.google.cloud google-cloud-dialogflow-parent - 3.1.0 + 3.1.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index adfb4ffd1..bac77bc0e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-dialogflow-v2:3.1.0:3.1.0 -proto-google-cloud-dialogflow-v2beta1:0.95.0:0.95.0 -grpc-google-cloud-dialogflow-v2beta1:0.95.0:0.95.0 -grpc-google-cloud-dialogflow-v2:3.1.0:3.1.0 -google-cloud-dialogflow:3.1.0:3.1.0 +proto-google-cloud-dialogflow-v2:3.1.0:3.1.1-SNAPSHOT +proto-google-cloud-dialogflow-v2beta1:0.95.0:0.95.1-SNAPSHOT +grpc-google-cloud-dialogflow-v2beta1:0.95.0:0.95.1-SNAPSHOT +grpc-google-cloud-dialogflow-v2:3.1.0:3.1.1-SNAPSHOT +google-cloud-dialogflow:3.1.0:3.1.1-SNAPSHOT From 425ea659bbc2cc245f5365a375a3c2c460f294c7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 17 May 2021 03:46:09 +0200 Subject: [PATCH 02/23] chore(deps): update dependency com.google.cloud:libraries-bom to v20.4.0 (#556) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.3.0` -> `20.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.4.0/compatibility-slim/20.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.4.0/confidence-slim/20.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-dialogflow). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 7279cd0af..03cb12391 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.3.0 + 20.4.0 pom import From 59bc8921e472960f636a897aea91d8961cd3e0c4 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sun, 16 May 2021 19:00:03 -0700 Subject: [PATCH 03/23] chore: regenerate README (#558) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-05-17 01:48:25,836 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-dialogflow/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-05-17 01:48:27,098 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/85bc4e54-e9ca-4eec-8bf5-c9df039b58e5/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 3514b2c7e..00cd91809 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "0e0d5a3011f00880e0f2b0214932f434babe5750" + "sha": "425ea659bbc2cc245f5365a375a3c2c460f294c7" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "bd8281a06cc7f84906e04d4843c1d3d386a980cd" + "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1" } } ] diff --git a/README.md b/README.md index 7f9ed2882..79d47f9e1 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 20.3.0 + 20.4.0 pom import @@ -45,18 +45,18 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.3.0') +implementation platform('com.google.cloud:libraries-bom:20.4.0') compile 'com.google.cloud:google-cloud-dialogflow' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-dialogflow:3.0.2' +compile 'com.google.cloud:google-cloud-dialogflow:3.1.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "3.0.2" +libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "3.1.0" ``` ## Authentication From 01b2a8b7a117644e614d5d3ada0ce95150e42e5b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 17 May 2021 16:20:05 -0700 Subject: [PATCH 04/23] chore: add changelog to cloud-rad (#559) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/81e4ad9c-db2f-4f59-8745-b52a48665ccc/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/c86c7a60985644eab557949363a38301d40d78d2 --- .kokoro/release/publish_javadoc11.sh | 2 ++ synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 028830581..25789e177 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -42,6 +42,8 @@ mvn clean site -B -q -P docFX # copy README to docfx-yml dir and rename index.md cp README.md target/docfx-yml/index.md +# copy CHANGELOG to docfx-yml dir and rename history.md +cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml diff --git a/synth.metadata b/synth.metadata index d5cfa7a27..37a85f22e 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "6e41b49c6929c653a622a08797146ebb7b3c6abf" + "sha": "59bc8921e472960f636a897aea91d8961cd3e0c4" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1" + "sha": "c86c7a60985644eab557949363a38301d40d78d2" } } ], From 2cbe20fe371aca28962b5ea9b68913207f910892 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 19 May 2021 07:20:33 -0700 Subject: [PATCH 05/23] feat: add `gcf-owl-bot[bot]` to `ignoreAuthors` (#561) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/89d4fac7-23f8-4cf0-b412-6ccac17af7af/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/7332178a11ddddc91188dc0f25bca1ccadcaa6c6 --- .github/generated-files-bot.yml | 1 + synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index 47c2ba132..c644a24e1 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -9,3 +9,4 @@ ignoreAuthors: - 'renovate-bot' - 'yoshi-automation' - 'release-please[bot]' +- 'gcf-owl-bot[bot]' diff --git a/synth.metadata b/synth.metadata index 37a85f22e..a1687f03d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "59bc8921e472960f636a897aea91d8961cd3e0c4" + "sha": "01b2a8b7a117644e614d5d3ada0ce95150e42e5b" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "c86c7a60985644eab557949363a38301d40d78d2" + "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6" } } ], From f81b522a1e44fdb06f27947096efd2e4a5ffda63 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 19 May 2021 17:04:16 +0200 Subject: [PATCH 06/23] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 (#560) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `1.1.0` -> `1.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.2.0/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.2.0/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v1.2.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​120-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare110v120-2021-05-18) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v1.1.0...v1.2.0) ##### Dependencies - update dependency com.google.api-client:google-api-client-bom to v1.31.5 ([#​353](https://www.github.com/googleapis/java-shared-dependencies/issues/353)) ([8d72ab0](https://www.github.com/googleapis/java-shared-dependencies/commit/8d72ab003e08c864aedc17fc190ba26f393bf0c7)) - update dependency com.google.errorprone:error_prone_annotations to v2.7.1 ([#​360](https://www.github.com/googleapis/java-shared-dependencies/issues/360)) ([8f952d0](https://www.github.com/googleapis/java-shared-dependencies/commit/8f952d05745358fc426a1a2dcb688da5d5010239)) - update dependency com.google.protobuf:protobuf-bom to v3.17.0 ([#​355](https://www.github.com/googleapis/java-shared-dependencies/issues/355)) ([09858fb](https://www.github.com/googleapis/java-shared-dependencies/commit/09858fb4f1b78a77e828501597d20df4db0ebfcf)) - update dependency io.grpc:grpc-bom to v1.37.1 ([#​359](https://www.github.com/googleapis/java-shared-dependencies/issues/359)) ([bc9869e](https://www.github.com/googleapis/java-shared-dependencies/commit/bc9869e914314f951afd69f2acae95c414398f43)) - update google.common-protos.version to v2.2.1 ([#​358](https://www.github.com/googleapis/java-shared-dependencies/issues/358)) ([a3ed764](https://www.github.com/googleapis/java-shared-dependencies/commit/a3ed764a0e5143ee323d4b69c9747b8265d349e2)) - update iam.version to v1.0.14 ([#​352](https://www.github.com/googleapis/java-shared-dependencies/issues/352)) ([bea9a01](https://www.github.com/googleapis/java-shared-dependencies/commit/bea9a01788ac1332a4bc7e06574ef5701700fe90))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-dialogflow). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b102d7077..163f524bd 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ com.google.cloud google-cloud-shared-dependencies - 1.1.0 + 1.2.0 pom import From 7e525f10b4c34c044454b4f712c630cfe716bb52 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 19 May 2021 18:26:23 +0200 Subject: [PATCH 07/23] chore(deps): update dependency com.google.cloud:google-cloud-dialogflow to v3.1.0 (#555) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 8b3ddc4e4..bc658ab5e 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-dialogflow - 3.0.2 + 3.1.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 93a0b7319..1aeb070b9 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-dialogflow - 3.0.2 + 3.1.0 From 67d771022c56b229c46351f59cf17b317cf04d97 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 19 May 2021 09:38:07 -0700 Subject: [PATCH 08/23] chore: regenerate README (#563) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-05-19 16:31:55,681 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-dialogflow/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-05-19 16:31:56,930 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/0f0f1176-8cce-479a-ab07-d08ed038ec66/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 00cd91809..57bd2ffd3 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "425ea659bbc2cc245f5365a375a3c2c460f294c7" + "sha": "7e525f10b4c34c044454b4f712c630cfe716bb52" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1" + "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6" } } ] diff --git a/README.md b/README.md index 79d47f9e1..0e16147b3 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-dialogflow - 3.0.2 + 3.1.0 ``` From 6cd34208911fa52c8ee0acd3937520273bdadac0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 19 May 2021 23:02:18 +0200 Subject: [PATCH 09/23] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v0.12.0 (#564) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `0.11.2` -> `0.12.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.12.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.12.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.12.0/compatibility-slim/0.11.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.12.0/confidence-slim/0.11.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-dialogflow). --- google-cloud-dialogflow-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-dialogflow-bom/pom.xml b/google-cloud-dialogflow-bom/pom.xml index 673a1a59f..eba687720 100644 --- a/google-cloud-dialogflow-bom/pom.xml +++ b/google-cloud-dialogflow-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 Google Cloud Dialogflow BOM diff --git a/pom.xml b/pom.xml index 163f524bd..eb8d87826 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 From 794ab1e66e2dfd41de5964e0bccddea051eff5e2 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 20 May 2021 17:38:16 -0700 Subject: [PATCH 10/23] chore: dump maven version along with java (#565) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/77f4b242-0926-4e4e-acee-48c7b5d1aa76/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/8eae0234a16b26c2ff616d305dbd9786c8b10a47 --- .kokoro/build.sh | 4 ++-- synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index e614e7a1c..16c2da85b 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -23,8 +23,8 @@ cd ${scriptDir}/.. # include common functions source ${scriptDir}/common.sh -# Print out Java version -java -version +# Print out Maven & Java version +mvn -version echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) diff --git a/synth.metadata b/synth.metadata index a1687f03d..c7b422f51 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "01b2a8b7a117644e614d5d3ada0ce95150e42e5b" + "sha": "6cd34208911fa52c8ee0acd3937520273bdadac0" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6" + "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" } } ], From 807f5a596b7374d9033591c6735c06a3b8d712a7 Mon Sep 17 00:00:00 2001 From: Franklin Nunez <69214580+b-loved-dreamer@users.noreply.github.com> Date: Mon, 24 May 2021 14:52:39 -0700 Subject: [PATCH 11/23] samples: updated legacy field (#493) --- .../example/dialogflow/DetectIntentStream.java | 6 +++++- .../dialogflow/DetectIntentWithLocation.java | 15 ++++++++++----- .../example/dialogflow/CreateDocumentTest.java | 3 +-- ...etectIntentWithSentimentAndTextToSpeechIT.java | 8 +++----- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentStream.java b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentStream.java index ffeffcd4d..27febe126 100644 --- a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentStream.java +++ b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentStream.java @@ -96,7 +96,11 @@ static void detectIntentStream(String projectId, String audioFilePath, String se System.out.format( "Detected Intent: %s (confidence: %f)\n", queryResult.getIntent().getDisplayName(), queryResult.getIntentDetectionConfidence()); - System.out.format("Fulfillment Text: '%s'\n", queryResult.getFulfillmentText()); + System.out.format( + "Fulfillment Text: '%s'\n", + queryResult.getFulfillmentMessagesCount() > 0 + ? queryResult.getFulfillmentMessages(0).getText() + : "Triggered Default Fallback Intent"); } } } diff --git a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithLocation.java b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithLocation.java index 5ef3237b6..9c6e943dc 100644 --- a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithLocation.java +++ b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithLocation.java @@ -35,17 +35,22 @@ public class DetectIntentWithLocation { // DialogFlow API Detect Intent sample with text inputs. public static Map detectIntentWithLocation( - String projectId, String locationId, List texts, String sessionId, + String projectId, + String locationId, + List texts, + String sessionId, String languageCode) throws IOException, ApiException { - SessionsSettings sessionsSettings = SessionsSettings.newBuilder() - .setEndpoint(locationId + "-dialogflow.googleapis.com:443").build(); + SessionsSettings sessionsSettings = + SessionsSettings.newBuilder() + .setEndpoint(locationId + "-dialogflow.googleapis.com:443") + .build(); Map queryResults = Maps.newHashMap(); // Instantiates a client try (SessionsClient sessionsClient = SessionsClient.create(sessionsSettings)) { // Set the session name using the projectId (my-project-id), locationId and sessionId (UUID) - SessionName session = SessionName - .ofProjectLocationSessionName(projectId, locationId, sessionId); + SessionName session = + SessionName.ofProjectLocationSessionName(projectId, locationId, sessionId); System.out.println("Session Path: " + session.toString()); // Detect intents for each text input diff --git a/samples/snippets/src/test/java/com/example/dialogflow/CreateDocumentTest.java b/samples/snippets/src/test/java/com/example/dialogflow/CreateDocumentTest.java index dc9c0d4ef..41c8d17e8 100644 --- a/samples/snippets/src/test/java/com/example/dialogflow/CreateDocumentTest.java +++ b/samples/snippets/src/test/java/com/example/dialogflow/CreateDocumentTest.java @@ -86,8 +86,7 @@ public void tearDown() throws IOException { System.setOut(null); } - @Rule - public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3); + @Rule public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3); @Test public void testCreateDocument() throws Exception { diff --git a/samples/snippets/src/test/java/com/example/dialogflow/DetectIntentWithSentimentAndTextToSpeechIT.java b/samples/snippets/src/test/java/com/example/dialogflow/DetectIntentWithSentimentAndTextToSpeechIT.java index c0584150e..64962cc77 100644 --- a/samples/snippets/src/test/java/com/example/dialogflow/DetectIntentWithSentimentAndTextToSpeechIT.java +++ b/samples/snippets/src/test/java/com/example/dialogflow/DetectIntentWithSentimentAndTextToSpeechIT.java @@ -32,9 +32,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** - * Integration (system) tests for {@link DetectIntentWithSentimentAnalysis}. - */ +/** Integration (system) tests for {@link DetectIntentWithSentimentAnalysis}. */ @RunWith(JUnit4.class) @SuppressWarnings("checkstyle:abbreviationaswordinname") public class DetectIntentWithSentimentAndTextToSpeechIT { @@ -78,8 +76,8 @@ public void testDetectIntentTexts() throws Exception { @Test public void testDetectIntentTextsWithLocation() throws Exception { Map queryResults = - DetectIntentWithLocation - .detectIntentWithLocation(PROJECT_ID, LOCATION_ID, TEXTS, SESSION_ID, LANGUAGE_CODE); + DetectIntentWithLocation.detectIntentWithLocation( + PROJECT_ID, LOCATION_ID, TEXTS, SESSION_ID, LANGUAGE_CODE); com.google.cloud.dialogflow.v2beta1.QueryResult finalResult = queryResults.get(TEXTS.get(TEXTS.size() - 1)); assertTrue(finalResult.getAllRequiredParamsPresent()); From 9ff0d433c3221d4747aa553bf8df049f98521d68 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 24 May 2021 15:00:03 -0700 Subject: [PATCH 12/23] chore: regenerate README (#568) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-05-24 21:54:47,371 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-dialogflow/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-05-24 21:54:48,484 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/dc125f95-6e7f-44e5-95d4-f76af96edf0b/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 57bd2ffd3..79c6383c0 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "7e525f10b4c34c044454b4f712c630cfe716bb52" + "sha": "807f5a596b7374d9033591c6735c06a3b8d712a7" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6" + "sha": "a2de127f90799cd5bace653b1dcc5dd2ca8b19c9" } } ] diff --git a/README.md b/README.md index 0e16147b3..2cf93fdab 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.4.0') +implementation platform('com.google.cloud:libraries-bom:20.5.0') compile 'com.google.cloud:google-cloud-dialogflow' ``` From bedc4832f84b43fab82bbfd3e8a7c7df42fbf646 Mon Sep 17 00:00:00 2001 From: Franklin Nunez <69214580+b-loved-dreamer@users.noreply.github.com> Date: Mon, 24 May 2021 15:22:54 -0700 Subject: [PATCH 13/23] samples: updated legacy field in detectintentknoledge (#569) --- .../java/com/example/dialogflow/DetectIntentKnowledge.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentKnowledge.java b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentKnowledge.java index 4fc3243ef..04484eb50 100644 --- a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentKnowledge.java +++ b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentKnowledge.java @@ -80,7 +80,11 @@ public static Map detectIntentKnowledge( System.out.format( "Detected Intent: %s (confidence: %f)\n", queryResult.getIntent().getDisplayName(), queryResult.getIntentDetectionConfidence()); - System.out.format("Fulfillment Text: '%s'\n", queryResult.getFulfillmentText()); + System.out.format( + "Fulfillment Text: '%s'\n", + queryResult.getFulfillmentMessagesCount() > 0 + ? queryResult.getFulfillmentMessages(0).getText() + : "Triggered Default Fallback Intent"); KnowledgeAnswers knowledgeAnswers = queryResult.getKnowledgeAnswers(); for (Answer answer : knowledgeAnswers.getAnswersList()) { System.out.format(" - Answer: '%s'\n", answer.getAnswer()); From da0f279c763956ff59b87269c6d968a750b24253 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 25 May 2021 09:45:14 -0700 Subject: [PATCH 14/23] feat: added location-aware HTTP path binding for ListIntents (#557) PiperOrigin-RevId: 373895026 Source-Author: Google APIs Source-Date: Fri May 14 17:14:27 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 0d68bbb80a7620b69aff5ab0b497c8a396e73558 Source-Link: https://github.com/googleapis/googleapis/commit/0d68bbb80a7620b69aff5ab0b497c8a396e73558 Co-authored-by: Neenu Shaji --- .../cloud/dialogflow/v2/IntentsClient.java | 28 ++++- .../cloud/dialogflow/v2/IntentProto.java | 110 +++++++++--------- .../dialogflow/v2/ListIntentsRequest.java | 63 ++++++++-- .../v2/ListIntentsRequestOrBuilder.java | 18 ++- .../google/cloud/dialogflow/v2/intent.proto | 13 ++- synth.metadata | 8 +- 6 files changed, 168 insertions(+), 72 deletions(-) diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java index c9bf5d3f5..4338f0e3d 100644 --- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java +++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java @@ -178,7 +178,12 @@ public final OperationsClient getOperationsClient() { * } * * @param parent Required. The agent to list all intents from. Format: `projects/<Project - * ID>/agent`. + * ID>/agent` or `projects/<Project ID>/locations/<Location ID>/agent`. + *

Alternatively, you can specify the environment to list intents for. Format: + * `projects/<Project ID>/agent/environments/<Environment ID>` or + * `projects/<Project ID>/locations/<Location + * ID>/agent/environments/<Environment ID>`. Note: training phrases of the intents + * will not be returned for non-draft environment. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListIntentsPagedResponse listIntents(AgentName parent) { @@ -205,7 +210,12 @@ public final ListIntentsPagedResponse listIntents(AgentName parent) { * } * * @param parent Required. The agent to list all intents from. Format: `projects/<Project - * ID>/agent`. + * ID>/agent` or `projects/<Project ID>/locations/<Location ID>/agent`. + *

Alternatively, you can specify the environment to list intents for. Format: + * `projects/<Project ID>/agent/environments/<Environment ID>` or + * `projects/<Project ID>/locations/<Location + * ID>/agent/environments/<Environment ID>`. Note: training phrases of the intents + * will not be returned for non-draft environment. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListIntentsPagedResponse listIntents(String parent) { @@ -230,7 +240,12 @@ public final ListIntentsPagedResponse listIntents(String parent) { * } * * @param parent Required. The agent to list all intents from. Format: `projects/<Project - * ID>/agent`. + * ID>/agent` or `projects/<Project ID>/locations/<Location ID>/agent`. + *

Alternatively, you can specify the environment to list intents for. Format: + * `projects/<Project ID>/agent/environments/<Environment ID>` or + * `projects/<Project ID>/locations/<Location + * ID>/agent/environments/<Environment ID>`. Note: training phrases of the intents + * will not be returned for non-draft environment. * @param languageCode Optional. The language used to access language-specific data. If not * specified, the agent's default language is used. For more information, see [Multilingual * intent and entity @@ -263,7 +278,12 @@ public final ListIntentsPagedResponse listIntents(AgentName parent, String langu * } * * @param parent Required. The agent to list all intents from. Format: `projects/<Project - * ID>/agent`. + * ID>/agent` or `projects/<Project ID>/locations/<Location ID>/agent`. + *

Alternatively, you can specify the environment to list intents for. Format: + * `projects/<Project ID>/agent/environments/<Environment ID>` or + * `projects/<Project ID>/locations/<Location + * ID>/agent/environments/<Environment ID>`. Note: training phrases of the intents + * will not be returned for non-draft environment. * @param languageCode Optional. The language used to access language-specific data. If not * specified, the agent's default language is used. For more information, see [Multilingual * intent and entity 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 8c99a90bc..625cc00f2 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 @@ -443,64 +443,66 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ogflow.v2.IntentB\003\340A\002\"B\n\013IntentBatch\0223\n\007" + "intents\030\001 \003(\0132\".google.cloud.dialogflow." + "v2.Intent*?\n\nIntentView\022\033\n\027INTENT_VIEW_U" - + "NSPECIFIED\020\000\022\024\n\020INTENT_VIEW_FULL\020\0012\257\020\n\007I" - + "ntents\022\254\002\n\013ListIntents\022..google.cloud.di" + + "NSPECIFIED\020\000\022\024\n\020INTENT_VIEW_FULL\020\0012\363\020\n\007I" + + "ntents\022\360\002\n\013ListIntents\022..google.cloud.di" + "alogflow.v2.ListIntentsRequest\032/.google." + "cloud.dialogflow.v2.ListIntentsResponse\"" - + "\273\001\202\323\344\223\002\224\001\022%/v2/{parent=projects/*/agent}" + + "\377\001\202\323\344\223\002\330\001\022%/v2/{parent=projects/*/agent}" + "/intentsZ3\0221/v2/{parent=projects/*/locat" + "ions/*/agent}/intentsZ6\0224/v2/{parent=pro" - + "jects/*/agent/environments/*}/intents\332A\006" - + "parent\332A\024parent,language_code\022\335\001\n\tGetInt" - + "ent\022,.google.cloud.dialogflow.v2.GetInte" - + "ntRequest\032\".google.cloud.dialogflow.v2.I" - + "ntent\"~\202\323\344\223\002\\\022%/v2/{name=projects/*/agen" - + "t/intents/*}Z3\0221/v2/{name=projects/*/loc" - + "ations/*/agent/intents/*}\332A\004name\332A\022name," - + "language_code\022\206\002\n\014CreateIntent\022/.google." - + "cloud.dialogflow.v2.CreateIntentRequest\032" - + "\".google.cloud.dialogflow.v2.Intent\"\240\001\202\323" - + "\344\223\002l\"%/v2/{parent=projects/*/agent}/inte" - + "nts:\006intentZ;\"1/v2/{parent=projects/*/lo" - + "cations/*/agent}/intents:\006intent\332A\rparen" - + "t,intent\332A\033parent,intent,language_code\022\240" - + "\002\n\014UpdateIntent\022/.google.cloud.dialogflo" - + "w.v2.UpdateIntentRequest\032\".google.cloud." - + "dialogflow.v2.Intent\"\272\001\202\323\344\223\002z2,/v2/{inte" - + "nt.name=projects/*/agent/intents/*}:\006int" - + "entZB28/v2/{intent.name=projects/*/locat" - + "ions/*/agent/intents/*}:\006intent\332A\024intent" - + ",language_code\332A intent,language_code,up" - + "date_mask\022\302\001\n\014DeleteIntent\022/.google.clou" - + "d.dialogflow.v2.DeleteIntentRequest\032\026.go" - + "ogle.protobuf.Empty\"i\202\323\344\223\002\\*%/v2/{name=p" - + "rojects/*/agent/intents/*}Z3*1/v2/{name=" - + "projects/*/locations/*/agent/intents/*}\332" - + "A\004name\022\366\002\n\022BatchUpdateIntents\0225.google.c" - + "loud.dialogflow.v2.BatchUpdateIntentsReq" - + "uest\032\035.google.longrunning.Operation\"\211\002\202\323" - + "\344\223\002z\"1/v2/{parent=projects/*/agent}/inte" - + "nts:batchUpdate:\001*ZB\"=/v2/{parent=projec" - + "ts/*/locations/*/agent}/intents:batchUpd" - + "ate:\001*\332A\027parent,intent_batch_uri\332A\032paren" - + "t,intent_batch_inline\312AO\n5google.cloud.d" - + "ialogflow.v2.BatchUpdateIntentsResponse\022" - + "\026google.protobuf.Struct\022\260\002\n\022BatchDeleteI" - + "ntents\0225.google.cloud.dialogflow.v2.Batc" - + "hDeleteIntentsRequest\032\035.google.longrunni" - + "ng.Operation\"\303\001\202\323\344\223\002z\"1/v2/{parent=proje" - + "cts/*/agent}/intents:batchDelete:\001*ZB\"=/" - + "v2/{parent=projects/*/locations/*/agent}" - + "/intents:batchDelete:\001*\332A\016parent,intents" - + "\312A/\n\025google.protobuf.Empty\022\026google.proto" - + "buf.Struct\032x\312A\031dialogflow.googleapis.com" - + "\322AYhttps://www.googleapis.com/auth/cloud" - + "-platform,https://www.googleapis.com/aut" - + "h/dialogflowB\232\001\n\036com.google.cloud.dialog" - + "flow.v2B\013IntentProtoP\001ZDgoogle.golang.or" - + "g/genproto/googleapis/cloud/dialogflow/v" - + "2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dial" - + "ogflow.V2b\006proto3" + + "jects/*/agent/environments/*}/intentsZB\022" + + "@/v2/{parent=projects/*/locations/*/agen" + + "t/environments/*}/intents\332A\006parent\332A\024par" + + "ent,language_code\022\335\001\n\tGetIntent\022,.google" + + ".cloud.dialogflow.v2.GetIntentRequest\032\"." + + "google.cloud.dialogflow.v2.Intent\"~\202\323\344\223\002" + + "\\\022%/v2/{name=projects/*/agent/intents/*}" + + "Z3\0221/v2/{name=projects/*/locations/*/age" + + "nt/intents/*}\332A\004name\332A\022name,language_cod" + + "e\022\206\002\n\014CreateIntent\022/.google.cloud.dialog" + + "flow.v2.CreateIntentRequest\032\".google.clo" + + "ud.dialogflow.v2.Intent\"\240\001\202\323\344\223\002l\"%/v2/{p" + + "arent=projects/*/agent}/intents:\006intentZ" + + ";\"1/v2/{parent=projects/*/locations/*/ag" + + "ent}/intents:\006intent\332A\rparent,intent\332A\033p" + + "arent,intent,language_code\022\240\002\n\014UpdateInt" + + "ent\022/.google.cloud.dialogflow.v2.UpdateI" + + "ntentRequest\032\".google.cloud.dialogflow.v" + + "2.Intent\"\272\001\202\323\344\223\002z2,/v2/{intent.name=proj" + + "ects/*/agent/intents/*}:\006intentZB28/v2/{" + + "intent.name=projects/*/locations/*/agent" + + "/intents/*}:\006intent\332A\024intent,language_co" + + "de\332A intent,language_code,update_mask\022\302\001" + + "\n\014DeleteIntent\022/.google.cloud.dialogflow" + + ".v2.DeleteIntentRequest\032\026.google.protobu" + + "f.Empty\"i\202\323\344\223\002\\*%/v2/{name=projects/*/ag" + + "ent/intents/*}Z3*1/v2/{name=projects/*/l" + + "ocations/*/agent/intents/*}\332A\004name\022\366\002\n\022B" + + "atchUpdateIntents\0225.google.cloud.dialogf" + + "low.v2.BatchUpdateIntentsRequest\032\035.googl" + + "e.longrunning.Operation\"\211\002\202\323\344\223\002z\"1/v2/{p" + + "arent=projects/*/agent}/intents:batchUpd" + + "ate:\001*ZB\"=/v2/{parent=projects/*/locatio" + + "ns/*/agent}/intents:batchUpdate:\001*\332A\027par" + + "ent,intent_batch_uri\332A\032parent,intent_bat" + + "ch_inline\312AO\n5google.cloud.dialogflow.v2" + + ".BatchUpdateIntentsResponse\022\026google.prot" + + "obuf.Struct\022\260\002\n\022BatchDeleteIntents\0225.goo" + + "gle.cloud.dialogflow.v2.BatchDeleteInten" + + "tsRequest\032\035.google.longrunning.Operation" + + "\"\303\001\202\323\344\223\002z\"1/v2/{parent=projects/*/agent}" + + "/intents:batchDelete:\001*ZB\"=/v2/{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\232\001\n\036com.google.cloud.dialogflow.v2B\013Int" + + "entProtoP\001ZDgoogle.golang.org/genproto/g" + + "oogleapis/cloud/dialogflow/v2;dialogflow" + + "\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V2b\006p" + + "roto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java index f3fe53b00..e6363bf41 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java +++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java @@ -147,7 +147,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * *

    * Required. The agent to list all intents from.
-   * Format: `projects/<Project ID>/agent`.
+   * Format: `projects/<Project ID>/agent` or `projects/<Project
+   * ID>/locations/<Location ID>/agent`.
+   * Alternatively, you can specify the environment to list intents for.
+   * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+   * or `projects/<Project ID>/locations/<Location
+   * ID>/agent/environments/<Environment ID>`.
+   * Note: training phrases of the intents will not be returned for non-draft
+   * environment.
    * 
* * @@ -173,7 +180,14 @@ public java.lang.String getParent() { * *
    * Required. The agent to list all intents from.
-   * Format: `projects/<Project ID>/agent`.
+   * Format: `projects/<Project ID>/agent` or `projects/<Project
+   * ID>/locations/<Location ID>/agent`.
+   * Alternatively, you can specify the environment to list intents for.
+   * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+   * or `projects/<Project ID>/locations/<Location
+   * ID>/agent/environments/<Environment ID>`.
+   * Note: training phrases of the intents will not be returned for non-draft
+   * environment.
    * 
* * @@ -748,7 +762,14 @@ public Builder mergeFrom( * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * @@ -773,7 +794,14 @@ public java.lang.String getParent() { * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * @@ -798,7 +826,14 @@ public com.google.protobuf.ByteString getParentBytes() { * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * @@ -822,7 +857,14 @@ public Builder setParent(java.lang.String value) { * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * @@ -842,7 +884,14 @@ public Builder clearParent() { * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequestOrBuilder.java index 6b2019ce0..02af4ab4c 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequestOrBuilder.java +++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequestOrBuilder.java @@ -28,7 +28,14 @@ public interface ListIntentsRequestOrBuilder * *
    * Required. The agent to list all intents from.
-   * Format: `projects/<Project ID>/agent`.
+   * Format: `projects/<Project ID>/agent` or `projects/<Project
+   * ID>/locations/<Location ID>/agent`.
+   * Alternatively, you can specify the environment to list intents for.
+   * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+   * or `projects/<Project ID>/locations/<Location
+   * ID>/agent/environments/<Environment ID>`.
+   * Note: training phrases of the intents will not be returned for non-draft
+   * environment.
    * 
* * @@ -43,7 +50,14 @@ public interface ListIntentsRequestOrBuilder * *
    * Required. The agent to list all intents from.
-   * Format: `projects/<Project ID>/agent`.
+   * Format: `projects/<Project ID>/agent` or `projects/<Project
+   * ID>/locations/<Location ID>/agent`.
+   * Alternatively, you can specify the environment to list intents for.
+   * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+   * or `projects/<Project ID>/locations/<Location
+   * ID>/agent/environments/<Environment ID>`.
+   * Note: training phrases of the intents will not be returned for non-draft
+   * environment.
    * 
* * 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 fbed819d9..1e75f9baa 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 @@ -53,6 +53,9 @@ service Intents { additional_bindings { get: "/v2/{parent=projects/*/agent/environments/*}/intents" } + additional_bindings { + get: "/v2/{parent=projects/*/locations/*/agent/environments/*}/intents" + } }; option (google.api.method_signature) = "parent"; option (google.api.method_signature) = "parent,language_code"; @@ -877,7 +880,15 @@ message Intent { // The request message for [Intents.ListIntents][google.cloud.dialogflow.v2.Intents.ListIntents]. message ListIntentsRequest { // Required. The agent to list all intents from. - // Format: `projects//agent`. + // Format: `projects//agent` or `projects//locations//agent`. + // + // Alternatively, you can specify the environment to list intents for. + // Format: `projects//agent/environments/` + // or `projects//locations//agent/environments/`. + // Note: training phrases of the intents will not be returned for non-draft + // environment. string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { diff --git a/synth.metadata b/synth.metadata index c7b422f51..ab5865f53 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,16 +11,16 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "162641cfe5573c648df679a6dd30385650a08704", - "internalRef": "373400747" + "sha": "0d68bbb80a7620b69aff5ab0b497c8a396e73558", + "internalRef": "373895026" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "162641cfe5573c648df679a6dd30385650a08704", - "internalRef": "373400747" + "sha": "0d68bbb80a7620b69aff5ab0b497c8a396e73558", + "internalRef": "373895026" } }, { From 8f03b79c76bcabc1025e3b2b9debf6851b253666 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 25 May 2021 18:45:25 +0200 Subject: [PATCH 15/23] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.0 (#566) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb8d87826..ecf663a97 100644 --- a/pom.xml +++ b/pom.xml @@ -167,7 +167,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 html From 2672999b4ecabccc5599b4d97256fef0dd67933f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 25 May 2021 18:45:36 +0200 Subject: [PATCH 16/23] chore(deps): update dependency com.google.cloud:libraries-bom to v20.5.0 (#567) --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 03cb12391..653211f4a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.4.0 + 20.5.0 pom import From e618ea03abf065366b9834425f415714fc675a88 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 25 May 2021 09:54:09 -0700 Subject: [PATCH 17/23] chore: regenerate README (#570) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-05-25 16:47:31,893 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-dialogflow/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-05-25 16:47:33,257 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/48d682bf-528d-4c74-9180-3b5fdd08402f/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 79c6383c0..3ace50b52 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "807f5a596b7374d9033591c6735c06a3b8d712a7" + "sha": "2672999b4ecabccc5599b4d97256fef0dd67933f" } }, { diff --git a/README.md b/README.md index 2cf93fdab..7566bad4a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 20.4.0 + 20.5.0 pom import From 15edcf09d2e6b281f16efa051868c1ca235928da Mon Sep 17 00:00:00 2001 From: Franklin Nunez <69214580+b-loved-dreamer@users.noreply.github.com> Date: Tue, 25 May 2021 12:19:48 -0700 Subject: [PATCH 18/23] samples: updated legacy field in detectintentaudio (#571) --- .../main/java/com/example/dialogflow/DetectIntentAudio.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentAudio.java b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentAudio.java index 38f319a98..0d3a6955a 100644 --- a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentAudio.java +++ b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentAudio.java @@ -82,7 +82,11 @@ public static QueryResult detectIntentAudio( System.out.format( "Detected Intent: %s (confidence: %f)\n", queryResult.getIntent().getDisplayName(), queryResult.getIntentDetectionConfidence()); - System.out.format("Fulfillment Text: '%s'\n", queryResult.getFulfillmentText()); + System.out.format( + "Fulfillment Text: '%s'\n", + queryResult.getFulfillmentMessagesCount() > 0 + ? queryResult.getFulfillmentMessages(0).getText() + : "Triggered Default Fallback Intent"); return queryResult; } From fc4fb180bcdc4fb22cd2c3b4b3b9acc350a5f649 Mon Sep 17 00:00:00 2001 From: Franklin Nunez <69214580+b-loved-dreamer@users.noreply.github.com> Date: Tue, 25 May 2021 15:02:51 -0700 Subject: [PATCH 19/23] samples: updated legacy field in detectintenttexts (#572) --- .../main/java/com/example/dialogflow/DetectIntentTexts.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentTexts.java b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentTexts.java index 89d215623..0eb5b415b 100644 --- a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentTexts.java +++ b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentTexts.java @@ -63,7 +63,11 @@ public static Map detectIntentTexts( System.out.format( "Detected Intent: %s (confidence: %f)\n", queryResult.getIntent().getDisplayName(), queryResult.getIntentDetectionConfidence()); - System.out.format("Fulfillment Text: '%s'\n", queryResult.getFulfillmentText()); + System.out.format( + "Fulfillment Text: '%s'\n", + queryResult.getFulfillmentMessagesCount() > 0 + ? queryResult.getFulfillmentMessages(0).getText() + : "Triggered Default Fallback Intent"); queryResults.put(text, queryResult); } From d6147062203a82fbcd5be70a8bf6ddb4d068968c Mon Sep 17 00:00:00 2001 From: Franklin Nunez <69214580+b-loved-dreamer@users.noreply.github.com> Date: Wed, 26 May 2021 12:55:24 -0700 Subject: [PATCH 20/23] samples: updated legacy field in detect intent samples (#575) --- .../com/example/dialogflow/DetectIntentWithLocation.java | 6 +++++- .../dialogflow/DetectIntentWithSentimentAnalysis.java | 6 +++++- .../dialogflow/DetectIntentWithTextToSpeechResponse.java | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithLocation.java b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithLocation.java index 9c6e943dc..6c8258125 100644 --- a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithLocation.java +++ b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithLocation.java @@ -73,7 +73,11 @@ public static Map detectIntentWithLocation( System.out.format( "Detected Intent: %s (confidence: %f)\n", queryResult.getIntent().getDisplayName(), queryResult.getIntentDetectionConfidence()); - System.out.format("Fulfillment Text: '%s'\n", queryResult.getFulfillmentText()); + System.out.format( + "Fulfillment Text: '%s'\n", + queryResult.getFulfillmentMessagesCount() > 0 + ? queryResult.getFulfillmentMessages(0).getText() + : "Triggered Default Fallback Intent"); queryResults.put(text, queryResult); } diff --git a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithSentimentAnalysis.java b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithSentimentAnalysis.java index 136590c93..4a9133a3e 100644 --- a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithSentimentAnalysis.java +++ b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithSentimentAnalysis.java @@ -80,7 +80,11 @@ public static Map detectIntentSentimentAnalysis( System.out.format( "Detected Intent: %s (confidence: %f)\n", queryResult.getIntent().getDisplayName(), queryResult.getIntentDetectionConfidence()); - System.out.format("Fulfillment Text: '%s'\n", queryResult.getFulfillmentText()); + System.out.format( + "Fulfillment Text: '%s'\n", + queryResult.getFulfillmentMessagesCount() > 0 + ? queryResult.getFulfillmentMessages(0).getText() + : "Triggered Default Fallback Intent"); System.out.format( "Sentiment Score: '%s'\n", queryResult.getSentimentAnalysisResult().getQueryTextSentiment().getScore()); diff --git a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithTextToSpeechResponse.java b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithTextToSpeechResponse.java index 3a40384c2..fbe971318 100644 --- a/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithTextToSpeechResponse.java +++ b/samples/snippets/src/main/java/com/example/dialogflow/DetectIntentWithTextToSpeechResponse.java @@ -81,7 +81,11 @@ public static Map detectIntentWithTexttoSpeech( System.out.format( "Detected Intent: %s (confidence: %f)\n", queryResult.getIntent().getDisplayName(), queryResult.getIntentDetectionConfidence()); - System.out.format("Fulfillment Text: '%s'\n", queryResult.getFulfillmentText()); + System.out.format( + "Fulfillment Text: '%s'\n", + queryResult.getFulfillmentMessagesCount() > 0 + ? queryResult.getFulfillmentMessages(0).getText() + : "Triggered Default Fallback Intent"); queryResults.put(text, queryResult); } From b7189c512aa76e1cce33daefd265e61f4f4b96ab Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 May 2021 22:56:14 +0200 Subject: [PATCH 21/23] test(deps): update dependency com.google.truth:truth to v1.1.3 (#573) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | com.google.truth:truth | `1.1.2` -> `1.1.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.truth:truth/1.1.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.truth:truth/1.1.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.truth:truth/1.1.3/compatibility-slim/1.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.truth:truth/1.1.3/confidence-slim/1.1.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-dialogflow). --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index bc658ab5e..23b18197d 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -49,7 +49,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1aeb070b9..4f8d5e345 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -47,7 +47,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 653211f4a..7f4a3a76a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -62,7 +62,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test
From 7d8d343e97d1012b7f4b19b6915073b5b1dae9e0 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 31 May 2021 09:28:03 -0700 Subject: [PATCH 22/23] feat: added location-aware HTTP path binding for ListIntents (#574) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/963aecad-626e-4516-985d-a8612df44fa2/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) PiperOrigin-RevId: 375741797 Source-Link: https://github.com/googleapis/googleapis/commit/5e797ab6ee046efd2baeef6a7b1aeddab6718074 PiperOrigin-RevId: 375489925 Source-Link: https://github.com/googleapis/googleapis/commit/a185afb98265e13f1310e428ea5798470b24882a PiperOrigin-RevId: 374460003 Source-Link: https://github.com/googleapis/googleapis/commit/13095786b182305c9c743ccc8dc8b86a8030dff3 feat: exposed match confidence and parameter in AnalyzeContentResponse feat: added DTMF and PARTIAL DTMF type in recognition result feat: added a field in the query result to indicate whether slot filling is cancelled --- .../dialogflow/v2beta1/IntentsClient.java | 28 +- .../cloud/dialogflow/v2/QueryResult.java | 94 ++++ .../dialogflow/v2/QueryResultOrBuilder.java | 14 + .../cloud/dialogflow/v2/SessionProto.java | 168 +++---- .../google/cloud/dialogflow/v2/session.proto | 4 + .../v2beta1/AutomatedAgentReply.java | 426 ++++++++++++++++- .../v2beta1/AutomatedAgentReplyOrBuilder.java | 65 ++- .../cloud/dialogflow/v2beta1/IntentProto.java | 116 ++--- .../v2beta1/ListIntentsRequest.java | 63 ++- .../v2beta1/ListIntentsRequestOrBuilder.java | 18 +- .../dialogflow/v2beta1/ParticipantProto.java | 434 +++++++++--------- .../cloud/dialogflow/v2beta1/QueryResult.java | 94 ++++ .../v2beta1/QueryResultOrBuilder.java | 14 + .../dialogflow/v2beta1/SessionProto.java | 209 ++++----- .../v2beta1/StreamingRecognitionResult.java | 54 +++ .../dialogflow/v2beta1/environment.proto | 4 +- .../cloud/dialogflow/v2beta1/intent.proto | 13 +- .../dialogflow/v2beta1/participant.proto | 14 +- .../cloud/dialogflow/v2beta1/session.proto | 15 + synth.metadata | 10 +- 20 files changed, 1361 insertions(+), 496 deletions(-) diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java index ce233a730..84b1f0d26 100644 --- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java +++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java @@ -179,7 +179,12 @@ public final OperationsClient getOperationsClient() { * } * * @param parent Required. The agent to list all intents from. Format: `projects/<Project - * ID>/agent`. + * ID>/agent` or `projects/<Project ID>/locations/<Location ID>/agent`. + *

Alternatively, you can specify the environment to list intents for. Format: + * `projects/<Project ID>/agent/environments/<Environment ID>` or + * `projects/<Project ID>/locations/<Location + * ID>/agent/environments/<Environment ID>`. Note: training phrases of the intents + * will not be returned for non-draft environment. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListIntentsPagedResponse listIntents(AgentName parent) { @@ -206,7 +211,12 @@ public final ListIntentsPagedResponse listIntents(AgentName parent) { * } * * @param parent Required. The agent to list all intents from. Format: `projects/<Project - * ID>/agent`. + * ID>/agent` or `projects/<Project ID>/locations/<Location ID>/agent`. + *

Alternatively, you can specify the environment to list intents for. Format: + * `projects/<Project ID>/agent/environments/<Environment ID>` or + * `projects/<Project ID>/locations/<Location + * ID>/agent/environments/<Environment ID>`. Note: training phrases of the intents + * will not be returned for non-draft environment. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListIntentsPagedResponse listIntents(String parent) { @@ -231,7 +241,12 @@ public final ListIntentsPagedResponse listIntents(String parent) { * } * * @param parent Required. The agent to list all intents from. Format: `projects/<Project - * ID>/agent`. + * ID>/agent` or `projects/<Project ID>/locations/<Location ID>/agent`. + *

Alternatively, you can specify the environment to list intents for. Format: + * `projects/<Project ID>/agent/environments/<Environment ID>` or + * `projects/<Project ID>/locations/<Location + * ID>/agent/environments/<Environment ID>`. Note: training phrases of the intents + * will not be returned for non-draft environment. * @param languageCode Optional. The language used to access language-specific data. If not * specified, the agent's default language is used. For more information, see [Multilingual * intent and entity @@ -264,7 +279,12 @@ public final ListIntentsPagedResponse listIntents(AgentName parent, String langu * } * * @param parent Required. The agent to list all intents from. Format: `projects/<Project - * ID>/agent`. + * ID>/agent` or `projects/<Project ID>/locations/<Location ID>/agent`. + *

Alternatively, you can specify the environment to list intents for. Format: + * `projects/<Project ID>/agent/environments/<Environment ID>` or + * `projects/<Project ID>/locations/<Location + * ID>/agent/environments/<Environment ID>`. Note: training phrases of the intents + * will not be returned for non-draft environment. * @param languageCode Optional. The language used to access language-specific data. If not * specified, the agent's default language is used. For more information, see [Multilingual * intent and entity diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java index d9808e1ee..dbd9ab741 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java +++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java @@ -226,6 +226,11 @@ private QueryResult( sentimentAnalysisResult_ = subBuilder.buildPartial(); } + break; + } + case 168: + { + cancelsSlotFilling_ = input.readBool(); break; } default: @@ -567,6 +572,25 @@ public boolean getAllRequiredParamsPresent() { return allRequiredParamsPresent_; } + public static final int CANCELS_SLOT_FILLING_FIELD_NUMBER = 21; + private boolean cancelsSlotFilling_; + /** + * + * + *

+   * Indicates whether the conversational query triggers a cancellation for slot
+   * filling.
+   * 
+ * + * bool cancels_slot_filling = 21; + * + * @return The cancelsSlotFilling. + */ + @java.lang.Override + public boolean getCancelsSlotFilling() { + return cancelsSlotFilling_; + } + public static final int FULFILLMENT_TEXT_FIELD_NUMBER = 6; private volatile java.lang.Object fulfillmentText_; /** @@ -1129,6 +1153,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (sentimentAnalysisResult_ != null) { output.writeMessage(17, getSentimentAnalysisResult()); } + if (cancelsSlotFilling_ != false) { + output.writeBool(21, cancelsSlotFilling_); + } unknownFields.writeTo(output); } @@ -1188,6 +1215,9 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 17, getSentimentAnalysisResult()); } + if (cancelsSlotFilling_ != false) { + size += com.google.protobuf.CodedOutputStream.computeBoolSize(21, cancelsSlotFilling_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -1214,6 +1244,7 @@ public boolean equals(final java.lang.Object obj) { if (!getParameters().equals(other.getParameters())) return false; } if (getAllRequiredParamsPresent() != other.getAllRequiredParamsPresent()) return false; + if (getCancelsSlotFilling() != other.getCancelsSlotFilling()) return false; if (!getFulfillmentText().equals(other.getFulfillmentText())) return false; if (!getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList())) return false; if (!getWebhookSource().equals(other.getWebhookSource())) return false; @@ -1261,6 +1292,8 @@ public int hashCode() { } hash = (37 * hash) + ALL_REQUIRED_PARAMS_PRESENT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAllRequiredParamsPresent()); + hash = (37 * hash) + CANCELS_SLOT_FILLING_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getCancelsSlotFilling()); hash = (37 * hash) + FULFILLMENT_TEXT_FIELD_NUMBER; hash = (53 * hash) + getFulfillmentText().hashCode(); if (getFulfillmentMessagesCount() > 0) { @@ -1455,6 +1488,8 @@ public Builder clear() { } allRequiredParamsPresent_ = false; + cancelsSlotFilling_ = false; + fulfillmentText_ = ""; if (fulfillmentMessagesBuilder_ == null) { @@ -1535,6 +1570,7 @@ public com.google.cloud.dialogflow.v2.QueryResult buildPartial() { result.parameters_ = parametersBuilder_.build(); } result.allRequiredParamsPresent_ = allRequiredParamsPresent_; + result.cancelsSlotFilling_ = cancelsSlotFilling_; result.fulfillmentText_ = fulfillmentText_; if (fulfillmentMessagesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { @@ -1646,6 +1682,9 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.QueryResult other) { if (other.getAllRequiredParamsPresent() != false) { setAllRequiredParamsPresent(other.getAllRequiredParamsPresent()); } + if (other.getCancelsSlotFilling() != false) { + setCancelsSlotFilling(other.getCancelsSlotFilling()); + } if (!other.getFulfillmentText().isEmpty()) { fulfillmentText_ = other.fulfillmentText_; onChanged(); @@ -2555,6 +2594,61 @@ public Builder clearAllRequiredParamsPresent() { return this; } + private boolean cancelsSlotFilling_; + /** + * + * + *
+     * Indicates whether the conversational query triggers a cancellation for slot
+     * filling.
+     * 
+ * + * bool cancels_slot_filling = 21; + * + * @return The cancelsSlotFilling. + */ + @java.lang.Override + public boolean getCancelsSlotFilling() { + return cancelsSlotFilling_; + } + /** + * + * + *
+     * Indicates whether the conversational query triggers a cancellation for slot
+     * filling.
+     * 
+ * + * bool cancels_slot_filling = 21; + * + * @param value The cancelsSlotFilling to set. + * @return This builder for chaining. + */ + public Builder setCancelsSlotFilling(boolean value) { + + cancelsSlotFilling_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Indicates whether the conversational query triggers a cancellation for slot
+     * filling.
+     * 
+ * + * bool cancels_slot_filling = 21; + * + * @return This builder for chaining. + */ + public Builder clearCancelsSlotFilling() { + + cancelsSlotFilling_ = false; + onChanged(); + return this; + } + private java.lang.Object fulfillmentText_ = ""; /** * diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResultOrBuilder.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResultOrBuilder.java index 85bba3558..09e62d5a7 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResultOrBuilder.java +++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResultOrBuilder.java @@ -229,6 +229,20 @@ public interface QueryResultOrBuilder */ boolean getAllRequiredParamsPresent(); + /** + * + * + *
+   * Indicates whether the conversational query triggers a cancellation for slot
+   * filling.
+   * 
+ * + * bool cancels_slot_filling = 21; + * + * @return The cancelsSlotFilling. + */ + boolean getCancelsSlotFilling(); + /** * * diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java index d023935cb..80b9275f6 100644 --- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java +++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java @@ -138,93 +138,94 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "oud.dialogflow.v2.InputAudioConfigH\000\0225\n\004" + "text\030\002 \001(\0132%.google.cloud.dialogflow.v2." + "TextInputH\000\0227\n\005event\030\003 \001(\0132&.google.clou" - + "d.dialogflow.v2.EventInputH\000B\007\n\005input\"\220\005" + + "d.dialogflow.v2.EventInputH\000B\007\n\005input\"\256\005" + "\n\013QueryResult\022\022\n\nquery_text\030\001 \001(\t\022\025\n\rlan" + "guage_code\030\017 \001(\t\022%\n\035speech_recognition_c" + "onfidence\030\002 \001(\002\022\016\n\006action\030\003 \001(\t\022+\n\nparam" + "eters\030\004 \001(\0132\027.google.protobuf.Struct\022#\n\033" - + "all_required_params_present\030\005 \001(\010\022\030\n\020ful" - + "fillment_text\030\006 \001(\t\022H\n\024fulfillment_messa" - + "ges\030\007 \003(\0132*.google.cloud.dialogflow.v2.I" - + "ntent.Message\022\026\n\016webhook_source\030\010 \001(\t\0220\n" - + "\017webhook_payload\030\t \001(\0132\027.google.protobuf" - + ".Struct\022<\n\017output_contexts\030\n \003(\0132#.googl" - + "e.cloud.dialogflow.v2.Context\0222\n\006intent\030" - + "\013 \001(\0132\".google.cloud.dialogflow.v2.Inten" - + "t\022#\n\033intent_detection_confidence\030\014 \001(\002\0220" - + "\n\017diagnostic_info\030\016 \001(\0132\027.google.protobu" - + "f.Struct\022V\n\031sentiment_analysis_result\030\021 " - + "\001(\01323.google.cloud.dialogflow.v2.Sentime" - + "ntAnalysisResult\"\234\003\n\034StreamingDetectInte" - + "ntRequest\022:\n\007session\030\001 \001(\tB)\340A\002\372A#\n!dial" - + "ogflow.googleapis.com/Session\022A\n\014query_p" - + "arams\030\002 \001(\0132+.google.cloud.dialogflow.v2" - + ".QueryParameters\022@\n\013query_input\030\003 \001(\0132&." - + "google.cloud.dialogflow.v2.QueryInputB\003\340" - + "A\002\022\034\n\020single_utterance\030\004 \001(\010B\002\030\001\022J\n\023outp" - + "ut_audio_config\030\005 \001(\0132-.google.cloud.dia" - + "logflow.v2.OutputAudioConfig\022<\n\030output_a" - + "udio_config_mask\030\007 \001(\0132\032.google.protobuf" - + ".FieldMask\022\023\n\013input_audio\030\006 \001(\014\"\325\002\n\035Stre" - + "amingDetectIntentResponse\022\023\n\013response_id" - + "\030\001 \001(\t\022R\n\022recognition_result\030\002 \001(\01326.goo" - + "gle.cloud.dialogflow.v2.StreamingRecogni" - + "tionResult\022=\n\014query_result\030\003 \001(\0132\'.googl" - + "e.cloud.dialogflow.v2.QueryResult\022*\n\016web" - + "hook_status\030\004 \001(\0132\022.google.rpc.Status\022\024\n" - + "\014output_audio\030\005 \001(\014\022J\n\023output_audio_conf" - + "ig\030\006 \001(\0132-.google.cloud.dialogflow.v2.Ou" - + "tputAudioConfig\"\206\003\n\032StreamingRecognition" - + "Result\022X\n\014message_type\030\001 \001(\0162B.google.cl" - + "oud.dialogflow.v2.StreamingRecognitionRe" - + "sult.MessageType\022\022\n\ntranscript\030\002 \001(\t\022\020\n\010" - + "is_final\030\003 \001(\010\022\022\n\nconfidence\030\004 \001(\002\022D\n\020sp" - + "eech_word_info\030\007 \003(\0132*.google.cloud.dial" - + "ogflow.v2.SpeechWordInfo\0224\n\021speech_end_o" - + "ffset\030\010 \001(\0132\031.google.protobuf.Duration\"X" - + "\n\013MessageType\022\034\n\030MESSAGE_TYPE_UNSPECIFIE" - + "D\020\000\022\016\n\nTRANSCRIPT\020\001\022\033\n\027END_OF_SINGLE_UTT" - + "ERANCE\020\002\":\n\tTextInput\022\021\n\004text\030\001 \001(\tB\003\340A\002" - + "\022\032\n\rlanguage_code\030\002 \001(\tB\003\340A\002\"h\n\nEventInp" - + "ut\022\021\n\004name\030\001 \001(\tB\003\340A\002\022+\n\nparameters\030\002 \001(" - + "\0132\027.google.protobuf.Struct\022\032\n\rlanguage_c" - + "ode\030\003 \001(\tB\003\340A\002\"F\n\036SentimentAnalysisReque" - + "stConfig\022$\n\034analyze_query_text_sentiment" - + "\030\001 \001(\010\"^\n\027SentimentAnalysisResult\022C\n\024que" - + "ry_text_sentiment\030\001 \001(\0132%.google.cloud.d" - + "ialogflow.v2.Sentiment\"-\n\tSentiment\022\r\n\005s" - + "core\030\001 \001(\002\022\021\n\tmagnitude\030\002 \001(\0022\345\005\n\010Sessio" - + "ns\022\311\003\n\014DetectIntent\022/.google.cloud.dialo" - + "gflow.v2.DetectIntentRequest\0320.google.cl" - + "oud.dialogflow.v2.DetectIntentResponse\"\325" - + "\002\202\323\344\223\002\270\002\"6/v2/{session=projects/*/agent/" - + "sessions/*}:detectIntent:\001*ZR\"M/v2/{sess" - + "ion=projects/*/agent/environments/*/user" - + "s/*/sessions/*}:detectIntent:\001*ZG\"B/v2/{" - + "session=projects/*/locations/*/agent/ses" - + "sions/*}:detectIntent:\001*Z^\"Y/v2/{session" - + "=projects/*/locations/*/agent/environmen" - + "ts/*/users/*/sessions/*}:detectIntent:\001*" - + "\332A\023session,query_input\022\222\001\n\025StreamingDete" - + "ctIntent\0228.google.cloud.dialogflow.v2.St" - + "reamingDetectIntentRequest\0329.google.clou" - + "d.dialogflow.v2.StreamingDetectIntentRes" - + "ponse\"\000(\0010\001\032x\312A\031dialogflow.googleapis.co" - + "m\322AYhttps://www.googleapis.com/auth/clou" - + "d-platform,https://www.googleapis.com/au" - + "th/dialogflowB\360\003\n\036com.google.cloud.dialo" - + "gflow.v2B\014SessionProtoP\001ZDgoogle.golang." - + "org/genproto/googleapis/cloud/dialogflow" - + "/v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Di" - + "alogflow.V2\352A\321\002\n!dialogflow.googleapis.c" - + "om/Session\022+projects/{project}/agent/ses" - + "sions/{session}\022Sprojects/{project}/agen" - + "t/environments/{environment}/users/{user" - + "}/sessions/{session}\022@projects/{project}" - + "/locations/{location}/agent/sessions/{se" - + "ssion}\022hprojects/{project}/locations/{lo" - + "cation}/agent/environments/{environment}" - + "/users/{user}/sessions/{session}b\006proto3" + + "all_required_params_present\030\005 \001(\010\022\034\n\024can" + + "cels_slot_filling\030\025 \001(\010\022\030\n\020fulfillment_t" + + "ext\030\006 \001(\t\022H\n\024fulfillment_messages\030\007 \003(\0132" + + "*.google.cloud.dialogflow.v2.Intent.Mess" + + "age\022\026\n\016webhook_source\030\010 \001(\t\0220\n\017webhook_p" + + "ayload\030\t \001(\0132\027.google.protobuf.Struct\022<\n" + + "\017output_contexts\030\n \003(\0132#.google.cloud.di" + + "alogflow.v2.Context\0222\n\006intent\030\013 \001(\0132\".go" + + "ogle.cloud.dialogflow.v2.Intent\022#\n\033inten" + + "t_detection_confidence\030\014 \001(\002\0220\n\017diagnost" + + "ic_info\030\016 \001(\0132\027.google.protobuf.Struct\022V" + + "\n\031sentiment_analysis_result\030\021 \001(\01323.goog" + + "le.cloud.dialogflow.v2.SentimentAnalysis" + + "Result\"\234\003\n\034StreamingDetectIntentRequest\022" + + ":\n\007session\030\001 \001(\tB)\340A\002\372A#\n!dialogflow.goo" + + "gleapis.com/Session\022A\n\014query_params\030\002 \001(" + + "\0132+.google.cloud.dialogflow.v2.QueryPara" + + "meters\022@\n\013query_input\030\003 \001(\0132&.google.clo" + + "ud.dialogflow.v2.QueryInputB\003\340A\002\022\034\n\020sing" + + "le_utterance\030\004 \001(\010B\002\030\001\022J\n\023output_audio_c" + + "onfig\030\005 \001(\0132-.google.cloud.dialogflow.v2" + + ".OutputAudioConfig\022<\n\030output_audio_confi" + + "g_mask\030\007 \001(\0132\032.google.protobuf.FieldMask" + + "\022\023\n\013input_audio\030\006 \001(\014\"\325\002\n\035StreamingDetec" + + "tIntentResponse\022\023\n\013response_id\030\001 \001(\t\022R\n\022" + + "recognition_result\030\002 \001(\01326.google.cloud." + + "dialogflow.v2.StreamingRecognitionResult" + + "\022=\n\014query_result\030\003 \001(\0132\'.google.cloud.di" + + "alogflow.v2.QueryResult\022*\n\016webhook_statu" + + "s\030\004 \001(\0132\022.google.rpc.Status\022\024\n\014output_au" + + "dio\030\005 \001(\014\022J\n\023output_audio_config\030\006 \001(\0132-" + + ".google.cloud.dialogflow.v2.OutputAudioC" + + "onfig\"\206\003\n\032StreamingRecognitionResult\022X\n\014" + + "message_type\030\001 \001(\0162B.google.cloud.dialog" + + "flow.v2.StreamingRecognitionResult.Messa" + + "geType\022\022\n\ntranscript\030\002 \001(\t\022\020\n\010is_final\030\003" + + " \001(\010\022\022\n\nconfidence\030\004 \001(\002\022D\n\020speech_word_" + + "info\030\007 \003(\0132*.google.cloud.dialogflow.v2." + + "SpeechWordInfo\0224\n\021speech_end_offset\030\010 \001(" + + "\0132\031.google.protobuf.Duration\"X\n\013MessageT" + + "ype\022\034\n\030MESSAGE_TYPE_UNSPECIFIED\020\000\022\016\n\nTRA" + + "NSCRIPT\020\001\022\033\n\027END_OF_SINGLE_UTTERANCE\020\002\":" + + "\n\tTextInput\022\021\n\004text\030\001 \001(\tB\003\340A\002\022\032\n\rlangua" + + "ge_code\030\002 \001(\tB\003\340A\002\"h\n\nEventInput\022\021\n\004name" + + "\030\001 \001(\tB\003\340A\002\022+\n\nparameters\030\002 \001(\0132\027.google" + + ".protobuf.Struct\022\032\n\rlanguage_code\030\003 \001(\tB" + + "\003\340A\002\"F\n\036SentimentAnalysisRequestConfig\022$" + + "\n\034analyze_query_text_sentiment\030\001 \001(\010\"^\n\027" + + "SentimentAnalysisResult\022C\n\024query_text_se" + + "ntiment\030\001 \001(\0132%.google.cloud.dialogflow." + + "v2.Sentiment\"-\n\tSentiment\022\r\n\005score\030\001 \001(\002" + + "\022\021\n\tmagnitude\030\002 \001(\0022\345\005\n\010Sessions\022\311\003\n\014Det" + + "ectIntent\022/.google.cloud.dialogflow.v2.D" + + "etectIntentRequest\0320.google.cloud.dialog" + + "flow.v2.DetectIntentResponse\"\325\002\202\323\344\223\002\270\002\"6" + + "/v2/{session=projects/*/agent/sessions/*" + + "}:detectIntent:\001*ZR\"M/v2/{session=projec" + + "ts/*/agent/environments/*/users/*/sessio" + + "ns/*}:detectIntent:\001*ZG\"B/v2/{session=pr" + + "ojects/*/locations/*/agent/sessions/*}:d" + + "etectIntent:\001*Z^\"Y/v2/{session=projects/" + + "*/locations/*/agent/environments/*/users" + + "/*/sessions/*}:detectIntent:\001*\332A\023session" + + ",query_input\022\222\001\n\025StreamingDetectIntent\0228" + + ".google.cloud.dialogflow.v2.StreamingDet" + + "ectIntentRequest\0329.google.cloud.dialogfl" + + "ow.v2.StreamingDetectIntentResponse\"\000(\0010" + + "\001\032x\312A\031dialogflow.googleapis.com\322AYhttps:" + + "//www.googleapis.com/auth/cloud-platform" + + ",https://www.googleapis.com/auth/dialogf" + + "lowB\360\003\n\036com.google.cloud.dialogflow.v2B\014" + + "SessionProtoP\001ZDgoogle.golang.org/genpro" + + "to/googleapis/cloud/dialogflow/v2;dialog" + + "flow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialogflow.V" + + "2\352A\321\002\n!dialogflow.googleapis.com/Session" + + "\022+projects/{project}/agent/sessions/{ses" + + "sion}\022Sprojects/{project}/agent/environm" + + "ents/{environment}/users/{user}/sessions" + + "/{session}\022@projects/{project}/locations" + + "/{location}/agent/sessions/{session}\022hpr" + + "ojects/{project}/locations/{location}/ag" + + "ent/environments/{environment}/users/{us" + + "er}/sessions/{session}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -310,6 +311,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Action", "Parameters", "AllRequiredParamsPresent", + "CancelsSlotFilling", "FulfillmentText", "FulfillmentMessages", "WebhookSource", 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 45b1454e7..2398811ae 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 @@ -309,6 +309,10 @@ message QueryResult { // matched intent doesn't contain any required parameters. bool all_required_params_present = 5; + // Indicates whether the conversational query triggers a cancellation for slot + // filling. + bool cancels_slot_filling = 21; + // The text to be pronounced to the user or shown on the screen. // Note: This is a legacy field, `fulfillment_messages` should be preferred. string fulfillment_text = 6; diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReply.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReply.java index 1ca1a2c6d..2c57f2933 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReply.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReply.java @@ -131,6 +131,26 @@ private AutomatedAgentReply( cxSessionParameters_ = subBuilder.buildPartial(); } + break; + } + case 77: + { + matchConfidence_ = input.readFloat(); + break; + } + case 82: + { + com.google.protobuf.Struct.Builder subBuilder = null; + if (parameters_ != null) { + subBuilder = parameters_.toBuilder(); + } + parameters_ = + input.readMessage(com.google.protobuf.Struct.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(parameters_); + parameters_ = subBuilder.buildPartial(); + } + break; } default: @@ -536,6 +556,75 @@ public com.google.protobuf.ByteString getEventBytes() { } } + public static final int MATCH_CONFIDENCE_FIELD_NUMBER = 9; + private float matchConfidence_; + /** + * + * + *
+   * The confidence of the match. Values range from 0.0 (completely uncertain)
+   * to 1.0 (completely certain).
+   * This value is for informational purpose only and is only used to help match
+   * the best intent within the classification threshold. This value may change
+   * for the same end-user expression at any time due to a model retraining or
+   * change in implementation.
+   * 
+ * + * float match_confidence = 9; + * + * @return The matchConfidence. + */ + @java.lang.Override + public float getMatchConfidence() { + return matchConfidence_; + } + + public static final int PARAMETERS_FIELD_NUMBER = 10; + private com.google.protobuf.Struct parameters_; + /** + * + * + *
+   * The collection of current parameters at the time of this response.
+   * 
+ * + * .google.protobuf.Struct parameters = 10; + * + * @return Whether the parameters field is set. + */ + @java.lang.Override + public boolean hasParameters() { + return parameters_ != null; + } + /** + * + * + *
+   * The collection of current parameters at the time of this response.
+   * 
+ * + * .google.protobuf.Struct parameters = 10; + * + * @return The parameters. + */ + @java.lang.Override + public com.google.protobuf.Struct getParameters() { + return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_; + } + /** + * + * + *
+   * The collection of current parameters at the time of this response.
+   * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + @java.lang.Override + public com.google.protobuf.StructOrBuilder getParametersOrBuilder() { + return getParameters(); + } + public static final int CX_SESSION_PARAMETERS_FIELD_NUMBER = 6; private com.google.protobuf.Struct cxSessionParameters_; /** @@ -544,13 +633,15 @@ public com.google.protobuf.ByteString getEventBytes() { *
    * The collection of current Dialogflow CX agent session parameters at the
    * time of this response.
+   * Deprecated: Use `parameters` instead.
    * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; * * @return Whether the cxSessionParameters field is set. */ @java.lang.Override + @java.lang.Deprecated public boolean hasCxSessionParameters() { return cxSessionParameters_ != null; } @@ -560,13 +651,15 @@ public boolean hasCxSessionParameters() { *
    * The collection of current Dialogflow CX agent session parameters at the
    * time of this response.
+   * Deprecated: Use `parameters` instead.
    * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; * * @return The cxSessionParameters. */ @java.lang.Override + @java.lang.Deprecated public com.google.protobuf.Struct getCxSessionParameters() { return cxSessionParameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() @@ -578,11 +671,13 @@ public com.google.protobuf.Struct getCxSessionParameters() { *
    * The collection of current Dialogflow CX agent session parameters at the
    * time of this response.
+   * Deprecated: Use `parameters` instead.
    * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ @java.lang.Override + @java.lang.Deprecated public com.google.protobuf.StructOrBuilder getCxSessionParametersOrBuilder() { return getCxSessionParameters(); } @@ -616,6 +711,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (cxSessionParameters_ != null) { output.writeMessage(6, getCxSessionParameters()); } + if (matchConfidence_ != 0F) { + output.writeFloat(9, matchConfidence_); + } + if (parameters_ != null) { + output.writeMessage(10, getParameters()); + } unknownFields.writeTo(output); } @@ -642,6 +743,12 @@ public int getSerializedSize() { if (cxSessionParameters_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getCxSessionParameters()); } + if (matchConfidence_ != 0F) { + size += com.google.protobuf.CodedOutputStream.computeFloatSize(9, matchConfidence_); + } + if (parameters_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getParameters()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -659,6 +766,12 @@ public boolean equals(final java.lang.Object obj) { (com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply) obj; if (!getResponseMessagesList().equals(other.getResponseMessagesList())) return false; + if (java.lang.Float.floatToIntBits(getMatchConfidence()) + != java.lang.Float.floatToIntBits(other.getMatchConfidence())) return false; + if (hasParameters() != other.hasParameters()) return false; + if (hasParameters()) { + if (!getParameters().equals(other.getParameters())) return false; + } if (hasCxSessionParameters() != other.hasCxSessionParameters()) return false; if (hasCxSessionParameters()) { if (!getCxSessionParameters().equals(other.getCxSessionParameters())) return false; @@ -697,6 +810,12 @@ public int hashCode() { hash = (37 * hash) + RESPONSE_MESSAGES_FIELD_NUMBER; hash = (53 * hash) + getResponseMessagesList().hashCode(); } + hash = (37 * hash) + MATCH_CONFIDENCE_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits(getMatchConfidence()); + if (hasParameters()) { + hash = (37 * hash) + PARAMETERS_FIELD_NUMBER; + hash = (53 * hash) + getParameters().hashCode(); + } if (hasCxSessionParameters()) { hash = (37 * hash) + CX_SESSION_PARAMETERS_FIELD_NUMBER; hash = (53 * hash) + getCxSessionParameters().hashCode(); @@ -875,6 +994,14 @@ public Builder clear() { } else { responseMessagesBuilder_.clear(); } + matchConfidence_ = 0F; + + if (parametersBuilder_ == null) { + parameters_ = null; + } else { + parameters_ = null; + parametersBuilder_ = null; + } if (cxSessionParametersBuilder_ == null) { cxSessionParameters_ = null; } else { @@ -935,6 +1062,12 @@ public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply buildPartial() { if (matchCase_ == 5) { result.match_ = match_; } + result.matchConfidence_ = matchConfidence_; + if (parametersBuilder_ == null) { + result.parameters_ = parameters_; + } else { + result.parameters_ = parametersBuilder_.build(); + } if (cxSessionParametersBuilder_ == null) { result.cxSessionParameters_ = cxSessionParameters_; } else { @@ -1019,6 +1152,12 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply } } } + if (other.getMatchConfidence() != 0F) { + setMatchConfidence(other.getMatchConfidence()); + } + if (other.hasParameters()) { + mergeParameters(other.getParameters()); + } if (other.hasCxSessionParameters()) { mergeCxSessionParameters(other.getCxSessionParameters()); } @@ -1991,6 +2130,252 @@ public Builder setEventBytes(com.google.protobuf.ByteString value) { return this; } + private float matchConfidence_; + /** + * + * + *
+     * The confidence of the match. Values range from 0.0 (completely uncertain)
+     * to 1.0 (completely certain).
+     * This value is for informational purpose only and is only used to help match
+     * the best intent within the classification threshold. This value may change
+     * for the same end-user expression at any time due to a model retraining or
+     * change in implementation.
+     * 
+ * + * float match_confidence = 9; + * + * @return The matchConfidence. + */ + @java.lang.Override + public float getMatchConfidence() { + return matchConfidence_; + } + /** + * + * + *
+     * The confidence of the match. Values range from 0.0 (completely uncertain)
+     * to 1.0 (completely certain).
+     * This value is for informational purpose only and is only used to help match
+     * the best intent within the classification threshold. This value may change
+     * for the same end-user expression at any time due to a model retraining or
+     * change in implementation.
+     * 
+ * + * float match_confidence = 9; + * + * @param value The matchConfidence to set. + * @return This builder for chaining. + */ + public Builder setMatchConfidence(float value) { + + matchConfidence_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * The confidence of the match. Values range from 0.0 (completely uncertain)
+     * to 1.0 (completely certain).
+     * This value is for informational purpose only and is only used to help match
+     * the best intent within the classification threshold. This value may change
+     * for the same end-user expression at any time due to a model retraining or
+     * change in implementation.
+     * 
+ * + * float match_confidence = 9; + * + * @return This builder for chaining. + */ + public Builder clearMatchConfidence() { + + matchConfidence_ = 0F; + onChanged(); + return this; + } + + private com.google.protobuf.Struct parameters_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Struct, + com.google.protobuf.Struct.Builder, + com.google.protobuf.StructOrBuilder> + parametersBuilder_; + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + * + * @return Whether the parameters field is set. + */ + public boolean hasParameters() { + return parametersBuilder_ != null || parameters_ != null; + } + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + * + * @return The parameters. + */ + public com.google.protobuf.Struct getParameters() { + if (parametersBuilder_ == null) { + return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_; + } else { + return parametersBuilder_.getMessage(); + } + } + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + public Builder setParameters(com.google.protobuf.Struct value) { + if (parametersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + parameters_ = value; + onChanged(); + } else { + parametersBuilder_.setMessage(value); + } + + return this; + } + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + public Builder setParameters(com.google.protobuf.Struct.Builder builderForValue) { + if (parametersBuilder_ == null) { + parameters_ = builderForValue.build(); + onChanged(); + } else { + parametersBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + public Builder mergeParameters(com.google.protobuf.Struct value) { + if (parametersBuilder_ == null) { + if (parameters_ != null) { + parameters_ = + com.google.protobuf.Struct.newBuilder(parameters_).mergeFrom(value).buildPartial(); + } else { + parameters_ = value; + } + onChanged(); + } else { + parametersBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + public Builder clearParameters() { + if (parametersBuilder_ == null) { + parameters_ = null; + onChanged(); + } else { + parameters_ = null; + parametersBuilder_ = null; + } + + return this; + } + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + public com.google.protobuf.Struct.Builder getParametersBuilder() { + + onChanged(); + return getParametersFieldBuilder().getBuilder(); + } + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + public com.google.protobuf.StructOrBuilder getParametersOrBuilder() { + if (parametersBuilder_ != null) { + return parametersBuilder_.getMessageOrBuilder(); + } else { + return parameters_ == null ? com.google.protobuf.Struct.getDefaultInstance() : parameters_; + } + } + /** + * + * + *
+     * The collection of current parameters at the time of this response.
+     * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Struct, + com.google.protobuf.Struct.Builder, + com.google.protobuf.StructOrBuilder> + getParametersFieldBuilder() { + if (parametersBuilder_ == null) { + parametersBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Struct, + com.google.protobuf.Struct.Builder, + com.google.protobuf.StructOrBuilder>( + getParameters(), getParentForChildren(), isClean()); + parameters_ = null; + } + return parametersBuilder_; + } + private com.google.protobuf.Struct cxSessionParameters_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, @@ -2003,12 +2388,14 @@ public Builder setEventBytes(com.google.protobuf.ByteString value) { *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; * * @return Whether the cxSessionParameters field is set. */ + @java.lang.Deprecated public boolean hasCxSessionParameters() { return cxSessionParametersBuilder_ != null || cxSessionParameters_ != null; } @@ -2018,12 +2405,14 @@ public boolean hasCxSessionParameters() { *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; * * @return The cxSessionParameters. */ + @java.lang.Deprecated public com.google.protobuf.Struct getCxSessionParameters() { if (cxSessionParametersBuilder_ == null) { return cxSessionParameters_ == null @@ -2039,10 +2428,12 @@ public com.google.protobuf.Struct getCxSessionParameters() { *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ + @java.lang.Deprecated public Builder setCxSessionParameters(com.google.protobuf.Struct value) { if (cxSessionParametersBuilder_ == null) { if (value == null) { @@ -2062,10 +2453,12 @@ public Builder setCxSessionParameters(com.google.protobuf.Struct value) { *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ + @java.lang.Deprecated public Builder setCxSessionParameters(com.google.protobuf.Struct.Builder builderForValue) { if (cxSessionParametersBuilder_ == null) { cxSessionParameters_ = builderForValue.build(); @@ -2082,10 +2475,12 @@ public Builder setCxSessionParameters(com.google.protobuf.Struct.Builder builder *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ + @java.lang.Deprecated public Builder mergeCxSessionParameters(com.google.protobuf.Struct value) { if (cxSessionParametersBuilder_ == null) { if (cxSessionParameters_ != null) { @@ -2109,10 +2504,12 @@ public Builder mergeCxSessionParameters(com.google.protobuf.Struct value) { *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ + @java.lang.Deprecated public Builder clearCxSessionParameters() { if (cxSessionParametersBuilder_ == null) { cxSessionParameters_ = null; @@ -2130,10 +2527,12 @@ public Builder clearCxSessionParameters() { *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ + @java.lang.Deprecated public com.google.protobuf.Struct.Builder getCxSessionParametersBuilder() { onChanged(); @@ -2145,10 +2544,12 @@ public com.google.protobuf.Struct.Builder getCxSessionParametersBuilder() { *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ + @java.lang.Deprecated public com.google.protobuf.StructOrBuilder getCxSessionParametersOrBuilder() { if (cxSessionParametersBuilder_ != null) { return cxSessionParametersBuilder_.getMessageOrBuilder(); @@ -2164,9 +2565,10 @@ public com.google.protobuf.StructOrBuilder getCxSessionParametersOrBuilder() { *
      * The collection of current Dialogflow CX agent session parameters at the
      * time of this response.
+     * Deprecated: Use `parameters` instead.
      * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReplyOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReplyOrBuilder.java index ecab61c17..06c5070cb 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReplyOrBuilder.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutomatedAgentReplyOrBuilder.java @@ -198,18 +198,73 @@ com.google.cloud.dialogflow.v2beta1.ResponseMessageOrBuilder getResponseMessages */ com.google.protobuf.ByteString getEventBytes(); + /** + * + * + *
+   * The confidence of the match. Values range from 0.0 (completely uncertain)
+   * to 1.0 (completely certain).
+   * This value is for informational purpose only and is only used to help match
+   * the best intent within the classification threshold. This value may change
+   * for the same end-user expression at any time due to a model retraining or
+   * change in implementation.
+   * 
+ * + * float match_confidence = 9; + * + * @return The matchConfidence. + */ + float getMatchConfidence(); + + /** + * + * + *
+   * The collection of current parameters at the time of this response.
+   * 
+ * + * .google.protobuf.Struct parameters = 10; + * + * @return Whether the parameters field is set. + */ + boolean hasParameters(); + /** + * + * + *
+   * The collection of current parameters at the time of this response.
+   * 
+ * + * .google.protobuf.Struct parameters = 10; + * + * @return The parameters. + */ + com.google.protobuf.Struct getParameters(); + /** + * + * + *
+   * The collection of current parameters at the time of this response.
+   * 
+ * + * .google.protobuf.Struct parameters = 10; + */ + com.google.protobuf.StructOrBuilder getParametersOrBuilder(); + /** * * *
    * The collection of current Dialogflow CX agent session parameters at the
    * time of this response.
+   * Deprecated: Use `parameters` instead.
    * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; * * @return Whether the cxSessionParameters field is set. */ + @java.lang.Deprecated boolean hasCxSessionParameters(); /** * @@ -217,12 +272,14 @@ com.google.cloud.dialogflow.v2beta1.ResponseMessageOrBuilder getResponseMessages *
    * The collection of current Dialogflow CX agent session parameters at the
    * time of this response.
+   * Deprecated: Use `parameters` instead.
    * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; * * @return The cxSessionParameters. */ + @java.lang.Deprecated com.google.protobuf.Struct getCxSessionParameters(); /** * @@ -230,10 +287,12 @@ com.google.cloud.dialogflow.v2beta1.ResponseMessageOrBuilder getResponseMessages *
    * The collection of current Dialogflow CX agent session parameters at the
    * time of this response.
+   * Deprecated: Use `parameters` instead.
    * 
* - * .google.protobuf.Struct cx_session_parameters = 6; + * .google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; */ + @java.lang.Deprecated com.google.protobuf.StructOrBuilder getCxSessionParametersOrBuilder(); public com.google.cloud.dialogflow.v2beta1.AutomatedAgentReply.ResponseCase getResponseCase(); 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 77647b375..39110d518 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 @@ -573,68 +573,70 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "tch\0228\n\007intents\030\001 \003(\0132\'.google.cloud.dial" + "ogflow.v2beta1.Intent*?\n\nIntentView\022\033\n\027I" + "NTENT_VIEW_UNSPECIFIED\020\000\022\024\n\020INTENT_VIEW_" - + "FULL\020\0012\330\021\n\007Intents\022\305\002\n\013ListIntents\0223.goo" + + "FULL\020\0012\241\022\n\007Intents\022\216\003\n\013ListIntents\0223.goo" + "gle.cloud.dialogflow.v2beta1.ListIntents" + "Request\0324.google.cloud.dialogflow.v2beta" - + "1.ListIntentsResponse\"\312\001\202\323\344\223\002\243\001\022*/v2beta" + + "1.ListIntentsResponse\"\223\002\202\323\344\223\002\354\001\022*/v2beta" + "1/{parent=projects/*/agent}/intentsZ8\0226/" + "v2beta1/{parent=projects/*/locations/*/a" + "gent}/intentsZ;\0229/v2beta1/{parent=projec" - + "ts/*/agent/environments/*}/intents\332A\006par" - + "ent\332A\024parent,language_code\022\362\001\n\tGetIntent" - + "\0221.google.cloud.dialogflow.v2beta1.GetIn" - + "tentRequest\032\'.google.cloud.dialogflow.v2" - + "beta1.Intent\"\210\001\202\323\344\223\002f\022*/v2beta1/{name=pr" - + "ojects/*/agent/intents/*}Z8\0226/v2beta1/{n" - + "ame=projects/*/locations/*/agent/intents" - + "/*}\332A\004name\332A\022name,language_code\022\232\002\n\014Crea" - + "teIntent\0224.google.cloud.dialogflow.v2bet" - + "a1.CreateIntentRequest\032\'.google.cloud.di" - + "alogflow.v2beta1.Intent\"\252\001\202\323\344\223\002v\"*/v2bet" - + "a1/{parent=projects/*/agent}/intents:\006in" - + "tentZ@\"6/v2beta1/{parent=projects/*/loca" - + "tions/*/agent}/intents:\006intent\332A\rparent," - + "intent\332A\033parent,intent,language_code\022\323\002\n" - + "\014UpdateIntent\0224.google.cloud.dialogflow." - + "v2beta1.UpdateIntentRequest\032\'.google.clo" - + "ud.dialogflow.v2beta1.Intent\"\343\001\202\323\344\223\002\204\00121" - + "/v2beta1/{intent.name=projects/*/agent/i" - + "ntents/*}:\006intentZG2=/v2beta1/{intent.na" - + "me=projects/*/locations/*/agent/intents/" - + "*}:\006intent\332A\022intent,update_mask\332A\006intent" - + "\332A\024intent,language_code\332A intent,languag" - + "e_code,update_mask\022\321\001\n\014DeleteIntent\0224.go" - + "ogle.cloud.dialogflow.v2beta1.DeleteInte" - + "ntRequest\032\026.google.protobuf.Empty\"s\202\323\344\223\002" - + "f**/v2beta1/{name=projects/*/agent/inten" - + "ts/*}Z8*6/v2beta1/{name=projects/*/locat" - + "ions/*/agent/intents/*}\332A\004name\022\213\003\n\022Batch" - + "UpdateIntents\022:.google.cloud.dialogflow." - + "v2beta1.BatchUpdateIntentsRequest\032\035.goog" - + "le.longrunning.Operation\"\231\002\202\323\344\223\002\204\001\"6/v2b" - + "eta1/{parent=projects/*/agent}/intents:b" - + "atchUpdate:\001*ZG\"B/v2beta1/{parent=projec" - + "ts/*/locations/*/agent}/intents:batchUpd" - + "ate:\001*\332A\027parent,intent_batch_uri\332A\032paren" - + "t,intent_batch_inline\312AT\n:google.cloud.d" - + "ialogflow.v2beta1.BatchUpdateIntentsResp" - + "onse\022\026google.protobuf.Struct\022\300\002\n\022BatchDe" - + "leteIntents\022:.google.cloud.dialogflow.v2" - + "beta1.BatchDeleteIntentsRequest\032\035.google" - + ".longrunning.Operation\"\316\001\202\323\344\223\002\204\001\"6/v2bet" - + "a1/{parent=projects/*/agent}/intents:bat" - + "chDelete:\001*ZG\"B/v2beta1/{parent=projects" - + "/*/locations/*/agent}/intents:batchDelet" - + "e:\001*\332A\016parent,intents\312A/\n\025google.protobu" - + "f.Empty\022\026google.protobuf.Struct\032x\312A\031dial" - + "ogflow.googleapis.com\322AYhttps://www.goog" - + "leapis.com/auth/cloud-platform,https://w" - + "ww.googleapis.com/auth/dialogflowB\251\001\n#co" - + "m.google.cloud.dialogflow.v2beta1B\013Inten" - + "tProtoP\001ZIgoogle.golang.org/genproto/goo" - + "gleapis/cloud/dialogflow/v2beta1;dialogf" - + "low\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dialogflow.V2" - + "beta1b\006proto3" + + "ts/*/agent/environments/*}/intentsZG\022E/v" + + "2beta1/{parent=projects/*/locations/*/ag" + + "ent/environments/*}/intents\332A\006parent\332A\024p" + + "arent,language_code\022\362\001\n\tGetIntent\0221.goog" + + "le.cloud.dialogflow.v2beta1.GetIntentReq" + + "uest\032\'.google.cloud.dialogflow.v2beta1.I" + + "ntent\"\210\001\202\323\344\223\002f\022*/v2beta1/{name=projects/" + + "*/agent/intents/*}Z8\0226/v2beta1/{name=pro" + + "jects/*/locations/*/agent/intents/*}\332A\004n" + + "ame\332A\022name,language_code\022\232\002\n\014CreateInten" + + "t\0224.google.cloud.dialogflow.v2beta1.Crea" + + "teIntentRequest\032\'.google.cloud.dialogflo" + + "w.v2beta1.Intent\"\252\001\202\323\344\223\002v\"*/v2beta1/{par" + + "ent=projects/*/agent}/intents:\006intentZ@\"" + + "6/v2beta1/{parent=projects/*/locations/*" + + "/agent}/intents:\006intent\332A\rparent,intent\332" + + "A\033parent,intent,language_code\022\323\002\n\014Update" + + "Intent\0224.google.cloud.dialogflow.v2beta1" + + ".UpdateIntentRequest\032\'.google.cloud.dial" + + "ogflow.v2beta1.Intent\"\343\001\202\323\344\223\002\204\00121/v2beta" + + "1/{intent.name=projects/*/agent/intents/" + + "*}:\006intentZG2=/v2beta1/{intent.name=proj" + + "ects/*/locations/*/agent/intents/*}:\006int" + + "ent\332A\022intent,update_mask\332A\006intent\332A\024inte" + + "nt,language_code\332A intent,language_code," + + "update_mask\022\321\001\n\014DeleteIntent\0224.google.cl" + + "oud.dialogflow.v2beta1.DeleteIntentReque" + + "st\032\026.google.protobuf.Empty\"s\202\323\344\223\002f**/v2b" + + "eta1/{name=projects/*/agent/intents/*}Z8" + + "*6/v2beta1/{name=projects/*/locations/*/" + + "agent/intents/*}\332A\004name\022\213\003\n\022BatchUpdateI" + + "ntents\022:.google.cloud.dialogflow.v2beta1" + + ".BatchUpdateIntentsRequest\032\035.google.long" + + "running.Operation\"\231\002\202\323\344\223\002\204\001\"6/v2beta1/{p" + + "arent=projects/*/agent}/intents:batchUpd" + + "ate:\001*ZG\"B/v2beta1/{parent=projects/*/lo" + + "cations/*/agent}/intents:batchUpdate:\001*\332" + + "A\027parent,intent_batch_uri\332A\032parent,inten" + + "t_batch_inline\312AT\n:google.cloud.dialogfl" + + "ow.v2beta1.BatchUpdateIntentsResponse\022\026g" + + "oogle.protobuf.Struct\022\300\002\n\022BatchDeleteInt" + + "ents\022:.google.cloud.dialogflow.v2beta1.B" + + "atchDeleteIntentsRequest\032\035.google.longru" + + "nning.Operation\"\316\001\202\323\344\223\002\204\001\"6/v2beta1/{par" + + "ent=projects/*/agent}/intents:batchDelet" + + "e:\001*ZG\"B/v2beta1/{parent=projects/*/loca" + + "tions/*/agent}/intents:batchDelete:\001*\332A\016" + + "parent,intents\312A/\n\025google.protobuf.Empty" + + "\022\026google.protobuf.Struct\032x\312A\031dialogflow." + + "googleapis.com\322AYhttps://www.googleapis." + + "com/auth/cloud-platform,https://www.goog" + + "leapis.com/auth/dialogflowB\251\001\n#com.googl" + + "e.cloud.dialogflow.v2beta1B\013IntentProtoP" + + "\001ZIgoogle.golang.org/genproto/googleapis" + + "/cloud/dialogflow/v2beta1;dialogflow\370\001\001\242" + + "\002\002DF\252\002\037Google.Cloud.Dialogflow.V2beta1b\006" + + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java index f14bf4ea8..7dafd8f42 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java @@ -147,7 +147,14 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * *
    * Required. The agent to list all intents from.
-   * Format: `projects/<Project ID>/agent`.
+   * Format: `projects/<Project ID>/agent` or `projects/<Project
+   * ID>/locations/<Location ID>/agent`.
+   * Alternatively, you can specify the environment to list intents for.
+   * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+   * or `projects/<Project ID>/locations/<Location
+   * ID>/agent/environments/<Environment ID>`.
+   * Note: training phrases of the intents will not be returned for non-draft
+   * environment.
    * 
* * @@ -173,7 +180,14 @@ public java.lang.String getParent() { * *
    * Required. The agent to list all intents from.
-   * Format: `projects/<Project ID>/agent`.
+   * Format: `projects/<Project ID>/agent` or `projects/<Project
+   * ID>/locations/<Location ID>/agent`.
+   * Alternatively, you can specify the environment to list intents for.
+   * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+   * or `projects/<Project ID>/locations/<Location
+   * ID>/agent/environments/<Environment ID>`.
+   * Note: training phrases of the intents will not be returned for non-draft
+   * environment.
    * 
* * @@ -745,7 +759,14 @@ public Builder mergeFrom( * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * @@ -770,7 +791,14 @@ public java.lang.String getParent() { * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * @@ -795,7 +823,14 @@ public com.google.protobuf.ByteString getParentBytes() { * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * @@ -819,7 +854,14 @@ public Builder setParent(java.lang.String value) { * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * @@ -839,7 +881,14 @@ public Builder clearParent() { * *
      * Required. The agent to list all intents from.
-     * Format: `projects/<Project ID>/agent`.
+     * Format: `projects/<Project ID>/agent` or `projects/<Project
+     * ID>/locations/<Location ID>/agent`.
+     * Alternatively, you can specify the environment to list intents for.
+     * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+     * or `projects/<Project ID>/locations/<Location
+     * ID>/agent/environments/<Environment ID>`.
+     * Note: training phrases of the intents will not be returned for non-draft
+     * environment.
      * 
* * diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequestOrBuilder.java index 67d07ecd4..75b6d4a47 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequestOrBuilder.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequestOrBuilder.java @@ -28,7 +28,14 @@ public interface ListIntentsRequestOrBuilder * *
    * Required. The agent to list all intents from.
-   * Format: `projects/<Project ID>/agent`.
+   * Format: `projects/<Project ID>/agent` or `projects/<Project
+   * ID>/locations/<Location ID>/agent`.
+   * Alternatively, you can specify the environment to list intents for.
+   * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+   * or `projects/<Project ID>/locations/<Location
+   * ID>/agent/environments/<Environment ID>`.
+   * Note: training phrases of the intents will not be returned for non-draft
+   * environment.
    * 
* * @@ -43,7 +50,14 @@ public interface ListIntentsRequestOrBuilder * *
    * Required. The agent to list all intents from.
-   * Format: `projects/<Project ID>/agent`.
+   * Format: `projects/<Project ID>/agent` or `projects/<Project
+   * ID>/locations/<Location ID>/agent`.
+   * Alternatively, you can specify the environment to list intents for.
+   * Format: `projects/<Project ID>/agent/environments/<Environment ID>`
+   * or `projects/<Project ID>/locations/<Location
+   * ID>/agent/environments/<Environment ID>`.
+   * Note: training phrases of the intents will not be returned for non-draft
+   * environment.
    * 
* * diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ParticipantProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ParticipantProto.java index 2bebc5144..167f709c1 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ParticipantProto.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ParticipantProto.java @@ -256,227 +256,229 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "le.protobuf.FieldMaskB\003\340A\002\"`\n\013OutputAudi" + "o\022B\n\006config\030\001 \001(\01322.google.cloud.dialogf" + "low.v2beta1.OutputAudioConfig\022\r\n\005audio\030\002" - + " \001(\014\"\322\002\n\023AutomatedAgentReply\022W\n\026detect_i" + + " \001(\014\"\235\003\n\023AutomatedAgentReply\022W\n\026detect_i" + "ntent_response\030\001 \001(\01325.google.cloud.dial" + "ogflow.v2beta1.DetectIntentResponseH\000\022K\n" + "\021response_messages\030\003 \003(\01320.google.cloud." + "dialogflow.v2beta1.ResponseMessage\0227\n\006in" + "tent\030\004 \001(\tB%\372A\"\n dialogflow.googleapis.c" - + "om/IntentH\001\022\017\n\005event\030\005 \001(\tH\001\0226\n\025cx_sessi" - + "on_parameters\030\006 \001(\0132\027.google.protobuf.St" - + "ructB\n\n\010responseB\007\n\005match\"\252\001\n\021Suggestion" - + "Feature\022E\n\004type\030\001 \001(\01627.google.cloud.dia" - + "logflow.v2beta1.SuggestionFeature.Type\"N" - + "\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\026\n\022ARTICLE_" - + "SUGGESTION\020\001\022\007\n\003FAQ\020\002\022\017\n\013SMART_REPLY\020\003\"\315" - + "\003\n\025AnalyzeContentRequest\022B\n\013participant\030" - + "\001 \001(\tB-\340A\002\372A\'\n%dialogflow.googleapis.com" - + "/Participant\022@\n\ntext_input\030\006 \001(\0132*.googl" - + "e.cloud.dialogflow.v2beta1.TextInputH\000\022B" - + "\n\013event_input\030\010 \001(\0132+.google.cloud.dialo" - + "gflow.v2beta1.EventInputH\000\022N\n\022reply_audi" - + "o_config\030\005 \001(\01322.google.cloud.dialogflow" - + ".v2beta1.OutputAudioConfig\022F\n\014query_para" - + "ms\030\t \001(\01320.google.cloud.dialogflow.v2bet" - + "a1.QueryParameters\0225\n\021message_send_time\030" - + "\n \001(\0132\032.google.protobuf.Timestamp\022\022\n\nreq" - + "uest_id\030\013 \001(\tB\007\n\005input\",\n\016DtmfParameters" - + "\022\032\n\022accepts_dtmf_input\030\001 \001(\010\"\374\003\n\026Analyze" - + "ContentResponse\022\022\n\nreply_text\030\001 \001(\t\022A\n\013r" - + "eply_audio\030\002 \001(\0132,.google.cloud.dialogfl" - + "ow.v2beta1.OutputAudio\022S\n\025automated_agen" - + "t_reply\030\003 \001(\01324.google.cloud.dialogflow." - + "v2beta1.AutomatedAgentReply\0229\n\007message\030\005" - + " \001(\0132(.google.cloud.dialogflow.v2beta1.M" - + "essage\022Y\n\036human_agent_suggestion_results" - + "\030\006 \003(\01321.google.cloud.dialogflow.v2beta1" - + ".SuggestionResult\022V\n\033end_user_suggestion" - + "_results\030\007 \003(\01321.google.cloud.dialogflow" - + ".v2beta1.SuggestionResult\022H\n\017dtmf_parame" - + "ters\030\t \001(\0132/.google.cloud.dialogflow.v2b" - + "eta1.DtmfParameters\"j\n\024AnnotatedMessageP" - + "art\022\014\n\004text\030\001 \001(\t\022\023\n\013entity_type\030\002 \001(\t\022/" - + "\n\017formatted_value\030\003 \001(\0132\026.google.protobu" - + "f.Value\"s\n\021MessageAnnotation\022D\n\005parts\030\001 " - + "\003(\01325.google.cloud.dialogflow.v2beta1.An" - + "notatedMessagePart\022\030\n\020contain_entities\030\002" - + " \001(\010\"\325\001\n\rArticleAnswer\022\r\n\005title\030\001 \001(\t\022\013\n" - + "\003uri\030\002 \001(\t\022\020\n\010snippets\030\003 \003(\t\022N\n\010metadata" - + "\030\005 \003(\0132<.google.cloud.dialogflow.v2beta1" - + ".ArticleAnswer.MetadataEntry\022\025\n\ranswer_r" - + "ecord\030\006 \001(\t\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(" - + "\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\345\001\n\tFaqAnswer\022\016\n\006an" - + "swer\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\022\020\n\010questi" - + "on\030\003 \001(\t\022\016\n\006source\030\004 \001(\t\022J\n\010metadata\030\005 \003" - + "(\01328.google.cloud.dialogflow.v2beta1.Faq" - + "Answer.MetadataEntry\022\025\n\ranswer_record\030\006 " - + "\001(\t\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" - + "ue\030\002 \001(\t:\0028\001\"L\n\020SmartReplyAnswer\022\r\n\005repl" - + "y\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\022\025\n\ranswer_re" - + "cord\030\003 \001(\t\"\371\002\n\020SuggestionResult\022#\n\005error" - + "\030\001 \001(\0132\022.google.rpc.StatusH\000\022]\n\031suggest_" - + "articles_response\030\002 \001(\01328.google.cloud.d" - + "ialogflow.v2beta1.SuggestArticlesRespons" - + "eH\000\022b\n\034suggest_faq_answers_response\030\003 \001(" - + "\0132:.google.cloud.dialogflow.v2beta1.Sugg" - + "estFaqAnswersResponseH\000\022f\n\036suggest_smart" - + "_replies_response\030\004 \001(\0132<.google.cloud.d" - + "ialogflow.v2beta1.SuggestSmartRepliesRes" - + "ponseH\000B\025\n\023suggestion_response\"\265\001\n\026Sugge" - + "stArticlesRequest\022=\n\006parent\030\001 \001(\tB-\340A\002\372A" - + "\'\n%dialogflow.googleapis.com/Participant" - + "\022A\n\016latest_message\030\002 \001(\tB)\340A\001\372A#\n!dialog" - + "flow.googleapis.com/Message\022\031\n\014context_s" - + "ize\030\003 \001(\005B\003\340A\001\"\220\001\n\027SuggestArticlesRespon" - + "se\022G\n\017article_answers\030\001 \003(\0132..google.clo" - + "ud.dialogflow.v2beta1.ArticleAnswer\022\026\n\016l" - + "atest_message\030\002 \001(\t\022\024\n\014context_size\030\003 \001(" - + "\005\"\267\001\n\030SuggestFaqAnswersRequest\022=\n\006parent" - + "\030\001 \001(\tB-\340A\002\372A\'\n%dialogflow.googleapis.co" - + "m/Participant\022A\n\016latest_message\030\002 \001(\tB)\340" - + "A\001\372A#\n!dialogflow.googleapis.com/Message" - + "\022\031\n\014context_size\030\003 \001(\005B\003\340A\001\"\212\001\n\031SuggestF" - + "aqAnswersResponse\022?\n\013faq_answers\030\001 \003(\0132*" - + ".google.cloud.dialogflow.v2beta1.FaqAnsw" - + "er\022\026\n\016latest_message\030\002 \001(\t\022\024\n\014context_si" - + "ze\030\003 \001(\005\"\371\001\n\032SuggestSmartRepliesRequest\022" - + "=\n\006parent\030\001 \001(\tB-\340A\002\372A\'\n%dialogflow.goog" - + "leapis.com/Participant\022F\n\022current_text_i" - + "nput\030\004 \001(\0132*.google.cloud.dialogflow.v2b" - + "eta1.TextInput\022>\n\016latest_message\030\002 \001(\tB&" - + "\372A#\n!dialogflow.googleapis.com/Message\022\024" - + "\n\014context_size\030\003 \001(\005\"\233\001\n\033SuggestSmartRep" - + "liesResponse\022N\n\023smart_reply_answers\030\001 \003(" - + "\01321.google.cloud.dialogflow.v2beta1.Smar" - + "tReplyAnswer\022\026\n\016latest_message\030\002 \001(\t\022\024\n\014" - + "context_size\030\003 \001(\005\"\304\005\n\nSuggestion\022\014\n\004nam" - + "e\030\001 \001(\t\022E\n\010articles\030\002 \003(\01323.google.cloud" - + ".dialogflow.v2beta1.Suggestion.Article\022J" - + "\n\013faq_answers\030\004 \003(\01325.google.cloud.dialo" - + "gflow.v2beta1.Suggestion.FaqAnswer\022/\n\013cr" - + "eate_time\030\005 \001(\0132\032.google.protobuf.Timest" - + "amp\022\026\n\016latest_message\030\007 \001(\t\032\324\001\n\007Article\022" - + "\r\n\005title\030\001 \001(\t\022\013\n\003uri\030\002 \001(\t\022\020\n\010snippets\030" - + "\003 \003(\t\022S\n\010metadata\030\005 \003(\0132A.google.cloud.d" - + "ialogflow.v2beta1.Suggestion.Article.Met" - + "adataEntry\022\025\n\ranswer_record\030\006 \001(\t\032/\n\rMet" - + "adataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" - + "8\001\032\360\001\n\tFaqAnswer\022\016\n\006answer\030\001 \001(\t\022\022\n\nconf" - + "idence\030\002 \001(\002\022\020\n\010question\030\003 \001(\t\022\016\n\006source" - + "\030\004 \001(\t\022U\n\010metadata\030\005 \003(\0132C.google.cloud." - + "dialogflow.v2beta1.Suggestion.FaqAnswer." - + "MetadataEntry\022\025\n\ranswer_record\030\006 \001(\t\032/\n\r" - + "MetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(" - + "\t:\0028\001:\002\030\001\"c\n\026ListSuggestionsRequest\022\016\n\006p" - + "arent\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_t" - + "oken\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t:\002\030\001\"x\n\027ListSu" - + "ggestionsResponse\022@\n\013suggestions\030\001 \003(\0132+" - + ".google.cloud.dialogflow.v2beta1.Suggest" - + "ion\022\027\n\017next_page_token\030\002 \001(\t:\002\030\001\"\\\n\030Comp" - + "ileSuggestionRequest\022\016\n\006parent\030\001 \001(\t\022\026\n\016" - + "latest_message\030\002 \001(\t\022\024\n\014context_size\030\003 \001" - + "(\005:\002\030\001\"\216\001\n\031CompileSuggestionResponse\022?\n\n" - + "suggestion\030\001 \001(\0132+.google.cloud.dialogfl" - + "ow.v2beta1.Suggestion\022\026\n\016latest_message\030" - + "\002 \001(\t\022\024\n\014context_size\030\003 \001(\005:\002\030\001\"\263\003\n\017Resp" - + "onseMessage\022E\n\004text\030\001 \001(\01325.google.cloud" - + ".dialogflow.v2beta1.ResponseMessage.Text" - + "H\000\022*\n\007payload\030\002 \001(\0132\027.google.protobuf.St" - + "ructH\000\022_\n\022live_agent_handoff\030\003 \001(\0132A.goo" - + "gle.cloud.dialogflow.v2beta1.ResponseMes" - + "sage.LiveAgentHandoffH\000\022Z\n\017end_interacti" - + "on\030\004 \001(\0132?.google.cloud.dialogflow.v2bet" - + "a1.ResponseMessage.EndInteractionH\000\032\024\n\004T" - + "ext\022\014\n\004text\030\001 \003(\t\032=\n\020LiveAgentHandoff\022)\n" - + "\010metadata\030\001 \001(\0132\027.google.protobuf.Struct" - + "\032\020\n\016EndInteractionB\t\n\007message2\310\031\n\014Partic" - + "ipants\022\271\002\n\021CreateParticipant\0229.google.cl" - + "oud.dialogflow.v2beta1.CreateParticipant" - + "Request\032,.google.cloud.dialogflow.v2beta" - + "1.Participant\"\272\001\202\323\344\223\002\236\001\"9/v2beta1/{paren" - + "t=projects/*/conversations/*}/participan" - + "ts:\013participantZT\"E/v2beta1/{parent=proj" - + "ects/*/locations/*/conversations/*}/part" - + "icipants:\013participant\332A\022parent,participa" - + "nt\022\213\002\n\016GetParticipant\0226.google.cloud.dia" - + "logflow.v2beta1.GetParticipantRequest\032,." - + "google.cloud.dialogflow.v2beta1.Particip" - + "ant\"\222\001\202\323\344\223\002\204\001\0229/v2beta1/{name=projects/*" - + "/conversations/*/participants/*}ZG\022E/v2b" - + "eta1/{name=projects/*/locations/*/conver" - + "sations/*/participants/*}\332A\004name\022\236\002\n\020Lis" - + "tParticipants\0228.google.cloud.dialogflow." - + "v2beta1.ListParticipantsRequest\0329.google" - + ".cloud.dialogflow.v2beta1.ListParticipan" - + "tsResponse\"\224\001\202\323\344\223\002\204\001\0229/v2beta1/{parent=p" - + "rojects/*/conversations/*}/participantsZ" - + "G\022E/v2beta1/{parent=projects/*/locations" - + "/*/conversations/*}/participants\332A\006paren" - + "t\022\326\002\n\021UpdateParticipant\0229.google.cloud.d" - + "ialogflow.v2beta1.UpdateParticipantReque" + + "om/IntentH\001\022\017\n\005event\030\005 \001(\tH\001\022\030\n\020match_co" + + "nfidence\030\t \001(\002\022+\n\nparameters\030\n \001(\0132\027.goo" + + "gle.protobuf.Struct\022:\n\025cx_session_parame" + + "ters\030\006 \001(\0132\027.google.protobuf.StructB\002\030\001B" + + "\n\n\010responseB\007\n\005match\"\252\001\n\021SuggestionFeatu" + + "re\022E\n\004type\030\001 \001(\01627.google.cloud.dialogfl" + + "ow.v2beta1.SuggestionFeature.Type\"N\n\004Typ" + + "e\022\024\n\020TYPE_UNSPECIFIED\020\000\022\026\n\022ARTICLE_SUGGE" + + "STION\020\001\022\007\n\003FAQ\020\002\022\017\n\013SMART_REPLY\020\003\"\315\003\n\025An" + + "alyzeContentRequest\022B\n\013participant\030\001 \001(\t" + + "B-\340A\002\372A\'\n%dialogflow.googleapis.com/Part" + + "icipant\022@\n\ntext_input\030\006 \001(\0132*.google.clo" + + "ud.dialogflow.v2beta1.TextInputH\000\022B\n\013eve" + + "nt_input\030\010 \001(\0132+.google.cloud.dialogflow" + + ".v2beta1.EventInputH\000\022N\n\022reply_audio_con" + + "fig\030\005 \001(\01322.google.cloud.dialogflow.v2be" + + "ta1.OutputAudioConfig\022F\n\014query_params\030\t " + + "\001(\01320.google.cloud.dialogflow.v2beta1.Qu" + + "eryParameters\0225\n\021message_send_time\030\n \001(\013" + + "2\032.google.protobuf.Timestamp\022\022\n\nrequest_" + + "id\030\013 \001(\tB\007\n\005input\",\n\016DtmfParameters\022\032\n\022a" + + "ccepts_dtmf_input\030\001 \001(\010\"\374\003\n\026AnalyzeConte" + + "ntResponse\022\022\n\nreply_text\030\001 \001(\t\022A\n\013reply_" + + "audio\030\002 \001(\0132,.google.cloud.dialogflow.v2" + + "beta1.OutputAudio\022S\n\025automated_agent_rep" + + "ly\030\003 \001(\01324.google.cloud.dialogflow.v2bet" + + "a1.AutomatedAgentReply\0229\n\007message\030\005 \001(\0132" + + "(.google.cloud.dialogflow.v2beta1.Messag" + + "e\022Y\n\036human_agent_suggestion_results\030\006 \003(" + + "\01321.google.cloud.dialogflow.v2beta1.Sugg" + + "estionResult\022V\n\033end_user_suggestion_resu" + + "lts\030\007 \003(\01321.google.cloud.dialogflow.v2be" + + "ta1.SuggestionResult\022H\n\017dtmf_parameters\030" + + "\t \001(\0132/.google.cloud.dialogflow.v2beta1." + + "DtmfParameters\"j\n\024AnnotatedMessagePart\022\014" + + "\n\004text\030\001 \001(\t\022\023\n\013entity_type\030\002 \001(\t\022/\n\017for" + + "matted_value\030\003 \001(\0132\026.google.protobuf.Val" + + "ue\"s\n\021MessageAnnotation\022D\n\005parts\030\001 \003(\01325" + + ".google.cloud.dialogflow.v2beta1.Annotat" + + "edMessagePart\022\030\n\020contain_entities\030\002 \001(\010\"" + + "\325\001\n\rArticleAnswer\022\r\n\005title\030\001 \001(\t\022\013\n\003uri\030" + + "\002 \001(\t\022\020\n\010snippets\030\003 \003(\t\022N\n\010metadata\030\005 \003(" + + "\0132<.google.cloud.dialogflow.v2beta1.Arti" + + "cleAnswer.MetadataEntry\022\025\n\ranswer_record" + + "\030\006 \001(\t\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" + + "value\030\002 \001(\t:\0028\001\"\345\001\n\tFaqAnswer\022\016\n\006answer\030" + + "\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\022\020\n\010question\030\003 " + + "\001(\t\022\016\n\006source\030\004 \001(\t\022J\n\010metadata\030\005 \003(\01328." + + "google.cloud.dialogflow.v2beta1.FaqAnswe" + + "r.MetadataEntry\022\025\n\ranswer_record\030\006 \001(\t\032/" + + "\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 " + + "\001(\t:\0028\001\"L\n\020SmartReplyAnswer\022\r\n\005reply\030\001 \001" + + "(\t\022\022\n\nconfidence\030\002 \001(\002\022\025\n\ranswer_record\030" + + "\003 \001(\t\"\371\002\n\020SuggestionResult\022#\n\005error\030\001 \001(" + + "\0132\022.google.rpc.StatusH\000\022]\n\031suggest_artic" + + "les_response\030\002 \001(\01328.google.cloud.dialog" + + "flow.v2beta1.SuggestArticlesResponseH\000\022b" + + "\n\034suggest_faq_answers_response\030\003 \001(\0132:.g" + + "oogle.cloud.dialogflow.v2beta1.SuggestFa" + + "qAnswersResponseH\000\022f\n\036suggest_smart_repl" + + "ies_response\030\004 \001(\0132<.google.cloud.dialog" + + "flow.v2beta1.SuggestSmartRepliesResponse" + + "H\000B\025\n\023suggestion_response\"\265\001\n\026SuggestArt" + + "iclesRequest\022=\n\006parent\030\001 \001(\tB-\340A\002\372A\'\n%di" + + "alogflow.googleapis.com/Participant\022A\n\016l" + + "atest_message\030\002 \001(\tB)\340A\001\372A#\n!dialogflow." + + "googleapis.com/Message\022\031\n\014context_size\030\003" + + " \001(\005B\003\340A\001\"\220\001\n\027SuggestArticlesResponse\022G\n" + + "\017article_answers\030\001 \003(\0132..google.cloud.di" + + "alogflow.v2beta1.ArticleAnswer\022\026\n\016latest" + + "_message\030\002 \001(\t\022\024\n\014context_size\030\003 \001(\005\"\267\001\n" + + "\030SuggestFaqAnswersRequest\022=\n\006parent\030\001 \001(" + + "\tB-\340A\002\372A\'\n%dialogflow.googleapis.com/Par" + + "ticipant\022A\n\016latest_message\030\002 \001(\tB)\340A\001\372A#" + + "\n!dialogflow.googleapis.com/Message\022\031\n\014c" + + "ontext_size\030\003 \001(\005B\003\340A\001\"\212\001\n\031SuggestFaqAns" + + "wersResponse\022?\n\013faq_answers\030\001 \003(\0132*.goog" + + "le.cloud.dialogflow.v2beta1.FaqAnswer\022\026\n" + + "\016latest_message\030\002 \001(\t\022\024\n\014context_size\030\003 " + + "\001(\005\"\371\001\n\032SuggestSmartRepliesRequest\022=\n\006pa" + + "rent\030\001 \001(\tB-\340A\002\372A\'\n%dialogflow.googleapi" + + "s.com/Participant\022F\n\022current_text_input\030" + + "\004 \001(\0132*.google.cloud.dialogflow.v2beta1." + + "TextInput\022>\n\016latest_message\030\002 \001(\tB&\372A#\n!" + + "dialogflow.googleapis.com/Message\022\024\n\014con" + + "text_size\030\003 \001(\005\"\233\001\n\033SuggestSmartRepliesR" + + "esponse\022N\n\023smart_reply_answers\030\001 \003(\01321.g" + + "oogle.cloud.dialogflow.v2beta1.SmartRepl" + + "yAnswer\022\026\n\016latest_message\030\002 \001(\t\022\024\n\014conte" + + "xt_size\030\003 \001(\005\"\304\005\n\nSuggestion\022\014\n\004name\030\001 \001" + + "(\t\022E\n\010articles\030\002 \003(\01323.google.cloud.dial" + + "ogflow.v2beta1.Suggestion.Article\022J\n\013faq" + + "_answers\030\004 \003(\01325.google.cloud.dialogflow" + + ".v2beta1.Suggestion.FaqAnswer\022/\n\013create_" + + "time\030\005 \001(\0132\032.google.protobuf.Timestamp\022\026" + + "\n\016latest_message\030\007 \001(\t\032\324\001\n\007Article\022\r\n\005ti" + + "tle\030\001 \001(\t\022\013\n\003uri\030\002 \001(\t\022\020\n\010snippets\030\003 \003(\t" + + "\022S\n\010metadata\030\005 \003(\0132A.google.cloud.dialog" + + "flow.v2beta1.Suggestion.Article.Metadata" + + "Entry\022\025\n\ranswer_record\030\006 \001(\t\032/\n\rMetadata" + + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032\360\001" + + "\n\tFaqAnswer\022\016\n\006answer\030\001 \001(\t\022\022\n\nconfidenc" + + "e\030\002 \001(\002\022\020\n\010question\030\003 \001(\t\022\016\n\006source\030\004 \001(" + + "\t\022U\n\010metadata\030\005 \003(\0132C.google.cloud.dialo" + + "gflow.v2beta1.Suggestion.FaqAnswer.Metad" + + "ataEntry\022\025\n\ranswer_record\030\006 \001(\t\032/\n\rMetad" + + "ataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" + + ":\002\030\001\"c\n\026ListSuggestionsRequest\022\016\n\006parent" + + "\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030" + + "\003 \001(\t\022\016\n\006filter\030\004 \001(\t:\002\030\001\"x\n\027ListSuggest" + + "ionsResponse\022@\n\013suggestions\030\001 \003(\0132+.goog" + + "le.cloud.dialogflow.v2beta1.Suggestion\022\027" + + "\n\017next_page_token\030\002 \001(\t:\002\030\001\"\\\n\030CompileSu" + + "ggestionRequest\022\016\n\006parent\030\001 \001(\t\022\026\n\016lates" + + "t_message\030\002 \001(\t\022\024\n\014context_size\030\003 \001(\005:\002\030" + + "\001\"\216\001\n\031CompileSuggestionResponse\022?\n\nsugge" + + "stion\030\001 \001(\0132+.google.cloud.dialogflow.v2" + + "beta1.Suggestion\022\026\n\016latest_message\030\002 \001(\t" + + "\022\024\n\014context_size\030\003 \001(\005:\002\030\001\"\263\003\n\017ResponseM" + + "essage\022E\n\004text\030\001 \001(\01325.google.cloud.dial" + + "ogflow.v2beta1.ResponseMessage.TextH\000\022*\n" + + "\007payload\030\002 \001(\0132\027.google.protobuf.StructH" + + "\000\022_\n\022live_agent_handoff\030\003 \001(\0132A.google.c" + + "loud.dialogflow.v2beta1.ResponseMessage." + + "LiveAgentHandoffH\000\022Z\n\017end_interaction\030\004 " + + "\001(\0132?.google.cloud.dialogflow.v2beta1.Re" + + "sponseMessage.EndInteractionH\000\032\024\n\004Text\022\014" + + "\n\004text\030\001 \003(\t\032=\n\020LiveAgentHandoff\022)\n\010meta" + + "data\030\001 \001(\0132\027.google.protobuf.Struct\032\020\n\016E" + + "ndInteractionB\t\n\007message2\310\031\n\014Participant" + + "s\022\271\002\n\021CreateParticipant\0229.google.cloud.d" + + "ialogflow.v2beta1.CreateParticipantReque" + "st\032,.google.cloud.dialogflow.v2beta1.Par" - + "ticipant\"\327\001\202\323\344\223\002\266\0012E/v2beta1/{participan" - + "t.name=projects/*/conversations/*/partic" - + "ipants/*}:\013participantZ`2Q/v2beta1/{part" - + "icipant.name=projects/*/locations/*/conv" - + "ersations/*/participants/*}:\013participant" - + "\332A\027participant,update_mask\022\364\002\n\016AnalyzeCo" - + "ntent\0226.google.cloud.dialogflow.v2beta1." - + "AnalyzeContentRequest\0327.google.cloud.dia" - + "logflow.v2beta1.AnalyzeContentResponse\"\360" - + "\001\202\323\344\223\002\266\001\"O/v2beta1/{participant=projects" - + "/*/conversations/*/participants/*}:analy" - + "zeContent:\001*Z`\"[/v2beta1/{participant=pr" - + "ojects/*/locations/*/conversations/*/par" - + "ticipants/*}:analyzeContent:\001*\332A\026partici" - + "pant,text_input\332A\027participant,event_inpu" - + "t\022\335\002\n\017SuggestArticles\0227.google.cloud.dia" - + "logflow.v2beta1.SuggestArticlesRequest\0328" - + ".google.cloud.dialogflow.v2beta1.Suggest" - + "ArticlesResponse\"\326\001\202\323\344\223\002\306\001\"W/v2beta1/{pa" - + "rent=projects/*/conversations/*/particip" - + "ants/*}/suggestions:suggestArticles:\001*Zh" - + "\"c/v2beta1/{parent=projects/*/locations/" - + "*/conversations/*/participants/*}/sugges" - + "tions:suggestArticles:\001*\332A\006parent\022\347\002\n\021Su" - + "ggestFaqAnswers\0229.google.cloud.dialogflo" - + "w.v2beta1.SuggestFaqAnswersRequest\032:.goo" - + "gle.cloud.dialogflow.v2beta1.SuggestFaqA" - + "nswersResponse\"\332\001\202\323\344\223\002\312\001\"Y/v2beta1/{pare" - + "nt=projects/*/conversations/*/participan" - + "ts/*}/suggestions:suggestFaqAnswers:\001*Zj" - + "\"e/v2beta1/{parent=projects/*/locations/" - + "*/conversations/*/participants/*}/sugges" - + "tions:suggestFaqAnswers:\001*\332A\006parent\022\361\002\n\023" - + "SuggestSmartReplies\022;.google.cloud.dialo" - + "gflow.v2beta1.SuggestSmartRepliesRequest" - + "\032<.google.cloud.dialogflow.v2beta1.Sugge" - + "stSmartRepliesResponse\"\336\001\202\323\344\223\002\316\001\"[/v2bet" - + "a1/{parent=projects/*/conversations/*/pa" - + "rticipants/*}/suggestions:suggestSmartRe" - + "plies:\001*Zl\"g/v2beta1/{parent=projects/*/" - + "locations/*/conversations/*/participants" - + "/*}/suggestions:suggestSmartReplies:\001*\332A" - + "\006parent\022\330\001\n\017ListSuggestions\0227.google.clo" - + "ud.dialogflow.v2beta1.ListSuggestionsReq" - + "uest\0328.google.cloud.dialogflow.v2beta1.L" - + "istSuggestionsResponse\"R\210\002\001\202\323\344\223\002I\022G/v2be" - + "ta1/{parent=projects/*/conversations/*/p" - + "articipants/*}/suggestions\022\351\001\n\021CompileSu" - + "ggestion\0229.google.cloud.dialogflow.v2bet" - + "a1.CompileSuggestionRequest\032:.google.clo" - + "ud.dialogflow.v2beta1.CompileSuggestionR" - + "esponse\"]\210\002\001\202\323\344\223\002T\"O/v2beta1/{parent=pro" - + "jects/*/conversations/*/participants/*}/" - + "suggestions:compile:\001*\032x\312A\031dialogflow.go" - + "ogleapis.com\322AYhttps://www.googleapis.co" - + "m/auth/cloud-platform,https://www.google" - + "apis.com/auth/dialogflowB\256\001\n#com.google." - + "cloud.dialogflow.v2beta1B\020ParticipantPro" - + "toP\001ZIgoogle.golang.org/genproto/googlea" - + "pis/cloud/dialogflow/v2beta1;dialogflow\370" - + "\001\001\242\002\002DF\252\002\037Google.Cloud.Dialogflow.V2beta" - + "1b\006proto3" + + "ticipant\"\272\001\202\323\344\223\002\236\001\"9/v2beta1/{parent=pro" + + "jects/*/conversations/*}/participants:\013p" + + "articipantZT\"E/v2beta1/{parent=projects/" + + "*/locations/*/conversations/*}/participa" + + "nts:\013participant\332A\022parent,participant\022\213\002" + + "\n\016GetParticipant\0226.google.cloud.dialogfl" + + "ow.v2beta1.GetParticipantRequest\032,.googl" + + "e.cloud.dialogflow.v2beta1.Participant\"\222" + + "\001\202\323\344\223\002\204\001\0229/v2beta1/{name=projects/*/conv" + + "ersations/*/participants/*}ZG\022E/v2beta1/" + + "{name=projects/*/locations/*/conversatio" + + "ns/*/participants/*}\332A\004name\022\236\002\n\020ListPart" + + "icipants\0228.google.cloud.dialogflow.v2bet" + + "a1.ListParticipantsRequest\0329.google.clou" + + "d.dialogflow.v2beta1.ListParticipantsRes" + + "ponse\"\224\001\202\323\344\223\002\204\001\0229/v2beta1/{parent=projec" + + "ts/*/conversations/*}/participantsZG\022E/v" + + "2beta1/{parent=projects/*/locations/*/co" + + "nversations/*}/participants\332A\006parent\022\326\002\n" + + "\021UpdateParticipant\0229.google.cloud.dialog" + + "flow.v2beta1.UpdateParticipantRequest\032,." + + "google.cloud.dialogflow.v2beta1.Particip" + + "ant\"\327\001\202\323\344\223\002\266\0012E/v2beta1/{participant.nam" + + "e=projects/*/conversations/*/participant" + + "s/*}:\013participantZ`2Q/v2beta1/{participa" + + "nt.name=projects/*/locations/*/conversat" + + "ions/*/participants/*}:\013participant\332A\027pa" + + "rticipant,update_mask\022\364\002\n\016AnalyzeContent" + + "\0226.google.cloud.dialogflow.v2beta1.Analy" + + "zeContentRequest\0327.google.cloud.dialogfl" + + "ow.v2beta1.AnalyzeContentResponse\"\360\001\202\323\344\223" + + "\002\266\001\"O/v2beta1/{participant=projects/*/co" + + "nversations/*/participants/*}:analyzeCon" + + "tent:\001*Z`\"[/v2beta1/{participant=project" + + "s/*/locations/*/conversations/*/particip" + + "ants/*}:analyzeContent:\001*\332A\026participant," + + "text_input\332A\027participant,event_input\022\335\002\n" + + "\017SuggestArticles\0227.google.cloud.dialogfl" + + "ow.v2beta1.SuggestArticlesRequest\0328.goog" + + "le.cloud.dialogflow.v2beta1.SuggestArtic" + + "lesResponse\"\326\001\202\323\344\223\002\306\001\"W/v2beta1/{parent=" + + "projects/*/conversations/*/participants/" + + "*}/suggestions:suggestArticles:\001*Zh\"c/v2" + + "beta1/{parent=projects/*/locations/*/con" + + "versations/*/participants/*}/suggestions" + + ":suggestArticles:\001*\332A\006parent\022\347\002\n\021Suggest" + + "FaqAnswers\0229.google.cloud.dialogflow.v2b" + + "eta1.SuggestFaqAnswersRequest\032:.google.c" + + "loud.dialogflow.v2beta1.SuggestFaqAnswer" + + "sResponse\"\332\001\202\323\344\223\002\312\001\"Y/v2beta1/{parent=pr" + + "ojects/*/conversations/*/participants/*}" + + "/suggestions:suggestFaqAnswers:\001*Zj\"e/v2" + + "beta1/{parent=projects/*/locations/*/con" + + "versations/*/participants/*}/suggestions" + + ":suggestFaqAnswers:\001*\332A\006parent\022\361\002\n\023Sugge" + + "stSmartReplies\022;.google.cloud.dialogflow" + + ".v2beta1.SuggestSmartRepliesRequest\032<.go" + + "ogle.cloud.dialogflow.v2beta1.SuggestSma" + + "rtRepliesResponse\"\336\001\202\323\344\223\002\316\001\"[/v2beta1/{p" + + "arent=projects/*/conversations/*/partici" + + "pants/*}/suggestions:suggestSmartReplies" + + ":\001*Zl\"g/v2beta1/{parent=projects/*/locat" + + "ions/*/conversations/*/participants/*}/s" + + "uggestions:suggestSmartReplies:\001*\332A\006pare" + + "nt\022\330\001\n\017ListSuggestions\0227.google.cloud.di" + + "alogflow.v2beta1.ListSuggestionsRequest\032" + + "8.google.cloud.dialogflow.v2beta1.ListSu" + + "ggestionsResponse\"R\210\002\001\202\323\344\223\002I\022G/v2beta1/{" + + "parent=projects/*/conversations/*/partic" + + "ipants/*}/suggestions\022\351\001\n\021CompileSuggest" + + "ion\0229.google.cloud.dialogflow.v2beta1.Co" + + "mpileSuggestionRequest\032:.google.cloud.di" + + "alogflow.v2beta1.CompileSuggestionRespon" + + "se\"]\210\002\001\202\323\344\223\002T\"O/v2beta1/{parent=projects" + + "/*/conversations/*/participants/*}/sugge" + + "stions:compile:\001*\032x\312A\031dialogflow.googlea" + + "pis.com\322AYhttps://www.googleapis.com/aut" + + "h/cloud-platform,https://www.googleapis." + + "com/auth/dialogflowB\256\001\n#com.google.cloud" + + ".dialogflow.v2beta1B\020ParticipantProtoP\001Z" + + "Igoogle.golang.org/genproto/googleapis/c" + + "loud/dialogflow/v2beta1;dialogflow\370\001\001\242\002\002" + + "DF\252\002\037Google.Cloud.Dialogflow.V2beta1b\006pr" + + "oto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -578,6 +580,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ResponseMessages", "Intent", "Event", + "MatchConfidence", + "Parameters", "CxSessionParameters", "Response", "Match", diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java index ae73532a6..1db54a348 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java @@ -245,6 +245,11 @@ private QueryResult( knowledgeAnswers_ = subBuilder.buildPartial(); } + break; + } + case 168: + { + cancelsSlotFilling_ = input.readBool(); break; } default: @@ -586,6 +591,25 @@ public boolean getAllRequiredParamsPresent() { return allRequiredParamsPresent_; } + public static final int CANCELS_SLOT_FILLING_FIELD_NUMBER = 21; + private boolean cancelsSlotFilling_; + /** + * + * + *
+   * Indicates whether the conversational query triggers a cancellation for slot
+   * filling.
+   * 
+ * + * bool cancels_slot_filling = 21; + * + * @return The cancelsSlotFilling. + */ + @java.lang.Override + public boolean getCancelsSlotFilling() { + return cancelsSlotFilling_; + } + public static final int FULFILLMENT_TEXT_FIELD_NUMBER = 6; private volatile java.lang.Object fulfillmentText_; /** @@ -1206,6 +1230,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (knowledgeAnswers_ != null) { output.writeMessage(18, getKnowledgeAnswers()); } + if (cancelsSlotFilling_ != false) { + output.writeBool(21, cancelsSlotFilling_); + } unknownFields.writeTo(output); } @@ -1268,6 +1295,9 @@ public int getSerializedSize() { if (knowledgeAnswers_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(18, getKnowledgeAnswers()); } + if (cancelsSlotFilling_ != false) { + size += com.google.protobuf.CodedOutputStream.computeBoolSize(21, cancelsSlotFilling_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -1294,6 +1324,7 @@ public boolean equals(final java.lang.Object obj) { if (!getParameters().equals(other.getParameters())) return false; } if (getAllRequiredParamsPresent() != other.getAllRequiredParamsPresent()) return false; + if (getCancelsSlotFilling() != other.getCancelsSlotFilling()) return false; if (!getFulfillmentText().equals(other.getFulfillmentText())) return false; if (!getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList())) return false; if (!getWebhookSource().equals(other.getWebhookSource())) return false; @@ -1345,6 +1376,8 @@ public int hashCode() { } hash = (37 * hash) + ALL_REQUIRED_PARAMS_PRESENT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAllRequiredParamsPresent()); + hash = (37 * hash) + CANCELS_SLOT_FILLING_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getCancelsSlotFilling()); hash = (37 * hash) + FULFILLMENT_TEXT_FIELD_NUMBER; hash = (53 * hash) + getFulfillmentText().hashCode(); if (getFulfillmentMessagesCount() > 0) { @@ -1543,6 +1576,8 @@ public Builder clear() { } allRequiredParamsPresent_ = false; + cancelsSlotFilling_ = false; + fulfillmentText_ = ""; if (fulfillmentMessagesBuilder_ == null) { @@ -1629,6 +1664,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryResult buildPartial() { result.parameters_ = parametersBuilder_.build(); } result.allRequiredParamsPresent_ = allRequiredParamsPresent_; + result.cancelsSlotFilling_ = cancelsSlotFilling_; result.fulfillmentText_ = fulfillmentText_; if (fulfillmentMessagesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { @@ -1746,6 +1782,9 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2beta1.QueryResult other) if (other.getAllRequiredParamsPresent() != false) { setAllRequiredParamsPresent(other.getAllRequiredParamsPresent()); } + if (other.getCancelsSlotFilling() != false) { + setCancelsSlotFilling(other.getCancelsSlotFilling()); + } if (!other.getFulfillmentText().isEmpty()) { fulfillmentText_ = other.fulfillmentText_; onChanged(); @@ -2658,6 +2697,61 @@ public Builder clearAllRequiredParamsPresent() { return this; } + private boolean cancelsSlotFilling_; + /** + * + * + *
+     * Indicates whether the conversational query triggers a cancellation for slot
+     * filling.
+     * 
+ * + * bool cancels_slot_filling = 21; + * + * @return The cancelsSlotFilling. + */ + @java.lang.Override + public boolean getCancelsSlotFilling() { + return cancelsSlotFilling_; + } + /** + * + * + *
+     * Indicates whether the conversational query triggers a cancellation for slot
+     * filling.
+     * 
+ * + * bool cancels_slot_filling = 21; + * + * @param value The cancelsSlotFilling to set. + * @return This builder for chaining. + */ + public Builder setCancelsSlotFilling(boolean value) { + + cancelsSlotFilling_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Indicates whether the conversational query triggers a cancellation for slot
+     * filling.
+     * 
+ * + * bool cancels_slot_filling = 21; + * + * @return This builder for chaining. + */ + public Builder clearCancelsSlotFilling() { + + cancelsSlotFilling_ = false; + onChanged(); + return this; + } + private java.lang.Object fulfillmentText_ = ""; /** * diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResultOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResultOrBuilder.java index 3ee2fde3f..95ef23dba 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResultOrBuilder.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResultOrBuilder.java @@ -229,6 +229,20 @@ public interface QueryResultOrBuilder */ boolean getAllRequiredParamsPresent(); + /** + * + * + *
+   * Indicates whether the conversational query triggers a cancellation for slot
+   * filling.
+   * 
+ * + * bool cancels_slot_filling = 21; + * + * @return The cancelsSlotFilling. + */ + boolean getCancelsSlotFilling(); + /** * * diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java index 1feb00556..7cd324ab8 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java @@ -157,113 +157,115 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\n\005event\030\003 \001(\0132+.google.cloud.dialogflow." + "v2beta1.EventInputH\000\022D\n\004dtmf\030\004 \001(\01324.goo" + "gle.cloud.dialogflow.v2beta1.TelephonyDt" - + "mfEventsH\000B\007\n\005input\"\362\005\n\013QueryResult\022\022\n\nq" + + "mfEventsH\000B\007\n\005input\"\220\006\n\013QueryResult\022\022\n\nq" + "uery_text\030\001 \001(\t\022\025\n\rlanguage_code\030\017 \001(\t\022%" + "\n\035speech_recognition_confidence\030\002 \001(\002\022\016\n" + "\006action\030\003 \001(\t\022+\n\nparameters\030\004 \001(\0132\027.goog" + "le.protobuf.Struct\022#\n\033all_required_param" - + "s_present\030\005 \001(\010\022\030\n\020fulfillment_text\030\006 \001(" - + "\t\022M\n\024fulfillment_messages\030\007 \003(\0132/.google" - + ".cloud.dialogflow.v2beta1.Intent.Message" - + "\022\026\n\016webhook_source\030\010 \001(\t\0220\n\017webhook_payl" - + "oad\030\t \001(\0132\027.google.protobuf.Struct\022A\n\017ou" - + "tput_contexts\030\n \003(\0132(.google.cloud.dialo" - + "gflow.v2beta1.Context\0227\n\006intent\030\013 \001(\0132\'." - + "google.cloud.dialogflow.v2beta1.Intent\022#" - + "\n\033intent_detection_confidence\030\014 \001(\002\0220\n\017d" - + "iagnostic_info\030\016 \001(\0132\027.google.protobuf.S" - + "truct\022[\n\031sentiment_analysis_result\030\021 \001(\013" - + "28.google.cloud.dialogflow.v2beta1.Senti" - + "mentAnalysisResult\022L\n\021knowledge_answers\030" - + "\022 \001(\01321.google.cloud.dialogflow.v2beta1." - + "KnowledgeAnswers\"\257\003\n\020KnowledgeAnswers\022I\n" - + "\007answers\030\001 \003(\01328.google.cloud.dialogflow" - + ".v2beta1.KnowledgeAnswers.Answer\032\317\002\n\006Ans" - + "wer\0227\n\006source\030\001 \001(\tB\'\372A$\n\"dialogflow.goo" - + "gleapis.com/Document\022\024\n\014faq_question\030\002 \001" - + "(\t\022\016\n\006answer\030\003 \001(\t\022m\n\026match_confidence_l" - + "evel\030\004 \001(\0162M.google.cloud.dialogflow.v2b" - + "eta1.KnowledgeAnswers.Answer.MatchConfid" - + "enceLevel\022\030\n\020match_confidence\030\005 \001(\002\"]\n\024M" - + "atchConfidenceLevel\022&\n\"MATCH_CONFIDENCE_" - + "LEVEL_UNSPECIFIED\020\000\022\007\n\003LOW\020\001\022\n\n\006MEDIUM\020\002" - + "\022\010\n\004HIGH\020\003\"\253\003\n\034StreamingDetectIntentRequ" - + "est\022:\n\007session\030\001 \001(\tB)\340A\002\372A#\n!dialogflow" - + ".googleapis.com/Session\022F\n\014query_params\030" - + "\002 \001(\01320.google.cloud.dialogflow.v2beta1." - + "QueryParameters\022E\n\013query_input\030\003 \001(\0132+.g" - + "oogle.cloud.dialogflow.v2beta1.QueryInpu" - + "tB\003\340A\002\022\034\n\020single_utterance\030\004 \001(\010B\002\030\001\022O\n\023" - + "output_audio_config\030\005 \001(\01322.google.cloud" - + ".dialogflow.v2beta1.OutputAudioConfig\022<\n" - + "\030output_audio_config_mask\030\007 \001(\0132\032.google" - + ".protobuf.FieldMask\022\023\n\013input_audio\030\006 \001(\014" - + "\"\265\003\n\035StreamingDetectIntentResponse\022\023\n\013re" - + "sponse_id\030\001 \001(\t\022W\n\022recognition_result\030\002 " - + "\001(\0132;.google.cloud.dialogflow.v2beta1.St" - + "reamingRecognitionResult\022B\n\014query_result" - + "\030\003 \001(\0132,.google.cloud.dialogflow.v2beta1" - + ".QueryResult\022O\n\031alternative_query_result" - + "s\030\007 \003(\0132,.google.cloud.dialogflow.v2beta" - + "1.QueryResult\022*\n\016webhook_status\030\004 \001(\0132\022." - + "google.rpc.Status\022\024\n\014output_audio\030\005 \001(\014\022" - + "O\n\023output_audio_config\030\006 \001(\01322.google.cl" - + "oud.dialogflow.v2beta1.OutputAudioConfig" - + "\"\356\003\n\032StreamingRecognitionResult\022]\n\014messa" - + "ge_type\030\001 \001(\0162G.google.cloud.dialogflow." - + "v2beta1.StreamingRecognitionResult.Messa" - + "geType\022\022\n\ntranscript\030\002 \001(\t\022\020\n\010is_final\030\003" - + " \001(\010\022\022\n\nconfidence\030\004 \001(\002\022\021\n\tstability\030\006 " - + "\001(\002\022I\n\020speech_word_info\030\007 \003(\0132/.google.c" - + "loud.dialogflow.v2beta1.SpeechWordInfo\0224" - + "\n\021speech_end_offset\030\010 \001(\0132\031.google.proto" - + "buf.Duration\022I\n\013dtmf_digits\030\005 \001(\01324.goog" - + "le.cloud.dialogflow.v2beta1.TelephonyDtm" - + "fEvents\"X\n\013MessageType\022\034\n\030MESSAGE_TYPE_U" - + "NSPECIFIED\020\000\022\016\n\nTRANSCRIPT\020\001\022\033\n\027END_OF_S" - + "INGLE_UTTERANCE\020\002\"0\n\tTextInput\022\014\n\004text\030\001" - + " \001(\t\022\025\n\rlanguage_code\030\002 \001(\t\"^\n\nEventInpu" - + "t\022\014\n\004name\030\001 \001(\t\022+\n\nparameters\030\002 \001(\0132\027.go" - + "ogle.protobuf.Struct\022\025\n\rlanguage_code\030\003 " - + "\001(\t\"F\n\036SentimentAnalysisRequestConfig\022$\n" - + "\034analyze_query_text_sentiment\030\001 \001(\010\"c\n\027S" - + "entimentAnalysisResult\022H\n\024query_text_sen" - + "timent\030\001 \001(\0132*.google.cloud.dialogflow.v" - + "2beta1.Sentiment\"-\n\tSentiment\022\r\n\005score\030\001" - + " \001(\002\022\021\n\tmagnitude\030\002 \001(\0022\215\006\n\010Sessions\022\347\003\n" - + "\014DetectIntent\0224.google.cloud.dialogflow." - + "v2beta1.DetectIntentRequest\0325.google.clo" - + "ud.dialogflow.v2beta1.DetectIntentRespon" - + "se\"\351\002\202\323\344\223\002\314\002\";/v2beta1/{session=projects" - + "/*/agent/sessions/*}:detectIntent:\001*ZW\"R" - + "/v2beta1/{session=projects/*/agent/envir" - + "onments/*/users/*/sessions/*}:detectInte" - + "nt:\001*ZL\"G/v2beta1/{session=projects/*/lo" - + "cations/*/agent/sessions/*}:detectIntent" - + ":\001*Zc\"^/v2beta1/{session=projects/*/loca" - + "tions/*/agent/environments/*/users/*/ses" - + "sions/*}:detectIntent:\001*\332A\023session,query" - + "_input\022\234\001\n\025StreamingDetectIntent\022=.googl" - + "e.cloud.dialogflow.v2beta1.StreamingDete" - + "ctIntentRequest\032>.google.cloud.dialogflo" - + "w.v2beta1.StreamingDetectIntentResponse\"" - + "\000(\0010\001\032x\312A\031dialogflow.googleapis.com\322AYht" - + "tps://www.googleapis.com/auth/cloud-plat" - + "form,https://www.googleapis.com/auth/dia" - + "logflowB\377\003\n#com.google.cloud.dialogflow." - + "v2beta1B\014SessionProtoP\001ZIgoogle.golang.o" - + "rg/genproto/googleapis/cloud/dialogflow/" - + "v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037Google.Clou" - + "d.Dialogflow.V2beta1\352A\321\002\n!dialogflow.goo" - + "gleapis.com/Session\022+projects/{project}/" - + "agent/sessions/{session}\022Sprojects/{proj" - + "ect}/agent/environments/{environment}/us" - + "ers/{user}/sessions/{session}\022@projects/" - + "{project}/locations/{location}/agent/ses" - + "sions/{session}\022hprojects/{project}/loca" - + "tions/{location}/agent/environments/{env" - + "ironment}/users/{user}/sessions/{session" - + "}b\006proto3" + + "s_present\030\005 \001(\010\022\034\n\024cancels_slot_filling\030" + + "\025 \001(\010\022\030\n\020fulfillment_text\030\006 \001(\t\022M\n\024fulfi" + + "llment_messages\030\007 \003(\0132/.google.cloud.dia" + + "logflow.v2beta1.Intent.Message\022\026\n\016webhoo" + + "k_source\030\010 \001(\t\0220\n\017webhook_payload\030\t \001(\0132" + + "\027.google.protobuf.Struct\022A\n\017output_conte" + + "xts\030\n \003(\0132(.google.cloud.dialogflow.v2be" + + "ta1.Context\0227\n\006intent\030\013 \001(\0132\'.google.clo" + + "ud.dialogflow.v2beta1.Intent\022#\n\033intent_d" + + "etection_confidence\030\014 \001(\002\0220\n\017diagnostic_" + + "info\030\016 \001(\0132\027.google.protobuf.Struct\022[\n\031s" + + "entiment_analysis_result\030\021 \001(\01328.google." + + "cloud.dialogflow.v2beta1.SentimentAnalys" + + "isResult\022L\n\021knowledge_answers\030\022 \001(\01321.go" + + "ogle.cloud.dialogflow.v2beta1.KnowledgeA" + + "nswers\"\257\003\n\020KnowledgeAnswers\022I\n\007answers\030\001" + + " \003(\01328.google.cloud.dialogflow.v2beta1.K" + + "nowledgeAnswers.Answer\032\317\002\n\006Answer\0227\n\006sou" + + "rce\030\001 \001(\tB\'\372A$\n\"dialogflow.googleapis.co" + + "m/Document\022\024\n\014faq_question\030\002 \001(\t\022\016\n\006answ" + + "er\030\003 \001(\t\022m\n\026match_confidence_level\030\004 \001(\016" + + "2M.google.cloud.dialogflow.v2beta1.Knowl" + + "edgeAnswers.Answer.MatchConfidenceLevel\022" + + "\030\n\020match_confidence\030\005 \001(\002\"]\n\024MatchConfid" + + "enceLevel\022&\n\"MATCH_CONFIDENCE_LEVEL_UNSP" + + "ECIFIED\020\000\022\007\n\003LOW\020\001\022\n\n\006MEDIUM\020\002\022\010\n\004HIGH\020\003" + + "\"\253\003\n\034StreamingDetectIntentRequest\022:\n\007ses" + + "sion\030\001 \001(\tB)\340A\002\372A#\n!dialogflow.googleapi" + + "s.com/Session\022F\n\014query_params\030\002 \001(\01320.go" + + "ogle.cloud.dialogflow.v2beta1.QueryParam" + + "eters\022E\n\013query_input\030\003 \001(\0132+.google.clou" + + "d.dialogflow.v2beta1.QueryInputB\003\340A\002\022\034\n\020" + + "single_utterance\030\004 \001(\010B\002\030\001\022O\n\023output_aud" + + "io_config\030\005 \001(\01322.google.cloud.dialogflo" + + "w.v2beta1.OutputAudioConfig\022<\n\030output_au" + + "dio_config_mask\030\007 \001(\0132\032.google.protobuf." + + "FieldMask\022\023\n\013input_audio\030\006 \001(\014\"\265\003\n\035Strea" + + "mingDetectIntentResponse\022\023\n\013response_id\030" + + "\001 \001(\t\022W\n\022recognition_result\030\002 \001(\0132;.goog" + + "le.cloud.dialogflow.v2beta1.StreamingRec" + + "ognitionResult\022B\n\014query_result\030\003 \001(\0132,.g" + + "oogle.cloud.dialogflow.v2beta1.QueryResu" + + "lt\022O\n\031alternative_query_results\030\007 \003(\0132,." + + "google.cloud.dialogflow.v2beta1.QueryRes" + + "ult\022*\n\016webhook_status\030\004 \001(\0132\022.google.rpc" + + ".Status\022\024\n\014output_audio\030\005 \001(\014\022O\n\023output_" + + "audio_config\030\006 \001(\01322.google.cloud.dialog" + + "flow.v2beta1.OutputAudioConfig\"\231\004\n\032Strea" + + "mingRecognitionResult\022]\n\014message_type\030\001 " + + "\001(\0162G.google.cloud.dialogflow.v2beta1.St" + + "reamingRecognitionResult.MessageType\022\022\n\n" + + "transcript\030\002 \001(\t\022\020\n\010is_final\030\003 \001(\010\022\022\n\nco" + + "nfidence\030\004 \001(\002\022\021\n\tstability\030\006 \001(\002\022I\n\020spe" + + "ech_word_info\030\007 \003(\0132/.google.cloud.dialo" + + "gflow.v2beta1.SpeechWordInfo\0224\n\021speech_e" + + "nd_offset\030\010 \001(\0132\031.google.protobuf.Durati" + + "on\022I\n\013dtmf_digits\030\005 \001(\01324.google.cloud.d" + + "ialogflow.v2beta1.TelephonyDtmfEvents\"\202\001" + + "\n\013MessageType\022\034\n\030MESSAGE_TYPE_UNSPECIFIE" + + "D\020\000\022\016\n\nTRANSCRIPT\020\001\022\017\n\013DTMF_DIGITS\020\003\022\033\n\027" + + "END_OF_SINGLE_UTTERANCE\020\002\022\027\n\023PARTIAL_DTM" + + "F_DIGITS\020\004\"0\n\tTextInput\022\014\n\004text\030\001 \001(\t\022\025\n" + + "\rlanguage_code\030\002 \001(\t\"^\n\nEventInput\022\014\n\004na" + + "me\030\001 \001(\t\022+\n\nparameters\030\002 \001(\0132\027.google.pr" + + "otobuf.Struct\022\025\n\rlanguage_code\030\003 \001(\t\"F\n\036" + + "SentimentAnalysisRequestConfig\022$\n\034analyz" + + "e_query_text_sentiment\030\001 \001(\010\"c\n\027Sentimen" + + "tAnalysisResult\022H\n\024query_text_sentiment\030" + + "\001 \001(\0132*.google.cloud.dialogflow.v2beta1." + + "Sentiment\"-\n\tSentiment\022\r\n\005score\030\001 \001(\002\022\021\n" + + "\tmagnitude\030\002 \001(\0022\215\006\n\010Sessions\022\347\003\n\014Detect" + + "Intent\0224.google.cloud.dialogflow.v2beta1" + + ".DetectIntentRequest\0325.google.cloud.dial" + + "ogflow.v2beta1.DetectIntentResponse\"\351\002\202\323" + + "\344\223\002\314\002\";/v2beta1/{session=projects/*/agen" + + "t/sessions/*}:detectIntent:\001*ZW\"R/v2beta" + + "1/{session=projects/*/agent/environments" + + "/*/users/*/sessions/*}:detectIntent:\001*ZL" + + "\"G/v2beta1/{session=projects/*/locations" + + "/*/agent/sessions/*}:detectIntent:\001*Zc\"^" + + "/v2beta1/{session=projects/*/locations/*" + + "/agent/environments/*/users/*/sessions/*" + + "}:detectIntent:\001*\332A\023session,query_input\022" + + "\234\001\n\025StreamingDetectIntent\022=.google.cloud" + + ".dialogflow.v2beta1.StreamingDetectInten" + + "tRequest\032>.google.cloud.dialogflow.v2bet" + + "a1.StreamingDetectIntentResponse\"\000(\0010\001\032x" + + "\312A\031dialogflow.googleapis.com\322AYhttps://w" + + "ww.googleapis.com/auth/cloud-platform,ht" + + "tps://www.googleapis.com/auth/dialogflow" + + "B\377\003\n#com.google.cloud.dialogflow.v2beta1" + + "B\014SessionProtoP\001ZIgoogle.golang.org/genp" + + "roto/googleapis/cloud/dialogflow/v2beta1" + + ";dialogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dialo" + + "gflow.V2beta1\352A\321\002\n!dialogflow.googleapis" + + ".com/Session\022+projects/{project}/agent/s" + + "essions/{session}\022Sprojects/{project}/ag" + + "ent/environments/{environment}/users/{us" + + "er}/sessions/{session}\022@projects/{projec" + + "t}/locations/{location}/agent/sessions/{" + + "session}\022hprojects/{project}/locations/{" + + "location}/agent/environments/{environmen" + + "t}/users/{user}/sessions/{session}b\006prot" + + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -358,6 +360,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Action", "Parameters", "AllRequiredParamsPresent", + "CancelsSlotFilling", "FulfillmentText", "FulfillmentMessages", "WebhookSource", diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java index b51f8df49..4a1671b41 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java @@ -233,6 +233,19 @@ public enum MessageType implements com.google.protobuf.ProtocolMessageEnum { * TRANSCRIPT = 1; */ TRANSCRIPT(1), + /** + * + * + *
+     * Message contains DTMF digits. When the client gets the message, it
+     * should stop sending additional data, half-close the gRPC connection, and
+     * wait for any additional results until the server closes the gRPC.
+     * connection.
+     * 
+ * + * DTMF_DIGITS = 3; + */ + DTMF_DIGITS(3), /** * * @@ -249,6 +262,18 @@ public enum MessageType implements com.google.protobuf.ProtocolMessageEnum { * END_OF_SINGLE_UTTERANCE = 2; */ END_OF_SINGLE_UTTERANCE(2), + /** + * + * + *
+     * Message contains DTMF digits. Before a message with DTMF_DIGITS is sent,
+     * a message with PARTIAL_DTMF_DIGITS may be sent with DTMF digits collected
+     * up to the time of sending, which represents an intermediate result.
+     * 
+ * + * PARTIAL_DTMF_DIGITS = 4; + */ + PARTIAL_DTMF_DIGITS(4), UNRECOGNIZED(-1), ; @@ -272,6 +297,19 @@ public enum MessageType implements com.google.protobuf.ProtocolMessageEnum { * TRANSCRIPT = 1; */ public static final int TRANSCRIPT_VALUE = 1; + /** + * + * + *
+     * Message contains DTMF digits. When the client gets the message, it
+     * should stop sending additional data, half-close the gRPC connection, and
+     * wait for any additional results until the server closes the gRPC.
+     * connection.
+     * 
+ * + * DTMF_DIGITS = 3; + */ + public static final int DTMF_DIGITS_VALUE = 3; /** * * @@ -288,6 +326,18 @@ public enum MessageType implements com.google.protobuf.ProtocolMessageEnum { * END_OF_SINGLE_UTTERANCE = 2; */ public static final int END_OF_SINGLE_UTTERANCE_VALUE = 2; + /** + * + * + *
+     * Message contains DTMF digits. Before a message with DTMF_DIGITS is sent,
+     * a message with PARTIAL_DTMF_DIGITS may be sent with DTMF digits collected
+     * up to the time of sending, which represents an intermediate result.
+     * 
+ * + * PARTIAL_DTMF_DIGITS = 4; + */ + public static final int PARTIAL_DTMF_DIGITS_VALUE = 4; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -317,8 +367,12 @@ public static MessageType forNumber(int value) { return MESSAGE_TYPE_UNSPECIFIED; case 1: return TRANSCRIPT; + case 3: + return DTMF_DIGITS; case 2: return END_OF_SINGLE_UTTERANCE; + case 4: + return PARTIAL_DTMF_DIGITS; default: return null; } 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 62258c1bb..226c9a0d5 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 @@ -287,9 +287,7 @@ message CreateEnvironmentRequest { // The request message for [Environments.UpdateEnvironment][google.cloud.dialogflow.v2beta1.Environments.UpdateEnvironment]. message UpdateEnvironmentRequest { // Required. The environment to update. - Environment environment = 1 [ - (google.api.field_behavior) = REQUIRED - ]; + Environment environment = 1 [(google.api.field_behavior) = REQUIRED]; // Required. The mask to control which fields get updated. google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED]; 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 ba8c1f830..ee31c026f 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 @@ -53,6 +53,9 @@ service Intents { additional_bindings { get: "/v2beta1/{parent=projects/*/agent/environments/*}/intents" } + additional_bindings { + get: "/v2beta1/{parent=projects/*/locations/*/agent/environments/*}/intents" + } }; option (google.api.method_signature) = "parent"; option (google.api.method_signature) = "parent,language_code"; @@ -1198,7 +1201,15 @@ message Intent { // The request message for [Intents.ListIntents][google.cloud.dialogflow.v2beta1.Intents.ListIntents]. message ListIntentsRequest { // Required. The agent to list all intents from. - // Format: `projects//agent`. + // Format: `projects//agent` or `projects//locations//agent`. + // + // Alternatively, you can specify the environment to list intents for. + // Format: `projects//agent/environments/` + // or `projects//locations//agent/environments/`. + // Note: training phrases of the intents will not be returned for non-draft + // environment. string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/participant.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/participant.proto index d4400025e..d6ba092b4 100644 --- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/participant.proto +++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/participant.proto @@ -410,9 +410,21 @@ message AutomatedAgentReply { string event = 5; } + // The confidence of the match. Values range from 0.0 (completely uncertain) + // to 1.0 (completely certain). + // This value is for informational purpose only and is only used to help match + // the best intent within the classification threshold. This value may change + // for the same end-user expression at any time due to a model retraining or + // change in implementation. + float match_confidence = 9; + + // The collection of current parameters at the time of this response. + google.protobuf.Struct parameters = 10; + // The collection of current Dialogflow CX agent session parameters at the // time of this response. - google.protobuf.Struct cx_session_parameters = 6; + // Deprecated: Use `parameters` instead. + google.protobuf.Struct cx_session_parameters = 6 [deprecated = true]; } // The type of Human Agent Assistant API suggestion to perform, and the maximum 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 2eba19bd3..6a5a67cde 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 @@ -342,6 +342,10 @@ message QueryResult { // matched intent doesn't contain any required parameters. bool all_required_params_present = 5; + // Indicates whether the conversational query triggers a cancellation for slot + // filling. + bool cancels_slot_filling = 21; + // The text to be pronounced to the user or shown on the screen. // Note: This is a legacy field, `fulfillment_messages` should be preferred. string fulfillment_text = 6; @@ -659,6 +663,12 @@ message StreamingRecognitionResult { // Message contains a (possibly partial) transcript. TRANSCRIPT = 1; + // Message contains DTMF digits. When the client gets the message, it + // should stop sending additional data, half-close the gRPC connection, and + // wait for any additional results until the server closes the gRPC. + // connection. + DTMF_DIGITS = 3; + // Event indicates that the server has detected the end of the user's speech // utterance and expects no additional speech. Therefore, the server will // not process additional audio (although it may subsequently return @@ -667,6 +677,11 @@ message StreamingRecognitionResult { // until the server closes the gRPC connection. This message is only sent if // `single_utterance` was set to `true`, and is not used otherwise. END_OF_SINGLE_UTTERANCE = 2; + + // Message contains DTMF digits. Before a message with DTMF_DIGITS is sent, + // a message with PARTIAL_DTMF_DIGITS may be sent with DTMF digits collected + // up to the time of sending, which represents an intermediate result. + PARTIAL_DTMF_DIGITS = 4; } // Type of the result message. diff --git a/synth.metadata b/synth.metadata index ab5865f53..39e17297c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,23 +4,23 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dialogflow.git", - "sha": "6cd34208911fa52c8ee0acd3937520273bdadac0" + "sha": "15edcf09d2e6b281f16efa051868c1ca235928da" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0d68bbb80a7620b69aff5ab0b497c8a396e73558", - "internalRef": "373895026" + "sha": "5e797ab6ee046efd2baeef6a7b1aeddab6718074", + "internalRef": "375741797" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0d68bbb80a7620b69aff5ab0b497c8a396e73558", - "internalRef": "373895026" + "sha": "5e797ab6ee046efd2baeef6a7b1aeddab6718074", + "internalRef": "375741797" } }, { From 099b9ef72bb99672993b8926aa3472a16504a61b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 21:34:12 +0000 Subject: [PATCH 23/23] chore: release 3.2.0 (#562) :robot: I have created a release \*beep\* \*boop\* --- ## [3.2.0](https://www.github.com/googleapis/java-dialogflow/compare/v3.1.0...v3.2.0) (2021-05-31) ### Features * add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#561](https://www.github.com/googleapis/java-dialogflow/issues/561)) ([2cbe20f](https://www.github.com/googleapis/java-dialogflow/commit/2cbe20fe371aca28962b5ea9b68913207f910892)) * added a field in the query result to indicate whether slot filling is cancelled ([7d8d343](https://www.github.com/googleapis/java-dialogflow/commit/7d8d343e97d1012b7f4b19b6915073b5b1dae9e0)) * added DTMF and PARTIAL DTMF type in recognition result ([7d8d343](https://www.github.com/googleapis/java-dialogflow/commit/7d8d343e97d1012b7f4b19b6915073b5b1dae9e0)) * added location-aware HTTP path binding for ListIntents ([#557](https://www.github.com/googleapis/java-dialogflow/issues/557)) ([da0f279](https://www.github.com/googleapis/java-dialogflow/commit/da0f279c763956ff59b87269c6d968a750b24253)) * added location-aware HTTP path binding for ListIntents ([#574](https://www.github.com/googleapis/java-dialogflow/issues/574)) ([7d8d343](https://www.github.com/googleapis/java-dialogflow/commit/7d8d343e97d1012b7f4b19b6915073b5b1dae9e0)) * exposed match confidence and parameter in AnalyzeContentResponse ([7d8d343](https://www.github.com/googleapis/java-dialogflow/commit/7d8d343e97d1012b7f4b19b6915073b5b1dae9e0)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#560](https://www.github.com/googleapis/java-dialogflow/issues/560)) ([f81b522](https://www.github.com/googleapis/java-dialogflow/commit/f81b522a1e44fdb06f27947096efd2e4a5ffda63)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 17 +++++++++++++++++ google-cloud-dialogflow-bom/pom.xml | 12 ++++++------ google-cloud-dialogflow/pom.xml | 4 ++-- grpc-google-cloud-dialogflow-v2/pom.xml | 4 ++-- grpc-google-cloud-dialogflow-v2beta1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-dialogflow-v2/pom.xml | 4 ++-- proto-google-cloud-dialogflow-v2beta1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 9 files changed, 44 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ab29ed89..e49edeb98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [3.2.0](https://www.github.com/googleapis/java-dialogflow/compare/v3.1.0...v3.2.0) (2021-05-31) + + +### Features + +* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#561](https://www.github.com/googleapis/java-dialogflow/issues/561)) ([2cbe20f](https://www.github.com/googleapis/java-dialogflow/commit/2cbe20fe371aca28962b5ea9b68913207f910892)) +* added a field in the query result to indicate whether slot filling is cancelled ([7d8d343](https://www.github.com/googleapis/java-dialogflow/commit/7d8d343e97d1012b7f4b19b6915073b5b1dae9e0)) +* added DTMF and PARTIAL DTMF type in recognition result ([7d8d343](https://www.github.com/googleapis/java-dialogflow/commit/7d8d343e97d1012b7f4b19b6915073b5b1dae9e0)) +* added location-aware HTTP path binding for ListIntents ([#557](https://www.github.com/googleapis/java-dialogflow/issues/557)) ([da0f279](https://www.github.com/googleapis/java-dialogflow/commit/da0f279c763956ff59b87269c6d968a750b24253)) +* added location-aware HTTP path binding for ListIntents ([#574](https://www.github.com/googleapis/java-dialogflow/issues/574)) ([7d8d343](https://www.github.com/googleapis/java-dialogflow/commit/7d8d343e97d1012b7f4b19b6915073b5b1dae9e0)) +* exposed match confidence and parameter in AnalyzeContentResponse ([7d8d343](https://www.github.com/googleapis/java-dialogflow/commit/7d8d343e97d1012b7f4b19b6915073b5b1dae9e0)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#560](https://www.github.com/googleapis/java-dialogflow/issues/560)) ([f81b522](https://www.github.com/googleapis/java-dialogflow/commit/f81b522a1e44fdb06f27947096efd2e4a5ffda63)) + ## [3.1.0](https://www.github.com/googleapis/java-dialogflow/compare/v3.0.2...v3.1.0) (2021-05-14) diff --git a/google-cloud-dialogflow-bom/pom.xml b/google-cloud-dialogflow-bom/pom.xml index eba687720..a2ba874e8 100644 --- a/google-cloud-dialogflow-bom/pom.xml +++ b/google-cloud-dialogflow-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dialogflow-bom - 3.1.1-SNAPSHOT + 3.2.0 pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-dialogflow-v2 - 3.1.1-SNAPSHOT + 3.2.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.95.1-SNAPSHOT + 0.96.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 3.1.1-SNAPSHOT + 3.2.0 com.google.cloud google-cloud-dialogflow - 3.1.1-SNAPSHOT + 3.2.0 com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.95.1-SNAPSHOT + 0.96.0
diff --git a/google-cloud-dialogflow/pom.xml b/google-cloud-dialogflow/pom.xml index d3d5d8393..b3a56be48 100644 --- a/google-cloud-dialogflow/pom.xml +++ b/google-cloud-dialogflow/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dialogflow - 3.1.1-SNAPSHOT + 3.2.0 jar Google Cloud Dialog Flow API https://github.com/googleapis/java-dialogflow @@ -11,7 +11,7 @@ com.google.cloud google-cloud-dialogflow-parent - 3.1.1-SNAPSHOT + 3.2.0 google-cloud-dialogflow diff --git a/grpc-google-cloud-dialogflow-v2/pom.xml b/grpc-google-cloud-dialogflow-v2/pom.xml index 5b399156f..fbd5c5f76 100644 --- a/grpc-google-cloud-dialogflow-v2/pom.xml +++ b/grpc-google-cloud-dialogflow-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 3.1.1-SNAPSHOT + 3.2.0 grpc-google-cloud-dialogflow-v2 GRPC library for grpc-google-cloud-dialogflow-v2 com.google.cloud google-cloud-dialogflow-parent - 3.1.1-SNAPSHOT + 3.2.0 diff --git a/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/grpc-google-cloud-dialogflow-v2beta1/pom.xml index 5b0e9fcfc..9964d368e 100644 --- a/grpc-google-cloud-dialogflow-v2beta1/pom.xml +++ b/grpc-google-cloud-dialogflow-v2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.95.1-SNAPSHOT + 0.96.0 grpc-google-cloud-dialogflow-v2beta1 GRPC library for grpc-google-cloud-dialogflow-v2beta1 com.google.cloud google-cloud-dialogflow-parent - 3.1.1-SNAPSHOT + 3.2.0 diff --git a/pom.xml b/pom.xml index ecf663a97..1f2db438f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dialogflow-parent pom - 3.1.1-SNAPSHOT + 3.2.0 Google Cloud Dialog Flow API Parent https://github.com/googleapis/java-dialogflow @@ -70,27 +70,27 @@ com.google.api.grpc proto-google-cloud-dialogflow-v2 - 3.1.1-SNAPSHOT + 3.2.0 com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.95.1-SNAPSHOT + 0.96.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.95.1-SNAPSHOT + 0.96.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 3.1.1-SNAPSHOT + 3.2.0 com.google.cloud google-cloud-dialogflow - 3.1.1-SNAPSHOT + 3.2.0 com.google.cloud diff --git a/proto-google-cloud-dialogflow-v2/pom.xml b/proto-google-cloud-dialogflow-v2/pom.xml index e7cc84fa5..203c76cf2 100644 --- a/proto-google-cloud-dialogflow-v2/pom.xml +++ b/proto-google-cloud-dialogflow-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dialogflow-v2 - 3.1.1-SNAPSHOT + 3.2.0 proto-google-cloud-dialogflow-v2 PROTO library for proto-google-cloud-dialogflow-v2 com.google.cloud google-cloud-dialogflow-parent - 3.1.1-SNAPSHOT + 3.2.0 diff --git a/proto-google-cloud-dialogflow-v2beta1/pom.xml b/proto-google-cloud-dialogflow-v2beta1/pom.xml index 0ea18dbe7..97867c328 100644 --- a/proto-google-cloud-dialogflow-v2beta1/pom.xml +++ b/proto-google-cloud-dialogflow-v2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.95.1-SNAPSHOT + 0.96.0 proto-google-cloud-dialogflow-v2beta1 PROTO library for proto-google-cloud-dialogflow-v2beta1 com.google.cloud google-cloud-dialogflow-parent - 3.1.1-SNAPSHOT + 3.2.0 diff --git a/versions.txt b/versions.txt index bac77bc0e..32f73c1bf 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-dialogflow-v2:3.1.0:3.1.1-SNAPSHOT -proto-google-cloud-dialogflow-v2beta1:0.95.0:0.95.1-SNAPSHOT -grpc-google-cloud-dialogflow-v2beta1:0.95.0:0.95.1-SNAPSHOT -grpc-google-cloud-dialogflow-v2:3.1.0:3.1.1-SNAPSHOT -google-cloud-dialogflow:3.1.0:3.1.1-SNAPSHOT +proto-google-cloud-dialogflow-v2:3.2.0:3.2.0 +proto-google-cloud-dialogflow-v2beta1:0.96.0:0.96.0 +grpc-google-cloud-dialogflow-v2beta1:0.96.0:0.96.0 +grpc-google-cloud-dialogflow-v2:3.2.0:3.2.0 +google-cloud-dialogflow:3.2.0:3.2.0