fix: RunTestCase http template. PHP REST client lib can be generated.

Google APIs · copybara-github · commit 2bea43cdc7a4 · 2021-02-16T13:06:57.000-08:00
feat: Support transition route group coverage for Test Cases.
feat: Support SentimentAnalysisResult input in the WebhookRequest.

PiperOrigin-RevId: 357788001
diff --git a/google/cloud/dialogflow/cx/v3/BUILD.bazel b/google/cloud/dialogflow/cx/v3/BUILD.bazel
@@ -192,74 +192,73 @@ go_gapic_assembly_pkg(
 # Python
 ##############################################################################
 load(
-   "@com_google_googleapis_imports//:imports.bzl",
-   "py_gapic_assembly_pkg",
-   "py_gapic_library",
+    "@com_google_googleapis_imports//:imports.bzl",
+    "py_gapic_assembly_pkg",
+    "py_gapic_library",
 )
 
 py_gapic_library(
-   name = "cx_py_gapic",
-   srcs = [":cx_proto"],
-   grpc_service_config = "dialogflow_grpc_service_config.json",
-   opt_args = [
-       "python-gapic-name=dialogflowcx",
-       "python-gapic-namespace=google.cloud",
-   ],
+    name = "cx_py_gapic",
+    srcs = [":cx_proto"],
+    grpc_service_config = "dialogflow_grpc_service_config.json",
+    opt_args = [
+        "python-gapic-name=dialogflowcx",
+        "python-gapic-namespace=google.cloud",
+    ],
 )
 
 # Open Source Packages
 py_gapic_assembly_pkg(
-   name = "dialogflow-cx-v3-py",
-   deps = [
-       ":cx_py_gapic",
-   ],
+    name = "dialogflow-cx-v3-py",
+    deps = [
+        ":cx_py_gapic",
+    ],
 )
 
-# TODO(b/177677397): Unable to generate PHP library.
 ##############################################################################
 # PHP
 ##############################################################################
-# load(
-#     "@com_google_googleapis_imports//:imports.bzl",
-#     "php_gapic_assembly_pkg",
-#     "php_gapic_library",
-#     "php_grpc_library",
-#     "php_proto_library",
-# )
-
-# php_proto_library(
-#     name = "cx_php_proto",
-#     deps = [":cx_proto"],
-# )
-
-# php_grpc_library(
-#     name = "cx_php_grpc",
-#     srcs = [":cx_proto"],
-#     deps = [":cx_php_proto"],
-# )
-
-# php_gapic_library(
-#     name = "cx_php_gapic",
-#     src = ":cx_proto_with_info",
-#     gapic_yaml = "dialogflow_gapic.yaml",
-#     grpc_service_config = "dialogflow_grpc_service_config.json",
-#     package = "google.cloud.dialogflow.cx.v3",
-#     service_yaml = "dialogflow_v3.yaml",
-#     deps = [
-#         ":cx_php_grpc",
-#         ":cx_php_proto",
-#     ],
-# )
-
-# # Open Source Packages
-# php_gapic_assembly_pkg(
-#     name = "google-cloud-dialogflow-cx-v3-php",
-#     deps = [
-#         ":cx_php_gapic",
-#         ":cx_php_grpc",
-#         ":cx_php_proto",
-#     ],
-# )
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "php_gapic_assembly_pkg",
+    "php_gapic_library",
+    "php_grpc_library",
+    "php_proto_library",
+)
+
+php_proto_library(
+    name = "cx_php_proto",
+    deps = [":cx_proto"],
+)
+
+php_grpc_library(
+    name = "cx_php_grpc",
+    srcs = [":cx_proto"],
+    deps = [":cx_php_proto"],
+)
+
+php_gapic_library(
+    name = "cx_php_gapic",
+    src = ":cx_proto_with_info",
+    gapic_yaml = "dialogflow_gapic.yaml",
+    grpc_service_config = "dialogflow_grpc_service_config.json",
+    package = "google.cloud.dialogflow.cx.v3",
+    service_yaml = "dialogflow_v3.yaml",
+    deps = [
+        ":cx_php_grpc",
+        ":cx_php_proto",
+    ],
+)
+
+# Open Source Packages
+php_gapic_assembly_pkg(
+    name = "google-cloud-dialogflow-cx-v3-php",
+    deps = [
+        ":cx_php_gapic",
+        ":cx_php_grpc",
+        ":cx_php_proto",
+    ],
+)
 
 ##############################################################################
 # Node.js
diff --git a/google/cloud/dialogflow/cx/v3/agent.proto b/google/cloud/dialogflow/cx/v3/agent.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/audio_config.proto b/google/cloud/dialogflow/cx/v3/audio_config.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/entity_type.proto b/google/cloud/dialogflow/cx/v3/entity_type.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/environment.proto b/google/cloud/dialogflow/cx/v3/environment.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/experiment.proto b/google/cloud/dialogflow/cx/v3/experiment.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/flow.proto b/google/cloud/dialogflow/cx/v3/flow.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/fulfillment.proto b/google/cloud/dialogflow/cx/v3/fulfillment.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/intent.proto b/google/cloud/dialogflow/cx/v3/intent.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/page.proto b/google/cloud/dialogflow/cx/v3/page.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/response_message.proto b/google/cloud/dialogflow/cx/v3/response_message.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/security_settings.proto b/google/cloud/dialogflow/cx/v3/security_settings.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/session.proto b/google/cloud/dialogflow/cx/v3/session.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/session_entity_type.proto b/google/cloud/dialogflow/cx/v3/session_entity_type.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/test_case.proto b/google/cloud/dialogflow/cx/v3/test_case.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import "google/cloud/dialogflow/cx/v3/intent.proto";
 import "google/cloud/dialogflow/cx/v3/page.proto";
 import "google/cloud/dialogflow/cx/v3/response_message.proto";
 import "google/cloud/dialogflow/cx/v3/session.proto";
