google-cloud-dialogflow 0.1.0 → 0.2.0

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

@@ -15,17 +15,6 @@
 module Google
   module Cloud
     module Dialogflow
-      ##
-      # # Dialogflow API Contents
-      #
-      # | Class | Description |
-      # | ----- | ----------- |
-      # | [SessionEntityTypesClient][] | Entities are extracted from user input and represent parameters that are meaningful to your application. |
-      # | [Data Types][] | Data types for Google::Cloud::Dialogflow::V2 |
-      #
-      # [SessionEntityTypesClient]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-dialogflow/latest/google/cloud/dialogflow/v2/sessionentitytypesclient
-      # [Data Types]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-dialogflow/latest/google/cloud/dialogflow/v2/datatypes
-      #
       module V2
         # Represents a session entity type.
         #

data/lib/google/cloud/dialogflow/v2/doc/google/longrunning/operations.rb

@@ -0,0 +1,92 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Google
+  module Longrunning
+    # This resource represents a long-running operation that is the result of a
+    # network API call.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The server-assigned name, which is only unique within the same service that
+    #     originally returns it. If you use the default HTTP mapping, the
+    #     +name+ should have the format of +operations/some/unique/name+.
+    # @!attribute [rw] metadata
+    #   @return [Google::Protobuf::Any]
+    #     Service-specific metadata associated with the operation.  It typically
+    #     contains progress information and common metadata such as create time.
+    #     Some services might not provide such metadata.  Any method that returns a
+    #     long-running operation should document the metadata type, if any.
+    # @!attribute [rw] done
+    #   @return [true, false]
+    #     If the value is +false+, it means the operation is still in progress.
+    #     If true, the operation is completed, and either +error+ or +response+ is
+    #     available.
+    # @!attribute [rw] error
+    #   @return [Google::Rpc::Status]
+    #     The error result of the operation in case of failure or cancellation.
+    # @!attribute [rw] response
+    #   @return [Google::Protobuf::Any]
+    #     The normal response of the operation in case of success.  If the original
+    #     method returns no data on success, such as +Delete+, the response is
+    #     +google.protobuf.Empty+.  If the original method is standard
+    #     +Get+/+Create+/+Update+, the response should be the resource.  For other
+    #     methods, the response should have the type +XxxResponse+, where +Xxx+
+    #     is the original method name.  For example, if the original method name
+    #     is +TakeSnapshot()+, the inferred response type is
+    #     +TakeSnapshotResponse+.
+    class Operation; end
+
+    # The request message for {Google::Longrunning::Operations::GetOperation Operations::GetOperation}.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The name of the operation resource.
+    class GetOperationRequest; end
+
+    # The request message for {Google::Longrunning::Operations::ListOperations Operations::ListOperations}.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The name of the operation collection.
+    # @!attribute [rw] filter
+    #   @return [String]
+    #     The standard list filter.
+    # @!attribute [rw] page_size
+    #   @return [Integer]
+    #     The standard list page size.
+    # @!attribute [rw] page_token
+    #   @return [String]
+    #     The standard list page token.
+    class ListOperationsRequest; end
+
+    # The response message for {Google::Longrunning::Operations::ListOperations Operations::ListOperations}.
+    # @!attribute [rw] operations
+    #   @return [Array<Google::Longrunning::Operation>]
+    #     A list of operations that matches the specified filter in the request.
+    # @!attribute [rw] next_page_token
+    #   @return [String]
+    #     The standard List next-page token.
+    class ListOperationsResponse; end
+
+    # The request message for {Google::Longrunning::Operations::CancelOperation Operations::CancelOperation}.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The name of the operation resource to be cancelled.
+    class CancelOperationRequest; end
+
+    # The request message for {Google::Longrunning::Operations::DeleteOperation Operations::DeleteOperation}.
+    # @!attribute [rw] name
+    #   @return [String]
+    #     The name of the operation resource to be deleted.
+    class DeleteOperationRequest; end
+  end
+end

data/lib/google/cloud/dialogflow/{credentials.rb → v2/doc/google/protobuf/empty.rb}

@@ -12,19 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "googleauth"
-
 module Google
