Skip to content

Commit

Permalink
feat: add blocking_operation_ids to ImportFeatureValuesOperationMetadata
Browse files Browse the repository at this point in the history
feat: add launch_stage to PublisherModel

PiperOrigin-RevId: 537154438
  • Loading branch information
Google APIs authored and Copybara-Service committed Jun 1, 2023
1 parent 5cba312 commit d2d95e5
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 22 deletions.
9 changes: 9 additions & 0 deletions google/cloud/aiplatform/v1beta1/aiplatform_v1beta1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ http:
- delete: '/v1beta1/{name=projects/*/locations/*/models/*/operations/*}'
- delete: '/v1beta1/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}'
- delete: '/v1beta1/{name=projects/*/locations/*/persistentResources/*/operations/*}'
- delete: '/v1beta1/{name=projects/*/locations/*/solvers/*/operations/*}'
- delete: '/v1beta1/{name=projects/*/locations/*/studies/*/operations/*}'
- delete: '/v1beta1/{name=projects/*/locations/*/studies/*/trials/*/operations/*}'
- delete: '/v1beta1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}'
Expand Down Expand Up @@ -437,6 +438,7 @@ http:
- get: '/v1beta1/{name=projects/*/locations/*/models/*/operations/*}'
- get: '/v1beta1/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}'
- get: '/v1beta1/{name=projects/*/locations/*/persistentResources/*/operations/*}'
- get: '/v1beta1/{name=projects/*/locations/*/solvers/*/operations/*}'
- get: '/v1beta1/{name=projects/*/locations/*/studies/*/operations/*}'
- get: '/v1beta1/{name=projects/*/locations/*/studies/*/trials/*/operations/*}'
- get: '/v1beta1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}'
Expand Down Expand Up @@ -506,6 +508,7 @@ http:
- get: '/v1beta1/{name=projects/*/locations/*/models/*}/operations'
- get: '/v1beta1/{name=projects/*/locations/*/models/*/evaluations/*}/operations'
- get: '/v1beta1/{name=projects/*/locations/*/persistentResources/*}/operations'
- get: '/v1beta1/{name=projects/*/locations/*/solvers/*}/operations'
- get: '/v1beta1/{name=projects/*/locations/*/studies/*}/operations'
- get: '/v1beta1/{name=projects/*/locations/*/studies/*/trials/*}/operations'
- get: '/v1beta1/{name=projects/*/locations/*/trainingPipelines/*}/operations'
Expand Down Expand Up @@ -701,6 +704,12 @@ publishing:
github_label: 'api: aiplatform'
organization: CLOUD
library_settings:
- version: google.cloud.aiplatform.v1
dotnet_settings:
renamed_resources:
datalabeling.googleapis.com/Dataset: DataLabelingDataset
automl.googleapis.com/Dataset: AutoMLDataset
automl.googleapis.com/Model: AutoMLModel
- version: google.cloud.aiplatform.v1beta1
dotnet_settings:
renamed_resources:
Expand Down
8 changes: 6 additions & 2 deletions google/cloud/aiplatform/v1beta1/featurestore_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ message ImportFeatureValuesRequest {
];

// Source column that holds entity IDs. If not provided, entity IDs are
// extracted from the column named `entity_id`.
// extracted from the column named entity_id.
string entity_id_field = 5;

// Required. Specifications defining which Feature values to import from the
Expand Down Expand Up @@ -1288,6 +1288,10 @@ message ImportFeatureValuesOperationMetadata {
// The number rows that weren't ingested due to having timestamps outside the
// retention boundary.
int64 timestamp_outside_retention_rows_count = 7;

// List of ImportFeatureValues operations running under a single EntityType
// that are blocking this operation.
repeated int64 blocking_operation_ids = 8;
}

// Details of operations that exports Features values.
Expand Down Expand Up @@ -1439,6 +1443,6 @@ message EntityIdSelector {
}

