Skip to content

Commit f20b8a2

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
feat: add MALFORMED_FUNCTION_CALL to FinishReason
feat: add preflight_validations to PipelineJob feat: add encryption_spec to TuningJob PiperOrigin-RevId: 643389856
1 parent f29a82a commit f20b8a2

5 files changed

Lines changed: 44 additions & 28 deletions

File tree

‎google/cloud/aiplatform/v1/aiplatform_v1.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ http:
259259
- post: '/ui/{name=projects/*/locations/*/migratableResources/*/operations/*}:cancel'
260260
- post: '/ui/{name=projects/*/locations/*/models/*/operations/*}:cancel'
261261
- post: '/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}:cancel'
262+
- post: '/ui/{name=projects/*/locations/*/notebookExecutionJobs/*/operations/*}:cancel'
263+
- post: '/ui/{name=projects/*/locations/*/notebookRuntimes/*/operations/*}:cancel'
264+
- post: '/ui/{name=projects/*/locations/*/notebookRuntimeTemplates/*/operations/*}:cancel'
262265
- post: '/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}:cancel'
263266
- post: '/ui/{name=projects/*/locations/*/studies/*/operations/*}:cancel'
264267
- post: '/ui/{name=projects/*/locations/*/studies/*/trials/*/operations/*}:cancel'
@@ -295,6 +298,9 @@ http:
295298
- post: '/v1/{name=projects/*/locations/*/migratableResources/*/operations/*}:cancel'
296299
- post: '/v1/{name=projects/*/locations/*/models/*/operations/*}:cancel'
297300
- post: '/v1/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}:cancel'
301+
- post: '/v1/{name=projects/*/locations/*/notebookExecutionJobs/*/operations/*}:cancel'
302+
- post: '/v1/{name=projects/*/locations/*/notebookRuntimes/*/operations/*}:cancel'
303+
- post: '/v1/{name=projects/*/locations/*/notebookRuntimeTemplates/*/operations/*}:cancel'
298304
- post: '/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}:cancel'
299305
- post: '/v1/{name=projects/*/locations/*/studies/*/operations/*}:cancel'
300306
- post: '/v1/{name=projects/*/locations/*/studies/*/trials/*/operations/*}:cancel'
@@ -338,6 +344,9 @@ http:
338344
- delete: '/ui/{name=projects/*/locations/*/migratableResources/*/operations/*}'
339345
- delete: '/ui/{name=projects/*/locations/*/models/*/operations/*}'
340346
- delete: '/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}'
347+
- delete: '/ui/{name=projects/*/locations/*/notebookExecutionJobs/*/operations/*}'
348+
- delete: '/ui/{name=projects/*/locations/*/notebookRuntimes/*/operations/*}'
349+
- delete: '/ui/{name=projects/*/locations/*/notebookRuntimeTemplates/*/operations/*}'
341350
- delete: '/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}'
342351
- delete: '/ui/{name=projects/*/locations/*/studies/*/operations/*}'
343352
- delete: '/ui/{name=projects/*/locations/*/studies/*/trials/*/operations/*}'
@@ -377,6 +386,9 @@ http:
377386
- delete: '/v1/{name=projects/*/locations/*/migratableResources/*/operations/*}'
378387
- delete: '/v1/{name=projects/*/locations/*/models/*/operations/*}'
379388
- delete: '/v1/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}'
389+
- delete: '/v1/{name=projects/*/locations/*/notebookExecutionJobs/*/operations/*}'
390+
- delete: '/v1/{name=projects/*/locations/*/notebookRuntimes/*/operations/*}'
391+
- delete: '/v1/{name=projects/*/locations/*/notebookRuntimeTemplates/*/operations/*}'
380392
- delete: '/v1/{name=projects/*/locations/*/studies/*/operations/*}'
381393
- delete: '/v1/{name=projects/*/locations/*/studies/*/trials/*/operations/*}'
382394
- delete: '/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}'
@@ -426,6 +438,9 @@ http:
426438
- get: '/ui/{name=projects/*/locations/*/migratableResources/*/operations/*}'
427439
- get: '/ui/{name=projects/*/locations/*/models/*/operations/*}'
428440
- get: '/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}'
441+
- get: '/ui/{name=projects/*/locations/*/notebookExecutionJobs/*/operations/*}'
442+
- get: '/ui/{name=projects/*/locations/*/notebookRuntimes/*/operations/*}'
443+
- get: '/ui/{name=projects/*/locations/*/notebookRuntimeTemplates/*/operations/*}'
429444
- get: '/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}'
430445
- get: '/ui/{name=projects/*/locations/*/studies/*/operations/*}'
431446
- get: '/ui/{name=projects/*/locations/*/studies/*/trials/*/operations/*}'
@@ -466,6 +481,9 @@ http:
466481
- get: '/v1/{name=projects/*/locations/*/migratableResources/*/operations/*}'
467482
- get: '/v1/{name=projects/*/locations/*/models/*/operations/*}'
468483
- get: '/v1/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}'
484+
- get: '/v1/{name=projects/*/locations/*/notebookExecutionJobs/*/operations/*}'
485+
- get: '/v1/{name=projects/*/locations/*/notebookRuntimes/*/operations/*}'
486+
- get: '/v1/{name=projects/*/locations/*/notebookRuntimeTemplates/*/operations/*}'
469487
- get: '/v1/{name=projects/*/locations/*/studies/*/operations/*}'
470488
- get: '/v1/{name=projects/*/locations/*/studies/*/trials/*/operations/*}'
471489
- get: '/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}'
@@ -514,6 +532,9 @@ http:
514532
- get: '/ui/{name=projects/*/locations/*/migratableResources/*}/operations'
515533
- get: '/ui/{name=projects/*/locations/*/models/*}/operations'
516534
- get: '/ui/{name=projects/*/locations/*/models/*/evaluations/*}/operations'
535+
- get: '/ui/{name=projects/*/locations/*/notebookExecutionJobs/*}/operations'
536+
- get: '/ui/{name=projects/*/locations/*/notebookRuntimes/*}/operations'
537+
- get: '/ui/{name=projects/*/locations/*/notebookRuntimeTemplates/*}/operations'
517538
- get: '/ui/{name=projects/*/locations/*/studies/*}/operations'
518539
- get: '/ui/{name=projects/*/locations/*/studies/*/trials/*}/operations'
519540
- get: '/ui/{name=projects/*/locations/*/trainingPipelines/*}/operations'
@@ -554,6 +575,9 @@ http:
554575
- get: '/v1/{name=projects/*/locations/*/migratableResources/*}/operations'
555576
- get: '/v1/{name=projects/*/locations/*/models/*}/operations'
556577
- get: '/v1/{name=projects/*/locations/*/models/*/evaluations/*}/operations'
578+
- get: '/v1/{name=projects/*/locations/*/notebookExecutionJobs/*}/operations'
579+
- get: '/v1/{name=projects/*/locations/*/notebookRuntimes/*}/operations'
580+
- get: '/v1/{name=projects/*/locations/*/notebookRuntimeTemplates/*}/operations'
557581
- get: '/v1/{name=projects/*/locations/*/studies/*}/operations'
558582
- get: '/v1/{name=projects/*/locations/*/studies/*/trials/*}/operations'
559583
- get: '/v1/{name=projects/*/locations/*/trainingPipelines/*}/operations'
@@ -602,6 +626,9 @@ http:
602626
- post: '/ui/{name=projects/*/locations/*/migratableResources/*/operations/*}:wait'
603627
- post: '/ui/{name=projects/*/locations/*/models/*/operations/*}:wait'
604628
- post: '/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}:wait'
629+
- post: '/ui/{name=projects/*/locations/*/notebookExecutionJobs/*/operations/*}:wait'
630+
- post: '/ui/{name=projects/*/locations/*/notebookRuntimes/*/operations/*}:wait'
631+
- post: '/ui/{name=projects/*/locations/*/notebookRuntimeTemplates/*/operations/*}:wait'
605632
- post: '/ui/{name=projects/*/locations/*/studies/*/operations/*}:wait'
606633
- post: '/ui/{name=projects/*/locations/*/studies/*/trials/*/operations/*}:wait'
607634
- post: '/ui/{name=projects/*/locations/*/trainingPipelines/*/operations/*}:wait'
@@ -641,6 +668,9 @@ http:
641668
- post: '/v1/{name=projects/*/locations/*/migratableResources/*/operations/*}:wait'
642669
- post: '/v1/{name=projects/*/locations/*/models/*/operations/*}:wait'
643670
- post: '/v1/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}:wait'
671+
- post: '/v1/{name=projects/*/locations/*/notebookExecutionJobs/*/operations/*}:wait'
672+
- post: '/v1/{name=projects/*/locations/*/notebookRuntimes/*/operations/*}:wait'
673+
- post: '/v1/{name=projects/*/locations/*/notebookRuntimeTemplates/*/operations/*}:wait'
644674
- post: '/v1/{name=projects/*/locations/*/studies/*/operations/*}:wait'
645675
- post: '/v1/{name=projects/*/locations/*/studies/*/trials/*/operations/*}:wait'
646676
- post: '/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}:wait'

