Add new sample for deploying a model with a node count (GoogleCloudPlatform#1601)

nnegrey · web-flow · commit 3cd29aa01cc2 · 2019-10-04T09:23:46.000-06:00
diff --git a/vision/automl/pom.xml b/vision/automl/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-automl</artifactId>
-      <version>0.55.0-beta</version>
+      <version>0.112.0-beta</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.argparse4j</groupId>
diff --git a/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/DeployModelNodeCount.java b/vision/automl/src/main/java/com/google/cloud/vision/samples/automl/DeployModelNodeCount.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.vision.samples.automl;
+
+// [START automl_vision_object_detection_deploy_model_node_count]
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.cloud.automl.v1beta1.AutoMlClient;
+import com.google.cloud.automl.v1beta1.DeployModelRequest;
+import com.google.cloud.automl.v1beta1.ImageObjectDetectionModelDeploymentMetadata;
+import com.google.cloud.automl.v1beta1.ModelName;
+import com.google.cloud.automl.v1beta1.OperationMetadata;
+import com.google.protobuf.Empty;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+class DeployModelNodeCount {
+
+  static void deployModelNodeCount(String projectId, String modelId) {
+    // String projectId = "YOUR_PROJECT_ID";
+    // String modelId = "YOUR_MODEL_ID";
+    
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests. After completing all of your requests, call
+    // the "close" method on the client to safely clean up any remaining background resources.
+    try (AutoMlClient client = AutoMlClient.create()) {
+      // Get the full path of the model.
+      ModelName modelFullId = ModelName.of(projectId, "us-central1", modelId);
+
+      // Set how many nodes the model is deployed on
+      ImageObjectDetectionModelDeploymentMetadata deploymentMetadata =
+              ImageObjectDetectionModelDeploymentMetadata.newBuilder().setNodeCount(2).build();
+
+      DeployModelRequest request = DeployModelRequest.newBuilder()
+              .setName(modelFullId.toString())
+              .setImageObjectDetectionModelDeploymentMetadata(deploymentMetadata)
+              .build();
+      // Deploy the model
+      OperationFuture<Empty, OperationMetadata> future = client.deployModelAsync(request);
+      future.get();
+      System.out.println("Model deployment on 2 nodes finished");
+    } catch (IOException | InterruptedException | ExecutionException e) {
+      e.printStackTrace();
+    }
+  }
+}
+// [END automl_vision_object_detection_deploy_model_node_count]
diff --git a/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/DeployModelNodeCountIT.java b/vision/automl/src/test/java/com/google/cloud/vision/samples/automl/DeployModelNodeCountIT.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.vision.samples.automl;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.cloud.automl.v1beta1.AutoMlClient;
+import com.google.cloud.automl.v1beta1.ModelName;
+import com.google.cloud.automl.v1beta1.OperationMetadata;
+import com.google.protobuf.Empty;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.concurrent.ExecutionException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for vision "Deploy Model Node Count" sample. */
+@RunWith(JUnit4.class)
+@SuppressWarnings("checkstyle:abbreviationaswordinname")
+public class DeployModelNodeCountIT {
+  private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
+  private static final String MODEL_ID = "IOD1854128448151224320";
+  private ByteArrayOutputStream bout;
+  private PrintStream out;
+
+  @Before
+  public void setUp() {
+    bout = new ByteArrayOutputStream();
+    out = new PrintStream(bout);
+    System.setOut(out);
+  }
+
+  @After
+  public void tearDown() throws IOException, InterruptedException, ExecutionException {
+    System.setOut(null);
+
+    try (AutoMlClient client = AutoMlClient.create()) {
+      OperationFuture<Empty, OperationMetadata> future = client.undeployModelAsync(
+              ModelName.of(PROJECT_ID, "us-central1", MODEL_ID).toString());
+
+      future.get();
+    }
+  }
+
+  @Test
+  public void testModelApi() {
+    DeployModelNodeCount.deployModelNodeCount(PROJECT_ID, MODEL_ID);
+
+    String got = bout.toString();
+    assertThat(got).contains("Model deployment on 2 nodes finished");
+  }
+}
