Skip to content
This repository was archived by the owner on Sep 9, 2023. It is now read-only.

Commit e720ecc

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: add ImportModelEvaluation in aiplatform v1 model_service.proto (#832)
* feat: add ImportModelEvaluation in aiplatform v1 model_service.proto feat: add data_item_schema_uri, annotation_schema_uri, explanation_specs to ModelEvaluationExplanationSpec in aiplatform v1 model_evaluation.proto feat: add ImportModelEvaluation in aiplatform v1beta1 model_service.proto PiperOrigin-RevId: 436869915 Source-Link: googleapis/googleapis@9ba488b Source-Link: https://github.com/googleapis/googleapis-gen/commit/908e7f896f876da6a4d05cd0cc4f8eb19c3cc7a9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTA4ZTdmODk2Zjg3NmRhNmE0ZDA1Y2QwY2M0ZjhlYjE5YzNjYzdhOSJ9 * 🦉 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 cd12452 commit e720ecc

File tree

34 files changed

+6769
-1456
lines changed

34 files changed

+6769
-1456
lines changed

‎google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/ModelServiceClient.java‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,113 @@ public final UnaryCallable<ExportModelRequest, Operation> exportModelCallable()
871871
return stub.exportModelCallable();
872872
}
873873

874+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
875+
/**
876+
* Imports an externally generated ModelEvaluation.
877+
*
878+
* <p>Sample code:
879+
*
880+
* <pre>{@code
881+
* try (ModelServiceClient modelServiceClient = ModelServiceClient.create()) {
882+
* ModelName parent = ModelName.of("[PROJECT]", "[LOCATION]", "[MODEL]");
883+
* ModelEvaluation modelEvaluation = ModelEvaluation.newBuilder().build();
884+
* ModelEvaluation response = modelServiceClient.importModelEvaluation(parent, modelEvaluation);
885+
* }
886+
* }</pre>
887+
*
888+
* @param parent Required. The name of the parent model resource. Format:
889+
* `projects/{project}/locations/{location}/models/{model}`
890+
* @param modelEvaluation Required. Model evaluation resource to be imported.
891+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
892+
*/
893+
public final ModelEvaluation importModelEvaluation(
894+
ModelName parent, ModelEvaluation modelEvaluation) {
895+
ImportModelEvaluationRequest request =
896+
ImportModelEvaluationRequest.newBuilder()
897+
.setParent(parent == null ? null : parent.toString())
898+
.setModelEvaluation(modelEvaluation)
899+
.build();
900+
return importModelEvaluation(request);
901+
}
902+
903+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
904+
/**
905+
* Imports an externally generated ModelEvaluation.
906+
*
907+
* <p>Sample code:
908+
*
909+
* <pre>{@code
910+
* try (ModelServiceClient modelServiceClient = ModelServiceClient.create()) {
911+
* String parent = ModelName.of("[PROJECT]", "[LOCATION]", "[MODEL]").toString();
912+
* ModelEvaluation modelEvaluation = ModelEvaluation.newBuilder().build();
913+
* ModelEvaluation response = modelServiceClient.importModelEvaluation(parent, modelEvaluation);
914+
* }
915+
* }</pre>
916+
*
917+
* @param parent Required. The name of the parent model resource. Format:
918+
* `projects/{project}/locations/{location}/models/{model}`
919+
* @param modelEvaluation Required. Model evaluation resource to be imported.
920+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
921+
*/
922+
public final ModelEvaluation importModelEvaluation(
923+
String parent, ModelEvaluation modelEvaluation) {
924+
ImportModelEvaluationRequest request =
925+
ImportModelEvaluationRequest.newBuilder()
926+
.setParent(parent)
927+
.setModelEvaluation(modelEvaluation)
928+
.build();
929+
return importModelEvaluation(request);
930+
}
931+
932+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
933+
/**
934+
* Imports an externally generated ModelEvaluation.
935+
*
936+
* <p>Sample code:
937+
*
938+
* <pre>{@code
939+
* try (ModelServiceClient modelServiceClient = ModelServiceClient.create()) {
940+
* ImportModelEvaluationRequest request =
941+
* ImportModelEvaluationRequest.newBuilder()
942+
* .setParent(ModelName.of("[PROJECT]", "[LOCATION]", "[MODEL]").toString())
943+
* .setModelEvaluation(ModelEvaluation.newBuilder().build())
944+
* .build();
945+
* ModelEvaluation response = modelServiceClient.importModelEvaluation(request);
946+
* }
947+
* }</pre>
948+
*
949+
* @param request The request object containing all of the parameters for the API call.
950+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
951+
*/
952+
public final ModelEvaluation importModelEvaluation(ImportModelEvaluationRequest request) {
953+
return importModelEvaluationCallable().call(request);
954+
}
955+
956+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
957+
/**
958+
* Imports an externally generated ModelEvaluation.
959+
*
960+
* <p>Sample code:
961+
*
962+
* <pre>{@code
963+
* try (ModelServiceClient modelServiceClient = ModelServiceClient.create()) {
964+
* ImportModelEvaluationRequest request =
965+
* ImportModelEvaluationRequest.newBuilder()
966+
* .setParent(ModelName.of("[PROJECT]", "[LOCATION]", "[MODEL]").toString())
967+
* .setModelEvaluation(ModelEvaluation.newBuilder().build())
968+
* .build();
969+
* ApiFuture<ModelEvaluation> future =
970+
* modelServiceClient.importModelEvaluationCallable().futureCall(request);
971+
* // Do something.
972+
* ModelEvaluation response = future.get();
973+
* }
974+
* }</pre>
975+
*/
976+
public final UnaryCallable<ImportModelEvaluationRequest, ModelEvaluation>
977+
importModelEvaluationCallable() {
978+
return stub.importModelEvaluationCallable();
979+
}
980+
874981
// AUTO-GENERATED DOCUMENTATION AND METHOD.
875982
/**
876983
* Gets a ModelEvaluation.

‎google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/ModelServiceSettings.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ public UnaryCallSettings<ExportModelRequest, Operation> exportModelSettings() {
124124
return ((ModelServiceStubSettings) getStubSettings()).exportModelOperationSettings();
125125
}
126126

127+
/** Returns the object with the settings used for calls to importModelEvaluation. */
128+
public UnaryCallSettings<ImportModelEvaluationRequest, ModelEvaluation>
129+
importModelEvaluationSettings() {
130+
return ((ModelServiceStubSettings) getStubSettings()).importModelEvaluationSettings();
131+
}
132+
127133
/** Returns the object with the settings used for calls to getModelEvaluation. */
128134
public UnaryCallSettings<GetModelEvaluationRequest, ModelEvaluation>
129135
getModelEvaluationSettings() {
@@ -302,6 +308,12 @@ public UnaryCallSettings.Builder<ExportModelRequest, Operation> exportModelSetti
302308
return getStubSettingsBuilder().exportModelOperationSettings();
303309
}
304310