// Source column that holds entity IDs. If not provided, entity IDs are
// extracted from the column named `entity_id`.
// extracted from the column named entity_id.
string entity_id_field = 5;
}
15 changes: 7 additions & 8 deletions google/cloud/aiplatform/v1beta1/index_endpoint.proto
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,16 @@ message DeployedIndex {
// Output only. The DeployedIndex may depend on various data on its original
// Index. Additionally when certain changes to the original Index are being
// done (e.g. when what the Index contains is being changed) the DeployedIndex
// may be asynchronously updated in the background to reflect this changes. If
// this timestamp's value is at least the
// may be asynchronously updated in the background to reflect these changes.
// If this timestamp's value is at least the
// [Index.update_time][google.cloud.aiplatform.v1beta1.Index.update_time] of
// the original Index, it means that this DeployedIndex and the original Index
// are in sync. If this timestamp is older, then to see which updates this
// DeployedIndex already contains (and which not), one must
// [list][Operations.ListOperations] [Operations][Operation]
// [working][Operation.name] on the original Index. Only
// the successfully completed Operations with
// [Operations.metadata.generic_metadata.update_time]
// [google.cloud.aiplatform.v1beta1.GenericOperationMetadata.update_time]
// DeployedIndex already contains (and which it does not), one must
// [list][google.longrunning.Operations.ListOperations] the operations that
// are running on the original Index. Only the successfully completed
// Operations with
// [update_time][google.cloud.aiplatform.v1beta1.GenericOperationMetadata.update_time]
// equal or before this sync time are contained in this DeployedIndex.
google.protobuf.Timestamp index_sync_time = 6
[(google.api.field_behavior) = OUTPUT_ONLY];
Expand Down
15 changes: 12 additions & 3 deletions google/cloud/aiplatform/v1beta1/metadata_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ message ListArtifactsRequest {
// To filter on metadata fields use traversal operation as follows:
// `metadata.<field_name>.<type_value>`.
// For example: `metadata.field_1.number_value = 10.0`
// In case the field name contains special characters (such as colon), one
// can embed it inside double quote.
// For example: `metadata."field:1".number_value = 10.0`
// * **Context based filtering**:
// To filter Artifacts based on the contexts to which they belong, use the
// function operator with the full resource name
Expand Down Expand Up @@ -629,7 +632,6 @@ message UpdateArtifactRequest {
Artifact artifact = 1 [(google.api.field_behavior) = REQUIRED];

// Optional. A FieldMask indicating which fields should be updated.
// Functionality of this field is not yet supported.
google.protobuf.FieldMask update_mask = 2
[(google.api.field_behavior) = OPTIONAL];

Expand Down Expand Up @@ -785,6 +787,9 @@ message ListContextsRequest {
// To filter on metadata fields use traversal operation as follows:
// `metadata.<field_name>.<type_value>`.
// For example: `metadata.field_1.number_value = 10.0`.
// In case the field name contains special characters (such as colon), one
// can embed it inside double quote.
// For example: `metadata."field:1".number_value = 10.0`
// * **Parent Child filtering**:
// To filter Contexts based on parent-child relationship use the HAS
// operator as follows:
Expand Down Expand Up @@ -835,7 +840,6 @@ message UpdateContextRequest {
Context context = 1 [(google.api.field_behavior) = REQUIRED];

// Optional. A FieldMask indicating which fields should be updated.
// Functionality of this field is not yet supported.
google.protobuf.FieldMask update_mask = 2
[(google.api.field_behavior) = OPTIONAL];

Expand Down Expand Up @@ -1099,6 +1103,9 @@ message ListExecutionsRequest {
// To filter on metadata fields use traversal operation as follows:
// `metadata.<field_name>.<type_value>`
// For example: `metadata.field_1.number_value = 10.0`
// In case the field name contains special characters (such as colon), one
// can embed it inside double quote.
// For example: `metadata."field:1".number_value = 10.0`
// * **Context based filtering**:
// To filter Executions based on the contexts to which they belong use
// the function operator with the full resource name:
Expand Down Expand Up @@ -1146,7 +1153,6 @@ message UpdateExecutionRequest {
Execution execution = 1 [(google.api.field_behavior) = REQUIRED];

// Optional. A FieldMask indicating which fields should be updated.
// Functionality of this field is not yet supported.
google.protobuf.FieldMask update_mask = 2
[(google.api.field_behavior) = OPTIONAL];

Expand Down Expand Up @@ -1382,6 +1388,9 @@ message QueryArtifactLineageSubgraphRequest {
// To filter on metadata fields use traversal operation as follows:
// `metadata.<field_name>.<type_value>`.
// For example: `metadata.field_1.number_value = 10.0`
// In case the field name contains special characters (such as colon), one
// can embed it inside double quote.
// For example: `metadata."field:1".number_value = 10.0`
//
// Each of the above supported filter types can be combined together using
// logical operators (`AND` & `OR`). Maximum nested expression depth allowed
Expand Down
4 changes: 2 additions & 2 deletions google/cloud/aiplatform/v1beta1/model.proto
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,8 @@ message Model {
// Contains information about the Large Model.
message LargeModelReference {
// Required. The unique name of the large Foundation or pre-built model. Like
// "chat-panda", "text-panda". Or model name with version ID, like
// "chat-panda-001", "text-panda-005", etc.
// "chat-bison", "text-bison". Or model name with version ID, like
// "chat-bison@001", "text-bison@005", etc.
string name = 1 [(google.api.field_behavior) = REQUIRED];
}

Expand Down
5 changes: 3 additions & 2 deletions google/cloud/aiplatform/v1beta1/model_evaluation.proto
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ message ModelEvaluation {
google.protobuf.Timestamp create_time = 4
[(google.api.field_behavior) = OUTPUT_ONLY];

// All possible [dimensions][ModelEvaluationSlice.slice.dimension] of
// ModelEvaluationSlices. The dimensions can be used as the filter of the
// All possible
// [dimensions][google.cloud.aiplatform.v1beta1.ModelEvaluationSlice.Slice.dimension]
// of ModelEvaluationSlices. The dimensions can be used as the filter of the
// [ModelService.ListModelEvaluationSlices][google.cloud.aiplatform.v1beta1.ModelService.ListModelEvaluationSlices]
// request, in the form of `slice.dimension = <dimension>`.
repeated string slice_dimensions = 5;
Expand Down
3 changes: 1 addition & 2 deletions google/cloud/aiplatform/v1beta1/prediction_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ service PredictionService {
// [deployed_model_id][google.cloud.aiplatform.v1beta1.ExplainRequest.deployed_model_id]
// is not specified, all DeployedModels must have
// [explanation_spec][google.cloud.aiplatform.v1beta1.DeployedModel.explanation_spec]
// populated. Only deployed AutoML tabular Models have
// explanation_spec.
// populated.
rpc Explain(ExplainRequest) returns (ExplainResponse) {
option (google.api.http) = {
post: "/v1beta1/{endpoint=projects/*/locations/*/endpoints/*}:explain"
Expand Down
27 changes: 26 additions & 1 deletion google/cloud/aiplatform/v1beta1/publisher_model.proto
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ message PublisherModel {
// The URI of the resource.
string uri = 1;

// The resource name of the GCP resource.
// The resource name of the Google Cloud resource.
string resource_name = 2;
}
}
Expand Down Expand Up @@ -150,6 +150,10 @@ message PublisherModel {
// Optional. Open in Generation AI Studio.
RegionalResourceReferences open_generation_ai_studio = 8
[(google.api.field_behavior) = OPTIONAL];

// Optional. Request for access.
RegionalResourceReferences request_access = 9
[(google.api.field_behavior) = OPTIONAL];
}

// An enum representing the open source category of a PublisherModel.
Expand All @@ -176,6 +180,24 @@ message PublisherModel {
THIRD_PARTY_OWNED_OSS = 5;
}

// An enum representing the launch stage of a PublisherModel.
enum LaunchStage {
// The model launch stage is unspecified.
LAUNCH_STAGE_UNSPECIFIED = 0;

// Used to indicate the PublisherModel is at Experimental launch stage.
EXPERIMENTAL = 1;

// Used to indicate the PublisherModel is at Private Preview launch stage.
PRIVATE_PREVIEW = 2;

// Used to indicate the PublisherModel is at Public Preview launch stage.
PUBLIC_PREVIEW = 3;

// Used to indicate the PublisherModel is at GA launch stage.
GA = 4;
}

// Output only. The resource name of the PublisherModel.
string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];

Expand All @@ -198,6 +220,9 @@ message PublisherModel {
// Optional. Additional information about the model's Frameworks.
repeated string frameworks = 23 [(google.api.field_behavior) = OPTIONAL];

// Optional. Indicates the launch stage of the model.
LaunchStage launch_stage = 29 [(google.api.field_behavior) = OPTIONAL];

// Optional. Output only. Immutable. Used to indicate this model has a
// publisher model and provide the template of the publisher model resource
// name.
Expand Down
3 changes: 2 additions & 1 deletion google/cloud/aiplatform/v1beta1/tensorboard_experiment.proto
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ message TensorboardExperiment {
google.protobuf.Timestamp update_time = 5
[(google.api.field_behavior) = OUTPUT_ONLY];

// The labels with user-defined metadata to organize your Datasets.
// The labels with user-defined metadata to organize your
// TensorboardExperiment.
//
// Label keys and values cannot be longer than 64 characters
// (Unicode codepoints), can only contain lowercase letters, numeric
Expand Down
3 changes: 2 additions & 1 deletion google/cloud/aiplatform/v1beta1/vizier_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ service VizierService {
// suggested by Vertex AI Vizier. Returns a long-running
// operation associated with the generation of Trial suggestions.
// When this long-running operation succeeds, it will contain
// a [SuggestTrialsResponse][google.cloud.ml.v1.SuggestTrialsResponse].
// a
// [SuggestTrialsResponse][google.cloud.aiplatform.v1beta1.SuggestTrialsResponse].
rpc SuggestTrials(SuggestTrialsRequest)
returns (google.longrunning.Operation) {
option (google.api.http) = {
Expand Down

0 comments on commit d2d95e5

Please sign in to comment.