‎google/cloud/aiplatform/v1/content.proto‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,9 @@ message Candidate {
346346
// The token generation was stopped as the response was flagged for
347347
// Sensitive Personally Identifiable Information (SPII) contents.
348348
SPII = 8;
349+
350+
// The function call generated by the model is invalid.
351+
MALFORMED_FUNCTION_CALL = 9;
349352
}
350353

351354
// Output only. Index of the candidate.

‎google/cloud/aiplatform/v1/pipeline_job.proto‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ message PipelineJob {
213213
// Output only. The schedule resource name.
214214
// Only returned if the Pipeline is created by Schedule API.
215215
string schedule_name = 22 [(google.api.field_behavior) = OUTPUT_ONLY];
216+
217+
// Optional. Whether to do component level validations before job creation.
218+
bool preflight_validations = 26 [(google.api.field_behavior) = OPTIONAL];
216219
}
217220

218221
// Pipeline template metadata if

‎google/cloud/aiplatform/v1/prediction_service.proto‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ service PredictionService {
9898
option (google.api.http) = {
9999
post: "/v1/{endpoint=projects/*/locations/*/endpoints/*}:directPredict"
100100
body: "*"
101-
additional_bindings {
102-
post: "/v1/{endpoint=projects/*/locations/*/publishers/*/models/*}:directPredict"
103-
body: "*"
104-
}
105101
};
106102
}
107103