311+
/** Returns the builder for the settings used for calls to importModelEvaluation. */
312+
public UnaryCallSettings.Builder<ImportModelEvaluationRequest, ModelEvaluation>
313+
importModelEvaluationSettings() {
314+
return getStubSettingsBuilder().importModelEvaluationSettings();
315+
}
316+
305317
/** Returns the builder for the settings used for calls to getModelEvaluation. */
306318
public UnaryCallSettings.Builder<GetModelEvaluationRequest, ModelEvaluation>
307319
getModelEvaluationSettings() {

‎google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/gapic_metadata.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,9 @@
445445
"GetModelEvaluationSlice": {
446446
"methods": ["getModelEvaluationSlice", "getModelEvaluationSlice", "getModelEvaluationSlice", "getModelEvaluationSliceCallable"]
447447
},
448+
"ImportModelEvaluation": {
449+
"methods": ["importModelEvaluation", "importModelEvaluation", "importModelEvaluation", "importModelEvaluationCallable"]
450+
},
448451
"ListModelEvaluationSlices": {
449452
"methods": ["listModelEvaluationSlices", "listModelEvaluationSlices", "listModelEvaluationSlices", "listModelEvaluationSlicesPagedCallable", "listModelEvaluationSlicesCallable"]
450453
},

‎google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/stub/GrpcModelServiceStub.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.google.cloud.aiplatform.v1.GetModelEvaluationRequest;
3636
import com.google.cloud.aiplatform.v1.GetModelEvaluationSliceRequest;
3737
import com.google.cloud.aiplatform.v1.GetModelRequest;
38+
import com.google.cloud.aiplatform.v1.ImportModelEvaluationRequest;
3839
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesRequest;
3940
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesResponse;
4041
import com.google.cloud.aiplatform.v1.ListModelEvaluationsRequest;
@@ -115,6 +116,16 @@ public class GrpcModelServiceStub extends ModelServiceStub {
115116
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
116117
.build();
117118

119+
private static final MethodDescriptor<ImportModelEvaluationRequest, ModelEvaluation>
120+
importModelEvaluationMethodDescriptor =
121+
MethodDescriptor.<ImportModelEvaluationRequest, ModelEvaluation>newBuilder()
122+
.setType(MethodDescriptor.MethodType.UNARY)
123+
.setFullMethodName("google.cloud.aiplatform.v1.ModelService/ImportModelEvaluation")
124+
.setRequestMarshaller(
125+
ProtoUtils.marshaller(ImportModelEvaluationRequest.getDefaultInstance()))
126+
.setResponseMarshaller(ProtoUtils.marshaller(ModelEvaluation.getDefaultInstance()))
127+
.build();
128+
118129
private static final MethodDescriptor<GetModelEvaluationRequest, ModelEvaluation>
119130
getModelEvaluationMethodDescriptor =
120131
MethodDescriptor.<GetModelEvaluationRequest, ModelEvaluation>newBuilder()
@@ -176,6 +187,8 @@ public class GrpcModelServiceStub extends ModelServiceStub {
176187
private final OperationCallable<
177188
ExportModelRequest, ExportModelResponse, ExportModelOperationMetadata>
178189
exportModelOperationCallable;
190+
private final UnaryCallable<ImportModelEvaluationRequest, ModelEvaluation>
191+
importModelEvaluationCallable;
179192
private final UnaryCallable<GetModelEvaluationRequest, ModelEvaluation>
180193
getModelEvaluationCallable;
181194
private final UnaryCallable<ListModelEvaluationsRequest, ListModelEvaluationsResponse>
@@ -292,6 +305,17 @@ protected GrpcModelServiceStub(
292305
return params.build();
293306
})
294307
.build();
308+
GrpcCallSettings<ImportModelEvaluationRequest, ModelEvaluation>
309+
importModelEvaluationTransportSettings =
310+
GrpcCallSettings.<ImportModelEvaluationRequest, ModelEvaluation>newBuilder()
311+
.setMethodDescriptor(importModelEvaluationMethodDescriptor)
312+
.setParamsExtractor(
313+
request -> {
314+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
315+
params.put("parent", String.valueOf(request.getParent()));
316+
return params.build();
317+
})
318+
.build();
295319
GrpcCallSettings<GetModelEvaluationRequest, ModelEvaluation>
296320
getModelEvaluationTransportSettings =
297321
GrpcCallSettings.<GetModelEvaluationRequest, ModelEvaluation>newBuilder()
@@ -377,6 +401,11 @@ protected GrpcModelServiceStub(
377401
settings.exportModelOperationSettings(),
378402
clientContext,
379403
operationsStub);
404+
this.importModelEvaluationCallable =
405+
callableFactory.createUnaryCallable(
406+
importModelEvaluationTransportSettings,
407+
settings.importModelEvaluationSettings(),
408+
clientContext);
380409
this.getModelEvaluationCallable =
381410
callableFactory.createUnaryCallable(
382411
getModelEvaluationTransportSettings,
@@ -469,6 +498,12 @@ public UnaryCallable<ExportModelRequest, Operation> exportModelCallable() {
469498
return exportModelOperationCallable;
470499
}
471500

501+
@Override
502+
public UnaryCallable<ImportModelEvaluationRequest, ModelEvaluation>
503+
importModelEvaluationCallable() {
504+
return importModelEvaluationCallable;
505+
}
506+
472507
@Override
473508
public UnaryCallable<GetModelEvaluationRequest, ModelEvaluation> getModelEvaluationCallable() {
474509
return getModelEvaluationCallable;

‎google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/stub/ModelServiceStub.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.google.cloud.aiplatform.v1.GetModelEvaluationRequest;
3232
import com.google.cloud.aiplatform.v1.GetModelEvaluationSliceRequest;
3333
import com.google.cloud.aiplatform.v1.GetModelRequest;
34+
import com.google.cloud.aiplatform.v1.ImportModelEvaluationRequest;
3435
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesRequest;
3536
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesResponse;
3637
import com.google.cloud.aiplatform.v1.ListModelEvaluationsRequest;
@@ -105,6 +106,11 @@ public UnaryCallable<ExportModelRequest, Operation> exportModelCallable() {
105106
throw new UnsupportedOperationException("Not implemented: exportModelCallable()");
106107
}
107108

109+
public UnaryCallable<ImportModelEvaluationRequest, ModelEvaluation>
110+
importModelEvaluationCallable() {
111+
throw new UnsupportedOperationException("Not implemented: importModelEvaluationCallable()");
112+
}
113+
108114
public UnaryCallable<GetModelEvaluationRequest, ModelEvaluation> getModelEvaluationCallable() {
109115
throw new UnsupportedOperationException("Not implemented: getModelEvaluationCallable()");
110116
}

‎google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/stub/ModelServiceStubSettings.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.google.cloud.aiplatform.v1.GetModelEvaluationRequest;
5555
import com.google.cloud.aiplatform.v1.GetModelEvaluationSliceRequest;
5656
import com.google.cloud.aiplatform.v1.GetModelRequest;
57+
import com.google.cloud.aiplatform.v1.ImportModelEvaluationRequest;
5758
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesRequest;
5859
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesResponse;
5960
import com.google.cloud.aiplatform.v1.ListModelEvaluationsRequest;
@@ -131,6 +132,8 @@ public class ModelServiceStubSettings extends StubSettings<ModelServiceStubSetti
131132
private final OperationCallSettings<
132133
ExportModelRequest, ExportModelResponse, ExportModelOperationMetadata>
133134
exportModelOperationSettings;
135+
private final UnaryCallSettings<ImportModelEvaluationRequest, ModelEvaluation>
136+
importModelEvaluationSettings;
134137
private final UnaryCallSettings<GetModelEvaluationRequest, ModelEvaluation>
135138
getModelEvaluationSettings;
136139
private final PagedCallSettings<
@@ -390,6 +393,12 @@ public UnaryCallSettings<ExportModelRequest, Operation> exportModelSettings() {
390393
return exportModelOperationSettings;
391394
}
392395

396+
/** Returns the object with the settings used for calls to importModelEvaluation. */
397+
public UnaryCallSettings<ImportModelEvaluationRequest, ModelEvaluation>
398+
importModelEvaluationSettings() {
399+
return importModelEvaluationSettings;
400+
}
401+
393402
/** Returns the object with the settings used for calls to getModelEvaluation. */
394403
public UnaryCallSettings<GetModelEvaluationRequest, ModelEvaluation>
395404
getModelEvaluationSettings() {
@@ -505,6 +514,7 @@ protected ModelServiceStubSettings(Builder settingsBuilder) throws IOException {
505514
deleteModelOperationSettings = settingsBuilder.deleteModelOperationSettings().build();
506515
exportModelSettings = settingsBuilder.exportModelSettings().build();
507516
exportModelOperationSettings = settingsBuilder.exportModelOperationSettings().build();
517+
importModelEvaluationSettings = settingsBuilder.importModelEvaluationSettings().build();
508518
getModelEvaluationSettings = settingsBuilder.getModelEvaluationSettings().build();
509519
listModelEvaluationsSettings = settingsBuilder.listModelEvaluationsSettings().build();
510520
getModelEvaluationSliceSettings = settingsBuilder.getModelEvaluationSliceSettings().build();
@@ -530,6 +540,8 @@ public static class Builder extends StubSettings.Builder<ModelServiceStubSetting
530540
private final OperationCallSettings.Builder<
531541
ExportModelRequest, ExportModelResponse, ExportModelOperationMetadata>
532542
exportModelOperationSettings;
543+
private final UnaryCallSettings.Builder<ImportModelEvaluationRequest, ModelEvaluation>
544+
importModelEvaluationSettings;
533545
private final UnaryCallSettings.Builder<GetModelEvaluationRequest, ModelEvaluation>
534546
getModelEvaluationSettings;
535547
private final PagedCallSettings.Builder<
@@ -580,6 +592,7 @@ protected Builder(ClientContext clientContext) {
580592
deleteModelOperationSettings = OperationCallSettings.newBuilder();
581593
exportModelSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
582594
exportModelOperationSettings = OperationCallSettings.newBuilder();
595+
importModelEvaluationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
583596
getModelEvaluationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
584597
listModelEvaluationsSettings =
585598
PagedCallSettings.newBuilder(LIST_MODEL_EVALUATIONS_PAGE_STR_FACT);
@@ -595,6 +608,7 @@ protected Builder(ClientContext clientContext) {
595608
updateModelSettings,
596609
deleteModelSettings,
597610
exportModelSettings,
611+
importModelEvaluationSettings,
598612
getModelEvaluationSettings,
599613
listModelEvaluationsSettings,
600614
getModelEvaluationSliceSettings,
@@ -614,6 +628,7 @@ protected Builder(ModelServiceStubSettings settings) {
614628
deleteModelOperationSettings = settings.deleteModelOperationSettings.toBuilder();
615629
exportModelSettings = settings.exportModelSettings.toBuilder();
616630
exportModelOperationSettings = settings.exportModelOperationSettings.toBuilder();
631+
importModelEvaluationSettings = settings.importModelEvaluationSettings.toBuilder();
617632
getModelEvaluationSettings = settings.getModelEvaluationSettings.toBuilder();
618633
listModelEvaluationsSettings = settings.listModelEvaluationsSettings.toBuilder();
619634
getModelEvaluationSliceSettings = settings.getModelEvaluationSliceSettings.toBuilder();
@@ -627,6 +642,7 @@ protected Builder(ModelServiceStubSettings settings) {
627642
updateModelSettings,
628643
deleteModelSettings,
629644
exportModelSettings,
645+
importModelEvaluationSettings,
630646
getModelEvaluationSettings,
631647
listModelEvaluationsSettings,
632648
getModelEvaluationSliceSettings,
@@ -677,6 +693,11 @@ private static Builder initDefaults(Builder builder) {
677693
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
678694
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
679695

696+
builder
697+
.importModelEvaluationSettings()
698+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
699+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
700+
680701
builder
681702
.getModelEvaluationSettings()
682703
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
@@ -843,6 +864,12 @@ public UnaryCallSettings.Builder<ExportModelRequest, Operation> exportModelSetti
843864
return exportModelOperationSettings;
844865
}
845866

867+
/** Returns the builder for the settings used for calls to importModelEvaluation. */
868+
public UnaryCallSettings.Builder<ImportModelEvaluationRequest, ModelEvaluation>
869+
importModelEvaluationSettings() {
870+
return importModelEvaluationSettings;
871+
}
872+
846873
/** Returns the builder for the settings used for calls to getModelEvaluation. */
847874
public UnaryCallSettings.Builder<GetModelEvaluationRequest, ModelEvaluation>
848875
getModelEvaluationSettings() {

0 commit comments

Comments
 (0)