google-cloud-dialogflow 0.1.0 → 0.2.0

data/lib/google/cloud/dialogflow/v2/intents_client.rb

@@ -27,7 +27,7 @@ require "google/gax/operation"
 require "google/longrunning/operations_client"
 
 require "google/cloud/dialogflow/v2/intent_pb"
-require "google/cloud/dialogflow/credentials"
+require "google/cloud/dialogflow/v2/credentials"
 
 module Google
   module Cloud
@@ -76,6 +76,9 @@ module Google
           # The default port of the service.
           DEFAULT_SERVICE_PORT = 443
 
+          # The default set of gRPC interceptors.
+          GRPC_INTERCEPTORS = []
+
           DEFAULT_TIMEOUT = 30
 
           PAGE_DESCRIPTORS = {
@@ -93,8 +96,10 @@ module Google
             "https://www.googleapis.com/auth/cloud-platform"
           ].freeze
 
+          # @private
           class OperationsClient < Google::Longrunning::OperationsClient
             self::SERVICE_ADDRESS = IntentsClient::SERVICE_ADDRESS
+            self::GRPC_INTERCEPTORS = IntentsClient::GRPC_INTERCEPTORS
           end
 
           PROJECT_AGENT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
@@ -170,11 +175,18 @@ module Google
           #   or the specified config is missing data points.
           # @param timeout [Numeric]
           #   The default timeout, in seconds, for calls made through this client.
+          # @param metadata [Hash]
+          #   Default metadata to be sent with each request. This can be overridden on a per call basis.
+          # @param exception_transformer [Proc]
+          #   An optional proc that intercepts any exceptions raised during an API call to inject
+          #   custom error handling.
           def initialize \
               credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -183,7 +195,7 @@ module Google
             require "google/gax/grpc"
             require "google/cloud/dialogflow/v2/intent_services_pb"
 
-            credentials ||= Google::Cloud::Dialogflow::Credentials.default
+            credentials ||= Google::Cloud::Dialogflow::V2::Credentials.default
 
             @operations_client = OperationsClient.new(
               credentials: credentials,
@@ -195,7 +207,7 @@ module Google
             )
 
             if credentials.is_a?(String) || credentials.is_a?(Hash)
-              updater_proc = Google::Cloud::Dialogflow::Credentials.new(credentials).updater_proc
+              updater_proc = Google::Cloud::Dialogflow::V2::Credentials.new(credentials).updater_proc
             end
             if credentials.is_a?(GRPC::Core::Channel)
               channel = credentials
@@ -219,6 +231,7 @@ module Google
             google_api_client.freeze
 
             headers = { :"x-goog-api-client" => google_api_client }
+            headers.merge!(metadata) unless metadata.nil?
             client_config_file = Pathname.new(__dir__).join(
               "intents_client_config.json"
             )
@@ -231,13 +244,14 @@ module Google
                 timeout,
                 page_descriptors: PAGE_DESCRIPTORS,
                 errors: Google::Gax::Grpc::API_ERRORS,
-                kwargs: headers
+                metadata: headers
               )
             end
 
             # Allow overriding the service path/port in subclasses.
             service_path = self.class::SERVICE_ADDRESS
             port = self.class::DEFAULT_SERVICE_PORT
+            interceptors = self.class::GRPC_INTERCEPTORS
             @intents_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
@@ -245,36 +259,44 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Cloud::Dialogflow::V2::Intents::Stub.method(:new)
             )
 
             @list_intents = Google::Gax.create_api_call(
               @intents_stub.method(:list_intents),
-              defaults["list_intents"]
+              defaults["list_intents"],
+              exception_transformer: exception_transformer
             )
             @get_intent = Google::Gax.create_api_call(
               @intents_stub.method(:get_intent),
-              defaults["get_intent"]
+              defaults["get_intent"],
+              exception_transformer: exception_transformer
             )
             @create_intent = Google::Gax.create_api_call(
               @intents_stub.method(:create_intent),
-              defaults["create_intent"]
+              defaults["create_intent"],
+              exception_transformer: exception_transformer
             )
             @update_intent = Google::Gax.create_api_call(
               @intents_stub.method(:update_intent),
-              defaults["update_intent"]
+              defaults["update_intent"],
+              exception_transformer: exception_transformer
             )
             @delete_intent = Google::Gax.create_api_call(
               @intents_stub.method(:delete_intent),
-              defaults["delete_intent"]
+              defaults["delete_intent"],
+              exception_transformer: exception_transformer
             )
             @batch_update_intents = Google::Gax.create_api_call(
               @intents_stub.method(:batch_update_intents),
-              defaults["batch_update_intents"]
+              defaults["batch_update_intents"],
+              exception_transformer: exception_transformer
             )
             @batch_delete_intents = Google::Gax.create_api_call(
               @intents_stub.method(:batch_delete_intents),
-              defaults["batch_delete_intents"]
+              defaults["batch_delete_intents"],
+              exception_transformer: exception_transformer
             )
           end
 