@@ -112,40 +108,18 @@ service PredictionService {
112108
option (google.api.http) = {
113109
post: "/v1/{endpoint=projects/*/locations/*/endpoints/*}:directRawPredict"
114110
body: "*"
115-
additional_bindings {
116-
post: "/v1/{endpoint=projects/*/locations/*/publishers/*/models/*}:directRawPredict"
117-
body: "*"
118-
}
119111
};
120112
}
121113

122114
// Perform a streaming online prediction request to a gRPC model server for
123115
// Vertex first-party products and frameworks.
124116
rpc StreamDirectPredict(stream StreamDirectPredictRequest)
125-
returns (stream StreamDirectPredictResponse) {
126-
option (google.api.http) = {
127-
post: "/v1/{endpoint=projects/*/locations/*/endpoints/*}:streamDirectPredict"
128-
body: "*"
129-
additional_bindings {
130-
post: "/v1/{endpoint=projects/*/locations/*/publishers/*/models/*}:streamDirectPredict"
131-
body: "*"
132-
}
133-
};
134-
}
117+
returns (stream StreamDirectPredictResponse) {}
135118

136119
// Perform a streaming online prediction request to a gRPC model server for
137120
// custom containers.
138121
rpc StreamDirectRawPredict(stream StreamDirectRawPredictRequest)
139-
returns (stream StreamDirectRawPredictResponse) {
140-
option (google.api.http) = {
141-
post: "/v1/{endpoint=projects/*/locations/*/endpoints/*}:streamDirectRawPredict"
142-
body: "*"
143-
additional_bindings {
144-
post: "/v1/{endpoint=projects/*/locations/*/publishers/*/models/*}:streamDirectRawPredict"
145-
body: "*"
146-
}
147-
};
148-
}
122+
returns (stream StreamDirectRawPredictResponse) {}
149123

150124
// Perform a streaming online prediction request for Vertex first-party
151125
// products and frameworks.

‎google/cloud/aiplatform/v1/tuning_job.proto‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package google.cloud.aiplatform.v1;
1919
import "google/api/field_behavior.proto";
2020
import "google/api/resource.proto";
2121
import "google/cloud/aiplatform/v1/content.proto";
22+
import "google/cloud/aiplatform/v1/encryption_spec.proto";
2223
import "google/cloud/aiplatform/v1/job_state.proto";
2324
import "google/protobuf/timestamp.proto";
2425
import "google/rpc/status.proto";
@@ -125,6 +126,11 @@ message TuningJob {
125126
// [TuningJob][google.cloud.aiplatform.v1.TuningJob].
126127
TuningDataStats tuning_data_stats = 15
127128
[(google.api.field_behavior) = OUTPUT_ONLY];
129+
130+
// Customer-managed encryption key options for a TuningJob. If this is set,
131+
// then all resources created by the TuningJob will be encrypted with the
132+
// provided encryption key.
133+
EncryptionSpec encryption_spec = 16;
128134
}
129135

130136
// The Model Registry Model and Online Prediction Endpoint assiociated with

0 commit comments

Comments
 (0)