Merge branch 'main' into feat/riva_tts

elevenlabs tts speed and pronunciation_dictionary_locators

lib/synth-audio.js

@@ -215,7 +215,8 @@ async function synthAudio(client, createHash, retrieveHash, logger, stats, { acc
         audioData = await synthNuance(client, logger, {credentials, stats, voice, model, text});
         break;
       case 'nvidia':
-        audioData = await synthNvidia(client, logger, {credentials, stats, language, voice, model, text});
+        audioData = await synthNvidia(client, logger, {credentials, stats, language, voice, model, text,
+          renderForCaching, disableTtsStreaming});
         break;
       case 'ibm':
         audioData = await synthIbm(logger, {credentials, stats, voice, text});
@@ -708,8 +709,24 @@ const synthNuance = async(client, logger, {credentials, stats, voice, model, tex
   });
 };
 
-const synthNvidia = async(client, logger, {credentials, stats, language,  voice, model, text}) => {
+const synthNvidia = async(client, logger, {
+  credentials, stats, language,  voice, model, text, renderForCaching, disableTtsStreaming
+}) => {
   const {riva_server_uri} = credentials;
+  if (!JAMBONES_DISABLE_TTS_STREAMING && !renderForCaching && !disableTtsStreaming) {
+    let params = '';
+    params += `{riva_server_uri=${riva_server_uri}`;
+    params += `,voice=${voice}`;
+    params += `,language=${language}`;
+    params += ',write_cache_file=1';
+    params += '}';
+
+    return {
+      filePath: `say:${params}${text.replace(/\n/g, ' ')}`,
+      servedFromCache: false,
+      rtt: 0
+    };
+  }
   let rivaClient, request;
   const sampleRate = 8000;
   try {
@@ -789,9 +806,13 @@ const synthElevenlabs = async(logger, {
     if (opts.voice_settings?.similarity_boost) params += `,similarity_boost=${opts.voice_settings.similarity_boost}`;
     if (opts.voice_settings?.stability) params += `,stability=${opts.voice_settings.stability}`;
     if (opts.voice_settings?.style) params += `,style=${opts.voice_settings.style}`;
+    if (opts.voice_settings?.speed !== null && opts.voice_settings?.speed !== undefined)
+      params += `,speed=${opts.voice_settings.speed}`;
     if (opts.voice_settings?.use_speaker_boost === false) params += ',use_speaker_boost=false';
     if (opts.previous_text) params += `,previous_text=${opts.previous_text}`;
     if (opts.next_text) params += `,next_text=${opts.next_text}`;
+    if (opts.pronunciation_dictionary_locators && Array.isArray(opts.pronunciation_dictionary_locators))
+      params += `,pronunciation_dictionary_locators=${JSON.stringify(opts.pronunciation_dictionary_locators)}`;
     params += '}';
 
     return {
@@ -926,7 +947,7 @@ const synthPlayHT = async(client, logger, {
 };
 
 const synthRimelabs = async(logger, {
-  credentials, options, stats, voice, text, renderForCaching, disableTtsStreaming
+  credentials, options, stats, language, voice, text, renderForCaching, disableTtsStreaming
 }) => {
   const {api_key, model_id, options: credOpts} = credentials;
   const opts = !!options && Object.keys(options).length !== 0 ? options : JSON.parse(credOpts || '{}');
@@ -937,6 +958,7 @@ const synthRimelabs = async(logger, {
     params += `{api_key=${api_key}`;
     params += `,model_id=${model_id}`;
     params += ',vendor=rimelabs';
+    params += `,language=${language}`;
     params += `,voice=${voice}`;
     params += ',write_cache_file=1';
     if (opts.speedAlpha) params += `,speed_alpha=${opts.speedAlpha}`;
@@ -962,6 +984,7 @@ const synthRimelabs = async(logger, {
       text,
       modelId: model_id,
       samplingRate: sampleRate,
+      lang: language,
       ...opts
     });
     return {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/speech-utils",
-  "version": "0.2.2",
+  "version": "0.2.6",
   "description": "TTS-related speech utilities for jambonz",
   "main": "index.js",
   "author": "Dave Horton",
@@ -39,7 +39,7 @@
     "ibm-watson": "^8.0.0",
     "microsoft-cognitiveservices-speech-sdk": "1.38.0",
     "openai": "^4.25.0",
-    "undici": "^6.4.0"
+    "undici": "^7.5.0"
   },
   "devDependencies": {
     "config": "^3.3.11",

test/synth.js

@@ -720,7 +720,7 @@ test('Cartesia speech synth tests', async(t) => {
   client.quit();
 });
 
-test('rimelabs speech synth tests', async(t) => {
+test('rimelabs speech synth tests mist', async(t) => {
   const fn = require('..');
   const {synthAudio, client} = fn(opts, logger);
 
@@ -730,7 +730,7 @@ test('rimelabs speech synth tests', async(t) => {
   }
   const text = 'Hi there and welcome to jambones!';
   try {
-    let opts = await synthAudio(stats, {
+    const opts = await synthAudio(stats, {
       vendor: 'rimelabs',
       credentials: {
         api_key: process.env.RIMELABS_API_KEY,
@@ -740,7 +740,7 @@ test('rimelabs speech synth tests', async(t) => {
           reduceLatency: false
         })
       },
-      language: 'en-US',
+      language: 'eng',
       voice: 'amber',
       text,
       renderForCaching: true
@@ -754,6 +754,40 @@ test('rimelabs speech synth tests', async(t) => {
   client.quit();
 });
 
+test('rimelabs speech synth tests mistv2', async(t) => {
+  const fn = require('..');
+  const {synthAudio, client} = fn(opts, logger);
+
+  if (!process.env.RIMELABS_API_KEY) {
+    t.pass('skipping rimelabs speech synth tests since RIMELABS_API_KEY is not provided');
+    return t.end();
+  }
+  const text = 'Hi there and welcome to jambones!';
+  try {
+    const opts = await synthAudio(stats, {
+      vendor: 'rimelabs',
+      credentials: {
+        api_key: process.env.RIMELABS_API_KEY,
+        model_id: 'mistv2',
+        options: JSON.stringify({
+          speedAlpha: 1.0,
+          reduceLatency: false
+        })
+      },
+      language: 'spa',
+      voice: 'pablo',
+      text,
+      renderForCaching: true
+    });
+    t.ok(!opts.servedFromCache, `successfully synthesized rimelabs mistv2 audio to ${opts.filePath}`);
+
+  } catch (err) {
+    console.error(JSON.stringify(err));
+    t.end(err);
+  }
+  client.quit();
+});
+
 test('whisper speech synth tests', async(t) => {
   const fn = require('..');
   const {synthAudio, client} = fn(opts, logger);