Skip to content
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.

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

chore: [discoveryengine] remove redundant gRPC service config file #5743

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0e3fe33
feat: Add GroundedGenerationService API
gcf-owl-bot[bot] Oct 10, 2024
784c765
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 10, 2024
6855da6
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 10, 2024
81f06fb
Merge branch 'owl-bot-copy-packages-google-cloud-discoveryengine' of …
gcf-owl-bot[bot] Oct 10, 2024
8d2af4b
Merge branch 'main' into owl-bot-copy-packages-google-cloud-discovery…
sofisl Oct 10, 2024
721a6d3
fix!: fix the location type annotation
gcf-owl-bot[bot] Oct 11, 2024
3526c2d
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 11, 2024
6593762
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 11, 2024
0a6e402
Merge branch 'owl-bot-copy-packages-google-cloud-discoveryengine' of …
gcf-owl-bot[bot] Oct 11, 2024
5d4bf5b
feat: add lite search API to allow public website search with API key
gcf-owl-bot[bot] Oct 25, 2024
8840114
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 25, 2024
90265ce
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 25, 2024
d3e3cf1
Merge branch 'owl-bot-copy-packages-google-cloud-discoveryengine' of …
gcf-owl-bot[bot] Oct 25, 2024
b9b8338
feat: Add GroundedGenerationService API
gcf-owl-bot[bot] Oct 30, 2024
62532f3
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 30, 2024
d29aed5
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 30, 2024
3048f3b
Merge branch 'owl-bot-copy-packages-google-cloud-discoveryengine' of …
gcf-owl-bot[bot] Oct 30, 2024
2212237
chore: regenerate API index
gcf-owl-bot[bot] Jan 2, 2025
5fdb202
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jan 2, 2025
9a649f1
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jan 2, 2025
8d91b3a
Merge branch 'owl-bot-copy-packages-google-cloud-discoveryengine' of …
gcf-owl-bot[bot] Jan 2, 2025
a7745f3
chore: remove redundant gRPC service config file
gcf-owl-bot[bot] Jan 6, 2025
64e7a9f
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jan 6, 2025
4fcafb5
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jan 6, 2025
e266ec4
Merge branch 'owl-bot-copy-packages-google-cloud-discoveryengine' of …
gcf-owl-bot[bot] Jan 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions packages/google-cloud-discoveryengine/.jsdoc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,7 +40,7 @@ module.exports = {
includePattern: '\\.js$'
},
templates: {
copyright: 'Copyright 2024 Google LLC',
copyright: 'Copyright 2025 Google LLC',
includeDate: false,
sourceFiles: false,
systemName: '@google-cloud/discoveryengine',
Expand Down
2 changes: 1 addition & 1 deletion packages/google-cloud-discoveryengine/.mocharc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion packages/google-cloud-discoveryengine/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Google LLC
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
14 changes: 12 additions & 2 deletions packages/google-cloud-discoveryengine/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,14 @@ message Answer {
// Adversarial query classification type.
ADVERSARIAL_QUERY = 1;

// Non-answer-seeking query classification type.
// Non-answer-seeking query classification type, for chit chat.
NON_ANSWER_SEEKING_QUERY = 2;

// Jail-breaking query classification type.
JAIL_BREAKING_QUERY = 3;

// Non-answer-seeking query classification type, for no clear intent.
NON_ANSWER_SEEKING_QUERY_V2 = 4;
}

// Query classification type.
Expand Down Expand Up @@ -321,7 +324,9 @@ message Answer {
// The adversarial query ignored case.
ADVERSARIAL_QUERY_IGNORED = 1;

// The non-answer seeking query ignored case.
// The non-answer seeking query ignored case
//
// Google skips the answer if the query is chit chat.
NON_ANSWER_SEEKING_QUERY_IGNORED = 2;

// The out-of-domain query ignored case.
Expand Down Expand Up @@ -353,6 +358,17 @@ message Answer {
// Google skips the summary if there is a customer policy violation
// detected. The policy is defined by the customer.
CUSTOMER_POLICY_VIOLATION = 7;

// The non-answer seeking query ignored case.
//
// Google skips the answer if the query doesn't have clear intent.
NON_ANSWER_SEEKING_QUERY_IGNORED_V2 = 8;

// The low-grounded answer case.
//
// Google skips the answer if a well grounded answer was unable to be
// generated.
LOW_GROUNDED_ANSWER = 9;
}

// Immutable. Fully qualified name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ option (google.api.resource_definition) = {
type: "healthcare.googleapis.com/FhirStore"
pattern: "projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_store}"
};
option (google.api.resource_definition) = {
type: "healthcare.googleapis.com/FhirResource"
pattern: "projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_store}/fhir/{resource_type}/{fhir_resource_id}"
};

// The industry vertical associated with the
// [DataStore][google.cloud.discoveryengine.v1.DataStore].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ message Condition {

// Search only
// A list of terms to match the query on.
// Cannot be set when
// [Condition.query_regex][google.cloud.discoveryengine.v1.Condition.query_regex]
// is set.
//
// Maximum of 10 query terms.
repeated QueryTerm query_terms = 2;
Expand All @@ -70,6 +73,12 @@ message Condition {
//
// Maximum of 10 time ranges.
repeated TimeRange active_time_range = 3;

// Optional. Query regex to match the whole search query.
// Cannot be set when
// [Condition.query_terms][google.cloud.discoveryengine.v1.Condition.query_terms]
// is set. This is currently supporting promotion use case.
string query_regex = 4 [(google.api.field_behavior) = OPTIONAL];
}

// Defines a conditioned behavior to employ during serving.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ service ControlService {
// Request for CreateControl method.
message CreateControlRequest {
// Required. Full resource name of parent data store. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection_id}/dataStores/{data_store_id}`
// `projects/{project}/locations/{location}/collections/{collection_id}/dataStores/{data_store_id}`
// or
// `projects/{project_number}/locations/{location_id}/collections/{collection_id}/engines/{engine_id}`.
// `projects/{project}/locations/{location}/collections/{collection_id}/engines/{engine_id}`.
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand Down Expand Up @@ -176,7 +176,7 @@ message UpdateControlRequest {
// Request for DeleteControl method.
message DeleteControlRequest {
// Required. The resource name of the Control to delete. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection_id}/dataStores/{data_store_id}/controls/{control_id}`
// `projects/{project}/locations/{location}/collections/{collection_id}/dataStores/{data_store_id}/controls/{control_id}`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -188,7 +188,7 @@ message DeleteControlRequest {
// Request for GetControl method.
message GetControlRequest {
// Required. The resource name of the Control to get. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection_id}/dataStores/{data_store_id}/controls/{control_id}`
// `projects/{project}/locations/{location}/collections/{collection_id}/dataStores/{data_store_id}/controls/{control_id}`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -200,9 +200,9 @@ message GetControlRequest {
// Request for ListControls method.
message ListControlsRequest {
// Required. The data store resource name. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection_id}/dataStores/{data_store_id}`
// `projects/{project}/locations/{location}/collections/{collection_id}/dataStores/{data_store_id}`
// or
// `projects/{project_number}/locations/{location_id}/collections/{collection_id}/engines/{engine_id}`.
// `projects/{project}/locations/{location}/collections/{collection_id}/engines/{engine_id}`.
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ service ConversationalSearchService {
// method.
message ConverseConversationRequest {
// Required. The resource name of the Conversation to get. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}/conversations/{conversation_id}`.
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}/conversations/{conversation_id}`.
// Use
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}/conversations/-`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}/conversations/-`
// to activate auto session mode, which automatically creates a new
// conversation inside a ConverseConversation session.
string name = 1 [
Expand All @@ -289,7 +289,7 @@ message ConverseConversationRequest {
TextInput query = 2 [(google.api.field_behavior) = REQUIRED];

// The resource name of the Serving Config to use. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}/servingConfigs/{serving_config_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}/servingConfigs/{serving_config_id}`
// If this is not set, the default serving config will be used.
string serving_config = 3 [(google.api.resource_reference) = {
type: "discoveryengine.googleapis.com/ServingConfig"
Expand Down Expand Up @@ -366,7 +366,7 @@ message ConverseConversationResponse {
// Request for CreateConversation method.
message CreateConversationRequest {
// Required. Full resource name of parent data store. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}`
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand Down Expand Up @@ -396,7 +396,7 @@ message UpdateConversationRequest {
// Request for DeleteConversation method.
message DeleteConversationRequest {
// Required. The resource name of the Conversation to delete. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}/conversations/{conversation_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}/conversations/{conversation_id}`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -408,7 +408,7 @@ message DeleteConversationRequest {
// Request for GetConversation method.
message GetConversationRequest {
// Required. The resource name of the Conversation to get. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}/conversations/{conversation_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}/conversations/{conversation_id}`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -420,7 +420,7 @@ message GetConversationRequest {
// Request for ListConversations method.
message ListConversationsRequest {
// Required. The data store resource name. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}`
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand Down Expand Up @@ -540,6 +540,20 @@ message AnswerQueryRequest {
// of relevance to generate answers. If set to `true` or unset, the behavior
// will be determined automatically by the service.
optional bool ignore_low_relevant_content = 7;

// Optional. Specifies whether to filter out jail-breaking queries. The
// default value is `false`.
//
// Google employs search-query classification to detect jail-breaking
// queries. No summary is returned if the search query is classified as a
// jail-breaking query. A user might add instructions to the query to
// change the tone, style, language, content of the answer, or ask the
// model to act as a different entity, e.g. "Reply in the tone of a
// competing company's CEO". If this field is set to `true`, we skip
// generating summaries for jail-breaking queries and return fallback
// messages instead.
bool ignore_jail_breaking_query = 8
[(google.api.field_behavior) = OPTIONAL];
}

// Search specification.
Expand Down Expand Up @@ -607,12 +621,14 @@ message AnswerQueryRequest {
// Page identifier.
string page_identifier = 1;

// Document content.
// Document content to be used for answer generation.
string content = 2;
}

// Extractive segment.
// [Guide](https://cloud.google.com/generative-ai-app-builder/docs/snippets#extractive-segments)
// Answer generation will only use it if document_contexts is empty.
// This is supposed to be shorter snippets.
message ExtractiveSegment {
// Page identifier.
string page_identifier = 1;
Expand Down Expand Up @@ -642,25 +658,43 @@ message AnswerQueryRequest {
// Title.
string title = 3;

// List of document contexts.
// List of document contexts. The content will be used for Answer
// Generation. This is supposed to be the main content of the document
// that can be long and comprehensive.
repeated DocumentContext document_contexts = 4;

// List of extractive segments.
repeated ExtractiveSegment extractive_segments = 5;

// Deprecated: This field is deprecated and will have no effect on
// the Answer generation.
// Please use document_contexts and extractive_segments fields.
// List of extractive answers.
repeated ExtractiveAnswer extractive_answers = 6;
repeated ExtractiveAnswer extractive_answers = 6 [deprecated = true];
}

// Chunk information.
message ChunkInfo {
// Document metadata contains the information of the document of the
// current chunk.
message DocumentMetadata {
// Uri of the document.
string uri = 1;

// Title of the document.
string title = 2;
}

// Chunk resource name.
string chunk = 1 [(google.api.resource_reference) = {
type: "discoveryengine.googleapis.com/Chunk"
}];

// Chunk textual content.
string content = 2;

// Metadata of the document from the current chunk.
DocumentMetadata document_metadata = 4;
}

// Search result content.
Expand Down Expand Up @@ -700,11 +734,14 @@ message AnswerQueryRequest {
// Adversarial query classification type.
ADVERSARIAL_QUERY = 1;

// Non-answer-seeking query classification type.
// Non-answer-seeking query classification type, for chit chat.
NON_ANSWER_SEEKING_QUERY = 2;

// Jail-breaking query classification type.
JAIL_BREAKING_QUERY = 3;

// Non-answer-seeking query classification type, for no clear intent.
NON_ANSWER_SEEKING_QUERY_V2 = 4;
}

// Enabled query classification types.
Expand Down Expand Up @@ -770,6 +807,9 @@ message AnswerQueryRequest {
// Query understanding specification.
QueryUnderstandingSpec query_understanding_spec = 9;

// Deprecated: This field is deprecated. Streaming Answer API will be
// supported.
//
// Asynchronous mode control.
//
// If enabled, the response will be returned with answer/session resource
Expand All @@ -779,7 +819,7 @@ message AnswerQueryRequest {
// or
// [ConversationalSearchService.GetSession][google.cloud.discoveryengine.v1.ConversationalSearchService.GetSession]
// method.
bool asynchronous_mode = 10;
bool asynchronous_mode = 10 [deprecated = true];

// A unique identifier for tracking visitors. For example, this could be
// implemented with an HTTP cookie, which should be able to uniquely identify
Expand Down Expand Up @@ -839,7 +879,7 @@ message AnswerQueryResponse {
// Request for GetAnswer method.
message GetAnswerRequest {
// Required. The resource name of the Answer to get. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/engines/{engine_id}/sessions/{session_id}/answers/{answer_id}`
// `projects/{project}/locations/{location}/collections/{collection}/engines/{engine_id}/sessions/{session_id}/answers/{answer_id}`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -851,7 +891,7 @@ message GetAnswerRequest {
// Request for CreateSession method.
message CreateSessionRequest {
// Required. Full resource name of parent data store. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}`
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand Down Expand Up @@ -881,7 +921,7 @@ message UpdateSessionRequest {
// Request for DeleteSession method.
message DeleteSessionRequest {
// Required. The resource name of the Session to delete. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}/sessions/{session_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}/sessions/{session_id}`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -893,7 +933,7 @@ message DeleteSessionRequest {
// Request for GetSession method.
message GetSessionRequest {
// Required. The resource name of the Session to get. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}/sessions/{session_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}/sessions/{session_id}`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -905,7 +945,7 @@ message GetSessionRequest {
// Request for ListSessions method.
message ListSessionsRequest {
// Required. The data store resource name. Format:
// `projects/{project_number}/locations/{location_id}/collections/{collection}/dataStores/{data_store_id}`
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store_id}`
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ message CustomTuningModel {
// Required. The fully qualified resource name of the model.
//
// Format:
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}/customTuningModels/{custom_tuning_model}`
// model must be an alpha-numerical string with limit of 40 characters.
// `projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}/customTuningModels/{custom_tuning_model}`.
//
// Model must be an alpha-numerical string with limit of 40 characters.
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -85,12 +86,16 @@ message CustomTuningModel {
// The state that the model is in (e.g.`TRAINING` or `TRAINING_FAILED`).
ModelState model_state = 4;

// Deprecated: timestamp the Model was created at.
// Deprecated: Timestamp the Model was created at.
google.protobuf.Timestamp create_time = 5 [deprecated = true];

// Timestamp the model training was initiated.
google.protobuf.Timestamp training_start_time = 6;

// The metrics of the trained model.
map<string, double> metrics = 7;

// Currently this is only populated if the model state is
// `INPUT_VALIDATION_FAILED`.
string error_message = 8;
}
Loading
Loading