v1.1 improvements (#78)

Author: ksyeo1010

binding/android/Orca/orca/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 ext {
     PUBLISH_GROUP_ID = 'ai.picovoice'
-    PUBLISH_VERSION = '1.1.0'
+    PUBLISH_VERSION = '1.1.1'
     PUBLISH_ARTIFACT_ID = 'orca-android'
 }
 

binding/android/OrcaTestApp/orca-test-app/build.gradle

@@ -71,8 +71,6 @@ android {
 
     tasks.register('copyParams', Copy) {
         from("$projectDir/../../../../lib/common/")
-        include("orca_params_en_female.pv")
-        include("orca_params_en_male.pv")
         into("$projectDir/src/main/assets/models")
     }
 
@@ -113,20 +111,22 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.errorprone:error_prone_annotations:2.36.0'
-    implementation 'ai.picovoice:orca-android:1.1.0'
+    implementation 'ai.picovoice:orca-android:1.1.1'
 
     // Espresso UI Testing
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     androidTestImplementation('androidx.test.espresso:espresso-intents:3.5.1')
-    androidTestImplementation('ai.picovoice:orca-android:1.0.0')
+    androidTestImplementation('ai.picovoice:orca-android:1.1.1')
 }
 
 afterEvaluate {
     tasks."mergeDebugAssets".dependsOn "copyParams"
     tasks."mergeReleaseAssets".dependsOn "copyParams"
+    tasks."generateDebugLintReportModel".dependsOn "copyParams"
     tasks."generateReleaseLintVitalReportModel".dependsOn "copyParams"
+    tasks."lintAnalyzeDebug".dependsOn "copyParams"
     tasks."lintVitalAnalyzeRelease".dependsOn "copyParams"
 }

binding/android/OrcaTestApp/orca-test-app/src/androidTest/java/ai/picovoice/orca/testapp/AlignmentTests.java

@@ -12,11 +12,6 @@
 
 package ai.picovoice.orca.testapp;
 
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -29,21 +24,17 @@
 import org.junit.runners.Parameterized;
 
 import java.io.File;
-
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
 
 import ai.picovoice.orca.Orca;
 import ai.picovoice.orca.OrcaAudio;
 import ai.picovoice.orca.OrcaException;
-import ai.picovoice.orca.OrcaInvalidArgumentException;
+import ai.picovoice.orca.OrcaPhoneme;
 import ai.picovoice.orca.OrcaSynthesizeParams;
 import ai.picovoice.orca.OrcaWord;
-import ai.picovoice.orca.OrcaPhoneme;
 
 @RunWith(Parameterized.class)
 public class AlignmentTests extends BaseTest {
@@ -92,8 +83,6 @@ public static Collection<Object[]> initParameters() throws IOException {
 
     @Before
     public void Setup() throws Exception {
-        super.Setup();
-
         orca = new Orca.Builder()
                 .setAccessKey(accessKey)
                 .setModelPath(getModelFilepath(modelFilename))

binding/android/OrcaTestApp/orca-test-app/src/androidTest/java/ai/picovoice/orca/testapp/BaseTest.java

@@ -12,6 +12,8 @@
 
 package ai.picovoice.orca.testapp;
 
+import static org.junit.Assert.assertEquals;
+
 import android.content.Context;
 import android.content.res.AssetManager;
 
@@ -20,7 +22,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 
-import org.junit.Before;
+import org.junit.BeforeClass;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -32,35 +34,37 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
-import static org.junit.Assert.assertEquals;
-
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
-import ai.picovoice.orca.OrcaWord;
 import ai.picovoice.orca.OrcaPhoneme;
+import ai.picovoice.orca.OrcaWord;
 
 public class BaseTest {
+    static Set<String> extractedFiles;
+
+    static Context testContext;
+    static Context appContext;
+    static AssetManager assetManager;
+    static String testResourcesPath;
+    static JsonObject testJson;
+    static String accessKey;
 
-    Context testContext;
-    Context appContext;
-    AssetManager assetManager;
-    String testResourcesPath;
-    JsonObject testJson;
-    String accessKey;
+    @BeforeClass
+    public static void setup() throws Exception {
+        extractedFiles = new HashSet<>();
 
-    @Before
-    public void Setup() throws Exception {
         testContext = InstrumentationRegistry.getInstrumentation().getContext();
         appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
         assetManager = testContext.getAssets();
-        extractAssetsRecursively("test_resources");
         testResourcesPath = new File(
                 appContext.getFilesDir(),
                 "test_resources").getAbsolutePath();
 
+        extractTestFile("test_resources/test_data.json");
         FileReader reader = new FileReader(
                 new File(testResourcesPath, "test_data.json").getAbsolutePath()
         );
@@ -86,20 +90,23 @@ public static String getTestDataString() throws IOException {
         return result.toString("UTF-8");
     }
 
-    public static String getModelFilepath(String modelFilename) {
+    public static String getModelFilepath(String modelFilename) throws IOException {
         Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
         String resPath = new File(
                 context.getFilesDir(),
                 "test_resources").getAbsolutePath();
-        return new File(resPath, String.format("model_files/%s", modelFilename)).getAbsolutePath();
+        String modelPath = String.format("model_files/%s", modelFilename);
+        extractTestFile(String.format("test_resources/%s", modelPath));
+        return new File(resPath, modelPath).getAbsolutePath();
     }
 
-    public static String getAudioFilepath(String modelFilename, String synthesisType) {
+    public static String getAudioFilepath(String modelFilename, String synthesisType) throws IOException {
         Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
         String resPath = new File(
                 context.getFilesDir(),
                 "test_resources").getAbsolutePath();
         String audioFilename = modelFilename.replace(".pv", String.format("_%s.wav", synthesisType));
+        extractTestFile(String.format("test_resources/wav/%s", audioFilename));
         return new File(resPath, String.format("wav/%s", audioFilename)).getAbsolutePath();
     }
 
@@ -163,7 +170,7 @@ protected void validateMetadata(
         }
     }
 
-    private void extractAssetsRecursively(String path) throws IOException {
+    private static void extractAssetsRecursively(String path) throws IOException {
         String[] dirList = assetManager.list(path);
         if (dirList != null && dirList.length > 0) {
             File outputFile = new File(appContext.getFilesDir(), path);
@@ -186,14 +193,25 @@ private void extractAssetsRecursively(String path) throws IOException {
         }
     }
 
-    private void extractTestFile(String filepath) throws IOException {
+    private static void extractTestFile(String filepath) throws IOException {
+        File absPath = new File(
+                appContext.getFilesDir(),
+                filepath);
+
+        if (extractedFiles.contains(filepath)) {
+            return;
+        }
+
+        if (!absPath.exists()) {
+            if (absPath.getParentFile() != null) {
+                absPath.getParentFile().mkdirs();
+            }
+            absPath.createNewFile();
+        }
 
         InputStream is = new BufferedInputStream(
                 assetManager.open(filepath),
                 256);
-        File absPath = new File(
-                appContext.getFilesDir(),
-                filepath);
         OutputStream os = new BufferedOutputStream(
                 new FileOutputStream(absPath),
                 256);
@@ -206,5 +224,7 @@ private void extractTestFile(String filepath) throws IOException {
 
         is.close();
         os.close();
+
+        extractedFiles.add(filepath);
     }
 }

binding/android/OrcaTestApp/orca-test-app/src/androidTest/java/ai/picovoice/orca/testapp/PerformanceTest.java

@@ -65,7 +65,6 @@ public static Collection<Object[]> initParameters() throws IOException {
 
     @Before
     public void Setup() throws Exception {
-        super.Setup();
         String iterationString = appContext.getString(R.string.numTestIterations);
 
         try {

binding/android/OrcaTestApp/orca-test-app/src/androidTest/java/ai/picovoice/orca/testapp/SentenceTests.java

@@ -29,21 +29,17 @@
 import org.junit.runners.Parameterized;
 
 import java.io.File;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
 
 import ai.picovoice.orca.Orca;
 import ai.picovoice.orca.OrcaAudio;
 import ai.picovoice.orca.OrcaException;
 import ai.picovoice.orca.OrcaInvalidArgumentException;
 import ai.picovoice.orca.OrcaSynthesizeParams;
-import ai.picovoice.orca.OrcaWord;
-import ai.picovoice.orca.OrcaPhoneme;
 
 @RunWith(Parameterized.class)
 public class SentenceTests extends BaseTest {
@@ -98,8 +94,6 @@ public static Collection<Object[]> initParameters() throws IOException {
 
     @Before
     public void Setup() throws Exception {
-        super.Setup();
-
         orca = new Orca.Builder()
                 .setAccessKey(accessKey)
                 .setModelPath(getModelFilepath(modelFilename))

binding/android/OrcaTestApp/orca-test-app/src/androidTest/java/ai/picovoice/orca/testapp/StandardTests.java

@@ -15,22 +15,18 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import ai.picovoice.orca.Orca;
-import ai.picovoice.orca.OrcaException;
-
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import ai.picovoice.orca.Orca;
+import ai.picovoice.orca.OrcaException;
 
 @RunWith(AndroidJUnit4.class)
 public class StandardTests extends BaseTest {
@@ -39,8 +35,6 @@ public class StandardTests extends BaseTest {
 
     @Before
     public void Setup() throws Exception {
-        super.Setup();
-
         String testDataJsonString = getTestDataString();
 
         JsonParser parser = new JsonParser();

binding/dotnet/Orca/Orca.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net8.0;net6.0;netcoreapp3.0;netstandard2.0</TargetFrameworks>
-        <Version>1.1.1</Version>
+        <Version>1.1.2</Version>
         <Authors>Picovoice</Authors>
         <Company />
         <Product>Orca Streaming Text-to-Speech Engine</Product>

binding/ios/Orca-iOS.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
     s.name = 'Orca-iOS'
     s.module_name = 'Orca'
-    s.version = '1.1.0'
+    s.version = '1.1.1'
     s.license = {:type => 'Apache 2.0'}
     s.summary = 'iOS binding for Picovoice\'s Orca Text-to-Speech Engine.'
     s.description =

binding/ios/OrcaAppTest/OrcaAppTest.xcodeproj/project.pbxproj

@@ -236,7 +236,7 @@
 			);
 			mainGroup = 1E00643F27CEDF9B006FF6E9;
 			packageReferences = (
-				07F723562D6D57E90002D88F /* XCRemoteSwiftPackageReference "orca" */,
+				1E7C0A402D84D9C700A5350A /* XCRemoteSwiftPackageReference "orca" */,
 			);
 			productRefGroup = 1E00644927CEDF9B006FF6E9 /* Products */;
 			projectDirPath = "";
@@ -655,12 +655,12 @@
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		07F723562D6D57E90002D88F /* XCRemoteSwiftPackageReference "orca" */ = {
+		1E7C0A402D84D9C700A5350A /* XCRemoteSwiftPackageReference "orca" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Picovoice/orca";
 			requirement = {
-				kind = exactVersion;
-				version = 1.1.0;
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.1.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */