google-cloud-dialogflow 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 229a61fb2d5d02dd466058f0e1b90b9a84619f933fd9c0a0432c7cf4c3c48813
-  data.tar.gz: 275e5947988d587ffe13cda4443e53ced1413ec28af0cae376eb872ca5305eae
+  metadata.gz: 4eec775b6e0a5bf58391574cf0cc4360c723d8e05c38be3bf8a3fbbbecd94ae4
+  data.tar.gz: 7a495e93f68e6ecd8eea5a1b42f09040f6b9490760dd4ecbc07da8da99f8fac7
 SHA512:
-  metadata.gz: c204361b8718a32cb8dc3fdfdcea688b30a1bf566dee881ee8b3a770558b15c99f0ccbbcd8496adb76b13e8cd323381cee5da9d4f47095ba49915aed6d82b0ae
-  data.tar.gz: 5080029d8710ec1bd5894c80af56f9c5cf38efc57156970e44e847b5edecf9b38dd8c47237c859e2d0e999bb32990f721c9ba36195b94b541e23072aea3fc372
+  metadata.gz: 8e550945990483bdf2c052c0c0a35dd0259ba28a44d5780f72a78d243adbd78eaf2b1951b2dc9ed4b863e2f7a5d41f080b3767e69c11d853cd1c86617d5a2dd4
+  data.tar.gz: 51d57428a3b290cc4df523ea4a81cfe36dde9d6a365c9ebc2e4ec5ede4cf94c2def8f7c5770a9aeedf8eb35d8e03e1b81f291a088d41d82633841beb2c213816

data/.yardopts

@@ -2,6 +2,7 @@
 --title=Dialogflow API
 --exclude _pb\.rb$
 --markup markdown
+--markup-provider redcarpet
 
 ./lib/**/*.rb
 -

data/README.md

@@ -21,7 +21,7 @@ $ gem install google-cloud-dialogflow
 ```
 
 ### Next Steps
-- Read the [Client Library Documentation][https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-dialogflow/latest/google/cloud/dialogflow] for Dialogflow API
+- Read the [Client Library Documentation][] for Dialogflow API
   to see other available methods on the client.
 - Read the [Dialogflow API Product documentation][Product Documentation]
   to learn more about the product and see How-to Guides.
@@ -30,3 +30,40 @@ $ gem install google-cloud-dialogflow
 
 [Client Library Documentation]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-dialogflow/latest/google/cloud/dialogflow/v2
 [Product Documentation]: https://cloud.google.com/dialogflow
+
+## Enabling Logging
+
+To enable logging for this library, set the logger for the underlying [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library.
+The logger that you set may be a Ruby stdlib [`Logger`](https://ruby-doc.org/stdlib-2.5.0/libdoc/logger/rdoc/Logger.html) as shown below,
+or a [`Google::Cloud::Logging::Logger`](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-logging/latest/google/cloud/logging/logger)
+that will write logs to [Stackdriver Logging](https://cloud.google.com/logging/). See [grpc/logconfig.rb](https://github.com/grpc/grpc/blob/master/src/ruby/lib/grpc/logconfig.rb)
+and the gRPC [spec_helper.rb](https://github.com/grpc/grpc/blob/master/src/ruby/spec/spec_helper.rb) for additional information.
+
+Configuring a Ruby stdlib logger:
+
+```ruby
+require "logger"
+
+module MyLogger
+  LOGGER = Logger.new $stderr, level: Logger::WARN
+  def logger
+    LOGGER
+  end
+end
+
+# Define a gRPC module-level logger method before grpc/logconfig.rb loads.
+module GRPC
+  extend MyLogger
+end
+```
+
+## Supported Ruby Versions
+
+This library is supported on Ruby 2.3+.
+
+Google provides official support for Ruby versions that are actively supported
+by Ruby Core—that is, Ruby versions that are either in normal maintenance or
+in security maintenance, and not end of life. Currently, this means Ruby 2.3
+and later. Older versions of Ruby _may_ still work, but are unsupported and not
+recommended. See https://www.ruby-lang.org/en/downloads/branches/ for details
+about the Ruby support schedule.

data/lib/google/cloud/dialogflow.rb

@@ -33,7 +33,7 @@ module Google
     #
     # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
     # 2. [Enable billing for your project.](https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project)
-    # 3. [Enable the Dialogflow API.](https://console.cloud.google.com/apis/api/dialogflow)
+    # 3. [Enable the Dialogflow API.](https://console.cloud.google.com/apis/library/dialogflow.googleapis.com)
     # 4. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
     #
     # ### Next Steps
@@ -44,6 +44,31 @@ module Google
     #
     # [Product Documentation]: https://cloud.google.com/dialogflow
     #
+    # ## Enabling Logging
+    #
+    # To enable logging for this library, set the logger for the underlying [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library.
+    # The logger that you set may be a Ruby stdlib [`Logger`](https://ruby-doc.org/stdlib-2.5.0/libdoc/logger/rdoc/Logger.html) as shown below,
+    # or a [`Google::Cloud::Logging::Logger`](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-logging/latest/google/cloud/logging/logger)
+    # that will write logs to [Stackdriver Logging](https://cloud.google.com/logging/). See [grpc/logconfig.rb](https://github.com/grpc/grpc/blob/master/src/ruby/lib/grpc/logconfig.rb)
+    # and the gRPC [spec_helper.rb](https://github.com/grpc/grpc/blob/master/src/ruby/spec/spec_helper.rb) for additional information.
+    #
+    # Configuring a Ruby stdlib logger:
+    #
+    # ```ruby
+    # require "logger"
+    #
+    # module MyLogger
+    #   LOGGER = Logger.new $stderr, level: Logger::WARN
+    #   def logger
+    #     LOGGER
+    #   end
+    # end
+    #
+    # # Define a gRPC module-level logger method before grpc/logconfig.rb loads.
+    # module GRPC
+    #   extend MyLogger
+    # end
+    # ```
     #
     module Dialogflow
       # rubocop:enable LineLength
