Support for Kokoro

alba/pom.xml

@@ -34,7 +34,11 @@
             <artifactId>alba-model</artifactId>
             <version>${models.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.pitest.voices</groupId>
+            <artifactId>piper-runtime</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

alba/src/main/java/org/pitest/voices/alba/Alba.java

@@ -4,10 +4,12 @@
 import org.pitest.voices.Language;
 import org.pitest.voices.Model;
 
+import static org.pitest.voices.piper.PiperHandler.piper;
+
 public class Alba {
 
     public static Model albaMedium() {
-         return new ClassPathModel("/models/vits-piper-en_GB-alba-medium/en_GB-alba-medium.onnx",
+         return new ClassPathModel(piper(),"/models/vits-piper-en_GB-alba-medium/en_GB-alba-medium.onnx",
                  Language.en_GB,
                  2.0f);
     }

bryce/pom.xml

@@ -29,6 +29,11 @@
             <artifactId>core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.pitest.voices</groupId>
+            <artifactId>piper-runtime</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.pitest.voices</groupId>
             <artifactId>bryce-model</artifactId>

bryce/src/main/java/org/pitest/voices/bryce/Bryce.java

@@ -4,10 +4,12 @@
 import org.pitest.voices.Language;
 import org.pitest.voices.Model;
 
+import static org.pitest.voices.piper.PiperHandler.piper;
+
 public class Bryce {
 
     public static Model bryceMedium() {
-         return new ClassPathModel("/models/vits-piper-en_US-bryce-medium/en_US-bryce-medium.onnx",
+         return new ClassPathModel(piper(), "/models/vits-piper-en_US-bryce-medium/en_US-bryce-medium.onnx",
                  Language.en_US,
                  1.0f);
     }

chorus/pom.xml

@@ -29,19 +29,18 @@
             <artifactId>core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.microsoft.onnxruntime</groupId>
+            <artifactId>onnxruntime</artifactId>
+            <version>${onnx.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.opennlp</groupId>
             <artifactId>opennlp-tools</artifactId>
             <version>2.5.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.microsoft.onnxruntime</groupId>
-            <artifactId>onnxruntime</artifactId>
-            <version>1.20.0</version>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
         <dependency>
@@ -63,7 +62,6 @@
             <scope>test</scope>
         </dependency>
 
-
     </dependencies>
 
     <build>

chorus/src/main/java/org/pitest/voices/Chorus.java

@@ -41,12 +41,8 @@ public Voice voice(Model model) {
         var session = voices.computeIfAbsent(model.id(), n -> loadVoice(model));
         var phonemizer = new PiperPhonemizer(g2p(), conf.expansions(), conf.trace());
 
-        return new PiperVoice(model,
-                phonemizer,
-                conf.trace(),
+        return model.createVoice(phonemizer, conf.trace(),
                 session,
-                Pause.defaultPauses(),
-                ModelParameters.defaultParams(),
                 model.defaultGain());
     }
 
@@ -71,8 +67,7 @@ private VoiceSession loadPiperModel(Model model) {
         OrtEnvironment env = OrtEnvironment.getEnvironment();
         try {
             var options = configureSession();
-            var session = env.createSession(model.asBytes(conf.base()), options);
-            return new VoiceSession(env, model.resolveConfig(conf.base()), session);
+            return model.createSession(env, options, conf.base());
         } catch (IOException | OrtException e) {
             throw new RuntimeException(e);
         }