@@ -302,6 +324,9 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Gax::PagedEnumerable<Google::Cloud::Dialogflow::V2::Intent>]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Gax::PagedEnumerable<Google::Cloud::Dialogflow::V2::Intent>]
           #   An enumerable of Google::Cloud::Dialogflow::V2::Intent instances.
           #   See Google::Gax::PagedEnumerable documentation for other
@@ -309,9 +334,9 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   intents_client = Google::Cloud::Dialogflow::V2::Intents.new
+          #   intents_client = Google::Cloud::Dialogflow::Intents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::IntentsClient.project_agent_path("[PROJECT]")
           #
           #   # Iterate over all results.
@@ -332,7 +357,8 @@ module Google
               language_code: nil,
               intent_view: nil,
               page_size: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               parent: parent,
               language_code: language_code,
@@ -340,7 +366,7 @@ module Google
               page_size: page_size
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::ListIntentsRequest)
-            @list_intents.call(req, options)
+            @list_intents.call(req, options, &block)
           end
 
           # Retrieves the specified intent.
@@ -359,12 +385,15 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Dialogflow::V2::Intent]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::Intent]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   intents_client = Google::Cloud::Dialogflow::V2::Intents.new
+          #   intents_client = Google::Cloud::Dialogflow::Intents.new(version: :v2)
           #   formatted_name = Google::Cloud::Dialogflow::V2::IntentsClient.intent_path("[PROJECT]", "[INTENT]")
           #   response = intents_client.get_intent(formatted_name)
 
@@ -372,14 +401,15 @@ module Google
               name,
               language_code: nil,
               intent_view: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               name: name,
               language_code: language_code,
               intent_view: intent_view
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::GetIntentRequest)
-            @get_intent.call(req, options)
+            @get_intent.call(req, options, &block)
           end
 
           # Creates an intent in the specified agent.
@@ -402,12 +432,15 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Dialogflow::V2::Intent]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::Intent]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   intents_client = Google::Cloud::Dialogflow::V2::Intents.new
+          #   intents_client = Google::Cloud::Dialogflow::Intents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::IntentsClient.project_agent_path("[PROJECT]")
           #
           #   # TODO: Initialize +intent+:
@@ -419,7 +452,8 @@ module Google
               intent,
               language_code: nil,
               intent_view: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               parent: parent,
               intent: intent,
@@ -427,7 +461,7 @@ module Google
               intent_view: intent_view
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::CreateIntentRequest)
-            @create_intent.call(req, options)
+            @create_intent.call(req, options, &block)
           end
 
           # Updates the specified intent.
@@ -452,12 +486,15 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Dialogflow::V2::Intent]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::Intent]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   intents_client = Google::Cloud::Dialogflow::V2::Intents.new
+          #   intents_client = Google::Cloud::Dialogflow::Intents.new(version: :v2)
           #
           #   # TODO: Initialize +intent+:
           #   intent = {}
@@ -471,7 +508,8 @@ module Google
               language_code,
               update_mask: nil,
               intent_view: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               intent: intent,
               language_code: language_code,
@@ -479,7 +517,7 @@ module Google
               intent_view: intent_view
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::UpdateIntentRequest)
-            @update_intent.call(req, options)
+            @update_intent.call(req, options, &block)
           end
 
           # Deletes the specified intent.
@@ -490,22 +528,26 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result []
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   intents_client = Google::Cloud::Dialogflow::V2::Intents.new
+          #   intents_client = Google::Cloud::Dialogflow::Intents.new(version: :v2)
           #   formatted_name = Google::Cloud::Dialogflow::V2::IntentsClient.intent_path("[PROJECT]", "[INTENT]")
           #   intents_client.delete_intent(formatted_name)
 
           def delete_intent \
               name,
-              options: nil
+              options: nil,
+              &block
             req = {
               name: name
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::DeleteIntentRequest)
-            @delete_intent.call(req, options)
+            @delete_intent.call(req, options, &block)
             nil
           end
 
@@ -542,9 +584,9 @@ module Google
           # @return [Google::Gax::Operation]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   intents_client = Google::Cloud::Dialogflow::V2::Intents.new
