Skip to content

Commit

Permalink
fix!: remove field max_wait_duration from message Scheduling
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Google APIs authored and Copybara-Service committed Feb 9, 2024
1 parent 2834ef1 commit 3b25a48
Show file tree
Hide file tree
Showing 11 changed files with 125 additions and 13 deletions.
4 changes: 4 additions & 0 deletions google/cloud/aiplatform/v1/aiplatform_v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ http:
post: '/v1/{resource=projects/*/locations/*/featurestores/*}:getIamPolicy'
additional_bindings:
- post: '/v1/{resource=projects/*/locations/*/featurestores/*/entityTypes/*}:getIamPolicy'
- post: '/v1/{resource=projects/*/locations/*/models/*}:getIamPolicy'
- post: '/v1/{resource=projects/*/locations/*/notebookRuntimeTemplates/*}:getIamPolicy'
- post: '/ui/{resource=projects/*/locations/*/featurestores/*}:getIamPolicy'
- post: '/ui/{resource=projects/*/locations/*/featurestores/*/entityTypes/*}:getIamPolicy'
Expand All @@ -182,6 +183,8 @@ http:
additional_bindings:
- post: '/v1/{resource=projects/*/locations/*/featurestores/*/entityTypes/*}:setIamPolicy'
body: '*'
- post: '/v1/{resource=projects/*/locations/*/models/*}:setIamPolicy'
body: '*'
- post: '/v1/{resource=projects/*/locations/*/notebookRuntimeTemplates/*}:setIamPolicy'
body: '*'
- post: '/ui/{resource=projects/*/locations/*/featurestores/*}:setIamPolicy'
Expand All @@ -198,6 +201,7 @@ http:
post: '/v1/{resource=projects/*/locations/*/featurestores/*}:testIamPermissions'
additional_bindings:
- post: '/v1/{resource=projects/*/locations/*/featurestores/*/entityTypes/*}:testIamPermissions'
- post: '/v1/{resource=projects/*/locations/*/models/*}:testIamPermissions'
- post: '/v1/{resource=projects/*/locations/*/notebookRuntimeTemplates/*}:testIamPermissions'
- post: '/ui/{resource=projects/*/locations/*/featurestores/*}:testIamPermissions'
- post: '/ui/{resource=projects/*/locations/*/featurestores/*/entityTypes/*}:testIamPermissions'
Expand Down
5 changes: 0 additions & 5 deletions google/cloud/aiplatform/v1/custom_job.proto
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,4 @@ message Scheduling {
// job starts running. If true, overrides
// `Scheduling.restart_job_on_worker_restart` to false.
bool disable_retries = 5 [(google.api.field_behavior) = OPTIONAL];

// Optional. This is the maximum time a user will wait in the QRM queue for
// resources. Default is 1 day
google.protobuf.Duration max_wait_duration = 6
[(google.api.field_behavior) = OPTIONAL];
}
8 changes: 8 additions & 0 deletions google/cloud/aiplatform/v1/explanation.proto
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ message Explanation {
// [Attribution.output_index][google.cloud.aiplatform.v1.Attribution.output_index]
// can be used to identify which output this attribution is explaining.
//
// By default, we provide Shapley values for the predicted class. However,
// you can configure the explanation request to generate Shapley values for
// any other classes too. For example, if a model predicts a probability of
// `0.4` for approving a loan application, the model's decision is to reject
// the application since `p(reject) = 0.6 > p(approve) = 0.4`, and the default
// Shapley values would be computed for rejection decision and not approval,
// even though the latter might be the positive class.
//
// If users set
// [ExplanationParameters.top_k][google.cloud.aiplatform.v1.ExplanationParameters.top_k],
// the attributions are sorted by
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ message UpdateFeatureOnlineStoreRequest {
// Updatable fields:
//
// * `big_query_source`
// * `bigtable`
// * `labels`
// * `sync_config`
google.protobuf.FieldMask update_mask = 2;
Expand Down Expand Up @@ -480,6 +481,7 @@ message UpdateFeatureViewRequest {
// Updatable fields:
//
// * `labels`
// * `serviceAgentType`
google.protobuf.FieldMask update_mask = 2;
}

Expand Down
5 changes: 5 additions & 0 deletions google/cloud/aiplatform/v1/index_endpoint.proto
Original file line number Diff line number Diff line change
Expand Up @@ -291,4 +291,9 @@ message IndexPrivateEndpoints {
// Output only. The name of the service attachment resource. Populated if
// private service connect is enabled.
string service_attachment = 2 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. PscAutomatedEndpoints is populated if private service connect
// is enabled if PscAutomatedConfig is set.
repeated PscAutomatedEndpoints psc_automated_endpoints = 3
[(google.api.field_behavior) = OUTPUT_ONLY];
}
29 changes: 29 additions & 0 deletions google/cloud/aiplatform/v1/index_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,16 @@ message UpsertDatapointsRequest {

// A list of datapoints to be created/updated.
repeated IndexDatapoint datapoints = 2;

// Optional. Update mask is used to specify the fields to be overwritten in
// the datapoints by the update. The fields specified in the update_mask are
// relative to each IndexDatapoint inside datapoints, not the full request.
//
// Updatable fields:
//
// * Use `all_restricts` to update both restricts and numeric_restricts.
google.protobuf.FieldMask update_mask = 3
[(google.api.field_behavior) = OPTIONAL];
}

// Response message for
Expand Down Expand Up @@ -307,6 +317,25 @@ message NearestNeighborSearchOperationMetadata {

// The `namespace` field is missing.
NAMESPACE_MISSING = 7;

// Generic catch-all error. Only used for validation failure where the
// root cause cannot be easily retrieved programmatically.
PARSING_ERROR = 8;

// There are multiple restricts with the same `namespace` value.
DUPLICATE_NAMESPACE = 9;

// Numeric restrict has operator specified in datapoint.
OP_IN_DATAPOINT = 10;

// Numeric restrict has multiple values specified.
MULTIPLE_VALUES = 11;

// Numeric restrict has invalid numeric value specified.
INVALID_NUMERIC_VALUE = 12;

// File is not in UTF_8 format.
INVALID_ENCODING = 13;
}

// The error type of this record.
Expand Down
14 changes: 11 additions & 3 deletions google/cloud/aiplatform/v1/model.proto
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,12 @@ message Model {
// deploying this Model. The specification is ingested upon
// [ModelService.UploadModel][google.cloud.aiplatform.v1.ModelService.UploadModel],
// and all binaries it contains are copied and stored internally by Vertex AI.
// Not present for AutoML Models or Large Models.
// Not required for AutoML Models.
ModelContainerSpec container_spec = 9
[(google.api.field_behavior) = INPUT_ONLY];

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

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

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

Expand Down Expand Up @@ -766,6 +767,10 @@ message Port {
// Detail description of the source information of the model.
message ModelSourceInfo {
// Source of the model.
// Different from `objective` field, this `ModelSourceType` enum
// indicates the source from which the model was accessed or obtained,
// whereas the `objective` indicates the overall aim or function of this
// model.
enum ModelSourceType {
// Should not be used.
MODEL_SOURCE_TYPE_UNSPECIFIED = 0;
Expand All @@ -787,6 +792,9 @@ message ModelSourceInfo {

// The Model is uploaded by text embedding finetuning pipeline.
CUSTOM_TEXT_EMBEDDING = 6;

// The Model is saved or tuned from Marketplace.
MARKETPLACE = 7;
}

// Type of the model source.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,11 @@ message ModelDeploymentMonitoringBigQueryTable {
// & analysis. Format:
// `bq://<project_id>.model_deployment_monitoring_<endpoint_id>.<tolower(log_source)>_<tolower(log_type)>`
string bigquery_table_path = 3;

// Output only. The schema version of the request/response logging BigQuery
// table. Default to v1 if unset.
string request_response_logging_schema_version = 4
[(google.api.field_behavior) = OUTPUT_ONLY];
}

// ModelDeploymentMonitoringObjectiveConfig contains the pair of
Expand Down
3 changes: 1 addition & 2 deletions google/cloud/aiplatform/v1/prediction_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -653,8 +653,7 @@ message GenerateContentRequest {
//
// A `Tool` is a piece of code that enables the system to interact with
// external systems to perform an action, or set of actions, outside of
// knowledge and scope of the model. The only supported tool is currently
// `Function`
// knowledge and scope of the model.
repeated Tool tools = 6 [(google.api.field_behavior) = OPTIONAL];

// Optional. Per request settings for blocking unsafe content.
Expand Down
50 changes: 47 additions & 3 deletions google/cloud/aiplatform/v1/publisher_model.proto
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ message PublisherModel {
string resource_name = 2;

// Use case (CUJ) of the resource.
string use_case = 3;
string use_case = 3 [deprecated = true];

// Description of the resource.
string description = 4;
string description = 4 [deprecated = true];
}
}

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

// Required. The title of the regional resource reference.
// Required.
string title = 2 [(google.api.field_behavior) = REQUIRED];

// Optional. Title of the resource.
optional string resource_title = 3
[(google.api.field_behavior) = OPTIONAL];

// Optional. Use case (CUJ) of the resource.
optional string resource_use_case = 4
[(google.api.field_behavior) = OPTIONAL];

// Optional. Description of the resource.
optional string resource_description = 5
[(google.api.field_behavior) = OPTIONAL];
}

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

// Open notebooks.
message OpenNotebooks {
// Required. Regional resource references to notebooks.
repeated RegionalResourceReferences notebooks = 1
[(google.api.field_behavior) = REQUIRED];
}

// Open fine tuning pipelines.
message OpenFineTuningPipelines {
// Required. Regional resource references to fine tuning pipelines.
repeated RegionalResourceReferences fine_tuning_pipelines = 1
[(google.api.field_behavior) = REQUIRED];
}

// Model metadata that is needed for UploadModel or
// DeployModel/CreateEndpoint requests.
message Deploy {
Expand Down Expand Up @@ -131,13 +157,24 @@ message PublisherModel {
string public_artifact_uri = 9 [(google.api.field_behavior) = OPTIONAL];
}

// Configurations for PublisherModel GKE deployment
message DeployGke {
// Optional. GKE deployment configuration in yaml format.
repeated string gke_yaml_configs = 1
[(google.api.field_behavior) = OPTIONAL];
}

// Optional. To view Rest API docs.
ViewRestApi view_rest_api = 1 [(google.api.field_behavior) = OPTIONAL];

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

// Optional. Open notebooks of the PublisherModel.
optional OpenNotebooks open_notebooks = 12
[(google.api.field_behavior) = OPTIONAL];

// Optional. Create application using the PublisherModel.
RegionalResourceReferences create_application = 3
[(google.api.field_behavior) = OPTIONAL];
Expand All @@ -146,6 +183,10 @@ message PublisherModel {
RegionalResourceReferences open_fine_tuning_pipeline = 4
[(google.api.field_behavior) = OPTIONAL];

// Optional. Open fine-tuning pipelines of the PublisherModel.
optional OpenFineTuningPipelines open_fine_tuning_pipelines = 13
[(google.api.field_behavior) = OPTIONAL];

// Optional. Open prompt-tuning pipeline of the PublisherModel.
RegionalResourceReferences open_prompt_tuning_pipeline = 5
[(google.api.field_behavior) = OPTIONAL];
Expand All @@ -157,6 +198,9 @@ message PublisherModel {
// Optional. Deploy the PublisherModel to Vertex Endpoint.
Deploy deploy = 7 [(google.api.field_behavior) = OPTIONAL];

// Optional. Deploy PublisherModel to Google Kubernetes Engine.
DeployGke deploy_gke = 14 [(google.api.field_behavior) = OPTIONAL];

// Optional. Open in Generation AI Studio.
RegionalResourceReferences open_generation_ai_studio = 8
[(google.api.field_behavior) = OPTIONAL];
Expand Down
13 changes: 13 additions & 0 deletions google/cloud/aiplatform/v1/service_networking.proto
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,16 @@ message PrivateServiceConnectConfig {
// attachment.
repeated string project_allowlist = 2;
}

// PscAutomatedEndpoints defines the output of the forwarding rule
// automatically created by each PscAutomationConfig.
message PscAutomatedEndpoints {
// Corresponding project_id in pscAutomationConfigs
string project_id = 1;

// Corresponding network in pscAutomationConfigs.
string network = 2;

// Ip Address created by the automated forwarding rule.
string match_address = 3;
}

0 comments on commit 3b25a48

Please sign in to comment.