@@ -32,6 +32,7 @@ proto_library(
 "flow.proto",
 "fulfillment.proto",
 "gcs.proto",
+"import_strategy.proto",
 "intent.proto",
 "page.proto",
 "response_message.proto",
@@ -245,16 +246,15 @@ py_gapic_library(
 ],
 )
 
-# Uncomment once https://.com/googleapis/gapic-generator-python/issues/1376 is fixed
-# py_test(
-# name = "cx_py_gapic_test",
-# srcs = [
-# "cx_py_gapic_pytest.py",
-# "cx_py_gapic_test.py",
-# ],
-# legacy_create_init = False,
-# deps = [":cx_py_gapic"],
-# )
+py_test(
+name = "cx_py_gapic_test",
+srcs = [
+"cx_py_gapic_pytest.py",
+"cx_py_gapic_test.py",
+],
+legacy_create_init = False,
+deps = [":cx_py_gapic"],
+)
 
 # Open Source Packages
 py_gapic_assembly_pkg(
@@ -399,7 +399,6 @@ load(
 
 csharp_proto_library(
 name = "cx_csharp_proto",
-extra_opts = [""],
 deps = [":cx_proto"],
 )
 

@@ -180,8 +180,9 @@ message SpeechToTextSettings {
 // Types][google.cloud.dialogflow.cx.v3beta1.EntityType],
 // [Flows][google.cloud.dialogflow.cx.v3beta1.Flow],
 // [Fulfillments][google.cloud.dialogflow.cx.v3beta1.Fulfillment],
-// [Webhooks][google.cloud.dialogflow.cx.v3beta1.Webhook], and so on to manage
-// the conversation flows..
+// [Webhooks][google.cloud.dialogflow.cx.v3beta1.Webhook],
+// [TransitionRouteGroups][google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroup]
+// and so on to manage the conversation flows.
 message Agent {
 option (google.api.resource) = {
 type: "dialogflow.googleapis.com/Agent"

@@ -20,6 +20,7 @@ import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
+import "google/cloud/dialogflow/cx/v3beta1/import_strategy.proto";
 import "google/cloud/dialogflow/cx/v3beta1/page.proto";
 import "google/cloud/dialogflow/cx/v3beta1/validation_message.proto";
 import "google/longrunning/operations.proto";
@@ -308,7 +309,10 @@ message Flow {
 // defined in the page have higher priority than those defined in the flow.
 //
 // Format:`projects/<Project ID>/locations/<Location ID>/agents/<Agent
-// ID>/flows/<Flow ID>/transitionRouteGroups/<TransitionRouteGroup ID>`.
+// ID>/flows/<Flow ID>/transitionRouteGroups/<TransitionRouteGroup ID>`
+// or `projects/<Project ID>/locations/<Location ID>/agents/<Agent
+// ID>/transitionRouteGroups/<TransitionRouteGroup ID>` for agent-level
+// groups.
 repeated string transition_route_groups = 15
 [(google.api.resource_reference) = {
 type: "dialogflow.googleapis.com/TransitionRouteGroup"
@@ -582,6 +586,24 @@ message ImportFlowRequest {
 
 // Flow import mode. If not specified, `KEEP` is assumed.
 ImportOption import_option = 4;
+
+// Optional. Specifies the import strategy used when resolving resource
+// conflicts.
+FlowImportStrategy flow_import_strategy = 5
+[(google.api.field_behavior) = OPTIONAL];
+}
+
+// The flow import strategy used for resource conflict resolution associated
+// with an
+// [ImportFlowRequest][google.cloud.dialogflow.cx.v3beta1.ImportFlowRequest].
+message FlowImportStrategy {
+// Optional. Global flow import strategy for resource conflict resolution. The
+// import Import strategy for resource conflict resolution, applied globally
+// throughout the flow. It will be applied for all
+// display name conflicts in the imported content. If not specified,
+// 'CREATE_NEW' is assumed.
+ImportStrategy global_import_strategy = 1
+[(google.api.field_behavior) = OPTIONAL];
 }
 
 // The response message for

@@ -0,0 +1,51 @@
+// Copyright 2023 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
+//
+// http://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.
+
+syntax = "proto3";
+
+package google.cloud.dialogflow.cx.v3beta1;
+
+option cc_enable_arenas = true;
+option csharp_namespace = "Google.Cloud.Dialogflow.Cx.V3Beta1";
+option go_package = "cloud.google.com/go/dialogflow/cx/apiv3beta1/cxpb;cxpb";
+option java_multiple_files = true;
+option java_outer_classname = "ImportStrategyProto";
+option java_package = "com.google.cloud.dialogflow.cx.v3beta1";
+option objc_class_prefix = "DF";
+
+// Import strategies for the conflict resolution of resources (i.e. intents,
+// entities, and webhooks) with identical display names during import
+// operations.
+enum ImportStrategy {
+// Unspecified. Treated as 'CREATE_NEW'.
+IMPORT_STRATEGY_UNSPECIFIED = 0;
+
+// Create a new resource with a numeric suffix appended to the end of the
+// existing display name.
+IMPORT_STRATEGY_CREATE_NEW = 1;
+
+// Replace existing resource with incoming resource in the content to be
+// imported.
+IMPORT_STRATEGY_REPLACE = 2;
+
+// Keep existing resource and discard incoming resource in the content to be
+// imported.
+IMPORT_STRATEGY_KEEP = 3;
+
+// Combine existing and incoming resources when a conflict is encountered.
+IMPORT_STRATEGY_MERGE = 4;
+
+// Throw error if a conflict is encountered.
+IMPORT_STRATEGY_THROW_ERROR = 5;
+}

@@ -139,7 +139,10 @@ message Page {
 // intent, then the first group in the ordered list takes precedence.
 //
 // Format:`projects/<Project ID>/locations/<Location ID>/agents/<Agent
-// ID>/flows/<Flow ID>/transitionRouteGroups/<TransitionRouteGroup ID>`.
+// ID>/flows/<Flow ID>/transitionRouteGroups/<TransitionRouteGroup ID>`
+// or `projects/<Project ID>/locations/<Location ID>/agents/<Agent
+// ID>/transitionRouteGroups/<TransitionRouteGroup ID>` for agent-level
+// groups.
 repeated string transition_route_groups = 11
 [(google.api.resource_reference) = {
 type: "dialogflow.googleapis.com/TransitionRouteGroup"

@@ -609,15 +609,15 @@ message QueryParameters {
 
 // Represents the query input. It can contain one of:
 //
-// 1. A conversational query in the form of text.
+// 1. A conversational query in the form of text.
 //
-// 2. An intent query that specifies which intent to trigger.
+// 2. An intent query that specifies which intent to trigger.
 //
-// 3. Natural language speech audio to be processed.
+// 3. Natural language speech audio to be processed.
 //
-// 4. An event to be triggered.
+// 4. An event to be triggered.
 //
-// 5. DTMF digits to invoke an intent and fill in parameter value.
+// 5. DTMF digits to invoke an intent and fill in parameter value.
 message QueryInput {
 // Required. The input specification.
 oneof input {

@@ -46,6 +46,9 @@ service TransitionRouteGroups {
 returns (ListTransitionRouteGroupsResponse) {
 option (google.api.http) = {
 get: "/v3beta1/{parent=projects/*/locations/*/agents/*/flows/*}/transitionRouteGroups"
+additional_bindings {
+get: "/v3beta1/{parent=projects/*/locations/*/agents/*}/transitionRouteGroups"
+}
 };
 option (google.api.method_signature) = "parent";
 }
@@ -56,6 +59,9 @@ service TransitionRouteGroups {
 returns (TransitionRouteGroup) {
 option (google.api.http) = {
 get: "/v3beta1/{name=projects/*/locations/*/agents/*/flows/*/transitionRouteGroups/*}"
+additional_bindings {
+get: "/v3beta1/{name=projects/*/locations/*/agents/*/transitionRouteGroups/*}"
+}
 };
 option (google.api.method_signature) = "name";
 }
@@ -72,6 +78,10 @@ service TransitionRouteGroups {
 option (google.api.http) = {
 post: "/v3beta1/{parent=projects/*/locations/*/agents/*/flows/*}/transitionRouteGroups"
 body: "transition_route_group"
+additional_bindings {
+post: "/v3beta1/{parent=projects/*/locations/*/agents/*}/transitionRouteGroups"
+body: "transition_route_group"
+}
 };
 option (google.api.method_signature) = "parent,transition_route_group";
 }
@@ -87,6 +97,10 @@ service TransitionRouteGroups {
 option (google.api.http) = {
 : "/v3beta1/{transition_route_group.name=projects/*/locations/*/agents/*/flows/*/transitionRouteGroups/*}"
 body: "transition_route_group"
+additional_bindings {
+: "/v3beta1/{transition_route_group.name=projects/*/locations/*/agents/*/transitionRouteGroups/*}"
+body: "transition_route_group"
+}
 };
 option (google.api.method_signature) = "transition_route_group,update_mask";
 }
@@ -101,25 +115,34 @@ service TransitionRouteGroups {
 returns (google.protobuf.Empty) {
 option (google.api.http) = {
 delete: "/v3beta1/{name=projects/*/locations/*/agents/*/flows/*/transitionRouteGroups/*}"
+additional_bindings {
+delete: "/v3beta1/{name=projects/*/locations/*/agents/*/transitionRouteGroups/*}"
+}
 };
 option (google.api.method_signature) = "name";
 }
 }
 
-// An TransitionRouteGroup represents a group of
+// A TransitionRouteGroup represents a group of
 // [`TransitionRoutes`][google.cloud.dialogflow.cx.v3beta1.TransitionRoute] to
 // be used by a [Page][google.cloud.dialogflow.cx.v3beta1.Page].
 message TransitionRouteGroup {
 option (google.api.resource) = {
 type: "dialogflow.googleapis.com/TransitionRouteGroup"
 pattern: "projects/{project}/locations/{location}/agents/{agent}/flows/{flow}/transitionRouteGroups/{transition_route_group}"
+pattern: "projects/{project}/locations/{location}/agents/{agent}/transitionRouteGroups/{transition_route_group}"
+plural: "transitionRouteGroups"
+singular: "transitionRouteGroup"
 };
 
 // The unique identifier of the transition route group.
 // [TransitionRouteGroups.CreateTransitionRouteGroup][google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups.CreateTransitionRouteGroup]
 // populates the name automatically. Format: `projects/<Project
 // ID>/locations/<Location ID>/agents/<Agent ID>/flows/<Flow
-// ID>/transitionRouteGroups/<Transition Route Group ID>`.
+// ID>/transitionRouteGroups/<Transition Route Group ID>` or
+// `projects/<Project ID>/locations/<Location ID>/agents/<Agent
+// ID>/transitionRouteGroups/<TransitionRouteGroup ID>` for agent-level
+// groups.
 string name = 1;
 
 // Required. The human-readable name of the transition route group, unique
@@ -136,7 +159,8 @@ message TransitionRouteGroup {
 message ListTransitionRouteGroupsRequest {
 // Required. The flow to list all transition route groups for.
 // Format: `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-// ID>/flows/<Flow ID>`.
+// ID>/flows/<Flow ID>`
+// or `projects/<Project ID>/locations/<Location ID>/agents/<Agent ID>.
 string parent = 1 [
 (google.api.field_behavior) = REQUIRED,
 (google.api.resource_reference) = {
@@ -186,7 +210,9 @@ message GetTransitionRouteGroupRequest {
 // Required. The name of the
 // [TransitionRouteGroup][google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroup].
 // Format: `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-// ID>/flows/<Flow ID>/transitionRouteGroups/<Transition Route Group ID>`.
+// ID>/flows/<Flow ID>/transitionRouteGroups/<Transition Route Group ID>`
+// or `projects/<Project ID>/locations/<Location ID>/agents/<Agent
+// ID>/transitionRouteGroups/<Transition Route Group ID>`.
 string name = 1 [
 (google.api.field_behavior) = REQUIRED,
 (google.api.resource_reference) = {
@@ -215,7 +241,9 @@ message CreateTransitionRouteGroupRequest {
 // Required. The flow to create an
 // [TransitionRouteGroup][google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroup]
 // for. Format: `projects/<Project ID>/locations/<Location ID>/agents/<Agent
-// ID>/flows/<Flow ID>`.
+// ID>/flows/<Flow ID>`
+// or `projects/<Project ID>/locations/<Location ID>/agents/<Agent ID>`
+// for agent-level groups.
 string parent = 1 [
 (google.api.field_behavior) = REQUIRED,
 (google.api.resource_reference) = {
@@ -272,7 +300,8 @@ message DeleteTransitionRouteGroupRequest {
 // [TransitionRouteGroup][google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroup]
 // to delete. Format: `projects/<Project ID>/locations/<Location
 // ID>/agents/<Agent ID>/flows/<Flow ID>/transitionRouteGroups/<Transition
-// Route Group ID>`.
+// Route Group ID>` or `projects/<Project ID>/locations/<Location
+// ID>/agents/<Agent ID>/transitionRouteGroups/<Transition Route Group ID>`.
 string name = 1 [
 (google.api.field_behavior) = REQUIRED,
 (google.api.resource_reference) = {

@@ -182,8 +182,8 @@ message Webhook {
 
 // Optional. Maps the values extracted from specific fields of the flexible
 // webhook response into session parameters.
-// - Key: session parameter name
-// - Value: field path in the webhook response
+// - Key: session parameter name
+// - Value: field path in the webhook response
 map<string, string> parameter_mapping = 9
 [(google.api.field_behavior) = OPTIONAL];
 }