Skip to content

feat: [discoveryengine] support extractive content in search #9554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcf-merge-on-green merged 2 commits into from
Jun 22, 2023
Merged

feat: [discoveryengine] support extractive content in search #9554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd396e0
feat: support extractive content in search
gcf-owl-bot[bot] Jun 17, 2023
15928c3
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jun 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java-discoveryengine/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.16.0</version>
<version>26.17.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
[stability-image]: https://img.shields.io/badge/stability-preview-yellow
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-discoveryengine.svg
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-discoveryengine/0.14.0
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-discoveryengine/0.15.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
Expand Down
14 changes: 14 additions & 0 deletions ...ne-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/CompleteQueryRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ public com.google.protobuf.ByteString getQueryBytes() {
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down Expand Up @@ -234,6 +236,8 @@ public java.lang.String getQueryModel() {
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down Expand Up @@ -1008,6 +1012,8 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down Expand Up @@ -1045,6 +1051,8 @@ public java.lang.String getQueryModel() {
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down Expand Up @@ -1082,6 +1090,8 @@ public com.google.protobuf.ByteString getQueryModelBytes() {
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down Expand Up @@ -1118,6 +1128,8 @@ public Builder setQueryModel(java.lang.String value) {
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down Expand Up @@ -1150,6 +1162,8 @@ public Builder clearQueryModel() {
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down
4 changes: 4 additions & 0 deletions .../src/main/java/com/google/cloud/discoveryengine/v1beta/CompleteQueryRequestOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ public interface CompleteQueryRequestOrBuilder
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down Expand Up @@ -123,6 +125,8 @@ public interface CompleteQueryRequestOrBuilder
* API calls. Do not use it when there is no traffic for Search API.
* * `user-event` - Using suggestions generated from user-imported search
* events.
* * `document-completable` - Using suggestions taken directly from
* user-imported document fields marked as completable.
*
* Default values:
*
Expand Down
45 changes: 36 additions & 9 deletions ...iscoveryengine-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/Document.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,11 @@ public interface ContentOrBuilder
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand All @@ -176,8 +179,11 @@ public interface ContentOrBuilder
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand Down Expand Up @@ -418,8 +424,11 @@ public com.google.protobuf.ByteString getUriBytes() {
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand All @@ -446,8 +455,11 @@ public java.lang.String getMimeType() {
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand Down Expand Up @@ -1160,8 +1172,11 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) {
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand All @@ -1187,8 +1202,11 @@ public java.lang.String getMimeType() {
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand All @@ -1214,8 +1232,11 @@ public com.google.protobuf.ByteString getMimeTypeBytes() {
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand All @@ -1240,8 +1261,11 @@ public Builder setMimeType(java.lang.String value) {
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand All @@ -1262,8 +1286,11 @@ public Builder clearMimeType() {
* <pre>
* The MIME type of the content. Supported types:
*
* * `application/pdf` (PDF)
* * `application/pdf` (PDF, only native PDFs are supported for now)
* * `text/html` (HTML)
* * `application/vnd.openxmlformats-officedocument.wordprocessingml.document` (DOCX)
* * `application/vnd.openxmlformats-officedocument.presentationml.presentation` (PPTX)
* * `text/plain` (TXT)
*
* See https://www.iana.org/assignments/media-types/media-types.xhtml.
* </pre>
Expand Down
28 changes: 28 additions & 0 deletions ...scoveryengine-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/GcsSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ public com.google.protobuf.ByteString getInputUrisBytes(int index) {
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down Expand Up @@ -220,6 +224,10 @@ public java.lang.String getDataSchema() {
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down Expand Up @@ -881,6 +889,10 @@ public Builder addInputUrisBytes(com.google.protobuf.ByteString value) {
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down Expand Up @@ -922,6 +934,10 @@ public java.lang.String getDataSchema() {
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down Expand Up @@ -963,6 +979,10 @@ public com.google.protobuf.ByteString getDataSchemaBytes() {
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down Expand Up @@ -1003,6 +1023,10 @@ public Builder setDataSchema(java.lang.String value) {
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down Expand Up @@ -1039,6 +1063,10 @@ public Builder clearDataSchema() {
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down
8 changes: 8 additions & 0 deletions ...gine-v1beta/src/main/java/com/google/cloud/discoveryengine/v1beta/GcsSourceOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ public interface GcsSourceOrBuilder
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down Expand Up @@ -152,6 +156,10 @@ public interface GcsSourceOrBuilder
* * `custom`: One custom data JSON per row in arbitrary format that conforms
* the defined [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. This can only be used by the GENERIC Data Store vertical.
* * `csv`: A CSV file with header conforming the defined
* [Schema][google.cloud.discoveryengine.v1beta.Schema] of the
* data store. Each entry after the header will be imported as a Document.
* This can only be used by the GENERIC Data Store vertical.
*
* Supported values for user even imports:
*
Expand Down
Loading