Skip to content

Commit 6b73cce

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: Add Grounding feature to PredictionService.GenerateContent (#5036)
* fix!: remove field `max_wait_duration` from message Scheduling feat: add psc_automated_endpoints to IndexPrivateEndpoints feat: add request_response_logging_schema_version to ModelDeploymentMonitoringBigQueryTable feat: add resource_title, resource_use_case, resource_description to RegionalResourceReferences feat: add deploy_gke, open_tine_tuning_pipelines, open_notebooks to CallToAction docs: deprecate use_case and description in ResourceReference docs: minor changes to comments PiperOrigin-RevId: 605667976 Source-Link: googleapis/googleapis@3b25a48 Source-Link: googleapis/googleapis-gen@b8402de Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFpcGxhdGZvcm0vLk93bEJvdC55YW1sIiwiaCI6ImI4NDAyZGUyMjYxMWEzYjdiZmZhNTliMDc1ODkxZTViMjlhMGQ1NTQifQ== * fix!: remove field `max_wait_duration` from message Scheduling fix!: remove method `CountTokens` from service LlmUtilityService feat: add psc_automated_endpoints to IndexPrivateEndpoints feat: add update_mask to UpsertDatapointsRequest feat: add more RecordErrorType enum values feat: add request_response_logging_schema_version to ModelDeploymentMonitoringBigQueryTable feat: add resource_title, resource_use_case, resource_description to RegionalResourceReferences docs: deprecate use_case and description in ResourceReference feat: add deploy_gke, open_tine_tuning_pipelines, open_notebooks to CallToAction docs: minor changes to comments PiperOrigin-RevId: 605668103 Source-Link: googleapis/googleapis@f583398 Source-Link: googleapis/googleapis-gen@74cf405 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFpcGxhdGZvcm0vLk93bEJvdC55YW1sIiwiaCI6Ijc0Y2Y0MDU4NDE3YmQyYTY0MTEzOTVkMjg2YzM0ZmIyNzA4OGE3NmQifQ== * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Add Grounding feature to PredictionService.GenerateContent feat: Add Retrieval feat: Add GoogleSearchRetrieval feat: Add VertexAiSearch feat: Add Tool.retrieval feat: Add Tool.google_search_retrieval feat: Add Candidate.grounding_metadata docs: A comment for message `Tool` is changed docs: A comment for field `tools` in message `.google.cloud.aiplatform.v1beta1.GenerateContentRequest` is changed docs: A comment for field `tools` in message `.google.cloud.aiplatform.v1beta1.GenerateContentRequest` is changed PiperOrigin-RevId: 605743031 Source-Link: googleapis/googleapis@e183baf Source-Link: googleapis/googleapis-gen@1f35985 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFpcGxhdGZvcm0vLk93bEJvdC55YW1sIiwiaCI6IjFmMzU5ODVhODY1YmNlMTg5YmMzZGUzOWUwMjAwNjgxMDI1ZWUyMTMifQ== * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent f49589c commit 6b73cce

88 files changed

Lines changed: 60000 additions & 51424 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/google-cloud-aiplatform/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/google-cloud-node/
562562
| Persistent_resource_service.get_persistent_resource | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-aiplatform/samples/generated/v1beta1/persistent_resource_service.get_persistent_resource.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-cloud-aiplatform/samples/generated/v1beta1/persistent_resource_service.get_persistent_resource.js,packages/google-cloud-aiplatform/samples/README.md) |
563563
| Persistent_resource_service.list_persistent_resources | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-aiplatform/samples/generated/v1beta1/persistent_resource_service.list_persistent_resources.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-cloud-aiplatform/samples/generated/v1beta1/persistent_resource_service.list_persistent_resources.js,packages/google-cloud-aiplatform/samples/README.md) |
564564
| Persistent_resource_service.update_persistent_resource | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-aiplatform/samples/generated/v1beta1/persistent_resource_service.update_persistent_resource.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-cloud-aiplatform/samples/generated/v1beta1/persistent_resource_service.update_persistent_resource.js,packages/google-cloud-aiplatform/samples/README.md) |
565+
| Pipeline_service.batch_cancel_pipeline_jobs | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-aiplatform/samples/generated/v1beta1/pipeline_service.batch_cancel_pipeline_jobs.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-cloud-aiplatform/samples/generated/v1beta1/pipeline_service.batch_cancel_pipeline_jobs.js,packages/google-cloud-aiplatform/samples/README.md) |
565566
| Pipeline_service.batch_delete_pipeline_jobs | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-aiplatform/samples/generated/v1beta1/pipeline_service.batch_delete_pipeline_jobs.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-cloud-aiplatform/samples/generated/v1beta1/pipeline_service.batch_delete_pipeline_jobs.js,packages/google-cloud-aiplatform/samples/README.md) |
566567
| Pipeline_service.cancel_pipeline_job | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-aiplatform/samples/generated/v1beta1/pipeline_service.cancel_pipeline_job.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-cloud-aiplatform/samples/generated/v1beta1/pipeline_service.cancel_pipeline_job.js,packages/google-cloud-aiplatform/samples/README.md) |
567568
| Pipeline_service.cancel_training_pipeline | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-aiplatform/samples/generated/v1beta1/pipeline_service.cancel_training_pipeline.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-cloud-aiplatform/samples/generated/v1beta1/pipeline_service.cancel_training_pipeline.js,packages/google-cloud-aiplatform/samples/README.md) |

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/custom_job.proto‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,4 @@ message Scheduling {
349349
// job starts running. If true, overrides
350350
// `Scheduling.restart_job_on_worker_restart` to false.
351351
bool disable_retries = 5 [(google.api.field_behavior) = OPTIONAL];
352-
353-
// Optional. This is the maximum time a user will wait in the QRM queue for
354-
// resources. Default is 1 day
355-
google.protobuf.Duration max_wait_duration = 6
356-
[(google.api.field_behavior) = OPTIONAL];
357352
}

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/explanation.proto‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ message Explanation {
4444
// [Attribution.output_index][google.cloud.aiplatform.v1.Attribution.output_index]
4545
// can be used to identify which output this attribution is explaining.
4646
//
47+
// By default, we provide Shapley values for the predicted class. However,
48+
// you can configure the explanation request to generate Shapley values for
49+
// any other classes too. For example, if a model predicts a probability of
50+
// `0.4` for approving a loan application, the model's decision is to reject
51+
// the application since `p(reject) = 0.6 > p(approve) = 0.4`, and the default
52+
// Shapley values would be computed for rejection decision and not approval,
53+
// even though the latter might be the positive class.
54+
//
4755
// If users set
4856
// [ExplanationParameters.top_k][google.cloud.aiplatform.v1.ExplanationParameters.top_k],
4957
// the attributions are sorted by

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/feature_online_store_admin_service.proto‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ message UpdateFeatureOnlineStoreRequest {
319319
// Updatable fields:
320320
//
321321
// * `big_query_source`
322+
// * `bigtable`
322323
// * `labels`
323324
// * `sync_config`
324325
google.protobuf.FieldMask update_mask = 2;
@@ -480,6 +481,7 @@ message UpdateFeatureViewRequest {
480481
// Updatable fields:
481482
//
482483
// * `labels`
484+
// * `serviceAgentType`
483485
google.protobuf.FieldMask update_mask = 2;
484486
}
485487

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/index_endpoint.proto‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,4 +291,9 @@ message IndexPrivateEndpoints {
291291
// Output only. The name of the service attachment resource. Populated if
292292
// private service connect is enabled.
293293
string service_attachment = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
294+
295+
// Output only. PscAutomatedEndpoints is populated if private service connect
296+
// is enabled if PscAutomatedConfig is set.
297+
repeated PscAutomatedEndpoints psc_automated_endpoints = 3
298+
[(google.api.field_behavior) = OUTPUT_ONLY];
294299
}

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/index_service.proto‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,16 @@ message UpsertDatapointsRequest {
252252

253253
// A list of datapoints to be created/updated.
254254
repeated IndexDatapoint datapoints = 2;
255+
256+
// Optional. Update mask is used to specify the fields to be overwritten in
257+
// the datapoints by the update. The fields specified in the update_mask are
258+
// relative to each IndexDatapoint inside datapoints, not the full request.
259+
//
260+
// Updatable fields:
261+
//
262+
// * Use `all_restricts` to update both restricts and numeric_restricts.
263+
google.protobuf.FieldMask update_mask = 3
264+
[(google.api.field_behavior) = OPTIONAL];
255265
}
256266

257267
// Response message for
@@ -307,6 +317,25 @@ message NearestNeighborSearchOperationMetadata {
307317

308318
// The `namespace` field is missing.
309319
NAMESPACE_MISSING = 7;
320+
321+
// Generic catch-all error. Only used for validation failure where the
322+
// root cause cannot be easily retrieved programmatically.
323+
PARSING_ERROR = 8;
324+
325+
// There are multiple restricts with the same `namespace` value.
326+
DUPLICATE_NAMESPACE = 9;
327+
328+
// Numeric restrict has operator specified in datapoint.
329+
OP_IN_DATAPOINT = 10;
330+
331+
// Numeric restrict has multiple values specified.
332+
MULTIPLE_VALUES = 11;
333+
334+
// Numeric restrict has invalid numeric value specified.
335+
INVALID_NUMERIC_VALUE = 12;
336+
337+
// File is not in UTF_8 format.
338+
INVALID_ENCODING = 13;
310339
}
311340

312341
// The error type of this record.

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/model.proto‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,12 @@ message Model {
249249
// deploying this Model. The specification is ingested upon
250250
// [ModelService.UploadModel][google.cloud.aiplatform.v1.ModelService.UploadModel],
251251
// and all binaries it contains are copied and stored internally by Vertex AI.
252-
// Not present for AutoML Models or Large Models.
252+
// Not required for AutoML Models.
253253
ModelContainerSpec container_spec = 9
254254
[(google.api.field_behavior) = INPUT_ONLY];
255255

256256
// Immutable. The path to the directory containing the Model artifact and any
257-
// of its supporting files. Not present for AutoML Models or Large Models.
257+
// of its supporting files. Not required for AutoML Models.
258258
string artifact_uri = 26 [(google.api.field_behavior) = IMMUTABLE];
259259

260260
// Output only. When this Model is deployed, its prediction resources are
@@ -437,7 +437,8 @@ message Model {
437437
EncryptionSpec encryption_spec = 24;
438438

439439
// Output only. Source of a model. It can either be automl training pipeline,
440-
// custom training pipeline, BigQuery ML, or existing Vertex AI Model.
440+
// custom training pipeline, BigQuery ML, or saved and tuned from Genie or
441+
// Model Garden.
441442
ModelSourceInfo model_source_info = 38
442443
[(google.api.field_behavior) = OUTPUT_ONLY];
443444

@@ -766,6 +767,10 @@ message Port {
766767
// Detail description of the source information of the model.
767768
message ModelSourceInfo {
768769
// Source of the model.
770+
// Different from `objective` field, this `ModelSourceType` enum
771+
// indicates the source from which the model was accessed or obtained,
772+
// whereas the `objective` indicates the overall aim or function of this
773+
// model.
769774
enum ModelSourceType {
770775
// Should not be used.
771776
MODEL_SOURCE_TYPE_UNSPECIFIED = 0;
@@ -787,6 +792,9 @@ message ModelSourceInfo {
787792

788793
// The Model is uploaded by text embedding finetuning pipeline.
789794
CUSTOM_TEXT_EMBEDDING = 6;
795+
796+
// The Model is saved or tuned from Marketplace.
797+
MARKETPLACE = 7;
790798
}
791799

792800
// Type of the model source.

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/model_deployment_monitoring_job.proto‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,11 @@ message ModelDeploymentMonitoringBigQueryTable {
263263
// & analysis. Format:
264264
// `bq://<project_id>.model_deployment_monitoring_<endpoint_id>.<tolower(log_source)>_<tolower(log_type)>`
265265
string bigquery_table_path = 3;
266+
267+
// Output only. The schema version of the request/response logging BigQuery
268+
// table. Default to v1 if unset.
269+
string request_response_logging_schema_version = 4
270+
[(google.api.field_behavior) = OUTPUT_ONLY];
266271
}
267272

268273
// ModelDeploymentMonitoringObjectiveConfig contains the pair of

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/prediction_service.proto‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,7 @@ message GenerateContentRequest {
653653
//
654654
// A `Tool` is a piece of code that enables the system to interact with
655655
// external systems to perform an action, or set of actions, outside of
656-
// knowledge and scope of the model. The only supported tool is currently
657-
// `Function`
656+
// knowledge and scope of the model.
658657
repeated Tool tools = 6 [(google.api.field_behavior) = OPTIONAL];
659658

660659
// Optional. Per request settings for blocking unsafe content.

‎packages/google-cloud-aiplatform/protos/google/cloud/aiplatform/v1/publisher_model.proto‎

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ message PublisherModel {
4646
string resource_name = 2;
4747

4848
// Use case (CUJ) of the resource.
49-
string use_case = 3;
49+
string use_case = 3 [deprecated = true];
5050

5151
// Description of the resource.
52-
string description = 4;
52+
string description = 4 [deprecated = true];
5353
}
5454
}
5555

@@ -72,8 +72,20 @@ message PublisherModel {
7272
map<string, ResourceReference> references = 1
7373
[(google.api.field_behavior) = REQUIRED];
7474

75-
// Required. The title of the regional resource reference.
75+
// Required.
7676
string title = 2 [(google.api.field_behavior) = REQUIRED];
77+
78+
// Optional. Title of the resource.
79+
optional string resource_title = 3
80+
[(google.api.field_behavior) = OPTIONAL];
81+
82+
// Optional. Use case (CUJ) of the resource.
83+
optional string resource_use_case = 4
84+
[(google.api.field_behavior) = OPTIONAL];
85+
86+
// Optional. Description of the resource.
87+
optional string resource_description = 5
88+
[(google.api.field_behavior) = OPTIONAL];
7789
}
7890

7991
// Rest API docs.
@@ -86,6 +98,20 @@ message PublisherModel {
8698
string title = 2 [(google.api.field_behavior) = REQUIRED];
8799
}
88100

101+
// Open notebooks.
102+
message OpenNotebooks {
103+
// Required. Regional resource references to notebooks.
104+
repeated RegionalResourceReferences notebooks = 1
105+
[(google.api.field_behavior) = REQUIRED];
106+
}
107+
108+
// Open fine tuning pipelines.
109+
message OpenFineTuningPipelines {
110+
// Required. Regional resource references to fine tuning pipelines.
111+
repeated RegionalResourceReferences fine_tuning_pipelines = 1
112+
[(google.api.field_behavior) = REQUIRED];
113+
}
114+
89115
// Model metadata that is needed for UploadModel or
90116
// DeployModel/CreateEndpoint requests.
91117
message Deploy {
@@ -131,13 +157,24 @@ message PublisherModel {
131157
string public_artifact_uri = 9 [(google.api.field_behavior) = OPTIONAL];
132158
}
133159

160+
// Configurations for PublisherModel GKE deployment
161+
message DeployGke {
162+
// Optional. GKE deployment configuration in yaml format.
163+
repeated string gke_yaml_configs = 1
164+
[(google.api.field_behavior) = OPTIONAL];
165+
}
166+
134167
// Optional. To view Rest API docs.
135168
ViewRestApi view_rest_api = 1 [(google.api.field_behavior) = OPTIONAL];
136169

137170
// Optional. Open notebook of the PublisherModel.
138171
RegionalResourceReferences open_notebook = 2
139172
[(google.api.field_behavior) = OPTIONAL];
140173

174+
// Optional. Open notebooks of the PublisherModel.
175+
optional OpenNotebooks open_notebooks = 12
176+
[(google.api.field_behavior) = OPTIONAL];
177+
141178
// Optional. Create application using the PublisherModel.
142179
RegionalResourceReferences create_application = 3
143180
[(google.api.field_behavior) = OPTIONAL];
@@ -146,6 +183,10 @@ message PublisherModel {
146183
RegionalResourceReferences open_fine_tuning_pipeline = 4
147184
[(google.api.field_behavior) = OPTIONAL];
148185

186+
// Optional. Open fine-tuning pipelines of the PublisherModel.
187+
optional OpenFineTuningPipelines open_fine_tuning_pipelines = 13
188+
[(google.api.field_behavior) = OPTIONAL];
189+
149190
// Optional. Open prompt-tuning pipeline of the PublisherModel.
150191
RegionalResourceReferences open_prompt_tuning_pipeline = 5
151192
[(google.api.field_behavior) = OPTIONAL];
@@ -157,6 +198,9 @@ message PublisherModel {
157198
// Optional. Deploy the PublisherModel to Vertex Endpoint.
158199
Deploy deploy = 7 [(google.api.field_behavior) = OPTIONAL];
159200

201+
// Optional. Deploy PublisherModel to Google Kubernetes Engine.
202+
DeployGke deploy_gke = 14 [(google.api.field_behavior) = OPTIONAL];
203+
160204
// Optional. Open in Generation AI Studio.
161205
RegionalResourceReferences open_generation_ai_studio = 8
162206
[(google.api.field_behavior) = OPTIONAL];

0 commit comments

Comments
 (0)