Skip to content

Commit af36e0a

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [discoveryengine] support extractive content in search (#9554)
- [ ] Regenerate this pull request now. feat: add redirected uri in search response feat: support docx/pptx/txt/csv in allowed data format docs: keep the API doc up-to-date with recent changes PiperOrigin-RevId: 541013898 Source-Link: https://togithub.com/googleapis/googleapis/commit/e491475a0207826f4246e4a69800df84e797d10d Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/2bfb35702b702b338c02b3daea5af58a871c44eb Copy-Tag: eyJwIjoiamF2YS1kaXNjb3ZlcnllbmdpbmUvLk93bEJvdC55YW1sIiwiaCI6IjJiZmIzNTcwMmI3MDJiMzM4YzAyYjNkYWVhNWFmNThhODcxYzQ0ZWIifQ==
1 parent 3c65d52 commit af36e0a

19 files changed

+2074
-492
lines changed

‎java-discoveryengine/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2323
<dependency>
2424
<groupId>com.google.cloud</groupId>
2525
<artifactId>libraries-bom</artifactId>
26-
<version>26.16.0</version>
26+
<version>26.17.0</version>
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>
@@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
201201
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
202202
[stability-image]: https://img.shields.io/badge/stability-preview-yellow
203203
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-discoveryengine.svg
204-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-discoveryengine/0.14.0
204+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-discoveryengine/0.15.0
205205
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
206206
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
207207
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎java-discoveryengine/proto-google-cloud-discoveryengine-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/CompleteQueryRequest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ public com.google.protobuf.ByteString getQueryBytes() {
196196
* API calls. Do not use it when there is no traffic for Search API.
197197
* * `user-event` - Using suggestions generated from user-imported search
198198
* events.
199+
* * `document-completable` - Using suggestions taken directly from
200+
* user-imported document fields marked as completable.
199201
*
200202
* Default values:
201203
*
@@ -234,6 +236,8 @@ public java.lang.String getQueryModel() {
234236
* API calls. Do not use it when there is no traffic for Search API.
235237
* * `user-event` - Using suggestions generated from user-imported search
236238
* events.
239+
* * `document-completable` - Using suggestions taken directly from
240+
* user-imported document fields marked as completable.
237241
*
238242
* Default values:
239243
*
@@ -1008,6 +1012,8 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
10081012
* API calls. Do not use it when there is no traffic for Search API.
10091013
* * `user-event` - Using suggestions generated from user-imported search
10101014
* events.
1015+
* * `document-completable` - Using suggestions taken directly from
1016+
* user-imported document fields marked as completable.
10111017
*
10121018
* Default values:
10131019
*
@@ -1045,6 +1051,8 @@ public java.lang.String getQueryModel() {
10451051
* API calls. Do not use it when there is no traffic for Search API.
10461052
* * `user-event` - Using suggestions generated from user-imported search
10471053
* events.
1054+
* * `document-completable` - Using suggestions taken directly from
1055+
* user-imported document fields marked as completable.
10481056
*
10491057
* Default values:
10501058
*
@@ -1082,6 +1090,8 @@ public com.google.protobuf.ByteString getQueryModelBytes() {
10821090
* API calls. Do not use it when there is no traffic for Search API.
10831091
* * `user-event` - Using suggestions generated from user-imported search
10841092
* events.
1093+
* * `document-completable` - Using suggestions taken directly from
1094+
* user-imported document fields marked as completable.
10851095
*
10861096
* Default values:
10871097
*
@@ -1118,6 +1128,8 @@ public Builder setQueryModel(java.lang.String value) {
11181128
* API calls. Do not use it when there is no traffic for Search API.
11191129
* * `user-event` - Using suggestions generated from user-imported search
11201130
* events.
1131+
* * `document-completable` - Using suggestions taken directly from
1132+
* user-imported document fields marked as completable.
11211133
*
11221134
* Default values:
11231135
*
@@ -1150,6 +1162,8 @@ public Builder clearQueryModel() {
11501162
* API calls. Do not use it when there is no traffic for Search API.
11511163
* * `user-event` - Using suggestions generated from user-imported search
11521164
* events.
1165+
* * `document-completable` - Using suggestions taken directly from
1166+
* user-imported document fields marked as completable.
11531167
*
11541168
* Default values:
11551169
*

‎java-discoveryengine/proto-google-cloud-discoveryengine-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/CompleteQueryRequestOrBuilder.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ public interface CompleteQueryRequestOrBuilder
9696
* API calls. Do not use it when there is no traffic for Search API.
9797
* * `user-event` - Using suggestions generated from user-imported search
9898
* events.
99+
* * `document-completable` - Using suggestions taken directly from
100+
* user-imported document fields marked as completable.
99101
*
100102
* Default values:
101103
*
@@ -123,6 +125,8 @@ public interface CompleteQueryRequestOrBuilder
123125
* API calls. Do not use it when there is no traffic for Search API.
124126
* * `user-event` - Using suggestions generated from user-imported search
125127
* events.
128+
* * `document-completable` - Using suggestions taken directly from
129+
* user-imported document fields marked as completable.
126130
*
127131
* Default values:
128132
*

‎java-discoveryengine/proto-google-cloud-discoveryengine-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/Document.java

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,11 @@ public interface ContentOrBuilder
159159
* <pre>
160160
* The MIME type of the content. Supported types:
161161
*
162-
* * `application/pdf` (PDF)
162+
* * `application/pdf` (PDF, only native PDFs are supported for now)
163163
* * `text/html` (HTML)
164+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
165+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
166+
* * `text/plain` (TXT)
164167
*
165168
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
166169
* </pre>
@@ -176,8 +179,11 @@ public interface ContentOrBuilder
176179
* <pre>
177180
* The MIME type of the content. Supported types:
178181
*
179-
* * `application/pdf` (PDF)
182+
* * `application/pdf` (PDF, only native PDFs are supported for now)
180183
* * `text/html` (HTML)
184+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
185+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
186+
* * `text/plain` (TXT)
181187
*
182188
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
183189
* </pre>
@@ -418,8 +424,11 @@ public com.google.protobuf.ByteString getUriBytes() {
418424
* <pre>
419425
* The MIME type of the content. Supported types:
420426
*
421-
* * `application/pdf` (PDF)
427+
* * `application/pdf` (PDF, only native PDFs are supported for now)
422428
* * `text/html` (HTML)
429+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
430+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
431+
* * `text/plain` (TXT)
423432
*
424433
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
425434
* </pre>
@@ -446,8 +455,11 @@ public java.lang.String getMimeType() {
446455
* <pre>
447456
* The MIME type of the content. Supported types:
448457
*
449-
* * `application/pdf` (PDF)
458+
* * `application/pdf` (PDF, only native PDFs are supported for now)
450459
* * `text/html` (HTML)
460+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
461+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
462+
* * `text/plain` (TXT)
451463
*
452464
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
453465
* </pre>
@@ -1160,8 +1172,11 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
11601172
* <pre>
11611173
* The MIME type of the content. Supported types:
11621174
*
1163-
* * `application/pdf` (PDF)
1175+
* * `application/pdf` (PDF, only native PDFs are supported for now)
11641176
* * `text/html` (HTML)
1177+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
1178+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
1179+
* * `text/plain` (TXT)
11651180
*
11661181
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
11671182
* </pre>
@@ -1187,8 +1202,11 @@ public java.lang.String getMimeType() {
11871202
* <pre>
11881203
* The MIME type of the content. Supported types:
11891204
*
1190-
* * `application/pdf` (PDF)
1205+
* * `application/pdf` (PDF, only native PDFs are supported for now)
11911206
* * `text/html` (HTML)
1207+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
1208+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
1209+
* * `text/plain` (TXT)
11921210
*
11931211
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
11941212
* </pre>
@@ -1214,8 +1232,11 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
12141232
* <pre>
12151233
* The MIME type of the content. Supported types:
12161234
*
1217-
* * `application/pdf` (PDF)
1235+
* * `application/pdf` (PDF, only native PDFs are supported for now)
12181236
* * `text/html` (HTML)
1237+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
1238+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
1239+
* * `text/plain` (TXT)
12191240
*
12201241
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
12211242
* </pre>
@@ -1240,8 +1261,11 @@ public Builder setMimeType(java.lang.String value) {
12401261
* <pre>
12411262
* The MIME type of the content. Supported types:
12421263
*
1243-
* * `application/pdf` (PDF)
1264+
* * `application/pdf` (PDF, only native PDFs are supported for now)
12441265
* * `text/html` (HTML)
1266+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
1267+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
1268+
* * `text/plain` (TXT)
12451269
*
12461270
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
12471271
* </pre>
@@ -1262,8 +1286,11 @@ public Builder clearMimeType() {
12621286
* <pre>
12631287
* The MIME type of the content. Supported types:
12641288
*
1265-
* * `application/pdf` (PDF)
1289+
* * `application/pdf` (PDF, only native PDFs are supported for now)
12661290
* * `text/html` (HTML)
1291+
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
1292+
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
1293+
* * `text/plain` (TXT)
12671294
*
12681295
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
12691296
* </pre>

‎java-discoveryengine/proto-google-cloud-discoveryengine-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/GcsSource.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,10 @@ public com.google.protobuf.ByteString getInputUrisBytes(int index) {
178178
* * `custom`: One custom data JSON per row in arbitrary format that conforms
179179
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
180180
* data store. This can only be used by the GENERIC Data Store vertical.
181+
* * `csv`: A CSV file with header conforming the defined
182+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
183+
* data store. Each entry after the header will be imported as a Document.
184+
* This can only be used by the GENERIC Data Store vertical.
181185
*
182186
* Supported values for user even imports:
183187
*
@@ -220,6 +224,10 @@ public java.lang.String getDataSchema() {
220224
* * `custom`: One custom data JSON per row in arbitrary format that conforms
221225
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
222226
* data store. This can only be used by the GENERIC Data Store vertical.
227+
* * `csv`: A CSV file with header conforming the defined
228+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
229+
* data store. Each entry after the header will be imported as a Document.
230+
* This can only be used by the GENERIC Data Store vertical.
223231
*
224232
* Supported values for user even imports:
225233
*
@@ -881,6 +889,10 @@ public Builder addInputUrisBytes(com.google.protobuf.ByteString value) {
881889
* * `custom`: One custom data JSON per row in arbitrary format that conforms
882890
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
883891
* data store. This can only be used by the GENERIC Data Store vertical.
892+
* * `csv`: A CSV file with header conforming the defined
893+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
894+
* data store. Each entry after the header will be imported as a Document.
895+
* This can only be used by the GENERIC Data Store vertical.
884896
*
885897
* Supported values for user even imports:
886898
*
@@ -922,6 +934,10 @@ public java.lang.String getDataSchema() {
922934
* * `custom`: One custom data JSON per row in arbitrary format that conforms
923935
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
924936
* data store. This can only be used by the GENERIC Data Store vertical.
937+
* * `csv`: A CSV file with header conforming the defined
938+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
939+
* data store. Each entry after the header will be imported as a Document.
940+
* This can only be used by the GENERIC Data Store vertical.
925941
*
926942
* Supported values for user even imports:
927943
*
@@ -963,6 +979,10 @@ public com.google.protobuf.ByteString getDataSchemaBytes() {
963979
* * `custom`: One custom data JSON per row in arbitrary format that conforms
964980
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
965981
* data store. This can only be used by the GENERIC Data Store vertical.
982+
* * `csv`: A CSV file with header conforming the defined
983+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
984+
* data store. Each entry after the header will be imported as a Document.
985+
* This can only be used by the GENERIC Data Store vertical.
966986
*
967987
* Supported values for user even imports:
968988
*
@@ -1003,6 +1023,10 @@ public Builder setDataSchema(java.lang.String value) {
10031023
* * `custom`: One custom data JSON per row in arbitrary format that conforms
10041024
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
10051025
* data store. This can only be used by the GENERIC Data Store vertical.
1026+
* * `csv`: A CSV file with header conforming the defined
1027+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
1028+
* data store. Each entry after the header will be imported as a Document.
1029+
* This can only be used by the GENERIC Data Store vertical.
10061030
*
10071031
* Supported values for user even imports:
10081032
*
@@ -1039,6 +1063,10 @@ public Builder clearDataSchema() {
10391063
* * `custom`: One custom data JSON per row in arbitrary format that conforms
10401064
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
10411065
* data store. This can only be used by the GENERIC Data Store vertical.
1066+
* * `csv`: A CSV file with header conforming the defined
1067+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
1068+
* data store. Each entry after the header will be imported as a Document.
1069+
* This can only be used by the GENERIC Data Store vertical.
10421070
*
10431071
* Supported values for user even imports:
10441072
*

‎java-discoveryengine/proto-google-cloud-discoveryengine-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/GcsSourceOrBuilder.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ public interface GcsSourceOrBuilder
121121
* * `custom`: One custom data JSON per row in arbitrary format that conforms
122122
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
123123
* data store. This can only be used by the GENERIC Data Store vertical.
124+
* * `csv`: A CSV file with header conforming the defined
125+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
126+
* data store. Each entry after the header will be imported as a Document.
127+
* This can only be used by the GENERIC Data Store vertical.
124128
*
125129
* Supported values for user even imports:
126130
*
@@ -152,6 +156,10 @@ public interface GcsSourceOrBuilder
152156
* * `custom`: One custom data JSON per row in arbitrary format that conforms
153157
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
154158
* data store. This can only be used by the GENERIC Data Store vertical.
159+
* * `csv`: A CSV file with header conforming the defined
160+
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
161+
* data store. Each entry after the header will be imported as a Document.
162+
* This can only be used by the GENERIC Data Store vertical.
155163
*
156164
* Supported values for user even imports:
157165
*

0 commit comments

Comments
 (0)