-  module Cloud
-    module Dialogflow
-      class Credentials < Google::Auth::Credentials
-        SCOPE = [
-          "https://www.googleapis.com/auth/cloud-platform"
-        ].freeze
-        PATH_ENV_VARS = %w(DIALOGFLOW_KEYFILE GOOGLE_CLOUD_KEYFILE GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(DIALOGFLOW_KEYFILE_JSON GOOGLE_CLOUD_KEYFILE_JSON GCLOUD_KEYFILE_JSON)
-        DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"]
-      end
-    end
+  module Protobuf
+    # A generic empty message that you can re-use to avoid defining duplicated
+    # empty messages in your APIs. A typical example is to use it as the request
+    # or the response type of an API method. For instance:
+    #
+    #     service Foo {
+    #       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
+    #     }
+    #
+    # The JSON representation for +Empty+ is empty JSON object +{}+.
+    class Empty; end
   end
-end
+end

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

@@ -30,7 +30,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)
     #
     # ### Installation
@@ -46,6 +46,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
       module V2

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

@@ -27,7 +27,7 @@ require "google/gax/operation"
 require "google/longrunning/operations_client"
 
 require "google/cloud/dialogflow/v2/entity_type_pb"
-require "google/cloud/dialogflow/credentials"
+require "google/cloud/dialogflow/v2/credentials"
 
 module Google
   module Cloud
@@ -72,6 +72,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 = {
@@ -89,8 +92,10 @@ module Google
             "https://www.googleapis.com/auth/cloud-platform"
           ].freeze
 
+          # @private
           class OperationsClient < Google::Longrunning::OperationsClient
             self::SERVICE_ADDRESS = EntityTypesClient::SERVICE_ADDRESS
+            self::GRPC_INTERCEPTORS = EntityTypesClient::GRPC_INTERCEPTORS
           end
 
           PROJECT_AGENT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
@@ -149,11 +154,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
@@ -162,7 +174,7 @@ module Google
             require "google/gax/grpc"
             require "google/cloud/dialogflow/v2/entity_type_services_pb"
 
-            credentials ||= Google::Cloud::Dialogflow::Credentials.default
+            credentials ||= Google::Cloud::Dialogflow::V2::Credentials.default
 
             @operations_client = OperationsClient.new(
               credentials: credentials,
@@ -174,7 +186,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
@@ -198,6 +210,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(
               "entity_types_client_config.json"
             )
@@ -210,13 +223,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
             @entity_types_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
@@ -224,48 +238,59 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Cloud::Dialogflow::V2::EntityTypes::Stub.method(:new)
             )
 
             @list_entity_types = Google::Gax.create_api_call(
               @entity_types_stub.method(:list_entity_types),
-              defaults["list_entity_types"]
+              defaults["list_entity_types"],
+              exception_transformer: exception_transformer
             )
             @get_entity_type = Google::Gax.create_api_call(
               @entity_types_stub.method(:get_entity_type),
-              defaults["get_entity_type"]
+              defaults["get_entity_type"],
+              exception_transformer: exception_transformer
             )
             @create_entity_type = Google::Gax.create_api_call(
               @entity_types_stub.method(:create_entity_type),
-              defaults["create_entity_type"]
+              defaults["create_entity_type"],
+              exception_transformer: exception_transformer
             )
             @update_entity_type = Google::Gax.create_api_call(
               @entity_types_stub.method(:update_entity_type),
-              defaults["update_entity_type"]
+              defaults["update_entity_type"],
+              exception_transformer: exception_transformer
             )
             @delete_entity_type = Google::Gax.create_api_call(
               @entity_types_stub.method(:delete_entity_type),
-              defaults["delete_entity_type"]
+              defaults["delete_entity_type"],
+              exception_transformer: exception_transformer
             )
             @batch_update_entity_types = Google::Gax.create_api_call(
               @entity_types_stub.method(:batch_update_entity_types),
-              defaults["batch_update_entity_types"]
+              defaults["batch_update_entity_types"],
+              exception_transformer: exception_transformer
             )
             @batch_delete_entity_types = Google::Gax.create_api_call(
               @entity_types_stub.method(:batch_delete_entity_types),
-              defaults["batch_delete_entity_types"]
+              defaults["batch_delete_entity_types"],
+              exception_transformer: exception_transformer
             )
             @batch_create_entities = Google::Gax.create_api_call(
               @entity_types_stub.method(:batch_create_entities),
-              defaults["batch_create_entities"]
+              defaults["batch_create_entities"],
+              exception_transformer: exception_transformer
             )
             @batch_update_entities = Google::Gax.create_api_call(
               @entity_types_stub.method(:batch_update_entities),
-              defaults["batch_update_entities"]
+              defaults["batch_update_entities"],
+              exception_transformer: exception_transformer
             )
             @batch_delete_entities = Google::Gax.create_api_call(
               @entity_types_stub.method(:batch_delete_entities),
-              defaults["batch_delete_entities"]
+              defaults["batch_delete_entities"],
+              exception_transformer: exception_transformer
             )
           end
 
