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

feat: add ImportModelEvaluation in aiplatform v1 model_service.proto #832

Merged
merged 4 commits into from
Mar 24, 2022
Merged

feat: add ImportModelEvaluation in aiplatform v1 model_service.proto #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76deb0e
feat: add ImportModelEvaluation in aiplatform v1 model_service.proto
gcf-owl-bot[bot] Mar 24, 2022
0da15e5
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 24, 2022
d85625d
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 24, 2022
847aa26
Merge branch 'owl-bot-copy' of https://github.com/googleapis/java-aip…
gcf-owl-bot[bot] Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 107 additions & 0 deletions google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/ModelServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,113 @@ public final UnaryCallable<ExportModelRequest, Operation> exportModelCallable()
return stub.exportModelCallable();
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Imports an externally generated ModelEvaluation.
*
* <p>Sample code:
*
* <pre>{@code
* try (ModelServiceClient modelServiceClient = ModelServiceClient.create()) {
* ModelName parent = ModelName.of("[PROJECT]", "[LOCATION]", "[MODEL]");
* ModelEvaluation modelEvaluation = ModelEvaluation.newBuilder().build();
* ModelEvaluation response = modelServiceClient.importModelEvaluation(parent, modelEvaluation);
* }
* }</pre>
*
* @param parent Required. The name of the parent model resource. Format:
* `projects/{project}/locations/{location}/models/{model}`
* @param modelEvaluation Required. Model evaluation resource to be imported.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ModelEvaluation importModelEvaluation(
ModelName parent, ModelEvaluation modelEvaluation) {
ImportModelEvaluationRequest request =
ImportModelEvaluationRequest.newBuilder()
.setParent(parent == null ? null : parent.toString())
.setModelEvaluation(modelEvaluation)
.build();
return importModelEvaluation(request);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Imports an externally generated ModelEvaluation.
*
* <p>Sample code:
*
* <pre>{@code
* try (ModelServiceClient modelServiceClient = ModelServiceClient.create()) {
* String parent = ModelName.of("[PROJECT]", "[LOCATION]", "[MODEL]").toString();
* ModelEvaluation modelEvaluation = ModelEvaluation.newBuilder().build();
* ModelEvaluation response = modelServiceClient.importModelEvaluation(parent, modelEvaluation);
* }
* }</pre>
*
* @param parent Required. The name of the parent model resource. Format:
* `projects/{project}/locations/{location}/models/{model}`
* @param modelEvaluation Required. Model evaluation resource to be imported.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ModelEvaluation importModelEvaluation(
String parent, ModelEvaluation modelEvaluation) {
ImportModelEvaluationRequest request =
ImportModelEvaluationRequest.newBuilder()
.setParent(parent)
.setModelEvaluation(modelEvaluation)
.build();
return importModelEvaluation(request);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Imports an externally generated ModelEvaluation.
*
* <p>Sample code:
*
* <pre>{@code
* try (ModelServiceClient modelServiceClient = ModelServiceClient.create()) {
* ImportModelEvaluationRequest request =
* ImportModelEvaluationRequest.newBuilder()
* .setParent(ModelName.of("[PROJECT]", "[LOCATION]", "[MODEL]").toString())
* .setModelEvaluation(ModelEvaluation.newBuilder().build())
* .build();
* ModelEvaluation response = modelServiceClient.importModelEvaluation(request);
* }
* }</pre>
*
* @param request The request object containing all of the parameters for the API call.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ModelEvaluation importModelEvaluation(ImportModelEvaluationRequest request) {
return importModelEvaluationCallable().call(request);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Imports an externally generated ModelEvaluation.
*
* <p>Sample code:
*
* <pre>{@code
* try (ModelServiceClient modelServiceClient = ModelServiceClient.create()) {
* ImportModelEvaluationRequest request =
* ImportModelEvaluationRequest.newBuilder()
* .setParent(ModelName.of("[PROJECT]", "[LOCATION]", "[MODEL]").toString())
* .setModelEvaluation(ModelEvaluation.newBuilder().build())
* .build();
* ApiFuture<ModelEvaluation> future =
* modelServiceClient.importModelEvaluationCallable().futureCall(request);
* // Do something.
* ModelEvaluation response = future.get();
* }
* }</pre>
*/
public final UnaryCallable<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationCallable() {
return stub.importModelEvaluationCallable();
}

// AUTO-GENERATED DOCUMENTATION AND METHOD.
/**
* Gets a ModelEvaluation.
Expand Down
12 changes: 12 additions & 0 deletions ...e-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/ModelServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ public UnaryCallSettings<ExportModelRequest, Operation> exportModelSettings() {
return ((ModelServiceStubSettings) getStubSettings()).exportModelOperationSettings();
}

/** Returns the object with the settings used for calls to importModelEvaluation. */
public UnaryCallSettings<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationSettings() {
return ((ModelServiceStubSettings) getStubSettings()).importModelEvaluationSettings();
}

/** Returns the object with the settings used for calls to getModelEvaluation. */
public UnaryCallSettings<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationSettings() {
Expand Down Expand Up @@ -302,6 +308,12 @@ public UnaryCallSettings.Builder<ExportModelRequest, Operation> exportModelSetti
return getStubSettingsBuilder().exportModelOperationSettings();
}

/** Returns the builder for the settings used for calls to importModelEvaluation. */
public UnaryCallSettings.Builder<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationSettings() {
return getStubSettingsBuilder().importModelEvaluationSettings();
}

/** Returns the builder for the settings used for calls to getModelEvaluation. */
public UnaryCallSettings.Builder<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationSettings() {
Expand Down
3 changes: 3 additions & 0 deletions google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/gapic_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,9 @@
"GetModelEvaluationSlice": {
"methods": ["getModelEvaluationSlice", "getModelEvaluationSlice", "getModelEvaluationSlice", "getModelEvaluationSliceCallable"]
},
"ImportModelEvaluation": {
"methods": ["importModelEvaluation", "importModelEvaluation", "importModelEvaluation", "importModelEvaluationCallable"]
},
"ListModelEvaluationSlices": {
"methods": ["listModelEvaluationSlices", "listModelEvaluationSlices", "listModelEvaluationSlices", "listModelEvaluationSlicesPagedCallable", "listModelEvaluationSlicesCallable"]
},
Expand Down
35 changes: 35 additions & 0 deletions ...ud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/stub/GrpcModelServiceStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.google.cloud.aiplatform.v1.GetModelEvaluationRequest;
import com.google.cloud.aiplatform.v1.GetModelEvaluationSliceRequest;
import com.google.cloud.aiplatform.v1.GetModelRequest;
import com.google.cloud.aiplatform.v1.ImportModelEvaluationRequest;
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesRequest;
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesResponse;
import com.google.cloud.aiplatform.v1.ListModelEvaluationsRequest;
Expand Down Expand Up @@ -115,6 +116,16 @@ public class GrpcModelServiceStub extends ModelServiceStub {
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
.build();

private static final MethodDescriptor<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationMethodDescriptor =
MethodDescriptor.<ImportModelEvaluationRequest, ModelEvaluation>newBuilder()
.setType(MethodDescriptor.MethodType.UNARY)
.setFullMethodName("google.cloud.aiplatform.v1.ModelService/ImportModelEvaluation")
.setRequestMarshaller(
ProtoUtils.marshaller(ImportModelEvaluationRequest.getDefaultInstance()))
.setResponseMarshaller(ProtoUtils.marshaller(ModelEvaluation.getDefaultInstance()))
.build();

private static final MethodDescriptor<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationMethodDescriptor =
MethodDescriptor.<GetModelEvaluationRequest, ModelEvaluation>newBuilder()
Expand Down Expand Up @@ -176,6 +187,8 @@ public class GrpcModelServiceStub extends ModelServiceStub {
private final OperationCallable<
ExportModelRequest, ExportModelResponse, ExportModelOperationMetadata>
exportModelOperationCallable;
private final UnaryCallable<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationCallable;
private final UnaryCallable<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationCallable;
private final UnaryCallable<ListModelEvaluationsRequest, ListModelEvaluationsResponse>
Expand Down Expand Up @@ -292,6 +305,17 @@ protected GrpcModelServiceStub(
return params.build();
})
.build();
GrpcCallSettings<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationTransportSettings =
GrpcCallSettings.<ImportModelEvaluationRequest, ModelEvaluation>newBuilder()
.setMethodDescriptor(importModelEvaluationMethodDescriptor)
.setParamsExtractor(
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();
GrpcCallSettings<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationTransportSettings =
GrpcCallSettings.<GetModelEvaluationRequest, ModelEvaluation>newBuilder()
Expand Down Expand Up @@ -377,6 +401,11 @@ protected GrpcModelServiceStub(
settings.exportModelOperationSettings(),
clientContext,
operationsStub);
this.importModelEvaluationCallable =
callableFactory.createUnaryCallable(
importModelEvaluationTransportSettings,
settings.importModelEvaluationSettings(),
clientContext);
this.getModelEvaluationCallable =
callableFactory.createUnaryCallable(
getModelEvaluationTransportSettings,
Expand Down Expand Up @@ -469,6 +498,12 @@ public UnaryCallable<ExportModelRequest, Operation> exportModelCallable() {
return exportModelOperationCallable;
}

@Override
public UnaryCallable<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationCallable() {
return importModelEvaluationCallable;
}

@Override
public UnaryCallable<GetModelEvaluationRequest, ModelEvaluation> getModelEvaluationCallable() {
return getModelEvaluationCallable;
Expand Down
6 changes: 6 additions & 0 deletions ...-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/stub/ModelServiceStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.google.cloud.aiplatform.v1.GetModelEvaluationRequest;
import com.google.cloud.aiplatform.v1.GetModelEvaluationSliceRequest;
import com.google.cloud.aiplatform.v1.GetModelRequest;
import com.google.cloud.aiplatform.v1.ImportModelEvaluationRequest;
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesRequest;
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesResponse;
import com.google.cloud.aiplatform.v1.ListModelEvaluationsRequest;
Expand Down Expand Up @@ -105,6 +106,11 @@ public UnaryCallable<ExportModelRequest, Operation> exportModelCallable() {
throw new UnsupportedOperationException("Not implemented: exportModelCallable()");
}

public UnaryCallable<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationCallable() {
throw new UnsupportedOperationException("Not implemented: importModelEvaluationCallable()");
}

public UnaryCallable<GetModelEvaluationRequest, ModelEvaluation> getModelEvaluationCallable() {
throw new UnsupportedOperationException("Not implemented: getModelEvaluationCallable()");
}
Expand Down
27 changes: 27 additions & 0 deletions ...iplatform/src/main/java/com/google/cloud/aiplatform/v1/stub/ModelServiceStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import com.google.cloud.aiplatform.v1.GetModelEvaluationRequest;
import com.google.cloud.aiplatform.v1.GetModelEvaluationSliceRequest;
import com.google.cloud.aiplatform.v1.GetModelRequest;
import com.google.cloud.aiplatform.v1.ImportModelEvaluationRequest;
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesRequest;
import com.google.cloud.aiplatform.v1.ListModelEvaluationSlicesResponse;
import com.google.cloud.aiplatform.v1.ListModelEvaluationsRequest;
Expand Down Expand Up @@ -131,6 +132,8 @@ public class ModelServiceStubSettings extends StubSettings<ModelServiceStubSetti
private final OperationCallSettings<
ExportModelRequest, ExportModelResponse, ExportModelOperationMetadata>
exportModelOperationSettings;
private final UnaryCallSettings<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationSettings;
private final UnaryCallSettings<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationSettings;
private final PagedCallSettings<
Expand Down Expand Up @@ -390,6 +393,12 @@ public UnaryCallSettings<ExportModelRequest, Operation> exportModelSettings() {
return exportModelOperationSettings;
}

/** Returns the object with the settings used for calls to importModelEvaluation. */
public UnaryCallSettings<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationSettings() {
return importModelEvaluationSettings;
}

/** Returns the object with the settings used for calls to getModelEvaluation. */
public UnaryCallSettings<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationSettings() {
Expand Down Expand Up @@ -505,6 +514,7 @@ protected ModelServiceStubSettings(Builder settingsBuilder) throws IOException {
deleteModelOperationSettings = settingsBuilder.deleteModelOperationSettings().build();
exportModelSettings = settingsBuilder.exportModelSettings().build();
exportModelOperationSettings = settingsBuilder.exportModelOperationSettings().build();
importModelEvaluationSettings = settingsBuilder.importModelEvaluationSettings().build();
getModelEvaluationSettings = settingsBuilder.getModelEvaluationSettings().build();
listModelEvaluationsSettings = settingsBuilder.listModelEvaluationsSettings().build();
getModelEvaluationSliceSettings = settingsBuilder.getModelEvaluationSliceSettings().build();
Expand All @@ -530,6 +540,8 @@ public static class Builder extends StubSettings.Builder<ModelServiceStubSetting
private final OperationCallSettings.Builder<
ExportModelRequest, ExportModelResponse, ExportModelOperationMetadata>
exportModelOperationSettings;
private final UnaryCallSettings.Builder<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationSettings;
private final UnaryCallSettings.Builder<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationSettings;
private final PagedCallSettings.Builder<
Expand Down Expand Up @@ -580,6 +592,7 @@ protected Builder(ClientContext clientContext) {
deleteModelOperationSettings = OperationCallSettings.newBuilder();
exportModelSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
exportModelOperationSettings = OperationCallSettings.newBuilder();
importModelEvaluationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
getModelEvaluationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
listModelEvaluationsSettings =
PagedCallSettings.newBuilder(LIST_MODEL_EVALUATIONS_PAGE_STR_FACT);
Expand All @@ -595,6 +608,7 @@ protected Builder(ClientContext clientContext) {
updateModelSettings,
deleteModelSettings,
exportModelSettings,
importModelEvaluationSettings,
getModelEvaluationSettings,
listModelEvaluationsSettings,
getModelEvaluationSliceSettings,
Expand All @@ -614,6 +628,7 @@ protected Builder(ModelServiceStubSettings settings) {
deleteModelOperationSettings = settings.deleteModelOperationSettings.toBuilder();
exportModelSettings = settings.exportModelSettings.toBuilder();
exportModelOperationSettings = settings.exportModelOperationSettings.toBuilder();
importModelEvaluationSettings = settings.importModelEvaluationSettings.toBuilder();
getModelEvaluationSettings = settings.getModelEvaluationSettings.toBuilder();
listModelEvaluationsSettings = settings.listModelEvaluationsSettings.toBuilder();
getModelEvaluationSliceSettings = settings.getModelEvaluationSliceSettings.toBuilder();
Expand All @@ -627,6 +642,7 @@ protected Builder(ModelServiceStubSettings settings) {
updateModelSettings,
deleteModelSettings,
exportModelSettings,
importModelEvaluationSettings,
getModelEvaluationSettings,
listModelEvaluationsSettings,
getModelEvaluationSliceSettings,
Expand Down Expand Up @@ -677,6 +693,11 @@ private static Builder initDefaults(Builder builder) {
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));

builder
.importModelEvaluationSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));

builder
.getModelEvaluationSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
Expand Down Expand Up @@ -843,6 +864,12 @@ public UnaryCallSettings.Builder<ExportModelRequest, Operation> exportModelSetti
return exportModelOperationSettings;
}

/** Returns the builder for the settings used for calls to importModelEvaluation. */
public UnaryCallSettings.Builder<ImportModelEvaluationRequest, ModelEvaluation>
importModelEvaluationSettings() {
return importModelEvaluationSettings;
}

/** Returns the builder for the settings used for calls to getModelEvaluation. */
public UnaryCallSettings.Builder<GetModelEvaluationRequest, ModelEvaluation>
getModelEvaluationSettings() {
Expand Down
Loading