@@ -112,6 +137,11 @@ 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 self.new(*args, version: :v2, **kwargs)
           unless AVAILABLE_VERSIONS.include?(version.to_s.downcase)
             raise "The version: #{version} is not available. The available versions " \
@@ -175,6 +205,11 @@ 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 self.new(*args, version: :v2, **kwargs)
           unless AVAILABLE_VERSIONS.include?(version.to_s.downcase)
             raise "The version: #{version} is not available. The available versions " \
@@ -248,6 +283,11 @@ 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 self.new(*args, version: :v2, **kwargs)
           unless AVAILABLE_VERSIONS.include?(version.to_s.downcase)
             raise "The version: #{version} is not available. The available versions " \
@@ -325,6 +365,11 @@ 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 self.new(*args, version: :v2, **kwargs)
           unless AVAILABLE_VERSIONS.include?(version.to_s.downcase)
             raise "The version: #{version} is not available. The available versions " \
@@ -383,6 +428,11 @@ 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 self.new(*args, version: :v2, **kwargs)
           unless AVAILABLE_VERSIONS.include?(version.to_s.downcase)
             raise "The version: #{version} is not available. The available versions " \
@@ -433,6 +483,11 @@ 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 self.new(*args, version: :v2, **kwargs)
           unless AVAILABLE_VERSIONS.include?(version.to_s.downcase)
             raise "The version: #{version} is not available. The available versions " \

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

@@ -25,35 +25,60 @@ require "google/cloud/dialogflow/v2/webhook_pb"
 
 module Google
   module Cloud
-    # rubocop:disable LineLength
-
-    ##
-    # # Ruby Client for Dialogflow API ([Alpha](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
-    #
-    # [Dialogflow API][Product Documentation]:
-    # An end-to-end development suite for conversational interfaces (e.g.,
-    # chatbots, voice-powered apps and devices).
-    # - [Product Documentation][]
-    #
-    # ## Quick Start
-    # In order to use this library, you first need to go through the following
-    # steps:
-    #
-    # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-    # 2. [Enable billing for your project.](https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project)
-    # 3. [Enable the Dialogflow API.](https://console.cloud.google.com/apis/api/dialogflow)
-    # 4. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
-    #
-    # ### Next Steps
-    # - Read the [Dialogflow API Product documentation][Product Documentation]
-    #   to learn more about the product and see How-to Guides.
-    # - View this [repository's main README](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/README.md)
-    #   to see the full list of Cloud APIs that we cover.
-    #
-    # [Product Documentation]: https://cloud.google.com/dialogflow
-    #
-    #
     module Dialogflow