@@ -291,6 +316,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::EntityType>]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Gax::PagedEnumerable<Google::Cloud::Dialogflow::V2::EntityType>]
           #   An enumerable of Google::Cloud::Dialogflow::V2::EntityType instances.
           #   See Google::Gax::PagedEnumerable documentation for other
@@ -298,9 +326,9 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::EntityTypesClient.project_agent_path("[PROJECT]")
           #
           #   # Iterate over all results.
@@ -320,14 +348,15 @@ module Google
               parent,
               language_code: nil,
               page_size: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               parent: parent,
               language_code: language_code,
               page_size: page_size
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::ListEntityTypesRequest)
-            @list_entity_types.call(req, options)
+            @list_entity_types.call(req, options, &block)
           end
 
           # Retrieves the specified entity type.
@@ -344,25 +373,29 @@ 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::EntityType]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::EntityType]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_name = Google::Cloud::Dialogflow::V2::EntityTypesClient.entity_type_path("[PROJECT]", "[ENTITY_TYPE]")
           #   response = entity_types_client.get_entity_type(formatted_name)
 
           def get_entity_type \
               name,
               language_code: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               name: name,
               language_code: language_code
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::GetEntityTypeRequest)
-            @get_entity_type.call(req, options)
+            @get_entity_type.call(req, options, &block)
           end
 
           # Creates an entity type in the specified agent.
@@ -383,12 +416,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::EntityType]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::EntityType]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::EntityTypesClient.project_agent_path("[PROJECT]")
           #
           #   # TODO: Initialize +entity_type+:
@@ -399,14 +435,15 @@ module Google
               parent,
               entity_type,
               language_code: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               parent: parent,
               entity_type: entity_type,
               language_code: language_code
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::CreateEntityTypeRequest)
-            @create_entity_type.call(req, options)
+            @create_entity_type.call(req, options, &block)
           end
 
           # Updates the specified entity type.
@@ -429,12 +466,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::EntityType]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Dialogflow::V2::EntityType]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/dialogflow/v2"
+          #   require "google/cloud/dialogflow"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #
           #   # TODO: Initialize +entity_type+:
           #   entity_type = {}
@@ -444,14 +484,15 @@ module Google
               entity_type,
               language_code: nil,
               update_mask: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               entity_type: entity_type,
               language_code: language_code,
               update_mask: update_mask
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Dialogflow::V2::UpdateEntityTypeRequest)
-            @update_entity_type.call(req, options)
+            @update_entity_type.call(req, options, &block)
           end
 
           # Deletes the specified entity type.
@@ -462,22 +503,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"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_name = Google::Cloud::Dialogflow::V2::EntityTypesClient.entity_type_path("[PROJECT]", "[ENTITY_TYPE]")
           #   entity_types_client.delete_entity_type(formatted_name)
 
           def delete_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::DeleteEntityTypeRequest)
-            @delete_entity_type.call(req, options)
+            @delete_entity_type.call(req, options, &block)
             nil
           end
 
@@ -514,9 +559,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"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::EntityTypesClient.project_agent_path("[PROJECT]")
           #
           #   # Register a callback during the method call.
@@ -589,9 +634,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"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::EntityTypesClient.project_agent_path("[PROJECT]")
           #
           #   # TODO: Initialize +entity_type_names+:
@@ -668,9 +713,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"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::EntityTypesClient.entity_type_path("[PROJECT]", "[ENTITY_TYPE]")
           #
           #   # TODO: Initialize +entities+:
@@ -754,9 +799,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"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::EntityTypesClient.entity_type_path("[PROJECT]", "[ENTITY_TYPE]")
           #
           #   # TODO: Initialize +entities+:
@@ -837,9 +882,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"
           #
-          #   entity_types_client = Google::Cloud::Dialogflow::V2::EntityTypes.new
+          #   entity_types_client = Google::Cloud::Dialogflow::EntityTypes.new(version: :v2)
           #   formatted_parent = Google::Cloud::Dialogflow::V2::EntityTypesClient.entity_type_path("[PROJECT]", "[ENTITY_TYPE]")
           #
           #   # TODO: Initialize +entity_values+: