added gcs read for audio file

puneithk · puneithk · commit aaf5e91220e4 · 2016-05-27T00:30:40.000-07:00
diff --git a/speech/grpc/pom.xml b/speech/grpc/pom.xml
@@ -111,6 +111,11 @@ limitations under the License.
 
   <!-- // [START dependency] -->
   <dependencies>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>gcloud-java</artifactId>
+      <version>0.2.2</version>
+    </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
diff --git a/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/AudioRequestFactory.java b/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/AudioRequestFactory.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * 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.
+ */
+
+// AudioRequestFactory takes a URI as an input and creates an AudioRequest
+// The factory takes as input files of type local and gs
+
+package com.google.cloud.speech.grpc.demos;
+
+import com.google.cloud.speech.v1.AudioRequest;
+import java.net.URI;
+import java.io.IOException;
+
+import com.google.cloud.storage.Blob;
+import com.google.cloud.storage.BlobId;
+import com.google.cloud.storage.Storage;
+import com.google.cloud.storage.StorageOptions;
+import com.google.protobuf.ByteString;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class AudioRequestFactory {
+
+  private static final String FILE = "file";
+  private static final String GS = "gs";
+
+  /**
+   * Takes an input URI of form $scheme:// and converts to audio request
+   *
+   * @param uri input uri
+   * @return AudioRequest audio request
+   */
+  public static AudioRequest createRequest(URI uri)
+      throws IOException {
+    if(uri.getScheme() == null || uri.getScheme().equals(FILE)) {
+      Path path = Paths.get(uri);
+      return audioFromBytes(Files.readAllBytes(path));
+    }
+    else if(uri.getScheme().equals(GS)) {
+      Storage storage = StorageOptions.defaultInstance().service();
+      String path = uri.getPath();
+      BlobId blobId = BlobId.of(uri.getHost(), path.substring(1,path.length()));
+      Blob blob = storage.get(blobId);
+      return audioFromBytes(blob.content());
+    }
+    throw new RuntimeException("scheme not supported "+uri.getScheme());
+  }
+
+  /**
+   * Convert bytes to AudioRequest
+   *
+   * @param bytes input bytes
+   * @return AudioRequest audio request
+   */
+  private static AudioRequest audioFromBytes(byte[] bytes) {
+    return AudioRequest.newBuilder()
+        .setContent(ByteString.copyFrom(bytes))
+        .build();
+  }
+
+  public static void main(String[] args) {
+    
+  }
+}
diff --git a/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/NonStreamingRecognizeClient.java b/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/NonStreamingRecognizeClient.java
@@ -48,6 +48,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
+import java.net.URI;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -72,7 +73,7 @@ public class NonStreamingRecognizeClient {
 
   private final String host;
   private final int port;
-  private final String file;
+  private final URI input;
   private final int samplingRate;
 
   private final ManagedChannel channel;
@@ -81,11 +82,11 @@ public class NonStreamingRecognizeClient {
   /**
    * Construct client connecting to Cloud Speech server at {@code host:port}.
    */
-  public NonStreamingRecognizeClient(String host, int port, String file, int samplingRate)
+  public NonStreamingRecognizeClient(String host, int port, URI input, int samplingRate)
       throws IOException {
     this.host = host;
     this.port = port;
-    this.file = file;
+    this.input = input;
     this.samplingRate = samplingRate;
 
     GoogleCredentials creds = GoogleCredentials.getApplicationDefault();
@@ -99,10 +100,7 @@ public NonStreamingRecognizeClient(String host, int port, String file, int sampl
   }
 
   private AudioRequest createAudioRequest() throws IOException {
-    Path path = Paths.get(file);
-    return AudioRequest.newBuilder()
-        .setContent(ByteString.copyFrom(Files.readAllBytes(path)))
-        .build();
+    return AudioRequestFactory.createRequest(this.input);
   }
 
   public void shutdown() throws InterruptedException {
@@ -115,10 +113,10 @@ public void recognize() {
     try {
       audio = createAudioRequest();
     } catch (IOException e) {
-      logger.log(Level.WARNING, "Failed to read audio file: " + file);
+      logger.log(Level.WARNING, "Failed to read audio uri input: " + input);
       return;
     }
-    logger.info("Sending " + audio.getContent().size() + " bytes from audio file: " + file);
+    logger.info("Sending " + audio.getContent().size() + " bytes from audio uri input: " + input);
     InitialRecognizeRequest initial = InitialRecognizeRequest.newBuilder()
         .setEncoding(AudioEncoding.LINEAR16)
         .setSampleRate(samplingRate)
@@ -147,8 +145,8 @@ public static void main(String[] args) throws Exception {
     CommandLineParser parser = new DefaultParser();
 
     Options options = new Options();
-    options.addOption(OptionBuilder.withLongOpt("file")
-        .withDescription("path to audio file")
+    options.addOption(OptionBuilder.withLongOpt("uri")
+        .withDescription("path to audio uri")
         .hasArg()
         .withArgName("FILE_PATH")
         .create());
@@ -170,10 +168,10 @@ public static void main(String[] args) throws Exception {
 
     try {
       CommandLine line = parser.parse(options, args);
-      if (line.hasOption("file")) {
-        audioFile = line.getOptionValue("file");
+      if (line.hasOption("uri")) {
+        audioFile = line.getOptionValue("uri");
       } else {
-        System.err.println("An Audio file path must be specified (e.g. /foo/baz.raw).");
+        System.err.println("An Audio uri must be specified (e.g. file://foo/baz.raw).");
         System.exit(1);
       }
 
@@ -203,7 +201,7 @@ public static void main(String[] args) throws Exception {
     }
 
     NonStreamingRecognizeClient client =
-        new NonStreamingRecognizeClient(host, port, audioFile, sampling);
+        new NonStreamingRecognizeClient(host, port, URI.create(audioFile), sampling);
     try {
       client.recognize();
     } finally {