+      # rubocop:disable LineLength
+
+      ##
+      # # Ruby Client for Dialogflow API ([Alpha](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
+      #
+      # [Dialogflow API][Product Documentation]:
+      # An end-to-end development suite for conversational interfaces (e.g.,
+      # chatbots, voice-powered apps and devices).
+      # - [Product Documentation][]
+      #
+      # ## Quick Start
+      # In order to use this library, you first need to go through the following
+      # steps:
+      #
+      # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
+      # 2. [Enable billing for your project.](https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project)
+      # 3. [Enable the Dialogflow API.](https://console.cloud.google.com/apis/library/dialogflow.googleapis.com)
+      # 4. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
+      #
+      # ### Next Steps
+      # - Read the [Dialogflow API Product documentation][Product Documentation]
+      #   to learn more about the product and see How-to Guides.
+      # - View this [repository's main README](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/README.md)
+      #   to see the full list of Cloud APIs that we cover.
+      #
+      # [Product Documentation]: https://cloud.google.com/dialogflow
+      #
+      # ## Enabling Logging
+      #
+      # To enable logging for this library, set the logger for the underlying [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library.
+      # The logger that you set may be a Ruby stdlib [`Logger`](https://ruby-doc.org/stdlib-2.5.0/libdoc/logger/rdoc/Logger.html) as shown below,
+      # or a [`Google::Cloud::Logging::Logger`](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-logging/latest/google/cloud/logging/logger)
+      # that will write logs to [Stackdriver Logging](https://cloud.google.com/logging/). See [grpc/logconfig.rb](https://github.com/grpc/grpc/blob/master/src/ruby/lib/grpc/logconfig.rb)
+      # and the gRPC [spec_helper.rb](https://github.com/grpc/grpc/blob/master/src/ruby/spec/spec_helper.rb) for additional information.
+      #
+      # Configuring a Ruby stdlib logger:
+      #
+      # ```ruby
+      # require "logger"
+      #
+      # module MyLogger
+      #   LOGGER = Logger.new $stderr, level: Logger::WARN
+      #   def logger
+      #     LOGGER
+      #   end
+      # end
+      #
+      # # Define a gRPC module-level logger method before grpc/logconfig.rb loads.
+      # module GRPC
+      #   extend MyLogger
+      # end
+      # ```
+      #
       module V2
         # rubocop:enable LineLength
 
@@ -109,11 +134,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 self.new \
               credentials: nil,
               scopes: nil,
               client_config: nil,
               timeout: nil,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: nil
             kwargs = {
@@ -121,6 +153,8 @@ module Google
               scopes: scopes,
               client_config: client_config,
               timeout: timeout,
+              metadata: metadata,
+              exception_transformer: exception_transformer,
               lib_name: lib_name,
               lib_version: lib_version
             }.select { |_, v| v != nil }
@@ -172,11 +206,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 self.new \
               credentials: nil,
               scopes: nil,
               client_config: nil,
               timeout: nil,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: nil
             kwargs = {
@@ -184,6 +225,8 @@ module Google
               scopes: scopes,
               client_config: client_config,
               timeout: timeout,
+              metadata: metadata,
+              exception_transformer: exception_transformer,
               lib_name: lib_name,
               lib_version: lib_version
             }.select { |_, v| v != nil }
@@ -245,11 +288,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 self.new \
               credentials: nil,
               scopes: nil,
               client_config: nil,
               timeout: nil,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: nil
             kwargs = {
@@ -257,6 +307,8 @@ module Google
               scopes: scopes,
               client_config: client_config,
               timeout: timeout,
+              metadata: metadata,
+              exception_transformer: exception_transformer,
               lib_name: lib_name,
               lib_version: lib_version
             }.select { |_, v| v != nil }
@@ -322,11 +374,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 self.new \
               credentials: nil,
               scopes: nil,
               client_config: nil,
               timeout: nil,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: nil
             kwargs = {
@@ -334,6 +393,8 @@ module Google
               scopes: scopes,
               client_config: client_config,
               timeout: timeout,
+              metadata: metadata,
+              exception_transformer: exception_transformer,
               lib_name: lib_name,
               lib_version: lib_version
             }.select { |_, v| v != nil }
@@ -380,11 +441,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 self.new \
               credentials: nil,
               scopes: nil,
               client_config: nil,
               timeout: nil,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: nil
             kwargs = {
@@ -392,6 +460,8 @@ module Google
               scopes: scopes,
               client_config: client_config,
               timeout: timeout,
+              metadata: metadata,
+              exception_transformer: exception_transformer,
               lib_name: lib_name,
               lib_version: lib_version
             }.select { |_, v| v != nil }
@@ -430,11 +500,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 self.new \
               credentials: nil,
               scopes: nil,
               client_config: nil,
               timeout: nil,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: nil
             kwargs = {
@@ -442,6 +519,8 @@ module Google
               scopes: scopes,
               client_config: client_config,
               timeout: timeout,
+              metadata: metadata,
+              exception_transformer: exception_transformer,
               lib_name: lib_name,
               lib_version: lib_version
             }.select { |_, v| v != nil }

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

@@ -27,7 +27,7 @@ require "google/gax/operation"
 require "google/longrunning/operations_client"
 
 require "google/cloud/dialogflow/v2/agent_pb"
-require "google/cloud/dialogflow/credentials"
+require "google/cloud/dialogflow/v2/credentials"
 
 module Google
   module Cloud
@@ -70,6 +70,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 = {
@@ -87,8 +90,10 @@ module Google
             "https://www.googleapis.com/auth/cloud-platform"
           ].freeze
 
