Skip to content

Commit 9953dde

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
feat: add CMEK config service
feat: add identity mapping service feat: add user license config service feat: add HealthcareFhirConfig to FHIR data store feat: add ConnectorRunErrorContext to error log feat: support structured content for chunk feat: support ACL data store and document feat: add more options for layout parser config feat: support media recommendation engine feat: enable claim level score for grounding feat: add custom search operators for Workspace search feat: add more indexing state for site search engine docs: keep the API doc up-to-date with recent changes PiperOrigin-RevId: 766759284
1 parent 79d04b7 commit 9953dde

22 files changed

Lines changed: 1620 additions & 17 deletions

‎google/cloud/discoveryengine/logging/error_log.proto‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ syntax = "proto3";
1717
package google.cloud.discoveryengine.logging;
1818

1919
import "google/protobuf/struct.proto";
20+
import "google/protobuf/timestamp.proto";
2021
import "google/rpc/status.proto";
2122

2223
option csharp_namespace = "Google.Cloud.DiscoveryEngine.Logging";
@@ -86,6 +87,43 @@ message ImportErrorContext {
8687
}
8788
}
8889

90+
// The error payload that is populated on LRO sync APIs, including the
91+
// following:
92+
//
93+
// * `google.cloud.discoveryengine.v1main.DataConnectorService.SetUpDataConnector`
94+
// * `google.cloud.discoveryengine.v1main.DataConnectorService.StartConnectorRun`
95+
message ConnectorRunErrorContext {
96+
// The operation resource name of the LRO to sync the connector.
97+
string operation = 1;
98+
99+
// The full resource name of the DataConnector.
100+
// Format:
101+
// `projects/*/locations/*/collections/*/dataConnector`.
102+
string data_connector = 2;
103+
104+
// The full resource name of the Connector Run.
105+
// Format:
106+
// `projects/*/locations/*/collections/*/dataConnector/connectorRuns/*`.
107+
// The `connector_run_id` is system-generated.
108+
string connector_run = 3;
109+
110+
// The entity to sync for the connector run.
111+
string entity = 4;
112+
113+
// The type of sync run.
114+
// Can be one of the following:
115+
//
116+
// * `FULL`
117+
// * `INCREMENTAL`
118+
string sync_type = 5;
119+
120+
// The time when the connector run started.
121+
google.protobuf.Timestamp start_time = 6;
122+
123+
// The time when the connector run ended.
124+
google.protobuf.Timestamp end_time = 7;
125+
}
126+
89127
// An error log which is reported to the Error Reporting system.
90128
message ErrorLog {
91129
// The service context in which this error has occurred.
@@ -122,4 +160,7 @@ message ErrorLog {
122160

123161
// The error payload that is populated on LRO import APIs.
124162
ImportErrorContext import_payload = 7;
163+
164+
// The error payload that is populated on LRO connector sync APIs.
165+
ConnectorRunErrorContext connector_run_payload = 8;
125166
}

‎google/cloud/discoveryengine/v1/BUILD.bazel‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ proto_library(
2626
srcs = [
2727
"answer.proto",
2828
"chunk.proto",
29+
"cmek_config_service.proto",
2930
"common.proto",
3031
"completion.proto",
3132
"completion_service.proto",
@@ -43,6 +44,8 @@ proto_library(
4344
"engine_service.proto",
4445
"grounded_generation_service.proto",
4546
"grounding.proto",
47+
"identity_mapping_store.proto",
48+
"identity_mapping_store_service.proto",
4649
"import_config.proto",
4750
"project.proto",
4851
"project_service.proto",
@@ -61,6 +64,8 @@ proto_library(
6164
"site_search_engine_service.proto",
6265
"user_event.proto",
6366
"user_event_service.proto",
67+
"user_license.proto",
68+
"user_license_service.proto",
6469
],
6570
deps = [
6671
"//google/api:annotations_proto",
@@ -134,6 +139,8 @@ java_gapic_library(
134139
java_gapic_test(
135140
name = "discoveryengine_java_gapic_test_suite",
136141
test_classes = [
142+
"com.google.cloud.discoveryengine.v1.CmekConfigServiceClientHttpJsonTest",
143+
"com.google.cloud.discoveryengine.v1.CmekConfigServiceClientTest",
137144
"com.google.cloud.discoveryengine.v1.CompletionServiceClientHttpJsonTest",
138145
"com.google.cloud.discoveryengine.v1.CompletionServiceClientTest",
139146
"com.google.cloud.discoveryengine.v1.ControlServiceClientHttpJsonTest",
@@ -148,6 +155,8 @@ java_gapic_test(
148155
"com.google.cloud.discoveryengine.v1.EngineServiceClientTest",
149156
"com.google.cloud.discoveryengine.v1.GroundedGenerationServiceClientHttpJsonTest",
150157
"com.google.cloud.discoveryengine.v1.GroundedGenerationServiceClientTest",
158+
"com.google.cloud.discoveryengine.v1.IdentityMappingStoreServiceClientHttpJsonTest",
159+
"com.google.cloud.discoveryengine.v1.IdentityMappingStoreServiceClientTest",
151160
"com.google.cloud.discoveryengine.v1.ProjectServiceClientHttpJsonTest",
152161
"com.google.cloud.discoveryengine.v1.ProjectServiceClientTest",
153162
"com.google.cloud.discoveryengine.v1.RankServiceClientHttpJsonTest",
@@ -166,6 +175,8 @@ java_gapic_test(
166175
"com.google.cloud.discoveryengine.v1.SiteSearchEngineServiceClientTest",
167176
"com.google.cloud.discoveryengine.v1.UserEventServiceClientHttpJsonTest",
168177
"com.google.cloud.discoveryengine.v1.UserEventServiceClientTest",
178+
"com.google.cloud.discoveryengine.v1.UserLicenseServiceClientHttpJsonTest",
179+
"com.google.cloud.discoveryengine.v1.UserLicenseServiceClientTest",
169180
],
170181
runtime_deps = [":discoveryengine_java_gapic_test"],
171182
)
@@ -412,7 +423,6 @@ load(
412423

413424
csharp_proto_library(
414425
name = "discoveryengine_csharp_proto",
415-
extra_opts = [],
416426
deps = [":discoveryengine_proto"],
417427
)
418428

‎google/cloud/discoveryengine/v1/answer.proto‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,9 @@ message Answer {
325325

326326
// Non-answer-seeking query classification type, for no clear intent.
327327
NON_ANSWER_SEEKING_QUERY_V2 = 4;
328+
329+
// User defined query classification type.
330+
USER_DEFINED_CLASSIFICATION_QUERY = 5;
328331
}
329332

330333
// Query classification type.
@@ -409,6 +412,20 @@ message Answer {
409412
// Google skips the answer if a well grounded answer was unable to be
410413
// generated.
411414
LOW_GROUNDED_ANSWER = 9;
415+
416+
// The user defined query classification ignored case.
417+
//
418+
// Google skips the answer if the query is classified as a user defined
419+
// query classification.
420+
USER_DEFINED_CLASSIFICATION_QUERY_IGNORED = 10;
421+
422+
// The unhelpful answer case.
423+
//
424+
// Google skips the answer if the answer is not helpful. This can be due to
425+
// a variety of factors, including but not limited to: the query is not
426+
// answerable, the answer is not relevant to the query, or the answer is
427+
// not well-formatted.
428+
UNHELPFUL_ANSWER = 11;
412429
}
413430

414431
// Immutable. Fully qualified name

‎google/cloud/discoveryengine/v1/chunk.proto‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,42 @@ message Chunk {
8282
repeated Chunk next_chunks = 2;
8383
}
8484

85+
// The structured content information.
86+
message StructuredContent {
87+
// Output only. The structure type of the structured content.
88+
StructureType structure_type = 1
89+
[(google.api.field_behavior) = OUTPUT_ONLY];
90+
91+
// Output only. The content of the structured content.
92+
string content = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
93+
}
94+
95+
// The annotation metadata includes structured content in the current chunk.
96+
message AnnotationMetadata {
97+
// Output only. The structured content information.
98+
StructuredContent structured_content = 1
99+
[(google.api.field_behavior) = OUTPUT_ONLY];
100+
101+
// Output only. Image id is provided if the structured content is based on
102+
// an image.
103+
string image_id = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
104+
}
105+
106+
// Defines the types of the structured content that can be extracted.
107+
enum StructureType {
108+
// Default value.
109+
STRUCTURE_TYPE_UNSPECIFIED = 0;
110+
111+
// Shareholder structure.
112+
SHAREHOLDER_STRUCTURE = 1;
113+
114+
// Signature structure.
115+
SIGNATURE_STRUCTURE = 2;
116+
117+
// Checkbox structure.
118+
CHECKBOX_STRUCTURE = 3;
119+
}
120+
85121
// The full resource name of the chunk.
86122
// Format:
87123
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}/branches/{branch}/documents/{document_id}/chunks/{chunk_id}`.
@@ -117,4 +153,20 @@ message Chunk {
117153

118154
// Output only. Metadata of the current chunk.
119155
ChunkMetadata chunk_metadata = 7 [(google.api.field_behavior) = OUTPUT_ONLY];
156+
157+
// Output only. Image Data URLs if the current chunk contains images.
158+
// Data URLs are composed of four parts: a prefix (data:), a MIME type
159+
// indicating the type of data, an optional base64 token if non-textual,
160+
// and the data itself:
161+
// data:[<mediatype>][;base64],<data>
162+
repeated string data_urls = 9 [(google.api.field_behavior) = OUTPUT_ONLY];
163+
164+
// Output only. Annotation contents if the current chunk contains annotations.
165+
repeated string annotation_contents = 11
166+
[(google.api.field_behavior) = OUTPUT_ONLY];
167+
168+
// Output only. The annotation metadata includes structured content in the
169+
// current chunk.
170+
repeated AnnotationMetadata annotation_metadata = 12
171+
[(google.api.field_behavior) = OUTPUT_ONLY];
120172
}

0 commit comments

Comments
 (0)