Skip to content

Commit cb61467

Browse files
dzlier-gcpdzlier-gcp
authored
Use test endpoint for datalabeling integration tests. (GoogleCloudPlatform#1803)
* Use test endpoint for datalabeling integration tests. * Fix formatting * Fix typo * Fix formatting * Add quotes to variable * Add execeptions to method signitures.
1 parent 856b906 commit cb61467

16 files changed

+185
-47
lines changed

‎.kokoro/tests/run_tests.sh

+3
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then
5656
# Setup required env variables
5757
export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing
5858
export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json
59+
# For Tasks samples
5960
export QUEUE_ID=my-appengine-queue
6061
export LOCATION_ID=us-east1
62+
# For Datalabeling samples to hit the testing endpoint
63+
export DATALABELING_ENDPOINT="test-datalabeling.sandbox.googleapis.com:443"
6164
source "${KOKORO_GFILE_DIR}/aws-secrets.sh"
6265
source "${KOKORO_GFILE_DIR}/storage-hmac-credentials.sh"
6366
source "${KOKORO_GFILE_DIR}/dlp_secrets.txt"

‎datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java

+32-15
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.cloud.datalabeling.v1beta1.AnnotationSpecSet;
2222
import com.google.cloud.datalabeling.v1beta1.CreateAnnotationSpecSetRequest;
2323
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient;
24+
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings;
2425
import com.google.cloud.datalabeling.v1beta1.ProjectName;
2526
import java.io.IOException;
2627
import java.util.ArrayList;
@@ -32,36 +33,52 @@
3233
class CreateAnnotationSpecSet {
3334

3435
// Create an annotation spec set.
35-
static void createAnnotationSpecSet(String projectId) {
36+
static void createAnnotationSpecSet(String projectId) throws IOException {
3637
// String projectId = "YOUR_PROJECT_ID";
3738

3839
Map<String, String> annotationLabels = new HashMap<>();
3940
annotationLabels.put("label_1", "label_1_description");
4041
annotationLabels.put("label_2", "label_2_description");
4142

42-
try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) {
43+
// [END datalabeling_create_annotation_spec_set_beta]
44+
String endpoint = System.getenv("DATALABELING_ENDPOINT");
45+
if (endpoint == null) {
46+
endpoint = DataLabelingServiceSettings.getDefaultEndpoint();
47+
}
48+
// [START datalabeling_create_annotation_spec_set_beta]
4349

50+
DataLabelingServiceSettings settings = DataLabelingServiceSettings
51+
.newBuilder()
52+
// [END datalabeling_create_annotation_spec_set_beta]
53+
.setEndpoint(endpoint)
54+
// [START datalabeling_create_annotation_spec_set_beta]
55+
.build();
56+
try (DataLabelingServiceClient dataLabelingServiceClient =
57+
DataLabelingServiceClient.create(settings)) {
4458
ProjectName projectName = ProjectName.of(projectId);
4559

4660
List<AnnotationSpec> annotationSpecs = new ArrayList<>();
4761
for (Entry<String, String> entry : annotationLabels.entrySet()) {
48-
AnnotationSpec annotationSpec = AnnotationSpec.newBuilder()
49-
.setDisplayName(entry.getKey())
50-
.setDescription(entry.getValue())
51-
.build();
62+
AnnotationSpec annotationSpec =
63+
AnnotationSpec.newBuilder()
64+
.setDisplayName(entry.getKey())
65+
.setDescription(entry.getValue())
66+
.build();
5267
annotationSpecs.add(annotationSpec);
5368
}
5469

55-
AnnotationSpecSet annotationSpecSet = AnnotationSpecSet.newBuilder()
56-
.setDisplayName("YOUR_ANNOTATION_SPEC_SET_DISPLAY_NAME")
57-
.setDescription("YOUR_DESCRIPTION")
58-
.addAllAnnotationSpecs(annotationSpecs)
59-
.build();
70+
AnnotationSpecSet annotationSpecSet =
71+
AnnotationSpecSet.newBuilder()
72+
.setDisplayName("YOUR_ANNOTATION_SPEC_SET_DISPLAY_NAME")
73+
.setDescription("YOUR_DESCRIPTION")
74+
.addAllAnnotationSpecs(annotationSpecs)
75+
.build();
6076

61-
CreateAnnotationSpecSetRequest request = CreateAnnotationSpecSetRequest.newBuilder()
62-
.setAnnotationSpecSet(annotationSpecSet)
63-
.setParent(projectName.toString())
64-
.build();
77+
CreateAnnotationSpecSetRequest request =
78+
CreateAnnotationSpecSetRequest.newBuilder()
79+
.setAnnotationSpecSet(annotationSpecSet)
80+
.setParent(projectName.toString())
81+
.build();
6582

6683
AnnotationSpecSet result = dataLabelingServiceClient.createAnnotationSpecSet(request);
6784

‎datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java

+27-10
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,46 @@
1919
// [START datalabeling_create_dataset_beta]
2020
import com.google.cloud.datalabeling.v1beta1.CreateDatasetRequest;
2121
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient;
22+
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings;
2223
import com.google.cloud.datalabeling.v1beta1.Dataset;
2324
import com.google.cloud.datalabeling.v1beta1.ProjectName;
2425
import java.io.IOException;
2526

2627
class CreateDataset {
2728

2829
// Create a dataset that is initially empty.
29-
static void createDataset(String projectId, String datasetName) {
30+
static void createDataset(String projectId, String datasetName) throws IOException {
3031
// String projectId = "YOUR_PROJECT_ID";
3132
// String datasetName = "YOUR_DATASET_DISPLAY_NAME";
3233

33-
try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) {
34+
// [END datalabeling_create_dataset_beta]
35+
String endpoint = System.getenv("DATALABELING_ENDPOINT");
36+
if (endpoint == null) {
37+
endpoint = DataLabelingServiceSettings.getDefaultEndpoint();
38+
}
39+
// [START datalabeling_create_dataset_beta]
40+
41+
DataLabelingServiceSettings settings = DataLabelingServiceSettings
42+
.newBuilder()
43+
// [END datalabeling_create_dataset_beta]
44+
.setEndpoint(endpoint)
45+
// [START datalabeling_create_dataset_beta]
46+
.build();
47+
try (DataLabelingServiceClient dataLabelingServiceClient =
48+
DataLabelingServiceClient.create(settings)) {
3449
ProjectName projectName = ProjectName.of(projectId);
3550

36-
Dataset dataset = Dataset.newBuilder()
37-
.setDisplayName(datasetName)
38-
.setDescription("YOUR_DESCRIPTION")
39-
.build();
51+
Dataset dataset =
52+
Dataset.newBuilder()
53+
.setDisplayName(datasetName)
54+
.setDescription("YOUR_DESCRIPTION")
55+
.build();
4056

41-
CreateDatasetRequest createDatasetRequest = CreateDatasetRequest.newBuilder()
42-
.setParent(projectName.toString())
43-
.setDataset(dataset)
44-
.build();
57+
CreateDatasetRequest createDatasetRequest =
58+
CreateDatasetRequest.newBuilder()
59+
.setParent(projectName.toString())
60+
.setDataset(dataset)
61+
.build();
4562

4663
Dataset createdDataset = dataLabelingServiceClient.createDataset(createDatasetRequest);
4764

‎datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java

+16-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.cloud.datalabeling.v1beta1.CreateInstructionMetadata;
2222
import com.google.cloud.datalabeling.v1beta1.CreateInstructionRequest;
2323
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient;
24+
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings;
2425
import com.google.cloud.datalabeling.v1beta1.DataType;
2526
import com.google.cloud.datalabeling.v1beta1.Instruction;
2627
import com.google.cloud.datalabeling.v1beta1.PdfInstruction;
@@ -31,12 +32,25 @@
3132
class CreateInstruction {
3233

3334
// Create a instruction for a dataset.
34-
static void createInstruction(String projectId, String pdfUri) {
35+
static void createInstruction(String projectId, String pdfUri) throws IOException {
3536
// String projectId = "YOUR_PROJECT_ID";
3637
// String pdfUri = "gs://YOUR_BUCKET_ID/path_to_pdf_or_csv";
3738

38-
try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) {
39+
// [END datalabeling_create_instruction_beta]
40+
String endpoint = System.getenv("DATALABELING_ENDPOINT");
41+
if (endpoint == null) {
42+
endpoint = DataLabelingServiceSettings.getDefaultEndpoint();
43+
}
44+
// [START datalabeling_create_instruction_beta]
3945

46+
DataLabelingServiceSettings settings = DataLabelingServiceSettings
47+
.newBuilder()
48+
// [END datalabeling_create_instruction_beta]
49+
.setEndpoint(endpoint)
50+
// [START datalabeling_create_instruction_beta]
51+
.build();
52+
try (DataLabelingServiceClient dataLabelingServiceClient =
53+
DataLabelingServiceClient.create(settings)) {
4054
ProjectName projectName = ProjectName.of(projectId);
4155

4256
// There are two types of instructions: CSV (CsvInstruction) or PDF (PdfInstruction)

‎datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java

+19-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START datalabeling_export_data_beta]
2020
import com.google.api.gax.longrunning.OperationFuture;
2121
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient;
22+
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings;
2223
import com.google.cloud.datalabeling.v1beta1.ExportDataOperationMetadata;
2324
import com.google.cloud.datalabeling.v1beta1.ExportDataOperationResponse;
2425
import com.google.cloud.datalabeling.v1beta1.ExportDataRequest;
@@ -33,7 +34,8 @@
3334
class ExportData {
3435

3536
// Export data from an annotated dataset.
36-
static void exportData(String datasetName, String annotatedDatasetName, String gcsOutputUri) {
37+
static void exportData(String datasetName, String annotatedDatasetName, String gcsOutputUri)
38+
throws IOException {
3739
// String datasetName = DataLabelingServiceClient.formatDatasetName(
3840
// "YOUR_PROJECT_ID", "YOUR_DATASETS_UUID");
3941
// String annotatedDatasetName = DataLabelingServiceClient.formatAnnotatedDatasetName(
@@ -42,7 +44,21 @@ static void exportData(String datasetName, String annotatedDatasetName, String g
4244
// "YOUR_ANNOTATED_DATASET_UUID");
4345
// String gcsOutputUri = "gs://YOUR_BUCKET_ID/export_path";
4446

45-
try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) {
47+
// [END datalabeling_export_data_beta]
48+
String endpoint = System.getenv("DATALABELING_ENDPOINT");
49+
if (endpoint == null) {
50+
endpoint = DataLabelingServiceSettings.getDefaultEndpoint();
51+
}
52+
// [START datalabeling_export_data_beta]
53+
54+
DataLabelingServiceSettings settings = DataLabelingServiceSettings
55+
.newBuilder()
56+
// [END datalabeling_export_data_beta]
57+
.setEndpoint(endpoint)
58+
// [START datalabeling_export_data_beta]
59+
.build();
60+
try (DataLabelingServiceClient dataLabelingServiceClient =
61+
DataLabelingServiceClient.create(settings)) {
4662
GcsDestination gcsDestination = GcsDestination.newBuilder()
4763
.setOutputUri(gcsOutputUri)
4864
.setMimeType("text/csv")
@@ -75,4 +91,4 @@ static void exportData(String datasetName, String annotatedDatasetName, String g
7591
}
7692
}
7793
}
78-
// [END datalabeling_export_data_beta]
94+
// [END datalabeling_export_data_beta]

‎datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java

+17-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START datalabeling_import_data_beta]
2020
import com.google.api.gax.longrunning.OperationFuture;
2121
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient;
22+
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings;
2223
import com.google.cloud.datalabeling.v1beta1.DataType;
2324
import com.google.cloud.datalabeling.v1beta1.GcsSource;
2425
import com.google.cloud.datalabeling.v1beta1.ImportDataOperationMetadata;
@@ -31,12 +32,26 @@
3132
class ImportData {
3233

3334
// Import data to an existing dataset.
34-
static void importData(String datasetName, String gcsSourceUri) {
35+
static void importData(String datasetName, String gcsSourceUri) throws IOException {
3536
// String datasetName = DataLabelingServiceClient.formatDatasetName(
3637
// "YOUR_PROJECT_ID", "YOUR_DATASETS_UUID");
3738
// String gcsSourceUri = "gs://YOUR_BUCKET_ID/path_to_data";
3839

39-
try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) {
40+
// [END datalabeling_import_data_beta]
41+
String endpoint = System.getenv("DATALABELING_ENDPOINT");
42+
if (endpoint == null) {
43+
endpoint = DataLabelingServiceSettings.getDefaultEndpoint();
44+
}
45+
// [START datalabeling_import_data_beta]
46+
47+
DataLabelingServiceSettings settings = DataLabelingServiceSettings
48+
.newBuilder()
49+
// [END datalabeling_import_data_beta]
50+
.setEndpoint(endpoint)
51+
// [START datalabeling_import_data_beta]
52+
.build();
53+
try (DataLabelingServiceClient dataLabelingServiceClient =
54+
DataLabelingServiceClient.create(settings)) {
4055
GcsSource gcsSource = GcsSource.newBuilder()
4156
.setInputUri(gcsSourceUri)
4257
.setMimeType("text/csv")

‎datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java

+16-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.api.gax.longrunning.OperationFuture;
2121
import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset;
2222
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient;
23+
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings;
2324
import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig;
2425
import com.google.cloud.datalabeling.v1beta1.ImageClassificationConfig;
2526
import com.google.cloud.datalabeling.v1beta1.LabelImageRequest;
@@ -35,7 +36,7 @@ class LabelImage {
3536
static void labelImage(
3637
String formattedInstructionName,
3738
String formattedAnnotationSpecSetName,
38-
String formattedDatasetName) {
39+
String formattedDatasetName) throws IOException {
3940
// String formattedInstructionName = DataLabelingServiceClient.formatInstructionName(
4041
// "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID");
4142
// String formattedAnnotationSpecSetName =
@@ -44,8 +45,21 @@ static void labelImage(
4445
// String formattedDatasetName = DataLabelingServiceClient.formatDatasetName(
4546
// "YOUR_PROJECT_ID", "YOUR_DATASET_UUID");
4647

47-
try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) {
48+
// [END datalabeling_label_image_beta]
49+
String endpoint = System.getenv("DATALABELING_ENDPOINT");
50+
if (endpoint == null) {
51+
endpoint = DataLabelingServiceSettings.getDefaultEndpoint();
52+
}
53+
// [START datalabeling_label_image_beta]
4854

55+
DataLabelingServiceSettings settings = DataLabelingServiceSettings
56+
.newBuilder()
57+
// [END datalabeling_label_image_beta]
58+
.setEndpoint(endpoint)
59+
// [START datalabeling_label_image_beta]
60+
.build();
61+
try (DataLabelingServiceClient dataLabelingServiceClient =
62+
DataLabelingServiceClient.create(settings)) {
4963
HumanAnnotationConfig humanAnnotationConfig =
5064
HumanAnnotationConfig.newBuilder()
5165
.setAnnotatedDatasetDisplayName("annotated_displayname")

‎datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java

+16-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.api.gax.longrunning.OperationFuture;
2121
import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset;
2222
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient;
23+
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings;
2324
import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig;
2425
import com.google.cloud.datalabeling.v1beta1.LabelOperationMetadata;
2526
import com.google.cloud.datalabeling.v1beta1.LabelTextRequest;
@@ -35,7 +36,7 @@ class LabelText {
3536
static void labelText(
3637
String formattedInstructionName,
3738
String formattedAnnotationSpecSetName,
38-
String formattedDatasetName) {
39+
String formattedDatasetName) throws IOException {
3940
// String formattedInstructionName = DataLabelingServiceClient.formatInstructionName(
4041
// "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID");
4142
// String formattedAnnotationSpecSetName =
@@ -44,8 +45,21 @@ static void labelText(
4445
// String formattedDatasetName = DataLabelingServiceClient.formatDatasetName(
4546
// "YOUR_PROJECT_ID", "YOUR_DATASET_UUID");
4647

47-
try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) {
48+
// [END datalabeling_label_text_beta]
49+
String endpoint = System.getenv("DATALABELING_ENDPOINT");
50+
if (endpoint == null) {
51+
endpoint = DataLabelingServiceSettings.getDefaultEndpoint();
52+
}
53+
// [START datalabeling_label_text_beta]
4854

55+
DataLabelingServiceSettings settings = DataLabelingServiceSettings
56+
.newBuilder()
57+
// [END datalabeling_label_text_beta]
58+
.setEndpoint(endpoint)
59+
// [START datalabeling_label_text_beta]
60+
.build();
61+
try (DataLabelingServiceClient dataLabelingServiceClient =
62+
DataLabelingServiceClient.create(settings)) {
4963
HumanAnnotationConfig humanAnnotationConfig =
5064
HumanAnnotationConfig.newBuilder()
5165
.setAnnotatedDatasetDisplayName("annotated_displayname")

‎datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java

+17-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.api.gax.longrunning.OperationFuture;
2121
import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset;
2222
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient;
23+
import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings;
2324
import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig;
2425
import com.google.cloud.datalabeling.v1beta1.LabelOperationMetadata;
2526
import com.google.cloud.datalabeling.v1beta1.LabelVideoRequest;
@@ -33,7 +34,7 @@ class LabelVideo {
3334

3435
// Start a Video Labeling Task
3536
static void labelVideo(String formattedInstructionName, String formattedAnnotationSpecSetName,
36-
String formattedDatasetName) {
37+
String formattedDatasetName) throws IOException {
3738
// String formattedInstructionName = DataLabelingServiceClient.formatInstructionName(
3839
// "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID");
3940
// String formattedAnnotationSpecSetName =
@@ -42,8 +43,21 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati
4243
// String formattedDatasetName = DataLabelingServiceClient.formatDatasetName(
4344
// "YOUR_PROJECT_ID", "YOUR_DATASET_UUID");
4445

45-
try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) {
46+
// [END datalabeling_label_video_beta]
47+
String endpoint = System.getenv("DATALABELING_ENDPOINT");
48+
if (endpoint == null) {
49+
endpoint = DataLabelingServiceSettings.getDefaultEndpoint();
50+
}
51+
// [START datalabeling_label_video_beta]
4652

53+
DataLabelingServiceSettings settings = DataLabelingServiceSettings
54+
.newBuilder()
55+
// [END datalabeling_label_video_beta]
56+
.setEndpoint(endpoint)
57+
// [START datalabeling_label_video_beta]
58+
.build();
59+
try (DataLabelingServiceClient dataLabelingServiceClient =
60+
DataLabelingServiceClient.create(settings)) {
4761
HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder()
4862
.setAnnotatedDatasetDisplayName("annotated_displayname")
4963
.setAnnotatedDatasetDescription("annotated_description")
@@ -80,4 +94,4 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati
8094
}
8195
}
8296
}
83-
// [END datalabeling_label_video_beta]
97+
// [END datalabeling_label_video_beta]

0 commit comments

Comments
 (0)