Skip to content

Vision OCR multi-region #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
telpirion merged 7 commits into from
Dec 5, 2019
Merged

Vision OCR multi-region #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43d443a
Adds Vision OCR multiregion sample
telpirion Oct 25, 2019
6a7d7ff
Updated Google.Api.Gax.Grpc; fixed broken test
telpirion Nov 26, 2019
4bf3696
Adjusted region tag to match Python canonical
telpirion Nov 26, 2019
f4e3fbf
Fixes test issue with path
telpirion Dec 2, 2019
4c4eaad
fixed the order of arguments passed to test
telpirion Dec 3, 2019
0455ee3
Removed newlines per reviewer feedback.
telpirion Dec 3, 2019
ed97074
Removes () from object initializer per reviewer feedback
telpirion Dec 4, 2019
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
1 change: 1 addition & 0 deletions vision/api/Detect/Detect.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<PackageReference Include="Google.Cloud.Vision.V1" Version="1.6.0" />
<PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="2.3.0" />
<PackageReference Include="Google.Api.Gax.Grpc" Version="2.10.0" />
</ItemGroup>
<ItemGroup>
<None Remove="HelloWorld.exe" />
Expand Down
30 changes: 27 additions & 3 deletions vision/api/Detect/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
using System.Linq;
using System.IO;
using Google.Protobuf;

using Google.Api.Gax.Grpc;

namespace GoogleCloudSamples
{
class ImageOptions
Expand Down Expand Up @@ -48,7 +49,11 @@ class DetectFacesOptions : ImageOptions { }
class DetectLandmarksOptions : ImageOptions { }

[Verb("text", HelpText = "Detect text.")]
class DetectTextOptions : ImageOptions { }
class DetectTextOptions : ImageOptions
{
[Option('m', HelpText = "Uses multi-region endpoint")]
public bool EnableMultiRegion { get; set; }
}

[Verb("logos", HelpText = "Detect logos.")]
class DetectLogosOptions : ImageOptions { }
Expand Down Expand Up @@ -251,6 +256,23 @@ private static object DetectText(Image image)
return 0;
}

private static object DetectTextWithLocation(Image image)
{
// [START vision_set_endpoint]
// Instantiate a client connected to the 'eu' location.
var client = new ImageAnnotatorClientBuilder
{
Endpoint = new ServiceEndpoint("eu-vision.googleapis.com")
}.Build();
// [END vision_set_endpoint]
var response = client.DetectText(image);
foreach (var annotation in response)
{
if (annotation.Description != null)
Console.WriteLine(annotation.Description);
}
return 0;
}

private static object DetectLogos(Image image)
{
Expand Down Expand Up @@ -472,7 +494,9 @@ public static void Main(string[] args)
(DetectPropertiesOptions opts) => DetectProperties(ImageFromArg(opts.FilePath)),
(DetectFacesOptions opts) => DetectFaces(ImageFromArg(opts.FilePath)),
(DetectLandmarksOptions opts) => DetectLandmarks(ImageFromArg(opts.FilePath)),
(DetectTextOptions opts) => DetectText(ImageFromArg(opts.FilePath)),
(DetectTextOptions opts) => opts.EnableMultiRegion ?
DetectTextWithLocation(ImageFromArg(opts.FilePath))
: DetectText(ImageFromArg(opts.FilePath)),
(DetectLogosOptions opts) => DetectLogos(ImageFromArg(opts.FilePath)),
(DetectCropHintOptions opts) => DetectCropHint(ImageFromArg(opts.FilePath)),
(DetectWebOptions opts) => DetectWeb(ImageFromArg(opts.FilePath)),
Expand Down
8 changes: 8 additions & 0 deletions vision/api/VisionTest/VisionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ public void DetectText()
Assert.Contains("fermented", output.Stdout);
}

[Fact]
public void DetectTextWithMultiRegion()
{
var output = Run("text", Path.Combine("data", "bonito.gif"), "-m");
Assert.Equal(0, output.ExitCode);
Assert.Contains("fermented", output.Stdout);
}

[Fact]
public void DetectNoText()
{
Expand Down