+          # @private
           class OperationsClient < Google::Longrunning::OperationsClient
             self::SERVICE_ADDRESS = AgentsClient::SERVICE_ADDRESS
+            self::GRPC_INTERCEPTORS = AgentsClient::GRPC_INTERCEPTORS
           end
 
           PROJECT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
@@ -130,11 +135,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
@@ -143,7 +155,7 @@ module Google
             require "google/gax/grpc"
             require "google/cloud/dialogflow/v2/agent_services_pb"
 
-            credentials ||= Google::Cloud::Dialogflow::Credentials.default
+            credentials ||= Google::Cloud::Dialogflow::V2::Credentials.default
 
             @operations_client = OperationsClient.new(
               credentials: credentials,
@@ -155,7 +167,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
@@ -179,6 +191,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(
               "agents_client_config.json"
             )
@@ -191,13 +204,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
             @agents_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
@@ -205,32 +219,39 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Cloud::Dialogflow::V2::Agents::Stub.method(:new)
             )
 
             @get_agent = Google::Gax.create_api_call(
               @agents_stub.method(:get_agent),
-              defaults["get_agent"]
+              defaults["get_agent"],
+              exception_transformer: exception_transformer
             )
             @search_agents = Google::Gax.create_api_call(
               @agents_stub.method(:search_agents),
-              defaults["search_agents"]
+              defaults["search_agents"],
+              exception_transformer: exception_transformer
             )
             @train_agent = Google::Gax.create_api_call(
               @agents_stub.method(:train_agent),
-              defaults["train_agent"]
+              defaults["train_agent"],
+              exception_transformer: exception_transformer
             )
             @export_agent = Google::Gax.create_api_call(
               @agents_stub.method(:export_agent),
-              defaults["export_agent"]
+              defaults["export_agent"],
+              exception_transformer: exception_transformer
             )
             @import_agent = Google::Gax.create_api_call(
               @agents_stub.method(:import_agent),
-              defaults["import_agent"]
+              defaults["import_agent"],
+              exception_transformer: exception_transformer
             )
             @restore_agent = Google::Gax.create_api_call(
               @agents_stub.method(:restore_agent),
-              defaults["restore_agent"]
+              defaults["restore_agent"],
+              exception_transformer: exception_transformer
             )
           end
 
@@ -244,23 +265,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::Agent]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::Agent]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   agents_client = Google::Cloud::Dialogflow::V2::Agents.new
+          #   agents_client = Google::Cloud::Dialogflow::Agents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::AgentsClient.project_path("[PROJECT]")
           #   response = agents_client.get_agent(formatted_parent)
 
           def get_agent \
               parent,
-              options: nil
+              options: nil,
+              &block
             req = {
               parent: parent
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::GetAgentRequest)
-            @get_agent.call(req, options)
+            @get_agent.call(req, options, &block)
           end
 
           # Returns the list of agents.
@@ -283,6 +308,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::Agent>]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Gax::PagedEnumerable<Google::Cloud::Dialogflow::V2::Agent>]
           #   An enumerable of Google::Cloud::Dialogflow::V2::Agent instances.
           #   See Google::Gax::PagedEnumerable documentation for other
@@ -290,9 +318,9 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   agents_client = Google::Cloud::Dialogflow::V2::Agents.new
+          #   agents_client = Google::Cloud::Dialogflow::Agents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::AgentsClient.project_path("[PROJECT]")
           #
           #   # Iterate over all results.
@@ -311,13 +339,14 @@ module Google
           def search_agents \
               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::SearchAgentsRequest)
-            @search_agents.call(req, options)
+            @search_agents.call(req, options, &block)
           end
 
           # Trains the specified agent.
@@ -334,9 +363,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"
           #
-          #   agents_client = Google::Cloud::Dialogflow::V2::Agents.new
+          #   agents_client = Google::Cloud::Dialogflow::Agents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::AgentsClient.project_path("[PROJECT]")
           #
           #   # Register a callback during the method call.
@@ -402,9 +431,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"
           #
-          #   agents_client = Google::Cloud::Dialogflow::V2::Agents.new
+          #   agents_client = Google::Cloud::Dialogflow::Agents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::AgentsClient.project_path("[PROJECT]")
           #
           #   # Register a callback during the method call.
@@ -490,9 +519,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"
           #
-          #   agents_client = Google::Cloud::Dialogflow::V2::Agents.new
+          #   agents_client = Google::Cloud::Dialogflow::Agents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::AgentsClient.project_path("[PROJECT]")
           #
           #   # Register a callback during the method call.
@@ -579,9 +608,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"
           #
-          #   agents_client = Google::Cloud::Dialogflow::V2::Agents.new
+          #   agents_client = Google::Cloud::Dialogflow::Agents.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::AgentsClient.project_path("[PROJECT]")
           #
           #   # Register a callback during the method call.