+import "google/cloud/dialogflow/cx/v3/transition_route_group.proto";
 import "google/longrunning/operations.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
@@ -94,7 +95,7 @@ service TestCases {
   // Kicks off a test case run.
   rpc RunTestCase(RunTestCaseRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
-      post: "/v3/projects/*/locations/*/agents/*/testCases:run"
+      post: "/v3/{name=projects/*/locations/*/agents/*/testCases/*}:run"
       body: "*"
     };
     option (google.longrunning.operation_info) = {
@@ -277,12 +278,12 @@ message ConversationTurn {
       (google.api.field_behavior) = INPUT_ONLY
     ];
 
-    // The [Intent][google.cloud.dialogflow.cx.v3.Intent] that triggered the response. Only some fields such as
-    // name and displayname will be set.
+    // The [Intent][google.cloud.dialogflow.cx.v3.Intent] that triggered the response. Only name and displayName
+    // will be set.
     Intent triggered_intent = 7;
 
-    // The [Page][google.cloud.dialogflow.cx.v3.Page] on which the utterance was spoken. Only some fields such as
-    // name and displayname will be set.
+    // The [Page][google.cloud.dialogflow.cx.v3.Page] on which the utterance was spoken. Only name and displayName
+    // will be set.
     Page current_page = 8;
 
     // The [text][google.cloud.dialogflow.cx.v3.ResponseMessage.Text] responses from the agent for the turn.
@@ -327,8 +328,9 @@ message TestRunDifference {
   string description = 2;
 }
 
-// Transition coverage represents the percentage of all possible transitions
-// present within any of a parent's test cases.
+// Transition coverage represents the percentage of all possible page
+// transitions (page-level transition routes and event handlers, excluding
+// transition route groups) present within any of a parent's test cases.
 message TransitionCoverage {
   // The source or target of a transition.
   message TransitionNode {
@@ -344,7 +346,7 @@ message TransitionCoverage {
     }
   }
 
-  // A transition in the agent's graph.
+  // A transition in a page.
   message Transition {
     // The start node of a transition.
     TransitionNode source = 1;
@@ -376,6 +378,41 @@ message TransitionCoverage {
   float coverage_score = 2;
 }
 
+// Transition route group coverage represents the percentage of all possible
+// transition routes present within any of a parent's test cases. The results
+// are grouped by the transition route group.
+message TransitionRouteGroupCoverage {
+  // Coverage result message for one transition route group.
+  message Coverage {
+    // A transition coverage in a transition route group.
+    message Transition {
+      // Intent route or condition route.
+      TransitionRoute transition_route = 1;
+
+      // Whether or not the transition route is covered by at least one of the
+      // agent's test cases.
+      bool covered = 2;
+    }
+
+    // Transition route group metadata. Only name and displayName will be set.
+    TransitionRouteGroup route_group = 1;
+
+    // The list of transition routes and coverage in the transition route group.
+    repeated Transition transitions = 2;
+
+    // The percent of transition routes in the transition route group that are
+    // covered.
+    float coverage_score = 3;
+  }
+
+  // Transition route group coverages.
+  repeated Coverage coverages = 1;
+
+  // The percent of transition routes in all the transition route groups that
+  // are covered.
+  float coverage_score = 2;
+}
+
 // Intent coverage represents the percentage of all possible intents in the
 // agent that are triggered in any of a parent's test cases.
 message IntentCoverage {
@@ -408,8 +445,11 @@ message CalculateCoverageRequest {
     // Intent coverage.
     INTENT = 1;
 
-    // Page transition coverage
+    // Page transition coverage.
     PAGE_TRANSITION = 2;
+
+    // Transition route group coverage.
+    TRANSITION_ROUTE_GROUP = 3;
   }
 
   // Required. The agent to calculate coverage for.
@@ -438,8 +478,11 @@ message CalculateCoverageResponse {
     // Intent coverage.
     IntentCoverage intent_coverage = 2;
 
-    // Transition coverage.
+    // Transition (excluding transition route groups) coverage.
     TransitionCoverage transition_coverage = 4;
+
+    // Transition route group coverage.
+    TransitionRouteGroupCoverage route_group_coverage = 6;
   }
 }
 
diff --git a/google/cloud/dialogflow/cx/v3/transition_route_group.proto b/google/cloud/dialogflow/cx/v3/transition_route_group.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/validation_message.proto b/google/cloud/dialogflow/cx/v3/validation_message.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/version.proto b/google/cloud/dialogflow/cx/v3/version.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/cx/v3/webhook.proto b/google/cloud/dialogflow/cx/v3/webhook.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2020 Google LLC`
	`1`	`+// Copyright 2021 Google LLC`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`