Changeset 35241

Timestamp:

2021-08-03T15:30:08+12:00 (3 years ago)

Author:

davidb

Message:

Implement support for returning proper audio file name

Location:

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/src/main/java/org/atea/nlptools/koreromaoriinterface

Files:

• TranscriptionServlet.java (modified) (4 diffs)
• models/AudioFilePart.java (added)
• services/ReoTuhituhiApiService.java (modified) (5 diffs)

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/src/main/java/org/atea/nlptools/koreromaoriinterface/TranscriptionServlet.java

@@ -3 +3 @@
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.PrintWriter;
 import java.lang.reflect.Type;
@@ -15 +14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
 
 import com.google.gson.FieldNamingPolicy;
@@ -23 +23 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.atea.nlptools.koreromaoriinterface.models.AudioFilePart;
 import org.atea.nlptools.koreromaoriinterface.models.MyTranscriptionResponse;
 import org.atea.nlptools.koreromaoriinterface.models.TranscriptionResult;
@@ -86 +87 @@
         String[] audioFileKeys = audioFileKeysParameter.split("\\|");
 
-        ArrayList<InputStream> audioFileStreams = new ArrayList<InputStream>(audioFileKeys.length);
+        ArrayList<AudioFilePart> audioFileParts = new ArrayList<AudioFilePart>(audioFileKeys.length);
         for (String audioFileKey : audioFileKeys)
         {
-            audioFileStreams.add(request.getPart(audioFileKey).getInputStream());
+            Part p = request.getPart(audioFileKey);
+            AudioFilePart audioFilePart = AudioFilePart.fromPart(p);
+            audioFileParts.add(audioFilePart);
         }
 
         try
         {
-            List<TranscriptionResult> results = transcriptionService.GetTranscriptions(audioFileStreams);
+            List<AudioFilePart> results = transcriptionService.GetTranscriptions(audioFileParts);
             List<MyTranscriptionResponse> responses = new ArrayList<MyTranscriptionResponse>(results.size());
 
-            for (TranscriptionResult result : results) {
-                responses.add(MyTranscriptionResponse.FromTranscriptionResult(result, "placeholder")); // TODO: Insert correct file name
+            for (AudioFilePart result : results) {
+                responses.add(MyTranscriptionResponse.FromTranscriptionResult(result.getTranscriptionResult(), result.fileName));
             }
 

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/src/main/java/org/atea/nlptools/koreromaoriinterface/services/ReoTuhituhiApiService.java

@@ -14 +14 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.atea.nlptools.koreromaoriinterface.models.AudioFilePart;
 import org.atea.nlptools.koreromaoriinterface.models.TranscriptionResult;
 
@@ -40 +41 @@
      * Queries the Reo Tuhituhi API to transcribe the given audio files.
      * 
-     * @param audioFileStreams The audio files to retrieve a transcription for.
+     * @param audioFileParts The audio files to retrieve a transcription for.
      * @return A list of {@link TranscriptionResult} objects.
      * @throws Exception
      */
-    public List<TranscriptionResult> GetTranscriptions(Iterable<InputStream> audioFileStreams)
+    public List<AudioFilePart> GetTranscriptions(Iterable<AudioFilePart> audioFileParts)
         throws Exception
     {
-        Queue<Future<TranscriptionResult>> apiCalls = new LinkedList<Future<TranscriptionResult>>();
+        Queue<Future<AudioFilePart>> apiCalls = new LinkedList<Future<AudioFilePart>>();
 
         // Queue each transcription request up asynchronously
-        for (InputStream audioStream : audioFileStreams)
+        for (AudioFilePart part : audioFileParts)
         {
             //Callable<TranscriptionResult> transcriptionTask = getTranscriptionCallable(audioStream);
@@ -57 +58 @@
         }
 
-        List<TranscriptionResult> apiResults = new ArrayList<TranscriptionResult>(apiCalls.size());
+        List<AudioFilePart> apiResults = new ArrayList<AudioFilePart>(apiCalls.size());
         
-        for (InputStream audioStream : audioFileStreams)
+        for (AudioFilePart part : audioFileParts)
         {
-            apiResults.add(getTranscription(audioStream));
-            logger.debug("API call has completed.");
+            TranscriptionResult res = getTranscription(part.dataStream);
+            part.setTranscriptionResult(res);
+            apiResults.add(part);
         }
 
@@ -76 +78 @@
     }
 
-    private Callable<TranscriptionResult> getTranscriptionCallable(final InputStream audioStream)
+    private Callable<AudioFilePart> getTranscriptionCallable(final AudioFilePart part)
     {
-        return new Callable<TranscriptionResult>()
+        return new Callable<AudioFilePart>()
         {
             @Override
-            public TranscriptionResult call() throws Exception
+            public AudioFilePart call() throws Exception
             {
-                return getTranscription(audioStream);
+                TranscriptionResult res = getTranscription(part.dataStream);
+                part.setTranscriptionResult(res);
+                return part;
             }
         };
@@ -97 +101 @@
             .body();
 
-        logger.debug("Reo Tuhituhi API responded with a success status.");
+        logger.trace("Reo Tuhituhi API responded with a success status.");
         TranscriptionResult res = jsonSerialiser.fromJson(jsonResponse, TranscriptionResult.class);
-        logger.debug("Reo Tuhituhi API response was succesfully deserialised.");
+        logger.trace("Reo Tuhituhi API response was succesfully deserialised.");
         return res;
     }