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

fix: restore retry configs and update generated docs #187

Merged
merged 3 commits into from
Jun 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,13 @@ public static class Builder extends StubSettings.Builder<EnvironmentsStubSetting
"idempotent",
ImmutableSet.copyOf(
Lists.<StatusCode.Code>newArrayList(
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
StatusCode.Code.INTERNAL, StatusCode.Code.UNAVAILABLE)));
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
definitions.put(
"idempotent2",
ImmutableSet.copyOf(
Lists.<StatusCode.Code>newArrayList(
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down Expand Up @@ -304,7 +309,7 @@ private static Builder initDefaults(Builder builder) {

builder
.listEnvironmentsSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent2"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));

return builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,9 @@ public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 4;</code>
Expand Down Expand Up @@ -1279,6 +1282,9 @@ public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 4;</code>
Expand All @@ -1298,6 +1304,9 @@ public com.google.protobuf.ByteString getOutputAudio() {
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 4;</code>
Expand All @@ -1324,6 +1333,9 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 4;</code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ public interface DetectIntentResponseOrBuilder
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 4;</code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
*
*
* <pre>
* Represents an environment state. When a environment is pointed to a new
* Represents an environment state. When an environment is pointed to a new
* agent version, the environment is temporarily set to the `LOADING` state.
* During that time, the environment keeps on serving the previous version of
* the agent. After the new agent version is done loading, the environment is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,9 @@ public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 5;</code>
Expand Down Expand Up @@ -1568,6 +1571,9 @@ public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 5;</code>
Expand All @@ -1587,6 +1593,9 @@ public com.google.protobuf.ByteString getOutputAudio() {
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 5;</code>
Expand All @@ -1613,6 +1622,9 @@ public Builder setOutputAudio(com.google.protobuf.ByteString value) {
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 5;</code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ public interface StreamingDetectIntentResponseOrBuilder
* multiple default text responses exist, they will be concatenated when
* generating audio. If no default platform text responses exist, the
* generated audio content will be empty.
* In some scenarios, multiple output audio fields may be present in the
* response structure. In these cases, only the top-most-level audio output
* has content.
* </pre>
*
* <code>bytes output_audio = 5;</code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ message Environment {
pattern: "projects/{project}/agent/environments/{environment}"
};

// Represents an environment state. When a environment is pointed to a new
// Represents an environment state. When an environment is pointed to a new
// agent version, the environment is temporarily set to the `LOADING` state.
// During that time, the environment keeps on serving the previous version of
// the agent. After the new agent version is done loading, the environment is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ message Intent {
string display_name = 2;

// Optional. The definition of the parameter value. It can be:
//
// - a constant string,
// - a parameter value defined as `$parameter_name`,
// - an original parameter value defined as `$parameter_name.original`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ message DetectIntentResponse {
// multiple default text responses exist, they will be concatenated when
// generating audio. If no default platform text responses exist, the
// generated audio content will be empty.
//
// In some scenarios, multiple output audio fields may be present in the
// response structure. In these cases, only the top-most-level audio output
// has content.
bytes output_audio = 4;

// The config used by the speech synthesizer to generate the output audio.
Expand Down Expand Up @@ -439,6 +443,10 @@ message StreamingDetectIntentResponse {
// multiple default text responses exist, they will be concatenated when
// generating audio. If no default platform text responses exist, the
// generated audio content will be empty.
//
// In some scenarios, multiple output audio fields may be present in the
// response structure. In these cases, only the top-most-level audio output
// has content.
bytes output_audio = 5;

// The config used by the speech synthesizer to generate the output audio.
Expand Down
8 changes: 4 additions & 4 deletions synth.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "aed11c01e52921613b9ee469c2d85f5f33175fb7",
"internalRef": "310660461"
"sha": "cd3ce2651c3921670217e664303976cdf76e9fe2",
"internalRef": "312123588"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "aed11c01e52921613b9ee469c2d85f5f33175fb7",
"internalRef": "310660461"
"sha": "cd3ce2651c3921670217e664303976cdf76e9fe2",
"internalRef": "312123588"
}
},
{
Expand Down