Changeset 35240 for gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/src/main/java/org

Timestamp:

2021-08-03T14:36:14+12:00 (3 years ago)

Author:

davidb

Message:

Add setup file and ANT configuration tasks to allow including the API key and other properties

Location:

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy

Files:

• . (modified) (1 prop)
• src/main/java/org/atea/nlptools/koreromaoriinterface/TranscriptionServlet.java (modified) (3 diffs)
• src/main/java/org/atea/nlptools/koreromaoriinterface/services/ReoTuhituhiApiService.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package org.atea.nlptools.koreromaoriinterface;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -7 +8 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
 
 import javax.servlet.ServletException;
@@ -34 +36 @@
 
     private final Gson jsonSerialiser;
-    private final ReoTuhituhiApiService transcriptionService;
+
+    private ReoTuhituhiApiService transcriptionService;
 
     public TranscriptionServlet()
     {
         jsonSerialiser = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
-        this.transcriptionService = new ReoTuhituhiApiService(jsonSerialiser);
+    }
+
+    @Override
+    public void init() 
+    {
+        Properties prop = new Properties();
+
+        try {
+            FileInputStream fis = new FileInputStream("../webapps/gs3-koreromaori/config.properties");
+            prop.load(fis);
+            fis.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        String apiEndpoint = prop.getProperty("tuhituhi.api.endpoint");
+        String apiKey = prop.getProperty("tuhituhi.api.key");
+        
+        this.transcriptionService = new ReoTuhituhiApiService(jsonSerialiser, apiEndpoint, apiKey);
     }
 

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

@@ -25 +25 @@
     private final ExecutorService threadPool;
     private final Gson jsonSerialiser;
+    private final String apiEndpoint;
+    private final String apiKey;
 
-    public ReoTuhituhiApiService(Gson jsonSerialiser)
+    public ReoTuhituhiApiService(Gson jsonSerialiser, String apiEndpoint, String apiKey)
     {
         this.jsonSerialiser = jsonSerialiser;
+        this.apiEndpoint = apiEndpoint;
+        this.apiKey = apiKey;
 
         threadPool = java.util.concurrent.Executors.newFixedThreadPool(3);
@@ -87 +91 @@
         throws Exception
     {
-        // TODO: Use servlet param for URL
-        // TODO: Use servlet param for API key
         String jsonResponse = HttpRequestService
-            .post("https://asr.koreromaori.io/transcribe_with_metadata")
-            .authorization("Basic ")
+            .post(apiEndpoint)
+            .authorization("Basic " + apiKey)
             .send(audioStream)
             .body();