From 4e8f1142ff921de8d5ad757bce9f2c09dab6ff1b Mon Sep 17 00:00:00 2001 From: Google APIs Date: Tue, 23 Jun 2020 11:09:31 -0700 Subject: [PATCH] - Update grpc config for retry mechanism. - Update ImportAgent/ExportAgent external documentation. PiperOrigin-RevId: 317902626 --- google/cloud/dialogflow/v2/BUILD.bazel | 5 + google/cloud/dialogflow/v2/agent.proto | 16 +- google/cloud/dialogflow/v2/audio_config.proto | 58 +- .../v2/dialogflow_grpc_service_config.json | 578 ++---------------- 4 files changed, 98 insertions(+), 559 deletions(-) diff --git a/google/cloud/dialogflow/v2/BUILD.bazel b/google/cloud/dialogflow/v2/BUILD.bazel index d68c3810..72d0e8c6 100644 --- a/google/cloud/dialogflow/v2/BUILD.bazel +++ b/google/cloud/dialogflow/v2/BUILD.bazel @@ -74,6 +74,7 @@ java_gapic_library( name = "dialogflow_java_gapic", src = ":dialogflow_proto_with_info", gapic_yaml = "dialogflow_gapic.yaml", + grpc_service_config = "dialogflow_grpc_service_config.json", package = "google.cloud.dialogflow.v2", service_yaml = "dialogflow_v2.yaml", test_deps = [ @@ -213,6 +214,7 @@ py_gapic_library( name = "dialogflow_py_gapic", src = ":dialogflow_proto_with_info", gapic_yaml = "dialogflow_gapic.yaml", + grpc_service_config = "dialogflow_grpc_service_config.json", package = "google.cloud.dialogflow.v2", service_yaml = "dialogflow_v2.yaml", deps = [ @@ -257,6 +259,7 @@ php_gapic_library( name = "dialogflow_php_gapic", src = ":dialogflow_proto_with_info", gapic_yaml = "dialogflow_gapic.yaml", + grpc_service_config = "dialogflow_grpc_service_config.json", package = "google.cloud.dialogflow.v2", service_yaml = "dialogflow_v2.yaml", deps = [ @@ -327,6 +330,7 @@ ruby_gapic_library( name = "dialogflow_ruby_gapic", src = ":dialogflow_proto_with_info", gapic_yaml = "dialogflow_gapic.yaml", + grpc_service_config = "dialogflow_grpc_service_config.json", package = "google.cloud.dialogflow.v2", service_yaml = "dialogflow_v2.yaml", deps = [ @@ -371,6 +375,7 @@ csharp_gapic_library( name = "dialogflow_csharp_gapic", src = ":dialogflow_proto_with_info", gapic_yaml = "dialogflow_gapic.yaml", + grpc_service_config = "dialogflow_grpc_service_config.json", package = "google.cloud.dialogflow.v2", service_yaml = "dialogflow_v2.yaml", deps = [ diff --git a/google/cloud/dialogflow/v2/agent.proto b/google/cloud/dialogflow/v2/agent.proto index 9459029a..7eb7c525 100644 --- a/google/cloud/dialogflow/v2/agent.proto +++ b/google/cloud/dialogflow/v2/agent.proto @@ -113,9 +113,15 @@ service Agents { // // Uploads new intents and entity types without deleting the existing ones. // Intents and entity types with the same name are replaced with the new - // versions from ImportAgentRequest. + // versions from [ImportAgentRequest][google.cloud.dialogflow.v2.ImportAgentRequest]. After the import, the imported draft + // agent will be trained automatically (unless disabled in agent settings). + // However, once the import is done, training may not be completed yet. Please + // call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it returns in order to train + // explicitly. // // Operation + // An operation which tracks when importing is complete. It only tracks + // when the draft agent is updated not when it is done training. rpc ImportAgent(ImportAgentRequest) returns (google.longrunning.Operation) { option (google.api.http) = { post: "/v2/{parent=projects/*}/agent:import" @@ -130,9 +136,15 @@ service Agents { // Restores the specified agent from a ZIP file. // // Replaces the current agent version with a new one. All the intents and - // entity types in the older version are deleted. + // entity types in the older version are deleted. After the restore, the + // restored draft agent will be trained automatically (unless disabled in + // agent settings). However, once the restore is done, training may not be + // completed yet. Please call [TrainAgent][google.cloud.dialogflow.v2.Agents.TrainAgent] and wait for the operation it + // returns in order to train explicitly. // // Operation + // An operation which tracks when restoring is complete. It only tracks + // when the draft agent is updated not when it is done training. rpc RestoreAgent(RestoreAgentRequest) returns (google.longrunning.Operation) { option (google.api.http) = { post: "/v2/{parent=projects/*}/agent:restore" diff --git a/google/cloud/dialogflow/v2/audio_config.proto b/google/cloud/dialogflow/v2/audio_config.proto index ec0602f5..3d17394d 100644 --- a/google/cloud/dialogflow/v2/audio_config.proto +++ b/google/cloud/dialogflow/v2/audio_config.proto @@ -29,35 +29,6 @@ option java_outer_classname = "AudioConfigProto"; option java_package = "com.google.cloud.dialogflow.v2"; option objc_class_prefix = "DF"; -// Hints for the speech recognizer to help with recognition in a specific -// conversation state. -message SpeechContext { - // Optional. A list of strings containing words and phrases that the speech - // recognizer should recognize with higher likelihood. - // - // This list can be used to: - // * improve accuracy for words and phrases you expect the user to say, - // e.g. typical commands for your Dialogflow agent - // * add additional words to the speech recognizer vocabulary - // * ... - // - // See the [Cloud Speech - // documentation](https://cloud.google.com/speech-to-text/quotas) for usage - // limits. - repeated string phrases = 1; - - // Optional. Boost for this context compared to other contexts: - // - // * If the boost is positive, Dialogflow will increase the probability that - // the phrases in this context are recognized over similar sounding phrases. - // * If the boost is unspecified or non-positive, Dialogflow will not apply - // any boost. - // - // Dialogflow recommends that you use boosts in the range (0, 20] and that you - // find a value that fits your use case with binary search. - float boost = 2; -} - // Audio encoding of the audio content sent in the conversational query request. // Refer to the // [Cloud Speech API @@ -107,6 +78,35 @@ enum AudioEncoding { AUDIO_ENCODING_SPEEX_WITH_HEADER_BYTE = 7; } +// Hints for the speech recognizer to help with recognition in a specific +// conversation state. +message SpeechContext { + // Optional. A list of strings containing words and phrases that the speech + // recognizer should recognize with higher likelihood. + // + // This list can be used to: + // * improve accuracy for words and phrases you expect the user to say, + // e.g. typical commands for your Dialogflow agent + // * add additional words to the speech recognizer vocabulary + // * ... + // + // See the [Cloud Speech + // documentation](https://cloud.google.com/speech-to-text/quotas) for usage + // limits. + repeated string phrases = 1; + + // Optional. Boost for this context compared to other contexts: + // + // * If the boost is positive, Dialogflow will increase the probability that + // the phrases in this context are recognized over similar sounding phrases. + // * If the boost is unspecified or non-positive, Dialogflow will not apply + // any boost. + // + // Dialogflow recommends that you use boosts in the range (0, 20] and that you + // find a value that fits your use case with binary search. + float boost = 2; +} + // Information for a word recognized by the speech recognizer. message SpeechWordInfo { // The word this info is for. diff --git a/google/cloud/dialogflow/v2/dialogflow_grpc_service_config.json b/google/cloud/dialogflow/v2/dialogflow_grpc_service_config.json index 10cc1d83..8b666842 100755 --- a/google/cloud/dialogflow/v2/dialogflow_grpc_service_config.json +++ b/google/cloud/dialogflow/v2/dialogflow_grpc_service_config.json @@ -3,24 +3,55 @@ { "name": [ { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "ListEntityTypes" + "service": "google.cloud.dialogflow.v2.Agents" }, { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "GetEntityType" + "service": "google.cloud.dialogflow.v2.AnswerRecords" }, { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "DeleteEntityType" + "service": "google.cloud.dialogflow.v2.Contexts" }, { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "BatchDeleteEntityTypes" + "service": "google.cloud.dialogflow.v2.ConversationProfiles" }, { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "BatchDeleteEntities" + "service": "google.cloud.dialogflow.v2.Conversations" + }, + { + "service": "google.cloud.dialogflow.v2.Documents" + }, + { + "service": "google.cloud.dialogflow.v2.EntityTypes" + }, + { + "service": "google.cloud.dialogflow.v2.Environments" + }, + { + "service": "google.cloud.dialogflow.v2.Fulfillments" + }, + { + "service": "google.cloud.dialogflow.v2.Intents" + }, + { + "service": "google.cloud.dialogflow.v2.KnowledgeBases" + }, + { + "service": "google.cloud.dialogflow.v2.Participants" + }, + { + "service": "google.cloud.dialogflow.v2.PhoneNumbers" + }, + { + "service": "google.cloud.dialogflow.v2.PhoneNumberOrders" + }, + { + "service": "google.cloud.dialogflow.v2.Sessions" + }, + { + "service": "google.cloud.dialogflow.v2.SessionEntityTypes" + }, + { + "service": "google.cloud.dialogflow.v2.Versions" } ], "timeout": "60s", @@ -29,514 +60,28 @@ "maxBackoff": "60s", "backoffMultiplier": 1.3, "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" + "UNAVAILABLE" ] } }, { "name": [ - { - "service": "google.cloud.dialogflow.v2.Intents", - "method": "ListIntents" - }, - { - "service": "google.cloud.dialogflow.v2.Intents", - "method": "GetIntent" - }, - { - "service": "google.cloud.dialogflow.v2.Intents", - "method": "DeleteIntent" - }, - { - "service": "google.cloud.dialogflow.v2.Intents", - "method": "BatchDeleteIntents" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.SessionEntityTypes", - "method": "ListSessionEntityTypes" - }, - { - "service": "google.cloud.dialogflow.v2.SessionEntityTypes", - "method": "GetSessionEntityType" - }, - { - "service": "google.cloud.dialogflow.v2.SessionEntityTypes", - "method": "DeleteSessionEntityType" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.SessionEntityTypes", - "method": "CreateSessionEntityType" - }, - { - "service": "google.cloud.dialogflow.v2.SessionEntityTypes", - "method": "UpdateSessionEntityType" - } - ], - "timeout": "60s" - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Sessions", - "method": "DetectIntent" - }, - { - "service": "google.cloud.dialogflow.v2.Sessions", - "method": "StreamingDetectIntent" - } - ], - "timeout": "220s" - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Contexts", - "method": "ListContexts" - }, - { - "service": "google.cloud.dialogflow.v2.Contexts", - "method": "GetContext" - }, - { - "service": "google.cloud.dialogflow.v2.Contexts", - "method": "DeleteContext" - }, - { - "service": "google.cloud.dialogflow.v2.Contexts", - "method": "DeleteAllContexts" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Contexts", - "method": "CreateContext" - }, - { - "service": "google.cloud.dialogflow.v2.Contexts", - "method": "UpdateContext" - } - ], - "timeout": "60s" - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "CreateEntityType" - }, - { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "UpdateEntityType" - }, - { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "BatchUpdateEntityTypes" - }, - { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "BatchCreateEntities" - }, - { - "service": "google.cloud.dialogflow.v2.EntityTypes", - "method": "BatchUpdateEntities" - } - ], - "timeout": "60s" - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Intents", - "method": "CreateIntent" - }, - { - "service": "google.cloud.dialogflow.v2.Intents", - "method": "UpdateIntent" - }, - { - "service": "google.cloud.dialogflow.v2.Intents", - "method": "BatchUpdateIntents" - } - ], - "timeout": "60s" - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Agents", - "method": "SetAgent" - }, - { - "service": "google.cloud.dialogflow.v2.Agents", - "method": "DeleteAgent" - }, - { - "service": "google.cloud.dialogflow.v2.Agents", - "method": "GetAgent" - }, - { - "service": "google.cloud.dialogflow.v2.Agents", - "method": "SearchAgents" - }, - { - "service": "google.cloud.dialogflow.v2.Agents", - "method": "TrainAgent" - }, - { - "service": "google.cloud.dialogflow.v2.Agents", - "method": "ExportAgent" - }, - { - "service": "google.cloud.dialogflow.v2.Agents", - "method": "RestoreAgent" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Agents", - "method": "ImportAgent" - } - ], - "timeout": "60s" - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.AnswerRecords", - "method": "ListAnswerRecords" - }, - { - "service": "google.cloud.dialogflow.v2.AnswerRecords", - "method": "UpdateAnswerRecord" - }, - { - "service": "google.cloud.dialogflow.v2.AnswerRecords", - "method": "DeleteAnswerRecord" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "CreateConversation" - }, - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "ListConversations" - }, - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "GetConversation" - }, - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "AddConversationPhoneNumber" - }, - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "CompleteConversation" - }, - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "CreateCallMatcher" - }, - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "ListCallMatchers" - }, - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "ListCallMatchers" - }, - { - "service": "google.cloud.dialogflow.v2.Conversations", - "method": "ListMessages" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.ConversationProfiles", - "method": "ListConversationProfiles" - }, - { - "service": "google.cloud.dialogflow.v2.ConversationProfiles", - "method": "GetConversationProfile" - }, - { - "service": "google.cloud.dialogflow.v2.ConversationProfiles", - "method": "CreateConversationProfile" - }, - { - "service": "google.cloud.dialogflow.v2.ConversationProfiles", - "method": "UpdateConversationProfile" - }, - { - "service": "google.cloud.dialogflow.v2.ConversationProfiles", - "method": "DeleteConversationProfile" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Documents", - "method": "ListDocuments" - }, - { - "service": "google.cloud.dialogflow.v2.Documents", - "method": "GetDocument" - }, - { - "service": "google.cloud.dialogflow.v2.Documents", - "method": "CreateDocument" - }, - { - "service": "google.cloud.dialogflow.v2.Documents", - "method": "DeleteDocument" - }, - { - "service": "google.cloud.dialogflow.v2.Documents", - "method": "UpdateDocument" - }, - { - "service": "google.cloud.dialogflow.v2.Documents", - "method": "ReloadDocument" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.KnowledgeBases", - "method": "ListKnowledgeBases" - }, - { - "service": "google.cloud.dialogflow.v2.KnowledgeBases", - "method": "GetKnowledgeBase" - }, - { - "service": "google.cloud.dialogflow.v2.KnowledgeBases", - "method": "CreateKnowledgeBase" - }, - { - "service": "google.cloud.dialogflow.v2.KnowledgeBases", - "method": "DeleteKnowledgeBase" - }, - { - "service": "google.cloud.dialogflow.v2.KnowledgeBases", - "method": "UpdateKnowledgeBase" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.PhoneNumbers", - "method": "ListPhoneNumbers" - }, - { - "service": "google.cloud.dialogflow.v2.PhoneNumbers", - "method": "UpdatePhoneNumber" - }, - { - "service": "google.cloud.dialogflow.v2.PhoneNumbers", - "method": "DeletePhoneNumber" - }, - { - "service": "google.cloud.dialogflow.v2.PhoneNumbers", - "method": "UndeletePhoneNumber" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.PhoneNumberOrders", - "method": "CreatePhoneNumberOrder" - }, - { - "service": "google.cloud.dialogflow.v2.PhoneNumberOrders", - "method": "GetPhoneNumberOrder" - }, - { - "service": "google.cloud.dialogflow.v2.PhoneNumberOrders", - "method": "ListPhoneNumberOrders" - }, - { - "service": "google.cloud.dialogflow.v2.PhoneNumberOrders", - "method": "UpdatePhoneNumberOrder" - }, - { - "service": "google.cloud.dialogflow.v2.PhoneNumberOrders", - "method": "CancelPhoneNumberOrder" - } - ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ - { - "service": "google.cloud.dialogflow.v2.Participants", - "method": "CreateParticipant" - }, - { - "service": "google.cloud.dialogflow.v2.Participants", - "method": "GetParticipant" - }, - { - "service": "google.cloud.dialogflow.v2.Participants", - "method": "ListParticipants" - }, - { - "service": "google.cloud.dialogflow.v2.Participants", - "method": "UpdateParticipant" - }, { "service": "google.cloud.dialogflow.v2.Participants", "method": "AnalyzeContent" }, { - "service": "google.cloud.dialogflow.v2.Participants", - "method": "SuggestArticles" - }, - { - "service": "google.cloud.dialogflow.v2.Participants", - "method": "SuggestFaqAnswers" + "service": "google.cloud.dialogflow.v2.Sessions", + "method": "DetectIntent" } ], - "timeout": "60s", + "timeout": "220s", "retryPolicy": { "initialBackoff": "0.100s", "maxBackoff": "60s", "backoffMultiplier": 1.3, "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" + "UNAVAILABLE" ] } }, @@ -545,36 +90,13 @@ { "service": "google.cloud.dialogflow.v2.Participants", "method": "StreamingAnalyzeContent" - } - ], - "timeout": "1800s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "DEADLINE_EXCEEDED" - ] - } - }, - { - "name": [ + }, { - "service": "google.cloud.dialogflow.v2.Environments", - "method": "ListEnvironments" + "service": "google.cloud.dialogflow.v2.Sessions", + "method": "StreamingDetectIntent" } ], - "timeout": "60s", - "retryPolicy": { - "initialBackoff": "0.100s", - "maxBackoff": "60s", - "backoffMultiplier": 1.3, - "retryableStatusCodes": [ - "UNAVAILABLE", - "INTERNAL" - ] - } + "timeout": "220s" } ] }