From 1db4e7a9fd3c6a540a280ddc74804d94646e5dcf Mon Sep 17 00:00:00 2001 From: Dane Zeke Liergaard Date: Wed, 11 Dec 2019 15:00:46 -0800 Subject: [PATCH 1/6] Use test endpoint for datalabeling integration tests. --- .kokoro/tests/run_tests.sh | 1 + .../example/datalabeling/CreateAnnotationSpecSet.java | 11 ++++++++++- .../java/com/example/datalabeling/CreateDataset.java | 11 ++++++++++- .../com/example/datalabeling/CreateInstruction.java | 11 ++++++++++- .../java/com/example/datalabeling/ExportData.java | 11 ++++++++++- .../java/com/example/datalabeling/ImportData.java | 11 ++++++++++- .../java/com/example/datalabeling/LabelImage.java | 10 +++++++++- .../main/java/com/example/datalabeling/LabelText.java | 11 ++++++++++- .../java/com/example/datalabeling/LabelVideo.java | 11 ++++++++++- .../java/com/example/datalabeling/ImportDataIT.java | 2 ++ 10 files changed, 82 insertions(+), 8 deletions(-) diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh index 44c53f5ca1d..afd6bb01427 100755 --- a/.kokoro/tests/run_tests.sh +++ b/.kokoro/tests/run_tests.sh @@ -58,6 +58,7 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json export QUEUE_ID=my-appengine-queue export LOCATION_ID=us-east1 + export DATALABELING_ENDPOINT=test-datalabeling.sandbox.googleapis.com:443 source "${KOKORO_GFILE_DIR}/aws-secrets.sh" source "${KOKORO_GFILE_DIR}/storage-hmac-credentials.sh" source "${KOKORO_GFILE_DIR}/dlp_secrets.txt" diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java index 28626466ef8..d47e6f7f8fd 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java @@ -21,6 +21,7 @@ import com.google.cloud.datalabeling.v1beta1.AnnotationSpecSet; import com.google.cloud.datalabeling.v1beta1.CreateAnnotationSpecSetRequest; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.ProjectName; import java.io.IOException; import java.util.ArrayList; @@ -39,7 +40,15 @@ static void createAnnotationSpecSet(String projectId) { annotationLabels.put("label_1", "label_1_description"); annotationLabels.put("label_2", "label_2_description"); - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() + .setEndpoint(endpoint) + .build())) { ProjectName projectName = ProjectName.of(projectId); diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java index b8eceb820e1..bcf40556eb2 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java @@ -19,6 +19,7 @@ // [START datalabeling_create_dataset_beta] import com.google.cloud.datalabeling.v1beta1.CreateDatasetRequest; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.Dataset; import com.google.cloud.datalabeling.v1beta1.ProjectName; import java.io.IOException; @@ -30,7 +31,15 @@ static void createDataset(String projectId, String datasetName) { // String projectId = "YOUR_PROJECT_ID"; // String datasetName = "YOUR_DATASET_DISPLAY_NAME"; - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() + .setEndpoint(endpoint) + .build())) { ProjectName projectName = ProjectName.of(projectId); Dataset dataset = Dataset.newBuilder() diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java index ab56b3eeed0..0d83ff48bba 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java @@ -21,6 +21,7 @@ import com.google.cloud.datalabeling.v1beta1.CreateInstructionMetadata; import com.google.cloud.datalabeling.v1beta1.CreateInstructionRequest; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.DataType; import com.google.cloud.datalabeling.v1beta1.Instruction; import com.google.cloud.datalabeling.v1beta1.PdfInstruction; @@ -35,7 +36,15 @@ static void createInstruction(String projectId, String pdfUri) { // String projectId = "YOUR_PROJECT_ID"; // String pdfUri = "gs://YOUR_BUCKET_ID/path_to_pdf_or_csv"; - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() + .setEndpoint(endpoint) + .build())) { ProjectName projectName = ProjectName.of(projectId); diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java index 9b73085cc0e..e91edae115b 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java @@ -19,6 +19,7 @@ // [START datalabeling_export_data_beta] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.ExportDataOperationMetadata; import com.google.cloud.datalabeling.v1beta1.ExportDataOperationResponse; import com.google.cloud.datalabeling.v1beta1.ExportDataRequest; @@ -42,7 +43,15 @@ static void exportData(String datasetName, String annotatedDatasetName, String g // "YOUR_ANNOTATED_DATASET_UUID"); // String gcsOutputUri = "gs://YOUR_BUCKET_ID/export_path"; - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() + .setEndpoint(endpoint) + .build())) { GcsDestination gcsDestination = GcsDestination.newBuilder() .setOutputUri(gcsOutputUri) .setMimeType("text/csv") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java index f0e8c46dc13..9b3fc19245c 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java @@ -19,6 +19,7 @@ // [START datalabeling_import_data_beta] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.DataType; import com.google.cloud.datalabeling.v1beta1.GcsSource; import com.google.cloud.datalabeling.v1beta1.ImportDataOperationMetadata; @@ -36,7 +37,15 @@ static void importData(String datasetName, String gcsSourceUri) { // "YOUR_PROJECT_ID", "YOUR_DATASETS_UUID"); // String gcsSourceUri = "gs://YOUR_BUCKET_ID/path_to_data"; - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() + .setEndpoint(endpoint) + .build())) { GcsSource gcsSource = GcsSource.newBuilder() .setInputUri(gcsSourceUri) .setMimeType("text/csv") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java index 35f2503d1d8..88ad8304863 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java @@ -20,6 +20,7 @@ import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig; import com.google.cloud.datalabeling.v1beta1.ImageClassificationConfig; import com.google.cloud.datalabeling.v1beta1.LabelImageRequest; @@ -44,8 +45,15 @@ static void labelImage( // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() + .setEndpoint(endpoint) + .build())) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java index 2ff411f0dd8..e2ed262b2aa 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java @@ -20,6 +20,7 @@ import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig; import com.google.cloud.datalabeling.v1beta1.LabelOperationMetadata; import com.google.cloud.datalabeling.v1beta1.LabelTextRequest; @@ -44,7 +45,15 @@ static void labelText( // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() + .setEndpoint(endpoint) + .build())) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java index b5705cf32fb..b8e9dddbdf5 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java @@ -20,6 +20,7 @@ import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig; import com.google.cloud.datalabeling.v1beta1.LabelOperationMetadata; import com.google.cloud.datalabeling.v1beta1.LabelVideoRequest; @@ -42,7 +43,15 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() + .setEndpoint(endpoint) + .build())) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java index bf7fd2396b2..4325e0f0c0a 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java @@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -102,6 +103,7 @@ public void tearDown() { } @Test + @Ignore("b/146064330") public void testImportDataset() { ImportData.importData(dataset.getName(), GCS_SOURCE_URI); From 3609f8f85b00863645a3db7d4f87a1f0871bb0d0 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Fri, 13 Dec 2019 11:17:27 -0800 Subject: [PATCH 2/6] Fix formatting --- .kokoro/tests/run_tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh index afd6bb01427..9bb64f1fe0a 100755 --- a/.kokoro/tests/run_tests.sh +++ b/.kokoro/tests/run_tests.sh @@ -56,9 +56,11 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then # Setup required env variables export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json + # For Tasks samples export QUEUE_ID=my-appengine-queue export LOCATION_ID=us-east1 - export DATALABELING_ENDPOINT=test-datalabeling.sandbox.googleapis.com:443 + # For Datalabeling samples + export DATALABELING_ENDPOINT=test-datalabeling.sandbox.googleapis.com:443 source "${KOKORO_GFILE_DIR}/aws-secrets.sh" source "${KOKORO_GFILE_DIR}/storage-hmac-credentials.sh" source "${KOKORO_GFILE_DIR}/dlp_secrets.txt" From e3438a20b41757d730747fb015fbfb77f6464158 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Fri, 13 Dec 2019 11:20:38 -0800 Subject: [PATCH 3/6] Fix typo --- .../java/com/example/datalabeling/CreateAnnotationSpecSet.java | 2 +- .../src/main/java/com/example/datalabeling/CreateDataset.java | 2 +- .../main/java/com/example/datalabeling/CreateInstruction.java | 2 +- .../src/main/java/com/example/datalabeling/ExportData.java | 2 +- .../src/main/java/com/example/datalabeling/ImportData.java | 2 +- .../src/main/java/com/example/datalabeling/LabelImage.java | 2 +- .../src/main/java/com/example/datalabeling/LabelText.java | 2 +- .../src/main/java/com/example/datalabeling/LabelVideo.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java index d47e6f7f8fd..9c024f2c395 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java @@ -40,7 +40,7 @@ static void createAnnotationSpecSet(String projectId) { annotationLabels.put("label_1", "label_1_description"); annotationLabels.put("label_2", "label_2_description"); - String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java index bcf40556eb2..61624acded5 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java @@ -31,7 +31,7 @@ static void createDataset(String projectId, String datasetName) { // String projectId = "YOUR_PROJECT_ID"; // String datasetName = "YOUR_DATASET_DISPLAY_NAME"; - String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java index 0d83ff48bba..3abbbcc4066 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java @@ -36,7 +36,7 @@ static void createInstruction(String projectId, String pdfUri) { // String projectId = "YOUR_PROJECT_ID"; // String pdfUri = "gs://YOUR_BUCKET_ID/path_to_pdf_or_csv"; - String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java index e91edae115b..6571c5acd8b 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java @@ -43,7 +43,7 @@ static void exportData(String datasetName, String annotatedDatasetName, String g // "YOUR_ANNOTATED_DATASET_UUID"); // String gcsOutputUri = "gs://YOUR_BUCKET_ID/export_path"; - String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java index 9b3fc19245c..ee1a23b08ef 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java @@ -37,7 +37,7 @@ static void importData(String datasetName, String gcsSourceUri) { // "YOUR_PROJECT_ID", "YOUR_DATASETS_UUID"); // String gcsSourceUri = "gs://YOUR_BUCKET_ID/path_to_data"; - String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java index 88ad8304863..a4df10a8803 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java @@ -45,7 +45,7 @@ static void labelImage( // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java index e2ed262b2aa..020e6e39b7f 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java @@ -45,7 +45,7 @@ static void labelText( // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java index b8e9dddbdf5..7e7e7bd669b 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java @@ -43,7 +43,7 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - String endpoint = System.getenv("DATALEBELING_ENDPOINT"); + String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } From d1685f40689d327a89d5810a9f65fba9bae0e10a Mon Sep 17 00:00:00 2001 From: averikitsch Date: Fri, 13 Dec 2019 11:24:21 -0800 Subject: [PATCH 4/6] Fix formatting --- .../datalabeling/CreateAnnotationSpecSet.java | 35 ++++++++++--------- .../example/datalabeling/CreateDataset.java | 23 ++++++------ .../datalabeling/CreateInstruction.java | 6 ++-- .../com/example/datalabeling/ExportData.java | 7 ++-- .../com/example/datalabeling/ImportData.java | 5 ++- .../com/example/datalabeling/LabelImage.java | 5 ++- .../com/example/datalabeling/LabelText.java | 6 ++-- .../com/example/datalabeling/LabelVideo.java | 8 ++--- 8 files changed, 44 insertions(+), 51 deletions(-) diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java index 9c024f2c395..cb5c62d857c 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java @@ -46,31 +46,32 @@ static void createAnnotationSpecSet(String projectId) { } try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() - .setEndpoint(endpoint) - .build())) { - + DataLabelingServiceClient.create( + DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { ProjectName projectName = ProjectName.of(projectId); List annotationSpecs = new ArrayList<>(); for (Entry entry : annotationLabels.entrySet()) { - AnnotationSpec annotationSpec = AnnotationSpec.newBuilder() - .setDisplayName(entry.getKey()) - .setDescription(entry.getValue()) - .build(); + AnnotationSpec annotationSpec = + AnnotationSpec.newBuilder() + .setDisplayName(entry.getKey()) + .setDescription(entry.getValue()) + .build(); annotationSpecs.add(annotationSpec); } - AnnotationSpecSet annotationSpecSet = AnnotationSpecSet.newBuilder() - .setDisplayName("YOUR_ANNOTATION_SPEC_SET_DISPLAY_NAME") - .setDescription("YOUR_DESCRIPTION") - .addAllAnnotationSpecs(annotationSpecs) - .build(); + AnnotationSpecSet annotationSpecSet = + AnnotationSpecSet.newBuilder() + .setDisplayName("YOUR_ANNOTATION_SPEC_SET_DISPLAY_NAME") + .setDescription("YOUR_DESCRIPTION") + .addAllAnnotationSpecs(annotationSpecs) + .build(); - CreateAnnotationSpecSetRequest request = CreateAnnotationSpecSetRequest.newBuilder() - .setAnnotationSpecSet(annotationSpecSet) - .setParent(projectName.toString()) - .build(); + CreateAnnotationSpecSetRequest request = + CreateAnnotationSpecSetRequest.newBuilder() + .setAnnotationSpecSet(annotationSpecSet) + .setParent(projectName.toString()) + .build(); AnnotationSpecSet result = dataLabelingServiceClient.createAnnotationSpecSet(request); diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java index 61624acded5..94ed351a3d6 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java @@ -37,20 +37,21 @@ static void createDataset(String projectId, String datasetName) { } try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() - .setEndpoint(endpoint) - .build())) { + DataLabelingServiceClient.create( + DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { ProjectName projectName = ProjectName.of(projectId); - Dataset dataset = Dataset.newBuilder() - .setDisplayName(datasetName) - .setDescription("YOUR_DESCRIPTION") - .build(); + Dataset dataset = + Dataset.newBuilder() + .setDisplayName(datasetName) + .setDescription("YOUR_DESCRIPTION") + .build(); - CreateDatasetRequest createDatasetRequest = CreateDatasetRequest.newBuilder() - .setParent(projectName.toString()) - .setDataset(dataset) - .build(); + CreateDatasetRequest createDatasetRequest = + CreateDatasetRequest.newBuilder() + .setParent(projectName.toString()) + .setDataset(dataset) + .build(); Dataset createdDataset = dataLabelingServiceClient.createDataset(createDatasetRequest); diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java index 3abbbcc4066..e7f014ae526 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java @@ -42,10 +42,8 @@ static void createInstruction(String projectId, String pdfUri) { } try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() - .setEndpoint(endpoint) - .build())) { - + DataLabelingServiceClient.create( + DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { ProjectName projectName = ProjectName.of(projectId); // There are two types of instructions: CSV (CsvInstruction) or PDF (PdfInstruction) diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java index 6571c5acd8b..b25a82f6a77 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java @@ -49,9 +49,8 @@ static void exportData(String datasetName, String annotatedDatasetName, String g } try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() - .setEndpoint(endpoint) - .build())) { + DataLabelingServiceClient.create( + DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { GcsDestination gcsDestination = GcsDestination.newBuilder() .setOutputUri(gcsOutputUri) .setMimeType("text/csv") @@ -84,4 +83,4 @@ static void exportData(String datasetName, String annotatedDatasetName, String g } } } -// [END datalabeling_export_data_beta] \ No newline at end of file +// [END datalabeling_export_data_beta] diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java index ee1a23b08ef..2969bd1aef9 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java @@ -43,9 +43,8 @@ static void importData(String datasetName, String gcsSourceUri) { } try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() - .setEndpoint(endpoint) - .build())) { + DataLabelingServiceClient.create( + DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { GcsSource gcsSource = GcsSource.newBuilder() .setInputUri(gcsSourceUri) .setMimeType("text/csv") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java index a4df10a8803..ffe9bce806b 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java @@ -51,9 +51,8 @@ static void labelImage( } try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() - .setEndpoint(endpoint) - .build())) { + DataLabelingServiceClient.create( + DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java index 020e6e39b7f..515ab6cda2f 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java @@ -51,10 +51,8 @@ static void labelText( } try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() - .setEndpoint(endpoint) - .build())) { - + DataLabelingServiceClient.create( + DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java index 7e7e7bd669b..c8ecd7990e9 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java @@ -49,10 +49,8 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati } try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create(DataLabelingServiceSettings.newBuilder() - .setEndpoint(endpoint) - .build())) { - + DataLabelingServiceClient.create( + DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") .setAnnotatedDatasetDescription("annotated_description") @@ -89,4 +87,4 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati } } } -// [END datalabeling_label_video_beta] \ No newline at end of file +// [END datalabeling_label_video_beta] From 1995f7927e5d5db958500e8f960e9918c51db787 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Fri, 13 Dec 2019 11:54:27 -0800 Subject: [PATCH 5/6] Add quotes to variable --- .kokoro/tests/run_tests.sh | 4 ++-- .../datalabeling/CreateAnnotationSpecSet.java | 13 ++++++++++--- .../com/example/datalabeling/CreateDataset.java | 13 ++++++++++--- .../example/datalabeling/CreateInstruction.java | 13 ++++++++++--- .../java/com/example/datalabeling/ExportData.java | 14 +++++++++++--- .../java/com/example/datalabeling/ImportData.java | 13 ++++++++++--- .../java/com/example/datalabeling/LabelImage.java | 13 ++++++++++--- .../java/com/example/datalabeling/LabelText.java | 13 ++++++++++--- .../java/com/example/datalabeling/LabelVideo.java | 13 ++++++++++--- .../datalabeling/CreateAnnotationSpecSetIT.java | 2 ++ .../com/example/datalabeling/CreateDatasetIT.java | 2 ++ .../example/datalabeling/CreateInstructionIT.java | 2 ++ .../com/example/datalabeling/ImportDataIT.java | 2 +- .../com/example/datalabeling/LabelImageIT.java | 2 ++ .../java/com/example/datalabeling/LabelTextIT.java | 2 ++ .../com/example/datalabeling/LabelVideoIT.java | 2 ++ 16 files changed, 96 insertions(+), 27 deletions(-) diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh index 9bb64f1fe0a..8035afe15b9 100755 --- a/.kokoro/tests/run_tests.sh +++ b/.kokoro/tests/run_tests.sh @@ -59,8 +59,8 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then # For Tasks samples export QUEUE_ID=my-appengine-queue export LOCATION_ID=us-east1 - # For Datalabeling samples - export DATALABELING_ENDPOINT=test-datalabeling.sandbox.googleapis.com:443 + # For Datalabeling samples to hit the testing endpoint + export DATALABELING_ENDPOINT="test-datalabeling.sandbox.googleapis.com:443" source "${KOKORO_GFILE_DIR}/aws-secrets.sh" source "${KOKORO_GFILE_DIR}/storage-hmac-credentials.sh" source "${KOKORO_GFILE_DIR}/dlp_secrets.txt" diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java index cb5c62d857c..1564fdf509c 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java @@ -33,21 +33,28 @@ class CreateAnnotationSpecSet { // Create an annotation spec set. - static void createAnnotationSpecSet(String projectId) { + static void createAnnotationSpecSet(String projectId) throws IOException { // String projectId = "YOUR_PROJECT_ID"; Map annotationLabels = new HashMap<>(); annotationLabels.put("label_1", "label_1_description"); annotationLabels.put("label_2", "label_2_description"); + // [END datalabeling_create_annotation_spec_set_beta] String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } + // [START datalabeling_create_annotation_spec_set_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_create_annotation_spec_set_beta] + .setEndpoint(endpoint) + // [START datalabeling_create_annotation_spec_set_beta] + .build(); try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create( - DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { + DataLabelingServiceClient.create(settings)) { ProjectName projectName = ProjectName.of(projectId); List annotationSpecs = new ArrayList<>(); diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java index 94ed351a3d6..b3c13bc5ec8 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java @@ -27,18 +27,25 @@ class CreateDataset { // Create a dataset that is initially empty. - static void createDataset(String projectId, String datasetName) { + static void createDataset(String projectId, String datasetName) throws IOException { // String projectId = "YOUR_PROJECT_ID"; // String datasetName = "YOUR_DATASET_DISPLAY_NAME"; + // [END datalabeling_create_dataset_beta] String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } + // [START datalabeling_create_dataset_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_create_dataset_beta] + .setEndpoint(endpoint) + // [START datalabeling_create_dataset_beta] + .build(); try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create( - DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { + DataLabelingServiceClient.create(settings)) { ProjectName projectName = ProjectName.of(projectId); Dataset dataset = diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java index e7f014ae526..ac06bd3786d 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java @@ -32,18 +32,25 @@ class CreateInstruction { // Create a instruction for a dataset. - static void createInstruction(String projectId, String pdfUri) { + static void createInstruction(String projectId, String pdfUri) throws IOException { // String projectId = "YOUR_PROJECT_ID"; // String pdfUri = "gs://YOUR_BUCKET_ID/path_to_pdf_or_csv"; + // [END datalabeling_create_instruction_beta] String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } + // [START datalabeling_create_instruction_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_create_instruction_beta] + .setEndpoint(endpoint) + // [START datalabeling_create_instruction_beta] + .build(); try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create( - DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { + DataLabelingServiceClient.create(settings)) { ProjectName projectName = ProjectName.of(projectId); // There are two types of instructions: CSV (CsvInstruction) or PDF (PdfInstruction) diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java index b25a82f6a77..d38c5c71617 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java @@ -34,7 +34,8 @@ class ExportData { // Export data from an annotated dataset. - static void exportData(String datasetName, String annotatedDatasetName, String gcsOutputUri) { + static void exportData(String datasetName, String annotatedDatasetName, String gcsOutputUri) + throws IOException { // String datasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASETS_UUID"); // String annotatedDatasetName = DataLabelingServiceClient.formatAnnotatedDatasetName( @@ -43,14 +44,21 @@ static void exportData(String datasetName, String annotatedDatasetName, String g // "YOUR_ANNOTATED_DATASET_UUID"); // String gcsOutputUri = "gs://YOUR_BUCKET_ID/export_path"; + // [END datalabeling_export_data_beta] String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } + // [START datalabeling_export_data_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_export_data_beta] + .setEndpoint(endpoint) + // [START datalabeling_export_data_beta] + .build(); try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create( - DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { + DataLabelingServiceClient.create(settings)) { GcsDestination gcsDestination = GcsDestination.newBuilder() .setOutputUri(gcsOutputUri) .setMimeType("text/csv") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java index 2969bd1aef9..ec1b36fbe9e 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java @@ -32,19 +32,26 @@ class ImportData { // Import data to an existing dataset. - static void importData(String datasetName, String gcsSourceUri) { + static void importData(String datasetName, String gcsSourceUri) throws IOException { // String datasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASETS_UUID"); // String gcsSourceUri = "gs://YOUR_BUCKET_ID/path_to_data"; + // [END datalabeling_import_data_beta] String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } + // [START datalabeling_import_data_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_import_data_beta] + .setEndpoint(endpoint) + // [START datalabeling_import_data_beta] + .build(); try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create( - DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { + DataLabelingServiceClient.create(settings)) { GcsSource gcsSource = GcsSource.newBuilder() .setInputUri(gcsSourceUri) .setMimeType("text/csv") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java index ffe9bce806b..e00c9805162 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java @@ -36,7 +36,7 @@ class LabelImage { static void labelImage( String formattedInstructionName, String formattedAnnotationSpecSetName, - String formattedDatasetName) { + String formattedDatasetName) throws IOException { // String formattedInstructionName = DataLabelingServiceClient.formatInstructionName( // "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID"); // String formattedAnnotationSpecSetName = @@ -45,14 +45,21 @@ static void labelImage( // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); + // [END datalabeling_label_image_beta] String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } + // [START datalabeling_label_image_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_label_image_beta] + .setEndpoint(endpoint) + // [START datalabeling_label_image_beta] + .build(); try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create( - DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { + DataLabelingServiceClient.create(settings)) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java index 515ab6cda2f..2ebcfee575e 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java @@ -36,7 +36,7 @@ class LabelText { static void labelText( String formattedInstructionName, String formattedAnnotationSpecSetName, - String formattedDatasetName) { + String formattedDatasetName) throws IOException { // String formattedInstructionName = DataLabelingServiceClient.formatInstructionName( // "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID"); // String formattedAnnotationSpecSetName = @@ -45,14 +45,21 @@ static void labelText( // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); + // [END datalabeling_label_text_beta] String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } + // [START datalabeling_label_text_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_label_text_beta] + .setEndpoint(endpoint) + // [START datalabeling_label_text_beta] + .build(); try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create( - DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { + DataLabelingServiceClient.create(settings)) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java index c8ecd7990e9..a84b0bf1ed2 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java @@ -34,7 +34,7 @@ class LabelVideo { // Start a Video Labeling Task static void labelVideo(String formattedInstructionName, String formattedAnnotationSpecSetName, - String formattedDatasetName) { + String formattedDatasetName) throws IOException { // String formattedInstructionName = DataLabelingServiceClient.formatInstructionName( // "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID"); // String formattedAnnotationSpecSetName = @@ -43,14 +43,21 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); + // [END datalabeling_label_video_beta] String endpoint = System.getenv("DATALABELING_ENDPOINT"); if (endpoint == null) { endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); } + // [START datalabeling_label_video_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_label_video_beta] + .setEndpoint(endpoint) + // [START datalabeling_label_video_beta] + .build(); try (DataLabelingServiceClient dataLabelingServiceClient = - DataLabelingServiceClient.create( - DataLabelingServiceSettings.newBuilder().setEndpoint(endpoint).build())) { + DataLabelingServiceClient.create(settings)) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") .setAnnotatedDatasetDescription("annotated_description") diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java index 3ee1103d960..5a90c7f0023 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java @@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -37,6 +38,7 @@ * Integration (system) tests for {@link CreateAnnotationSpecSet}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class CreateAnnotationSpecSetIT { diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java index b8b57a54394..6bc1fe6da6b 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java @@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -37,6 +38,7 @@ * Integration (system) tests for {@link CreateDataset}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class CreateDatasetIT { diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java index d80230d4c83..38a9e5d29a4 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java @@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -37,6 +38,7 @@ * Integration (system) tests for {@link CreateInstruction}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class CreateInstructionIT { diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java index 4325e0f0c0a..4e1f195ff4b 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java @@ -38,6 +38,7 @@ * Integration (system) tests for {@link ImportData}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class ImportDataIT { @@ -103,7 +104,6 @@ public void tearDown() { } @Test - @Ignore("b/146064330") public void testImportDataset() { ImportData.importData(dataset.getName(), GCS_SOURCE_URI); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java index 718aaa32390..aa40c72776f 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java @@ -32,6 +32,7 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -40,6 +41,7 @@ * Integration (system) tests for {@link LabelImage}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class LabelImageIT { private static String PROJECT_ID = System.getenv().get("GOOGLE_CLOUD_PROJECT"); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java index f6379ed1e04..3faa363cdff 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java @@ -37,12 +37,14 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; /** Integration (system) tests for {@link LabelText}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class LabelTextIT { private static String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java index 409df270bbf..0aaa4861fc3 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java @@ -37,12 +37,14 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; /** Integration (system) tests for {@link LabelVideo}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class LabelVideoIT { private static String PROJECT_ID = System.getenv().get("GOOGLE_CLOUD_PROJECT"); From 5a3ce710893fc2866f6e1a488920b67028835449 Mon Sep 17 00:00:00 2001 From: kurtisvg <31518063+kurtisvg@users.noreply.github.com> Date: Tue, 17 Dec 2019 09:49:51 -0800 Subject: [PATCH 6/6] Add execeptions to method signitures. --- .../com/example/datalabeling/CreateAnnotationSpecSetIT.java | 2 +- .../test/java/com/example/datalabeling/CreateDatasetIT.java | 2 +- .../java/com/example/datalabeling/CreateInstructionIT.java | 2 +- .../src/test/java/com/example/datalabeling/ImportDataIT.java | 4 ++-- .../src/test/java/com/example/datalabeling/LabelImageIT.java | 2 +- .../src/test/java/com/example/datalabeling/LabelTextIT.java | 2 +- .../src/test/java/com/example/datalabeling/LabelVideoIT.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java index 5a90c7f0023..a5f9288682a 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java @@ -78,7 +78,7 @@ public void tearDown() { } @Test - public void testCreateAnnotationSpecSet() { + public void testCreateAnnotationSpecSet() throws IOException { CreateAnnotationSpecSet.createAnnotationSpecSet(PROJECT_ID); String output = bout.toString(); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java index 6bc1fe6da6b..ce4c845170e 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java @@ -79,7 +79,7 @@ public void tearDown() { } @Test - public void testCreateDataset() { + public void testCreateDataset() throws IOException { CreateDataset.createDataset(PROJECT_ID,datasetName); String output = bout.toString(); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java index 38a9e5d29a4..6ebdb898fdb 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java @@ -80,7 +80,7 @@ public void tearDown() { } @Test - public void testCreateInstruction() { + public void testCreateInstruction() throws IOException { CreateInstruction.createInstruction(PROJECT_ID, GCS_SOURCE_URI); String output = bout.toString(); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java index 4e1f195ff4b..eb7bd787e92 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java @@ -52,7 +52,7 @@ public class ImportDataIT { private static Dataset dataset; @Before - public void setUp() { + public void setUp() throws IOException { bout = new ByteArrayOutputStream(); System.setOut(new PrintStream(bout)); @@ -104,7 +104,7 @@ public void tearDown() { } @Test - public void testImportDataset() { + public void testImportDataset() throws IOException { ImportData.importData(dataset.getName(), GCS_SOURCE_URI); String output = bout.toString(); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java index aa40c72776f..79e1ef79e67 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java @@ -129,7 +129,7 @@ public void tearDown() { } @Test - public void testLabelImage() { + public void testLabelImage() throws IOException { // Start the labeling task LabelImage.labelImage(instruction.getName(), annotationSpecSet.getName(), dataset.getName()); } diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java index 3faa363cdff..a80cac1a608 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java @@ -147,7 +147,7 @@ public void tearDown() { } @Test - public void testLabelText() { + public void testLabelText() throws IOException { // Start the labeling task LabelText.labelText(instruction.getName(), annotationSpecSet.getName(), dataset.getName()); } diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java index 0aaa4861fc3..473abad2c70 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java @@ -149,7 +149,7 @@ public void tearDown() { } @Test - public void testLabelVideo() { + public void testLabelVideo() throws IOException { // Start the labeling task LabelVideo.labelVideo(instruction.getName(), annotationSpecSet.getName(), dataset.getName()); }