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

chore: add 'maxResults' field to detectWebEntity #799

Merged
eaball35 merged 11 commits into from
Feb 3, 2022
Merged

chore: add 'maxResults' field to detectWebEntity #799

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
111a564
chore: add 'maxResults' field to detectWebEntity
aribray Feb 1, 2022
1f2f880
fix linting
aribray Feb 1, 2022
4b5e7aa
🦉 Updates from OwlBot
gcf-owl-bot[bot] Feb 1, 2022
3cc074f
Merge branch 'aribray--flaky' of https://github.com/aribray/java-visi…
gcf-owl-bot[bot] Feb 1, 2022
8c31a62
build(deps): update dependency org.codehaus.mojo:build-helper-maven-p…
renovate-bot Feb 2, 2022
3a10482
deps: update dependency com.google.cloud:google-cloud-core to v2.4.0 …
renovate-bot Feb 2, 2022
ad99af8
make MAX_RESULTS a constant
aribray Feb 2, 2022
e842dc4
Merge remote-tracking branch 'origin' into aribray--flaky
aribray Feb 2, 2022
adddc2c
fix linting
aribray Feb 2, 2022
e7328d1
get build to rerun
aribray Feb 2, 2022
e517728
get build to rerun
aribray Feb 2, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions google-cloud-vision/src/test/java/com/google/cloud/vision/it/ITSystemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public class ITSystemTest {
private static final String GCS_BUCKET_ENV_VAR = "GOOGLE_CLOUD_TESTS_VISION_BUCKET";
private static final String SAMPLE_BUCKET;
private static final String SAMPLE_URI;
private static final int MAX_RESULTS = 15;

static {
String GCS_BUCKET;
Expand Down Expand Up @@ -465,8 +466,18 @@ public void detectSafeSearchGcsTest() throws IOException {

@Test
public void detectWebEntitiesGcsTest() throws IOException {
List<AnnotateImageResponse> responses =
getResponsesList("landmark/pofa.jpg", Type.WEB_DETECTION, true);
ImageSource imgSource =
ImageSource.newBuilder().setGcsImageUri(SAMPLE_BUCKET + "landmark/pofa.jpg").build();
Image img = Image.newBuilder().setSource(imgSource).build();
Feature feat =
Feature.newBuilder().setType(Type.WEB_DETECTION).setMaxResults(MAX_RESULTS).build();

AnnotateImageRequest request =
AnnotateImageRequest.newBuilder().addFeatures(feat).setImage(img).build();

BatchAnnotateImagesResponse response =
imageAnnotatorClient.batchAnnotateImages(ImmutableList.of(request));
List<AnnotateImageResponse> responses = response.getResponsesList();
List<String> actual = new ArrayList<>();
for (AnnotateImageResponse imgResponse : responses) {
for (WebDetection.WebEntity entity : imgResponse.getWebDetection().getWebEntitiesList()) {
Expand All @@ -480,7 +491,8 @@ public void detectWebEntitiesGcsTest() throws IOException {
public void detectWebEntitiesIncludeGeoResultsTest() throws IOException {
ByteString imgBytes = ByteString.readFrom(new FileInputStream(RESOURCES + "city.jpg"));
Image img = Image.newBuilder().setContent(imgBytes).build();
Feature feat = Feature.newBuilder().setType(Type.WEB_DETECTION).build();
Feature feat =
Feature.newBuilder().setType(Type.WEB_DETECTION).setMaxResults(MAX_RESULTS).build();
WebDetectionParams webDetectionParams =
WebDetectionParams.newBuilder().setIncludeGeoResults(true).build();
ImageContext imageContext =
Expand Down Expand Up @@ -511,7 +523,8 @@ public void detectWebEntitiesIncludeGeoResultsGcsTest() {
ImageSource imgSource =
ImageSource.newBuilder().setGcsImageUri(SAMPLE_BUCKET + "landmark/pofa.jpg").build();
Image img = Image.newBuilder().setSource(imgSource).build();
Feature feat = Feature.newBuilder().setType(Type.WEB_DETECTION).build();
Feature feat =
Feature.newBuilder().setType(Type.WEB_DETECTION).setMaxResults(MAX_RESULTS).build();
WebDetectionParams webDetectionParams =
WebDetectionParams.newBuilder().setIncludeGeoResults(true).build();
ImageContext imageContext =
Expand All @@ -526,6 +539,8 @@ public void detectWebEntitiesIncludeGeoResultsGcsTest() {
imageAnnotatorClient.batchAnnotateImages(ImmutableList.of(request));
List<AnnotateImageResponse> responses = response.getResponsesList();
List<String> actual = new ArrayList<>();
System.out.println("WebEntitiesGeo SIZE");
System.out.println(actual.size());
for (AnnotateImageResponse imgResponse : responses) {
for (WebDetection.WebEntity entity : imgResponse.getWebDetection().getWebEntitiesList()) {
actual.add(entity.getDescription());
Expand Down