+          #   intents_client = Google::Cloud::Dialogflow::Intents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::IntentsClient.project_agent_path("[PROJECT]")
           #
           #   # TODO: Initialize +language_code+:
@@ -623,9 +665,9 @@ module Google
           # @return [Google::Gax::Operation]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   intents_client = Google::Cloud::Dialogflow::V2::Intents.new
+          #   intents_client = Google::Cloud::Dialogflow::Intents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::IntentsClient.project_agent_path("[PROJECT]")
           #
           #   # TODO: Initialize +intents+:

data/lib/google/cloud/dialogflow/v2/session_entity_types_client.rb

@@ -25,7 +25,7 @@ require "pathname"
 require "google/gax"
 
 require "google/cloud/dialogflow/v2/session_entity_type_pb"
-require "google/cloud/dialogflow/credentials"
+require "google/cloud/dialogflow/v2/credentials"
 
 module Google
   module Cloud
@@ -55,6 +55,9 @@ module Google
           # The default port of the service.
           DEFAULT_SERVICE_PORT = 443
 
+          # The default set of gRPC interceptors.
+          GRPC_INTERCEPTORS = []
+
           DEFAULT_TIMEOUT = 30
 
           PAGE_DESCRIPTORS = {
@@ -133,11 +136,18 @@ module Google
           #   or the specified config is missing data points.
           # @param timeout [Numeric]
           #   The default timeout, in seconds, for calls made through this client.
+          # @param metadata [Hash]
+          #   Default metadata to be sent with each request. This can be overridden on a per call basis.
+          # @param exception_transformer [Proc]
+          #   An optional proc that intercepts any exceptions raised during an API call to inject
+          #   custom error handling.
           def initialize \
               credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -146,10 +156,10 @@ module Google
             require "google/gax/grpc"
             require "google/cloud/dialogflow/v2/session_entity_type_services_pb"
 
-            credentials ||= Google::Cloud::Dialogflow::Credentials.default
+            credentials ||= Google::Cloud::Dialogflow::V2::Credentials.default
 
             if credentials.is_a?(String) || credentials.is_a?(Hash)
-              updater_proc = Google::Cloud::Dialogflow::Credentials.new(credentials).updater_proc
+              updater_proc = Google::Cloud::Dialogflow::V2::Credentials.new(credentials).updater_proc
             end
             if credentials.is_a?(GRPC::Core::Channel)
               channel = credentials
@@ -173,6 +183,7 @@ module Google
             google_api_client.freeze
 
             headers = { :"x-goog-api-client" => google_api_client }
+            headers.merge!(metadata) unless metadata.nil?
             client_config_file = Pathname.new(__dir__).join(
               "session_entity_types_client_config.json"
             )
@@ -185,13 +196,14 @@ module Google
                 timeout,
                 page_descriptors: PAGE_DESCRIPTORS,
                 errors: Google::Gax::Grpc::API_ERRORS,
-                kwargs: headers
+                metadata: headers
               )
             end
 
             # Allow overriding the service path/port in subclasses.
             service_path = self.class::SERVICE_ADDRESS
             port = self.class::DEFAULT_SERVICE_PORT
+            interceptors = self.class::GRPC_INTERCEPTORS
             @session_entity_types_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
@@ -199,28 +211,34 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Cloud::Dialogflow::V2::SessionEntityTypes::Stub.method(:new)
             )
 
             @list_session_entity_types = Google::Gax.create_api_call(
               @session_entity_types_stub.method(:list_session_entity_types),
-              defaults["list_session_entity_types"]
+              defaults["list_session_entity_types"],
+              exception_transformer: exception_transformer
             )
             @get_session_entity_type = Google::Gax.create_api_call(
               @session_entity_types_stub.method(:get_session_entity_type),
-              defaults["get_session_entity_type"]
+              defaults["get_session_entity_type"],
+              exception_transformer: exception_transformer
             )
             @create_session_entity_type = Google::Gax.create_api_call(
               @session_entity_types_stub.method(:create_session_entity_type),
-              defaults["create_session_entity_type"]
+              defaults["create_session_entity_type"],
+              exception_transformer: exception_transformer
             )
             @update_session_entity_type = Google::Gax.create_api_call(
               @session_entity_types_stub.method(:update_session_entity_type),
-              defaults["update_session_entity_type"]
+              defaults["update_session_entity_type"],
+              exception_transformer: exception_transformer
             )
             @delete_session_entity_type = Google::Gax.create_api_call(
               @session_entity_types_stub.method(:delete_session_entity_type),
-              defaults["delete_session_entity_type"]
+              defaults["delete_session_entity_type"],
+              exception_transformer: exception_transformer
             )
           end
 
@@ -240,6 +258,9 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Gax::PagedEnumerable<Google::Cloud::Dialogflow::V2::SessionEntityType>]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Gax::PagedEnumerable<Google::Cloud::Dialogflow::V2::SessionEntityType>]
           #   An enumerable of Google::Cloud::Dialogflow::V2::SessionEntityType instances.
           #   See Google::Gax::PagedEnumerable documentation for other
@@ -247,9 +268,9 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   session_entity_types_client = Google::Cloud::Dialogflow::V2::SessionEntityTypes.new
+          #   session_entity_types_client = Google::Cloud::Dialogflow::SessionEntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::SessionEntityTypesClient.session_path("[PROJECT]", "[SESSION]")
           #
           #   # Iterate over all results.
@@ -268,13 +289,14 @@ module Google
           def list_session_entity_types \
               parent,
               page_size: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               parent: parent,
               page_size: page_size
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::ListSessionEntityTypesRequest)
-            @list_session_entity_types.call(req, options)
+            @list_session_entity_types.call(req, options, &block)
           end
 
           # Retrieves the specified session entity type.
@@ -286,23 +308,27 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Dialogflow::V2::SessionEntityType]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::SessionEntityType]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   session_entity_types_client = Google::Cloud::Dialogflow::V2::SessionEntityTypes.new
+          #   session_entity_types_client = Google::Cloud::Dialogflow::SessionEntityTypes.new(version: :v2)
           #   formatted_name = Google::Cloud::Dialogflow::V2::SessionEntityTypesClient.session_entity_type_path("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]")
           #   response = session_entity_types_client.get_session_entity_type(formatted_name)
 
           def get_session_entity_type \
               name,
-              options: nil
+              options: nil,
+              &block
             req = {
               name: name
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::GetSessionEntityTypeRequest)
-            @get_session_entity_type.call(req, options)
+            @get_session_entity_type.call(req, options, &block)
           end
 
           # Creates a session entity type.
@@ -317,12 +343,15 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Dialogflow::V2::SessionEntityType]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::SessionEntityType]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   session_entity_types_client = Google::Cloud::Dialogflow::V2::SessionEntityTypes.new
+          #   session_entity_types_client = Google::Cloud::Dialogflow::SessionEntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::SessionEntityTypesClient.session_path("[PROJECT]", "[SESSION]")
           #
           #   # TODO: Initialize +session_entity_type+:
@@ -332,13 +361,14 @@ module Google
           def create_session_entity_type \
               parent,
               session_entity_type,
-              options: nil
+              options: nil,
+              &block
             req = {
               parent: parent,
               session_entity_type: session_entity_type
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::CreateSessionEntityTypeRequest)
-            @create_session_entity_type.call(req, options)
+            @create_session_entity_type.call(req, options, &block)
           end
 
           # Updates the specified session entity type.
@@ -356,12 +386,15 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Dialogflow::V2::SessionEntityType]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::SessionEntityType]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   session_entity_types_client = Google::Cloud::Dialogflow::V2::SessionEntityTypes.new
+          #   session_entity_types_client = Google::Cloud::Dialogflow::SessionEntityTypes.new(version: :v2)
           #
           #   # TODO: Initialize +session_entity_type+:
           #   session_entity_type = {}
@@ -370,13 +403,14 @@ module Google
           def update_session_entity_type \
               session_entity_type,
               update_mask: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               session_entity_type: session_entity_type,
               update_mask: update_mask
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::UpdateSessionEntityTypeRequest)
-            @update_session_entity_type.call(req, options)
+            @update_session_entity_type.call(req, options, &block)
           end
 
           # Deletes the specified session entity type.
@@ -388,22 +422,26 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result []
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   session_entity_types_client = Google::Cloud::Dialogflow::V2::SessionEntityTypes.new
+          #   session_entity_types_client = Google::Cloud::Dialogflow::SessionEntityTypes.new(version: :v2)
           #   formatted_name = Google::Cloud::Dialogflow::V2::SessionEntityTypesClient.session_entity_type_path("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]")
           #   session_entity_types_client.delete_session_entity_type(formatted_name)
 
           def delete_session_entity_type \
               name,
-              options: nil
+              options: nil,
+              &block
             req = {
               name: name
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::DeleteSessionEntityTypeRequest)
-            @delete_session_entity_type.call(req, options)
+            @delete_session_entity_type.call(req, options, &block)
             nil
           end
         end