From f347cbc0dd955ee1d5a43ce2f0635520d72fd246 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 14:28:34 +0000 Subject: [PATCH] feat: include conversation dataset name to be created with dataset creation metadata (#1032) - [ ] Regenerate this pull request now. docs: clarify SuggestionFeature enums which are specific to chat agents PiperOrigin-RevId: 478522249 Source-Link: https://togithub.com/googleapis/googleapis/commit/8bd89cd4fc964360198362ef49c72ef90543bf45 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/ddf381e8fcebbdde902df0419b30908d01c63e0e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGRmMzgxZThmY2ViYmRkZTkwMmRmMDQxOWIzMDkwOGQwMWM2M2UwZSJ9 --- .../v2/ConversationDatasetProto.java | 102 ++++----- ...eConversationDatasetOperationMetadata.java | 195 +++++++++++++++++- ...tionDatasetOperationMetadataOrBuilder.java | 32 ++- .../dialogflow/v2/SuggestionFeature.java | 12 +- .../dialogflow/v2/conversation_dataset.proto | 7 +- .../dialogflow/v2/conversation_profile.proto | 6 +- 6 files changed, 293 insertions(+), 61 deletions(-) diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetProto.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetProto.java index a0338d057057..5992eb4ffc81 100644 --- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetProto.java +++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ConversationDatasetProto.java @@ -141,54 +141,56 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "OperationResponse\022P\n\024conversation_datase" + "t\030\001 \001(\tB2\372A/\n-dialogflow.googleapis.com/" + "ConversationDataset\022\024\n\014import_count\030\003 \001(" - + "\005\",\n*CreateConversationDatasetOperationM" - + "etadata\",\n*DeleteConversationDatasetOper" - + "ationMetadata2\326\014\n\024ConversationDatasets\022\263" - + "\002\n\031CreateConversationDataset\022<.google.cl" - + "oud.dialogflow.v2.CreateConversationData" - + "setRequest\032\035.google.longrunning.Operatio" - + "n\"\270\001\202\323\344\223\002P\"8/v2/{parent=projects/*/locat" - + "ions/*}/conversationDatasets:\024conversati" - + "on_dataset\332A\033parent,conversation_dataset" - + "\312AA\n\023ConversationDataset\022*CreateConversa" - + "tionDatasetOperationMetadata\022\375\001\n\026GetConv" - + "ersationDataset\0229.google.cloud.dialogflo" - + "w.v2.GetConversationDatasetRequest\032/.goo" - + "gle.cloud.dialogflow.v2.ConversationData" - + "set\"w\202\323\344\223\002j\022,/v2/{name=projects/*/conver" - + "sationDatasets/*}Z:\0228/v2/{name=projects/" - + "*/locations/*/conversationDatasets/*}\332A\004" - + "name\022\220\002\n\030ListConversationDatasets\022;.goog" - + "le.cloud.dialogflow.v2.ListConversationD" - + "atasetsRequest\032<.google.cloud.dialogflow" - + ".v2.ListConversationDatasetsResponse\"y\202\323" - + "\344\223\002j\022,/v2/{parent=projects/*}/conversati" - + "onDatasetsZ:\0228/v2/{parent=projects/*/loc" - + "ations/*}/conversationDatasets\332A\006parent\022" - + "\210\002\n\031DeleteConversationDataset\022<.google.c" - + "loud.dialogflow.v2.DeleteConversationDat" - + "asetRequest\032\035.google.longrunning.Operati" - + "on\"\215\001\202\323\344\223\002:*8/v2/{name=projects/*/locati" - + "ons/*/conversationDatasets/*}\332A\004name\312AC\n" - + "\025google.protobuf.Empty\022*DeleteConversati" - + "onDatasetOperationMetadata\022\357\002\n\026ImportCon" - + "versationData\0229.google.cloud.dialogflow." - + "v2.ImportConversationDataRequest\032\035.googl" - + "e.longrunning.Operation\"\372\001\202\323\344\223\002\236\001\"C/v2/{" - + "name=projects/*/conversationDatasets/*}:" - + "importConversationData:\001*ZT\"O/v2/{name=p" - + "rojects/*/locations/*/conversationDatase" - + "ts/*}:importConversationData:\001*\312AR\n\'Impo" - + "rtConversationDataOperationResponse\022\'Imp" - + "ortConversationDataOperationMetadata\032x\312A" - + "\031dialogflow.googleapis.com\322AYhttps://www" - + ".googleapis.com/auth/cloud-platform,http" - + "s://www.googleapis.com/auth/dialogflowB\247" - + "\001\n\036com.google.cloud.dialogflow.v2B\030Conve" - + "rsationDatasetProtoP\001ZDgoogle.golang.org" - + "/genproto/googleapis/cloud/dialogflow/v2" - + ";dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dialo" - + "gflow.V2b\006proto3" + + "\005\"~\n*CreateConversationDatasetOperationM" + + "etadata\022P\n\024conversation_dataset\030\001 \001(\tB2\372" + + "A/\n-dialogflow.googleapis.com/Conversati" + + "onDataset\",\n*DeleteConversationDatasetOp" + + "erationMetadata2\326\014\n\024ConversationDatasets" + + "\022\263\002\n\031CreateConversationDataset\022<.google." + + "cloud.dialogflow.v2.CreateConversationDa" + + "tasetRequest\032\035.google.longrunning.Operat" + + "ion\"\270\001\202\323\344\223\002P\"8/v2/{parent=projects/*/loc" + + "ations/*}/conversationDatasets:\024conversa" + + "tion_dataset\332A\033parent,conversation_datas" + + "et\312AA\n\023ConversationDataset\022*CreateConver" + + "sationDatasetOperationMetadata\022\375\001\n\026GetCo" + + "nversationDataset\0229.google.cloud.dialogf" + + "low.v2.GetConversationDatasetRequest\032/.g" + + "oogle.cloud.dialogflow.v2.ConversationDa" + + "taset\"w\202\323\344\223\002j\022,/v2/{name=projects/*/conv" + + "ersationDatasets/*}Z:\0228/v2/{name=project" + + "s/*/locations/*/conversationDatasets/*}\332" + + "A\004name\022\220\002\n\030ListConversationDatasets\022;.go" + + "ogle.cloud.dialogflow.v2.ListConversatio" + + "nDatasetsRequest\032<.google.cloud.dialogfl" + + "ow.v2.ListConversationDatasetsResponse\"y" + + "\202\323\344\223\002j\022,/v2/{parent=projects/*}/conversa" + + "tionDatasetsZ:\0228/v2/{parent=projects/*/l" + + "ocations/*}/conversationDatasets\332A\006paren" + + "t\022\210\002\n\031DeleteConversationDataset\022<.google" + + ".cloud.dialogflow.v2.DeleteConversationD" + + "atasetRequest\032\035.google.longrunning.Opera" + + "tion\"\215\001\202\323\344\223\002:*8/v2/{name=projects/*/loca" + + "tions/*/conversationDatasets/*}\332A\004name\312A" + + "C\n\025google.protobuf.Empty\022*DeleteConversa" + + "tionDatasetOperationMetadata\022\357\002\n\026ImportC" + + "onversationData\0229.google.cloud.dialogflo" + + "w.v2.ImportConversationDataRequest\032\035.goo" + + "gle.longrunning.Operation\"\372\001\202\323\344\223\002\236\001\"C/v2" + + "/{name=projects/*/conversationDatasets/*" + + "}:importConversationData:\001*ZT\"O/v2/{name" + + "=projects/*/locations/*/conversationData" + + "sets/*}:importConversationData:\001*\312AR\n\'Im" + + "portConversationDataOperationResponse\022\'I" + + "mportConversationDataOperationMetadata\032x" + + "\312A\031dialogflow.googleapis.com\322AYhttps://w" + + "ww.googleapis.com/auth/cloud-platform,ht" + + "tps://www.googleapis.com/auth/dialogflow" + + "B\247\001\n\036com.google.cloud.dialogflow.v2B\030Con" + + "versationDatasetProtoP\001ZDgoogle.golang.o" + + "rg/genproto/googleapis/cloud/dialogflow/" + + "v2;dialogflow\370\001\001\242\002\002DF\252\002\032Google.Cloud.Dia" + + "logflow.V2b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -302,7 +304,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { internal_static_google_cloud_dialogflow_v2_CreateConversationDatasetOperationMetadata_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_dialogflow_v2_CreateConversationDatasetOperationMetadata_descriptor, - new java.lang.String[] {}); + new java.lang.String[] { + "ConversationDataset", + }); internal_static_google_cloud_dialogflow_v2_DeleteConversationDatasetOperationMetadata_descriptor = getDescriptor().getMessageTypes().get(12); internal_static_google_cloud_dialogflow_v2_DeleteConversationDatasetOperationMetadata_fieldAccessorTable = diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadata.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadata.java index 96b5dedddc64..ec68bf02271b 100644 --- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadata.java +++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadata.java @@ -39,7 +39,9 @@ private CreateConversationDatasetOperationMetadata( super(builder); } - private CreateConversationDatasetOperationMetadata() {} + private CreateConversationDatasetOperationMetadata() { + conversationDataset_ = ""; + } @java.lang.Override @SuppressWarnings({"unused"}) @@ -68,6 +70,59 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { .class); } + public static final int CONVERSATION_DATASET_FIELD_NUMBER = 1; + private volatile java.lang.Object conversationDataset_; + /** + * + * + *
+ * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @return The conversationDataset.
+ */
+ @java.lang.Override
+ public java.lang.String getConversationDataset() {
+ java.lang.Object ref = conversationDataset_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ conversationDataset_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @return The bytes for conversationDataset.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getConversationDatasetBytes() {
+ java.lang.Object ref = conversationDataset_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ conversationDataset_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -82,6 +137,9 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(conversationDataset_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, conversationDataset_);
+ }
getUnknownFields().writeTo(output);
}
@@ -91,6 +149,9 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(conversationDataset_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, conversationDataset_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -108,6 +169,7 @@ public boolean equals(final java.lang.Object obj) {
com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata other =
(com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata) obj;
+ if (!getConversationDataset().equals(other.getConversationDataset())) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -119,6 +181,8 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + CONVERSATION_DATASET_FIELD_NUMBER;
+ hash = (53 * hash) + getConversationDataset().hashCode();
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -261,6 +325,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
@java.lang.Override
public Builder clear() {
super.clear();
+ conversationDataset_ = "";
+
return this;
}
@@ -292,6 +358,7 @@ public com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata
buildPartial() {
com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata result =
new com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata(this);
+ result.conversationDataset_ = conversationDataset_;
onBuilt();
return result;
}
@@ -346,6 +413,10 @@ public Builder mergeFrom(
if (other
== com.google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata
.getDefaultInstance()) return this;
+ if (!other.getConversationDataset().isEmpty()) {
+ conversationDataset_ = other.conversationDataset_;
+ onChanged();
+ }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -372,6 +443,12 @@ public Builder mergeFrom(
case 0:
done = true;
break;
+ case 10:
+ {
+ conversationDataset_ = input.readStringRequireUtf8();
+
+ break;
+ } // case 10
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -389,6 +466,122 @@ public Builder mergeFrom(
return this;
}
+ private java.lang.Object conversationDataset_ = "";
+ /**
+ *
+ *
+ * + * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @return The conversationDataset.
+ */
+ public java.lang.String getConversationDataset() {
+ java.lang.Object ref = conversationDataset_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ conversationDataset_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @return The bytes for conversationDataset.
+ */
+ public com.google.protobuf.ByteString getConversationDatasetBytes() {
+ java.lang.Object ref = conversationDataset_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ conversationDataset_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @param value The conversationDataset to set.
+ * @return This builder for chaining.
+ */
+ public Builder setConversationDataset(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ conversationDataset_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearConversationDataset() {
+
+ conversationDataset_ = getDefaultInstance().getConversationDataset();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @param value The bytes for conversationDataset to set.
+ * @return This builder for chaining.
+ */
+ public Builder setConversationDatasetBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ conversationDataset_ = value;
+ onChanged();
+ return this;
+ }
+
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadataOrBuilder.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadataOrBuilder.java
index b09628808a7a..8c3df2bbcedc 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadataOrBuilder.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateConversationDatasetOperationMetadataOrBuilder.java
@@ -21,4 +21,34 @@
public interface CreateConversationDatasetOperationMetadataOrBuilder
extends
// @@protoc_insertion_point(interface_extends:google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata)
- com.google.protobuf.MessageOrBuilder {}
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ *
+ *
+ * + * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @return The conversationDataset.
+ */
+ java.lang.String getConversationDataset();
+ /**
+ *
+ *
+ * + * The resource name of the conversation dataset that will be created. Format: + * `projects/<Project ID>/locations/<Location + * ID>/conversationDatasets/<Conversation Dataset Id>` + *+ * + *
string conversation_dataset = 1 [(.google.api.resource_reference) = { ... }
+ *
+ * @return The bytes for conversationDataset.
+ */
+ com.google.protobuf.ByteString getConversationDatasetBytes();
+}
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionFeature.java b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionFeature.java
index f3318e3ed70d..c18d430a9c55 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionFeature.java
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SuggestionFeature.java
@@ -93,7 +93,7 @@ public enum Type implements com.google.protobuf.ProtocolMessageEnum {
*
*
* - * Run article suggestion model. + * Run article suggestion model for chat. ** *
ARTICLE_SUGGESTION = 1;
@@ -103,7 +103,7 @@ public enum Type implements com.google.protobuf.ProtocolMessageEnum {
*
*
* - * Run FAQ model. + * Run FAQ model for chat. ** *
FAQ = 2;
@@ -113,7 +113,7 @@ public enum Type implements com.google.protobuf.ProtocolMessageEnum {
*
*
* - * Run smart reply model. + * Run smart reply model for chat. ** *
SMART_REPLY = 3;
@@ -136,7 +136,7 @@ public enum Type implements com.google.protobuf.ProtocolMessageEnum {
*
*
* - * Run article suggestion model. + * Run article suggestion model for chat. ** *
ARTICLE_SUGGESTION = 1;
@@ -146,7 +146,7 @@ public enum Type implements com.google.protobuf.ProtocolMessageEnum {
*
*
* - * Run FAQ model. + * Run FAQ model for chat. ** *
FAQ = 2;
@@ -156,7 +156,7 @@ public enum Type implements com.google.protobuf.ProtocolMessageEnum {
*
*
* - * Run smart reply model. + * Run smart reply model for chat. ** *
SMART_REPLY = 3;
diff --git a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_dataset.proto b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_dataset.proto
index cc35e1c8476c..282bdda3923d 100644
--- a/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_dataset.proto
+++ b/java-dialogflow/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/conversation_dataset.proto
@@ -306,7 +306,12 @@ message ImportConversationDataOperationResponse {
// Metadata for [ConversationDatasets][CreateConversationDataset].
message CreateConversationDatasetOperationMetadata {
-
+ // The resource name of the conversation dataset that will be created. Format:
+ // `projects/